From nobody Mon Aug 12 05:35:23 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wj3Bh1gwyz5T9Wn; Mon, 12 Aug 2024 05:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wj3Bh0cwrz4jqn; Mon, 12 Aug 2024 05:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723440924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h4UvG3E5sa5yZorFlH/8adXSFvAwZP2FKExW0MsMOso=; b=E4uw7vawZ9EBq1naqgzt3Og7mpKi6wgmquXoTVmeCj5GdXVmYq3KgIBQUgMcyIlunhlEXX fmZa4XmeAfV9WSO460iWp9ZhqkKNQL+g5HthX4Pbl9BXLTkL8+4Trwf+rmlkDcCJggLNFS M1vJ2sUGoZmCQgebZqWkUNxQmAnQPgXTlqMQIDBI60zm3rT3Qol33gV9mY6brKTMLD1eJd /+Wym0/0d/jG+shwDvdbKnMkZ6Tt1e6LMcM/S9pZMwMtJehIqnegaGh0+K9gB+mQGN8A1z qmWu0ir6TqvaEc1Nb1HOC1jdeXR9IyeTdrJ0PR2LYh0vHgQyEwIrAm34XWdjRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723440924; a=rsa-sha256; cv=none; b=DIsTHWl8LTNkbPg7TonHB1xZw3Wv6WPmZ8ZU7cbT2vvOUl+6HOoXI1hfT6RgzrZ4blP82B iRRovK1w7vdD/Ghq2zYzNtIsLWLviT2Nfkcwk7Ul1v8zfzQR+hwnbvicC5iynyn47iFDul L2sCMqBHqwIK9hOZ6WaiXkDlcZlVRpbyho50GlPrpIAt7iQiNk+wZzyqyt6k+ai3WhDFQs ChlY5ygI3oOPRvHVfaTbWZ1ZYVcW8vqTfukHBOyUOQXoVM6FDVXaU2uw5OeSXBJblgbJqh LFv8c/jn7FHjXez8jQM5X6hp1DNUIO9OwV8mF4FgzXbprfzKsWaJ+Rs8LRQ7vA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723440924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=h4UvG3E5sa5yZorFlH/8adXSFvAwZP2FKExW0MsMOso=; b=f+dItVXo07Zfx2UcimYBz16bpmHu05D13ZUtZbIsB7IypzY7Gy531IMJKLWllkJzHm6fhG EvTpsovnh9xHhqjjWTRmxuS1HhLdCnz0fdnpEc4/i+KmWRUV4pSTsM1zMbk1TCKLm78RnZ vMYzOYYKK1W6orrnWUkfzrdFaTZ5WZzgsjxTHdajjz2FGYaeZll3x9iqcVGZCt9li5wF9k agGIcS+o9gjGnPAcoqEH9u/wMbX7HJ5z/MH8dmvSfcyCwIobJyE3/ZNEQZiPrIbtYE8nPw h89ImgAyB6zG+vZB4UQQktShFqK3RG14MbvLQTDDFR2J1zPj3CnLknO4nzir9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wj3Bh0CxyzFlH; Mon, 12 Aug 2024 05:35:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47C5ZNKR092702; Mon, 12 Aug 2024 05:35:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47C5ZNwV092699; Mon, 12 Aug 2024 05:35:23 GMT (envelope-from git) Date: Mon, 12 Aug 2024 05:35:23 GMT Message-Id: <202408120535.47C5ZNwV092699@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: ce42e0ed036b - stable/14 - tcp: initialize V_ts_offset_secret for all vnets List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ce42e0ed036b39c5ddf18967b1449e95faf0d3c6 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=ce42e0ed036b39c5ddf18967b1449e95faf0d3c6 commit ce42e0ed036b39c5ddf18967b1449e95faf0d3c6 Author: Michael Tuexen AuthorDate: 2024-08-09 14:12:22 +0000 Commit: Michael Tuexen CommitDate: 2024-08-12 05:34:35 +0000 tcp: initialize V_ts_offset_secret for all vnets Initialize V_ts_offset_secret for each vnet, not only for the default vnet, since it is vnet specific. Reviewed by: Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D46246 (cherry picked from commit 9b569353e0b073a513cf10debbe634c2ceb29fdf) --- sys/netinet/tcp_subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index a2424f2ab4d6..d633bd660346 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -1508,6 +1508,7 @@ tcp_vnet_init(void *arg __unused) VNET_PCPUSTAT_ALLOC(tcpstat, M_WAITOK); V_tcp_msl = TCPTV_MSL; + arc4rand(&V_ts_offset_secret, sizeof(V_ts_offset_secret), 0); } VNET_SYSINIT(tcp_vnet_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_FOURTH, tcp_vnet_init, NULL); @@ -1545,7 +1546,6 @@ tcp_init(void *arg __unused) /* Initialize the TCP logging data. */ tcp_log_init(); #endif - arc4rand(&V_ts_offset_secret, sizeof(V_ts_offset_secret), 0); if (tcp_soreceive_stream) { #ifdef INET From nobody Mon Aug 12 05:51:50 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wj3Yf5Gv7z5TC3d; Mon, 12 Aug 2024 05:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wj3Yf3SjLz4lHv; Mon, 12 Aug 2024 05:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723441910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lz7fAWIv+WPl9ASooGFAA+GbcH8Jlrt0V+/by3A0V3I=; b=jfnZuKZwDTjUn0I6r/n5TuuiH1KIZmjELf+qytQNlaPl8y3oLUc+EaogQG92KWaLkoGb98 04sqcGJ1dzQ7D7q3djjs49Dbr0UW6tZI/qNDQawImkn2pU2L1/no0NGShncfI35mv1NOWN W/3mbDPBC35M58mZBBRFxNMT81y67+EfvFQHuUCcWiXKapedG44Y73BnltD+UyZPt4Coy7 siJ0ZRtb9jKBjeIJC4us2NwZ+ewvhAbPmICOKUJlPiEjeDcvUZgu+zXgQ1qMv0MwuPj8i1 pJGwwRa6djd3scFq2YoWJjgjJbcylaWtzmJEkJdJJnfRpI4Zyq9HUrCEM73f5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723441910; a=rsa-sha256; cv=none; b=uu6itt+Qa6bnU59P2SmUOQ886yMn5m0FA2ZPxI0fncj82bfnEvIDkBfxFrSWY8ho3f613O OdUyBSrL1Dw/+AbHnWXe+qfFj3zSooh33bh24qveGCT9pVzcxT86AC/g4XSaOtLzqNpjuM ueE6Aox+UZi7/8aaKf+uFdC60wl8eJH6NCWA+WAPpGAOSN0yb7ImHIxqecw1YNEmfSwYg4 aunWpUEagvomEle8yUED3dpwR8SeuJJjYv86oyn5RPleXLTr2Q99IaY4mm5bIsMugIaVDl oJbfwI0qnZqtGn/miZ8Ui1OZ0c0VWzFSdIyCD0Anx7qCZMNj98JI7PM3R7e+1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723441910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lz7fAWIv+WPl9ASooGFAA+GbcH8Jlrt0V+/by3A0V3I=; b=fX4HYZC10333CgyIJJytShXeucK8aPOh1Spkge0qOHGPK8Ef7afHgAuztXxxH58oe7+o3h Jhv2gblaFXTY/gdq33JSFAXwe0VkuumpZs/VVKNv/x3PmKslRY+sTbQJKYlQ/vqmFfP+Jm Qu+CJs23EjyTFv80Kfb5LDOirJkg3BDEJmZBoGTkyMquMn9LpFXokF7NQOvu2YV9JEI3y1 xv+/vVcKFVYWcIdaV7BXRbpHqPFOhGvFIwqc2VCcnCXkkasYlfOf0cd3daLzIfb3obgBvq E4q5Q20UlEkaXd0klR9TlWUWqcVaxO8ZwznRF622I9U3Vh2U5V3UYmersy0iFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wj3Yf359VzFq6; Mon, 12 Aug 2024 05:51:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47C5pon5021719; Mon, 12 Aug 2024 05:51:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47C5poMT021716; Mon, 12 Aug 2024 05:51:50 GMT (envelope-from git) Date: Mon, 12 Aug 2024 05:51:50 GMT Message-Id: <202408120551.47C5poMT021716@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 83572ae1f5dd - stable/13 - tcp: initialize V_ts_offset_secret for all vnets List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 83572ae1f5dd85fc00f33d5fd95374b8ee546636 Auto-Submitted: auto-generated The branch stable/13 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=83572ae1f5dd85fc00f33d5fd95374b8ee546636 commit 83572ae1f5dd85fc00f33d5fd95374b8ee546636 Author: Michael Tuexen AuthorDate: 2024-08-09 14:12:22 +0000 Commit: Michael Tuexen CommitDate: 2024-08-12 05:47:40 +0000 tcp: initialize V_ts_offset_secret for all vnets Initialize V_ts_offset_secret for each vnet, not only for the default vnet, since it is vnet specific. Reviewed by: Peter Lei Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D46246 (cherry picked from commit 9b569353e0b073a513cf10debbe634c2ceb29fdf) --- sys/netinet/tcp_subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 9bf02d21a307..493f569104cb 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -1448,6 +1448,7 @@ tcp_init(void) tcp_fastopen_init(); V_tcp_msl = TCPTV_MSL; + arc4rand(&V_ts_offset_secret, sizeof(V_ts_offset_secret), 0); /* Skip initialization of globals for non-default instances. */ if (!IS_DEFAULT_VNET(curvnet)) @@ -1481,7 +1482,6 @@ tcp_init(void) /* Initialize the TCP logging data. */ tcp_log_init(); #endif - arc4rand(&V_ts_offset_secret, sizeof(V_ts_offset_secret), 0); if (tcp_soreceive_stream) { #ifdef INET From nobody Mon Aug 12 12:51:17 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WjDsd4NqWz5SXp4; Mon, 12 Aug 2024 12:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WjDsd3x67z4TVh; Mon, 12 Aug 2024 12:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723467077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=njaO7VS/pFsEnjtTb8jI3ZTKh4jJNOnGdVNGclBZhWs=; b=q0Oz67/xZAeUGpIV7go5/JJlpd/HUJ1ZQy0KhG7bDB/r0/F9zYnfCBaJGoQrFi3Quvz1Jg CWZTePWKlAltNwcPRsxb/aaI1yGO8Nis3fayc3CnZHU/RuPqK3KPeC1nXyzlipmqQM1egD k39j0AThQPDgeppnjzbZ5PQSx0ticvE7ZGwFjAA7xQK3u7wpU0CaNxP1/9+4I/OB3WzBY/ q7rvknx70t0NNgVyqFcFm0zbdekvJUO7Hi8eOs/dTlMJVlyZcuoF/ovNu4wkIgc/Y21WDU hetmnXMHW8+J3T1fnVkm7yXQ9iYEGFS87HV1S0/JdS4+8bW375WM1jxsay4Waw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723467077; a=rsa-sha256; cv=none; b=K7ug5LdAFoLxV7Y3U3Gu9x78Vc8nsk4SsT4IEJV9vKfSRlp1r0gKtXufjv8jpjiZp+asFC BkT1D4IawPXzCS6gYFeF6UFJLqEH81NVR4gIRmHVKIhiXMMDotzGp7suB8Ruw0F7U6v06x 8B1VOF5MLIB5VDADgHJOxQ5/yT9e8BRMbSZwkbO7VHy2cr3N76DG1btU0EFszzXLCgLkMd 1N7rQdzB5Pbd+hWvge6WZ+C+Cx/RwtvFzIuIAjKjccqJZI3Rp1iFy/tdtmwx0opxJqv42l HrRuMVVn5C7uIFihujtP8/YFBlSsLsz3mAfZR2QSRkHMTG4GgSUZE5li1KSwgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723467077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=njaO7VS/pFsEnjtTb8jI3ZTKh4jJNOnGdVNGclBZhWs=; b=ipQTaDAO4f6tgy9YgVB5cUCSiB06aam/o7li7t+vCGXcqw/+WUQIjrBNdwNzGhw+mWzUWo ahLCjfRWqoRVGFJHWsk9I7c803iy855Qb2mWnAn9cStqLDrLnkw9ILYASlpnG1ie5iCR47 XTCNBiLUiRzXF/LCHgWkIcpg6eVFcgIAATVVHpQlqcQ/gbvFOAVWRGL8RfDXCDFmwlafhz PxFT5MOmFl5ed+QIZ4fIKwgCMZitTSgqJrY0w/3ZuciuNW7TdvQcccPIJ7rouM0xgyZ0zB 8hHsxM3oCJLt/T0lAXfslcVPpWV65HzWIQvXXp3RCGyek/aWe6YbhszOvqpkkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WjDsd3XGSzSG9; Mon, 12 Aug 2024 12:51:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47CCpHtH032510; Mon, 12 Aug 2024 12:51:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47CCpH7R032507; Mon, 12 Aug 2024 12:51:17 GMT (envelope-from git) Date: Mon, 12 Aug 2024 12:51:17 GMT Message-Id: <202408121251.47CCpH7R032507@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: eac2a1edabae - stable/14 - axgbe: Fix two typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: eac2a1edabae65e57bf66236bcbaf04d0c973b5e Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=eac2a1edabae65e57bf66236bcbaf04d0c973b5e commit eac2a1edabae65e57bf66236bcbaf04d0c973b5e Author: Gordon Bergling AuthorDate: 2024-07-21 09:06:07 +0000 Commit: Gordon Bergling CommitDate: 2024-08-12 12:51:02 +0000 axgbe: Fix two typos in source code comments - s/specfied/specified/ (cherry picked from commit 619c9488a31ce14c6570d2e31f70d416382ed7a6) --- sys/dev/axgbe/xgbe-phy-v2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/axgbe/xgbe-phy-v2.c b/sys/dev/axgbe/xgbe-phy-v2.c index 9a057c34c6c9..b7d27f633265 100644 --- a/sys/dev/axgbe/xgbe-phy-v2.c +++ b/sys/dev/axgbe/xgbe-phy-v2.c @@ -460,7 +460,7 @@ xgbe_phy_i2c_write(struct xgbe_prv_data *pdata, unsigned int target, void *val, retry = 1; again: - /* Write the specfied register */ + /* Write the specified register */ i2c_op.cmd = XGBE_I2C_CMD_WRITE; i2c_op.target = target; i2c_op.len = val_len; @@ -499,7 +499,7 @@ again1: retry = 1; again2: - /* Read the specfied register */ + /* Read the specified register */ i2c_op.cmd = XGBE_I2C_CMD_READ; i2c_op.target = target; i2c_op.len = val_len; From nobody Mon Aug 12 12:51:41 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WjDt55TRTz5SXwj; Mon, 12 Aug 2024 12:51:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WjDt54RwSz4V6L; Mon, 12 Aug 2024 12:51:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723467101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QteaYX6YKLeRnGKbO40yMYqAs5JjzUelxtDpIvPySpI=; b=HCwx+kFQzOvbO8z5lkVARMdnCVCU4fM7FJZwI0lbkT9ylE4L/zr6xvGLkP/ryQ2lIcXnrD c+wWOq/5D3LwY+ET6trMrGjN2OyHDR3tL5QitCHXMFTroZGnqvPbTpzJ7GWKLDmOrGsWEY gsxruB8e72WX3bKm/uaZI5Qa8B31xNbLWe+VKkosXCR7nPY7KK51hjGCeZhg+DX/4VpwpS B/wzey8Mt1HNuq6edA6IRnTVFKsMrUWPcK7aI+HCa0l/xt/5eR3LhzZPUr8cjTMs7lErGL 9Nk3xBTxRQ48xNXwMSaJ/pITmE4U11VFQ2DG7K12WT813cdNw2LhDTIHOAZ2iw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723467101; a=rsa-sha256; cv=none; b=tz6FPl5HUDhQThcob/zasqMBpL1Z9U5OhPPc7aNHBWqxoLuyJU5/JE0KAWUSlyHHe29G5a O8cPTgEqNJynPFeTEzygLcqJz0Sy6kmUnzTeEujf1KkZgshPVelhmcng5BcS8pmQTQzP6l 1WuNA4YcJ4BkdvZGefy9nITd81yCTQ9UFVNy1eIwBL3rTdP6Q/LOMIFIbxjHVHLiKpycLf ZEzwSaAFmX/nEihhl6K+2Dhgkb/rELWXnhrx+1SDx4A07lyzEgBjLVOfjIbjZE9MnE7UsX imblGaJMikhaKPFXKaJHQ8xJ/z9TPfK0+yB86dUojwpApiujWQNJyoJFPWT+5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723467101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QteaYX6YKLeRnGKbO40yMYqAs5JjzUelxtDpIvPySpI=; b=fB/3du3edqOm4mrKli+NC5xXH7qhVwod/qVOFk01Fim99CTG0fF2/MfG0vWG1ZVHAvdfkN T5sVjWvifmKuqzxGPV4859J1WWCkaLyJ8W3KL9zOcHJjFedEjiFl1/AXkP/S0aswcgRwhY EbZHVr/fJrY+X2hmsXhoIpJa95VYGIDcD6Nq0PZ8s7OgYkTkJ3/DV5rQV7aKbH2qz2rquC kvVGZ/TZkmGgAH6FT4Z1caWlkmUXoWEhrpKLF0Bh3CBbIOuebKomKux/ndm00Z1nEZCk81 gkOKyZCWemmS8qIgEBkXPHZUGWT+f+ft9rNrgmn2yqmKeiOPPBSAr4wOJBxzCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WjDt543WnzSF3; Mon, 12 Aug 2024 12:51:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47CCpfO3033640; Mon, 12 Aug 2024 12:51:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47CCpfMi033637; Mon, 12 Aug 2024 12:51:41 GMT (envelope-from git) Date: Mon, 12 Aug 2024 12:51:41 GMT Message-Id: <202408121251.47CCpfMi033637@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 0ea9f98023cf - stable/14 - sctp(4): Fix typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0ea9f98023cf159c3299774e28ef486ac13bf8b2 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=0ea9f98023cf159c3299774e28ef486ac13bf8b2 commit 0ea9f98023cf159c3299774e28ef486ac13bf8b2 Author: Gordon Bergling AuthorDate: 2024-07-21 08:57:22 +0000 Commit: Gordon Bergling CommitDate: 2024-08-12 12:51:29 +0000 sctp(4): Fix typos in source code comments - s/collasped/collapsed/ - s/defininitions/definitions/ - s/optionaly/optionally/ Obtained from: NetBSD (cherry picked from commit 58c99e07506e67c06d703b080c2fc22cc39237f2) --- sys/netinet6/sctp6_usrreq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c index 6c36e4899906..e38bf2b4ae6c 100644 --- a/sys/netinet6/sctp6_usrreq.c +++ b/sys/netinet6/sctp6_usrreq.c @@ -359,7 +359,7 @@ sctp6_ctlinput(struct ip6ctlparam *ip6cp) } /* - * this routine can probably be collasped into the one in sctp_userreq.c + * this routine can probably be collapsed into the one in sctp_userreq.c * since they do the same thing and now we lookup with a sockaddr */ static int @@ -721,8 +721,8 @@ connected_type: * note with the current version this code will only be used * by OpenBSD, NetBSD and FreeBSD have methods for * re-defining sosend() to use sctp_sosend(). One can - * optionaly switch back to this code (by changing back the - * defininitions but this is not advisable. + * optionally switch back to this code (by changing back the + * definitions but this is not advisable. */ struct epoch_tracker et; int ret; From nobody Mon Aug 12 12:52:10 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WjDtf6gWqz5SYN2; Mon, 12 Aug 2024 12:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WjDtf6FZ7z4VF1; Mon, 12 Aug 2024 12:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723467130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=++IKXa3obVCRyQzdFYT9Emid74PDZE263SG1sptzLQU=; b=J7OvevSG8ljc6aOuyYplc01D/uLTMi8VvyxHW81aDkU1fQ0rQIkZlpwBv8wH0nu8NXhf3V SyrYzTrg2/egQvUQxocmrFmcvYPudikpN0CVGpErVFvBGdUP5NJj9pojAs47Je2qPm6A3b LpCW8pxEbZRJqzCFi+AGFJMNv5rINDITrcONyhrfBQa+eOBb8g5wSomLoYrdiKpQLxo+iv TnE//tKvaHhN9yASwpG0sanfHzeZG62CIvnUa04uxHrFtOwXN/AWBMixkcPux5vkp29mXQ mHHJatnSY/m+1iGzHa/tQw0lE27/+3NLIRTAUX46TXEZk/9u5feQTwCJUuAEGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723467130; a=rsa-sha256; cv=none; b=HmPINNeqUxhp/G0dbpUNd9cae2kiqzUZEOHc5R+vPvB8jtWJffT4dkPmzglVTdc1HszS81 +4UEd24ZjtcWaOTyP9rDYXAtoULQzYOYM3dZRMUPLKASf6RwC8eUHJo9jmH6JrMRzxAv88 jPd2SDwrcxwvYzRO4desamR8FqFcmdiHQbzuTXR1a+NrLgB4aN/FOWSWlK8wxfFhbADEeK AjG+hBne2ss4d6NSyM32NMbs8GU8FskB8PfuPfJLaIxevmLQT16RQNwhRIoKUyt26mx8FX V9U4hhrVeBZlSg0RKR0/i7G/pA3fprkiSVrBrMcQqC5Hep3MSnOx8MOWjc8mBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723467130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=++IKXa3obVCRyQzdFYT9Emid74PDZE263SG1sptzLQU=; b=goJgAPbagtn1zPX0ZDQdGnDW00Anx3PlcS0eshLzGNtzGpuh3EL+9lBGQdnuIw76/jwno7 EWKN+SzwFM3bfl6rjPa1WDPBPQ5vhIjK/sa9AQ6Fz6NMQaUNgW6xc139DiORg5pfeCn1ff 8HMMYbBK7aZk5gVkH7rBhvsEztUNhqpzADRj873pwKEegN9nlncntelr39/DnB/TpUkShz 3k27LU2EvIeYXUCXL9cILYluV7UnpCbTq0UBfOq1nyAPbgLToF0su7DN95z9IXHwf4TNaj xp01InV9yOwj649zvOgKhp9s8+LSEyZ+FFpQHr2pr7deVtSy9MEPchh9ZLLQhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WjDtf5rqdzSPd; Mon, 12 Aug 2024 12:52:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47CCqA2Y035088; Mon, 12 Aug 2024 12:52:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47CCqAIj035085; Mon, 12 Aug 2024 12:52:10 GMT (envelope-from git) Date: Mon, 12 Aug 2024 12:52:10 GMT Message-Id: <202408121252.47CCqAIj035085@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 36dc690bd10c - stable/14 - ipfilter(4): Fix typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 36dc690bd10cf423ecbdfc7daaec7feb73949eb1 Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=36dc690bd10cf423ecbdfc7daaec7feb73949eb1 commit 36dc690bd10cf423ecbdfc7daaec7feb73949eb1 Author: Gordon Bergling AuthorDate: 2024-07-21 09:02:31 +0000 Commit: Gordon Bergling CommitDate: 2024-08-12 12:51:59 +0000 ipfilter(4): Fix typos in source code comments - s/inconsistancy/inconsistency/ (cherry picked from commit c90a206496fc431854e0c2989c2214b048e960d5) --- sys/netpfil/ipfilter/netinet/mlfk_ipl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/ipfilter/netinet/mlfk_ipl.c b/sys/netpfil/ipfilter/netinet/mlfk_ipl.c index 69be4abb2485..1c3051fb6615 100644 --- a/sys/netpfil/ipfilter/netinet/mlfk_ipl.c +++ b/sys/netpfil/ipfilter/netinet/mlfk_ipl.c @@ -536,7 +536,7 @@ ipfclose(dev_t dev, int flags) /* * ipfread/ipflog * both of these must operate with at least splnet() lest they be - * called during packet processing and cause an inconsistancy to appear in + * called during packet processing and cause an inconsistency to appear in * the filter lists. */ #ifdef __FreeBSD__ @@ -579,7 +579,7 @@ static int ipfread(dev, uio, ioflag) /* * ipfwrite * both of these must operate with at least splnet() lest they be - * called during packet processing and cause an inconsistancy to appear in + * called during packet processing and cause an inconsistency to appear in * the filter lists. */ #ifdef __FreeBSD__ From nobody Mon Aug 12 12:52:38 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WjDvB6T9Tz5SYL4; Mon, 12 Aug 2024 12:52:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WjDvB5zjcz4VZC; Mon, 12 Aug 2024 12:52:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723467158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+oRukR4ZUr1NbVeqZ4WvS0Ezu6v/MkKjq/prpFR6Fk0=; b=FFAPCFhBUsMj7jyqCzaGq53UhdsAajv9Ql9AVWnT89HzUid95AT6aWHJfMiF/4TLIVDD3J AmXv6gVTPyXwS1uJk/tUSN3RSHq417GDhKn4TImVcf2QMZpD3h88oooa65EzW7yh4P67T7 IwlxrlZIqQ0kJjBUJ/jKAmxL2vGnEGPQRg4qReT1jKLzgNkUZP92opi9ZuSNY32QODA1gy hKY9j7VUpmiBLoThUB2Ub/d5bgGOaKLuIODWjKwqFK3Me4EAB1uashUELblQLYiCWVW8+3 AeQ5Cz57nMEEeVuR9rQ42XH+UVJvP8KY7hOo2a7JrhMw31Phk+IDrZQzDY2Law== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723467158; a=rsa-sha256; cv=none; b=Nz/RSZ7leAhRHhdimAYBBLcD/VCWfkv9DXZnZb+eqgndgM56EsDhAF9gBqLyJmut1XQhkn 5ooOs/obxuDhRFfnvwpICEPhpZyCq1om9U4j9538ZofGgjzrQ5kYVc8ymZPL8M15ZehLAZ ahVGUMDgommsA8tHw6TlyYNuXNBcY5XXtgpCKlEDtTwtbnk+1K+jRucWcLw+wwE2Khqchd i+1xRonLZHUNNDObXTCuo1mv9GS3LXmkI6smzp6sSdbUKlVRlCjqk2Lyhob81L1zaTzXik dw6iPLLIYP3n262rRElTuQvZwJJrEg7/jSjz9WSK633waGNOmk53wFqNhje57A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723467158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+oRukR4ZUr1NbVeqZ4WvS0Ezu6v/MkKjq/prpFR6Fk0=; b=vFGTez+kH7l1d4fIAVfXeJgcSj3VDutQmE86mmL8PD3SWXKlnq8L51NfFwk3IVvQsjask9 NvHmVvCRSszlLhgbZ6TnOaHj/WGlsTFeQOXppueXLVSq9o0Nms7xkXGJvOOxIF/G3zbKhR Yg3en3UXAbf0mDbi5UEI/etQxvrRK3/rbij+NPw7fCut41m1wyxe7HMIycrb0bRJknJouZ wBS3lCCn9nXY9kiigAq6dEt19rYTHy1bztkie95QjCvcn1CfmXvtgy07RjCzb1w8Mgc7iL 1HWyhdY7xxG7nXMyfquLlCSCpXEQrdmKXFwJ+OtGkKsNUdUv2zq2aHAzFf10KQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WjDvB5YgtzSKJ; Mon, 12 Aug 2024 12:52:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47CCqcr8039324; Mon, 12 Aug 2024 12:52:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47CCqcvD039321; Mon, 12 Aug 2024 12:52:38 GMT (envelope-from git) Date: Mon, 12 Aug 2024 12:52:38 GMT Message-Id: <202408121252.47CCqcvD039321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 402db142e07a - stable/14 - stress2: Fix a typo in namecache2.sh List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 402db142e07aba7d95bd99b2e3f672ad7e2b23ee Auto-Submitted: auto-generated The branch stable/14 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=402db142e07aba7d95bd99b2e3f672ad7e2b23ee commit 402db142e07aba7d95bd99b2e3f672ad7e2b23ee Author: Gordon Bergling AuthorDate: 2024-07-21 09:00:58 +0000 Commit: Gordon Bergling CommitDate: 2024-08-12 12:52:27 +0000 stress2: Fix a typo in namecache2.sh - s/inconsistancy/inconsistency/ (cherry picked from commit 32a9b95a8751f916deef5970476f010995244bfe) --- tools/test/stress2/misc/namecache2.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test/stress2/misc/namecache2.sh b/tools/test/stress2/misc/namecache2.sh index 9fcfe5e0226c..b32d41974468 100755 --- a/tools/test/stress2/misc/namecache2.sh +++ b/tools/test/stress2/misc/namecache2.sh @@ -26,7 +26,7 @@ # SUCH DAMAGE. # -# UFS cache inconsistancy for rename(2) demonstrated +# UFS cache inconsistency for rename(2) demonstrated # Fails with: # ls -ali /mnt # ls: tfa1022: No such file or directory From nobody Mon Aug 12 12:54:05 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WjDws5LCnz5SYGH; Mon, 12 Aug 2024 12:54:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WjDws2kYnz4WBr; Mon, 12 Aug 2024 12:54:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723467245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P2ZV0d4xZ3I3J3tW6YLuMwy38fXJ8DwX9UduC9j4hpY=; b=yWKbs7BVCoNlREYgU3AQU+PYmAfQHD/8TqPhIsFXIj2X/UXd2HNmVKI9Y/7hHzckS46+pD kZ+ZvoSMIk2Ul7gKIHew3LSV2+BFfgEsLvYbJlZKV9NM+swECGvRJ4jUXM5HRP42dlJ3IJ ifqPjqoUxTEDyeD2ZQcQ88XzeyFhXT1+rEfsQ2Niw/uAkZus0KutAZlyPwwPVLjugOEg15 UmXy3Y/jiwRnfIH5AUBi7kaooOrnWqBde67S0mza8ZlsIJwYWFsZP3hIHNmMENxmwi49o3 FBB8twEfbsjDZ2XCzze7bk/o3ga5NIW+Lwf5e8OlUPp2kDlc8OTmxq6+oHRfcw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723467245; a=rsa-sha256; cv=none; b=AjAkc8rRCn9GXox9OudMSilV1iuB/LreDR9V/192yeTuUP5KPrz7IMQq1G0WIZjitI+/Ac Py7ba//9B6KbJLlov7A6WXSkA+rSen4WEXQpWx6I3KGDqDFwcRv+6zbKDztY4xmEPpLzln u0yzyjo1UEJ3GEwnDSdL2KwLasrV4YUUUwgNItK8c/Wv2CvIj3v4oSubPoDmRY0EwFYw5F BoRqpIt4YEGbxbdJ7mBmI44e37zrfBbJm9u7GkwbKOSRv1A05LZpetRY/2qDEo3OjlfvTC 94jk9l9DBaJBRXVILTT3nYZkke4Vda1nYmxcdH3bBFAXGcl3JYPIrPhiVbiw9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723467245; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=P2ZV0d4xZ3I3J3tW6YLuMwy38fXJ8DwX9UduC9j4hpY=; b=uSwoJKYtTwPPMv6huUnJGJ5v0LUoy429h0IvRzqsh7A5lP4e3kfhwf/BjrJwy8ohhIHfVX kz/6zvP35qybYeu543lSAxOZywsY73LU4cCRuGr4XEacE6hEP6oEPZnUxsUpIcLpTcMD2l vmbdorgQMkyxKkv6FDRu7b6y7GY8Y2ALxU94ZdxEGKR8ci8bNfacgxS619OEDwVZ99SP+s rDSC9owehl2K4/8Vb/Jw4DzwGaGytSaCr8GaWXl/j1Rq7ipofNND8qnI1rEPef4hnxY0ej E8rYYMWnNub9lkPwa/OWgDY9BFnRVk1MPMoND3BPmAumuNK1K2AB/DMAiVzJDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WjDws2LD6zSmQ; Mon, 12 Aug 2024 12:54:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47CCs50Y039737; Mon, 12 Aug 2024 12:54:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47CCs5Ld039734; Mon, 12 Aug 2024 12:54:05 GMT (envelope-from git) Date: Mon, 12 Aug 2024 12:54:05 GMT Message-Id: <202408121254.47CCs5Ld039734@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: b5e167874663 - stable/13 - ipfilter(4): Fix typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b5e1678746634443b8b818e15ebf054182a2c97c Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=b5e1678746634443b8b818e15ebf054182a2c97c commit b5e1678746634443b8b818e15ebf054182a2c97c Author: Gordon Bergling AuthorDate: 2024-07-21 09:02:31 +0000 Commit: Gordon Bergling CommitDate: 2024-08-12 12:53:34 +0000 ipfilter(4): Fix typos in source code comments - s/inconsistancy/inconsistency/ (cherry picked from commit c90a206496fc431854e0c2989c2214b048e960d5) --- sys/netpfil/ipfilter/netinet/mlfk_ipl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/ipfilter/netinet/mlfk_ipl.c b/sys/netpfil/ipfilter/netinet/mlfk_ipl.c index a2f1b5070818..762870bfc820 100644 --- a/sys/netpfil/ipfilter/netinet/mlfk_ipl.c +++ b/sys/netpfil/ipfilter/netinet/mlfk_ipl.c @@ -536,7 +536,7 @@ ipfclose(dev_t dev, int flags) /* * ipfread/ipflog * both of these must operate with at least splnet() lest they be - * called during packet processing and cause an inconsistancy to appear in + * called during packet processing and cause an inconsistency to appear in * the filter lists. */ static int ipfread(dev, uio, ioflag) @@ -579,7 +579,7 @@ static int ipfread(dev, uio, ioflag) /* * ipfwrite * both of these must operate with at least splnet() lest they be - * called during packet processing and cause an inconsistancy to appear in + * called during packet processing and cause an inconsistency to appear in * the filter lists. */ static int ipfwrite(dev, uio, ioflag) From nobody Mon Aug 12 12:54:02 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WjDwq3JmJz5SYNX; Mon, 12 Aug 2024 12:54:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WjDwq0hR0z4VmW; Mon, 12 Aug 2024 12:54:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723467243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VUPvMOIXqs5rBSRiAIndWJ3eoUYmj0tmQ/ULVmv9j4k=; b=tgzJbGc771MTXITpA1b/Z9LkbubjnuCD9jd9YMsj+mN0jakmHnf30z1KoP2JibotxJY/Db GCtW6/g6nysl2ox/p9lnsl2PWoyexfmOR0HH+u7LG4XXZjATe/n8AZQFFqNzQY1mLUGMsq jWDpjLJ2XrR41Ts/vTechItae7UXx7ac3FUwE7PHXO0JVuOCq3dAIT2AGJYERC9ThXaLXf zgITW9s1aiQ5zuw8aQpmCjH/y4KWB1st08heM0+hm9Inztrf4SZF+BZJDrQCQfie3HS08j EDwwru9ez28059SyRbP3koX+z7auBFngji3Ifwp9E7E6xL9EXGX/hsxPRuQciw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723467243; a=rsa-sha256; cv=none; b=lseNldHHSCJICRoCzuXBUE7EwvHI0aR1pkxahcwqU6AWskoY8+TQfKWvUFK4ZPMq7ugCqM qpJimjd7GIIcrwoOVmOmtGqV7kULlZIahwQ+1z3PnmfJqy7TBcXCFVVpf07pAyBbYmblgo mMR1kZ1U+4b7oSqKtYKCwg8rp02KSWTwXdt+rYoQSyRk0HhyMxXjAdgV440AAV0HHPRGHd gG3JBL+8LyEv3yIDXaQoGQDutgfTBhpfb0T1wUS0fRG3ddUi10ZpTh49wAabapBgYEQdsG pXNUeoF4j0SgvbIDHUJ3KvqiCGBrt63otdBOgmrdktRBTttDPXhBDwcJgn6jNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723467243; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VUPvMOIXqs5rBSRiAIndWJ3eoUYmj0tmQ/ULVmv9j4k=; b=s03h/2MkiI442FygaNASIWRiODd63/Z01beD0DilmQ44lH81AXNpZmDseVrFAOY6GwzjFz XzKhflF+Ma3JHLbH35JMZDPKaQq7G6IwZanZsT2lznuSCM4QXGthp9eaSoEKxj/ijjAhPV Xz5B4kGLo6lXGsw9kklRJlMZYH3py7i+9nle3/Qyjqwr1Dp9O1usdtA3IY1uBK5uGV9suK b9+TDdKCqKp0srg1UxzobqLk60HIv52zX5iu7f/6EDet6YMnvOT5KaDqV0RimuHTpPEU/t 5zBeADUy7M+Cdn2gupqFArigbdMz4tsWHtp4qkkX5YvjJOV2b8dwhex14XCKjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WjDwq0HqQzSFG; Mon, 12 Aug 2024 12:54:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47CCs2XH039641; Mon, 12 Aug 2024 12:54:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47CCs2jU039638; Mon, 12 Aug 2024 12:54:02 GMT (envelope-from git) Date: Mon, 12 Aug 2024 12:54:02 GMT Message-Id: <202408121254.47CCs2jU039638@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 5f21183f6465 - stable/13 - axgbe: Fix two typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5f21183f6465491dd9a690e550edb0a47ac2064b Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=5f21183f6465491dd9a690e550edb0a47ac2064b commit 5f21183f6465491dd9a690e550edb0a47ac2064b Author: Gordon Bergling AuthorDate: 2024-07-21 09:06:07 +0000 Commit: Gordon Bergling CommitDate: 2024-08-12 12:52:58 +0000 axgbe: Fix two typos in source code comments - s/specfied/specified/ (cherry picked from commit 619c9488a31ce14c6570d2e31f70d416382ed7a6) --- sys/dev/axgbe/xgbe-phy-v2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/axgbe/xgbe-phy-v2.c b/sys/dev/axgbe/xgbe-phy-v2.c index 536c5e40d957..1fd01dc36f41 100644 --- a/sys/dev/axgbe/xgbe-phy-v2.c +++ b/sys/dev/axgbe/xgbe-phy-v2.c @@ -460,7 +460,7 @@ xgbe_phy_i2c_write(struct xgbe_prv_data *pdata, unsigned int target, void *val, retry = 1; again: - /* Write the specfied register */ + /* Write the specified register */ i2c_op.cmd = XGBE_I2C_CMD_WRITE; i2c_op.target = target; i2c_op.len = val_len; @@ -499,7 +499,7 @@ again1: retry = 1; again2: - /* Read the specfied register */ + /* Read the specified register */ i2c_op.cmd = XGBE_I2C_CMD_READ; i2c_op.target = target; i2c_op.len = val_len; From nobody Mon Aug 12 12:54:04 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WjDwr4HFBz5SYGG; Mon, 12 Aug 2024 12:54:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WjDwr1h4Qz4WHT; Mon, 12 Aug 2024 12:54:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723467244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NOSpQdNRkqRy/3KLUT+rjuEIckFLqs9BAtrc2/o9yBw=; b=vNZkfw/rxYgSV8GiSTgpo2C58z8+VPSLDWDfENBnsbJiSBhVVszEk5tJi6L0/9IjxUD06j THmrpbwFyGmC8iD5NfzAzeQbOXd/+S+m05ghfmseB/gDc9z/r/XTO/WKqycxVoGsSOuCHh pr7q6YhLnCCNh81fE37fI2ec+l9KNUjbM8CuNGpjncEreDCOVDnRpbovQo2LuY9WZGQZnn TokGVqJZ6IxLp21dw0nQjtUNuqi79fia5AGFZRjKDEPkTrsXHVojzAytkJERqnvTIPiymA PeC9uMMlaKFajC39w1ZIPh7UxCPkFBAuqgIrX0kH2QjYxzVsCHNcO3QgdKoowQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723467244; a=rsa-sha256; cv=none; b=ud2luEoEoBY3k7hyWVtwvwAzRHdXnLoj4LzFVe5YnQxw3cnMPsmGDTLwZmShoLnzSwSinC GW8YQCE3nGNgGcSi0O7k4d6dh75qUoE9v7BR63EVBizsSMwhro0flj6KjwBUjbyUWmOH+t 1Qyb9JdB9BwntGvJjB1HtSNRREE2h1A9OUG0G7I3xs8MYiUF4AJ1ixn8gDxuxmPJJwT3bS wjBPJGCdgnjwzZ3A4UNRxqUKgfsWexIGX/ZfjdxMe9Mo/8ypC1YtVvFmoDQRVeNh9q/fjR TCtHoHg0lhn2qKsS4LTJXiJKWypVs7HRCToyMtOguEJOtfMHgXMINDnhxdghBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723467244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NOSpQdNRkqRy/3KLUT+rjuEIckFLqs9BAtrc2/o9yBw=; b=ZT0bNwpvJvOubHXOkP+Y7b9F3+Q42usG2g9YIGe7f9M3QnrDIbOs4hi7FUgET8C/no8Hcx vk86Tc+JL1p9/5vGVG1xA/FXvWl2LtXfYPz/AzWP4Jk4gsRy72OD5CfDJCy3+EQFT5/ipw TU+2PVcq6GF5LwRksIQXIQ6j6c/1D+HhKnpRvJToZX84H9FojTTAuOsjYpdskJoRQLFFRI yq4rHNOst6YGsi+S+MXGKvp/5tTeh9I/sGU+EKYlQ2xrt0Gy0+BhrSTqDEjj7yMi69Rpj7 aym+eBIEiigRe5gq2P3ckBnlZBnibwezE94yO+9GRHzQDt9RhDX6fSYiK4Jq3A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WjDwr1Hw3zSKK; Mon, 12 Aug 2024 12:54:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47CCs4cH039689; Mon, 12 Aug 2024 12:54:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47CCs4vg039686; Mon, 12 Aug 2024 12:54:04 GMT (envelope-from git) Date: Mon, 12 Aug 2024 12:54:04 GMT Message-Id: <202408121254.47CCs4vg039686@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gordon Bergling Subject: git: 99385e34c80d - stable/13 - sctp(4): Fix typos in source code comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 99385e34c80d1f0d86d56cab03adcc19da15177d Auto-Submitted: auto-generated The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=99385e34c80d1f0d86d56cab03adcc19da15177d commit 99385e34c80d1f0d86d56cab03adcc19da15177d Author: Gordon Bergling AuthorDate: 2024-07-21 08:57:22 +0000 Commit: Gordon Bergling CommitDate: 2024-08-12 12:53:15 +0000 sctp(4): Fix typos in source code comments - s/collasped/collapsed/ - s/defininitions/definitions/ - s/optionaly/optionally/ Obtained from: NetBSD (cherry picked from commit 58c99e07506e67c06d703b080c2fc22cc39237f2) --- sys/netinet6/sctp6_usrreq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c index 82829d3ba8c5..a9df9f3639c1 100644 --- a/sys/netinet6/sctp6_usrreq.c +++ b/sys/netinet6/sctp6_usrreq.c @@ -387,7 +387,7 @@ sctp6_ctlinput(int cmd, struct sockaddr *pktdst, void *d) } /* - * this routine can probably be collasped into the one in sctp_userreq.c + * this routine can probably be collapsed into the one in sctp_userreq.c * since they do the same thing and now we lookup with a sockaddr */ static int @@ -749,8 +749,8 @@ connected_type: * note with the current version this code will only be used * by OpenBSD, NetBSD and FreeBSD have methods for * re-defining sosend() to use sctp_sosend(). One can - * optionaly switch back to this code (by changing back the - * defininitions but this is not advisable. + * optionally switch back to this code (by changing back the + * definitions but this is not advisable. */ struct epoch_tracker et; int ret; From nobody Mon Aug 12 16:43:09 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WjL195g9qz5Sd0q; Mon, 12 Aug 2024 16:43:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WjL193qtnz41K3; Mon, 12 Aug 2024 16:43:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723480989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Sxp0L3zeEkjE5euGSFv0teQEpfev7pGhFQ23NJXN/8=; b=y0Jh5AqQR/cJHDwJyzd52O0DeJqmwpcDSE7IvYyq5xrKKVsyi7Q1tp/sCDca9qWaj7n7Fy KepJrdGDb5tBZG5ZrerrutPy2CREeEhqIqTVEr+oqFqZWmljEn/w2lLQ18374uwsJmFG3c Wk5LNesg/tzy+9HjBUvt92QhgbgUrOEHyiMu16hkQpkapTBmZ58kOBXHwaDs6ZIWMnbCXc 0+tEOKKsGF+QL9sxv058oqSXMvLJd8T2u6Oh1Kj6kSOaXW7XqYzqt4d9MBkrraOxjPr3Po NN0zlqoZg6G8uoLLIGT43u5NLVG9ndC/5Kzc3DDmQmCl3h6hZbEmDAh/aSpIFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723480989; a=rsa-sha256; cv=none; b=jUA6lhF+X+vqgq4/O8VxGXUoL1Fepvd7pq+EQi18j8gqhCaVvz5TiL4cIzepdOotj7hpUu RToid9xKuiTwfwCDCd86j12CNfBMraA+fepBdG82Ggi3xD+Tzb5ovMJlCT2lI1yCyis+Og OH1KEL3F3wmqIpWB0jk5lKXdXvAjUG0NYdcTg6AMcun/q9NVXNrrdSvOa0ZN+y3KOpsdEJ 3dNJLVBikBA99aEm09tIC/CY9M6VwKp3XJIU1OX9UWmAB/l/sR7FCRMIrtX+inLq9aDAfB 8JuzQBVjxP3oomyfFBfxtLEn/Gi9nexmdl3mcWl2DV23VolOafHHPP97JbrZwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723480989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Sxp0L3zeEkjE5euGSFv0teQEpfev7pGhFQ23NJXN/8=; b=LFwQiIwMk8jjwDHKqQvgDqEIf7Zk0KXSO8DdB8l+6utWJ2D/b5DpZ07UXG+BEy406DF7n0 w2Skdh29H+qvrXiKQMTuxun/+h3hxzGUh+MsyJUD1wX4LTlriXNSMy7PS2P62SVb5BqjYV a9Q5r92cPdjCN01NI9xxpCul23Cy8OKbw1OiqH5yTOeW2HQpGSUyr2gqUhv6/z851qoSHQ 8QTgjb4R2DwZe4yeA7P+vU2hcEPXbTo9hUqLArPLkal6LUorGptwAnvMVS4IC+ZP6ep1g5 wNWuPVOuKYvAme8fBzPAwvR7TXSmAUoY2NCcDRlDFLe/hHf2nmb4FcFD6Y1Vgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WjL193RBRzbcy; Mon, 12 Aug 2024 16:43:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47CGh931029240; Mon, 12 Aug 2024 16:43:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47CGh9tk029237; Mon, 12 Aug 2024 16:43:09 GMT (envelope-from git) Date: Mon, 12 Aug 2024 16:43:09 GMT Message-Id: <202408121643.47CGh9tk029237@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: 6a0215b2e353 - releng/13.4 - tcp: initialize V_ts_offset_secret for all vnets List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.4 X-Git-Reftype: branch X-Git-Commit: 6a0215b2e3530815bde5ba1fc59e8ac234b510b6 Auto-Submitted: auto-generated The branch releng/13.4 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6a0215b2e3530815bde5ba1fc59e8ac234b510b6 commit 6a0215b2e3530815bde5ba1fc59e8ac234b510b6 Author: Michael Tuexen AuthorDate: 2024-08-09 14:12:22 +0000 Commit: Michael Tuexen CommitDate: 2024-08-12 16:40:51 +0000 tcp: initialize V_ts_offset_secret for all vnets Initialize V_ts_offset_secret for each vnet, not only for the default vnet, since it is vnet specific. Reviewed by: Peter Lei Sponsored by: Netflix, Inc. Approved by: re (cperciva@) Differential Revision: https://reviews.freebsd.org/D46246 (cherry picked from commit 9b569353e0b073a513cf10debbe634c2ceb29fdf) (cherry picked from commit 83572ae1f5dd85fc00f33d5fd95374b8ee546636) --- sys/netinet/tcp_subr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c index 9bf02d21a307..493f569104cb 100644 --- a/sys/netinet/tcp_subr.c +++ b/sys/netinet/tcp_subr.c @@ -1448,6 +1448,7 @@ tcp_init(void) tcp_fastopen_init(); V_tcp_msl = TCPTV_MSL; + arc4rand(&V_ts_offset_secret, sizeof(V_ts_offset_secret), 0); /* Skip initialization of globals for non-default instances. */ if (!IS_DEFAULT_VNET(curvnet)) @@ -1481,7 +1482,6 @@ tcp_init(void) /* Initialize the TCP logging data. */ tcp_log_init(); #endif - arc4rand(&V_ts_offset_secret, sizeof(V_ts_offset_secret), 0); if (tcp_soreceive_stream) { #ifdef INET From nobody Mon Aug 12 16:51:54 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WjLCH0YcWz5SdSs; Mon, 12 Aug 2024 16:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WjLCG758Mz42c4; Mon, 12 Aug 2024 16:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723481515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DsI6ie2S8GjCotwMqE8p0VFreSgwRIZN7xRpM8I+ut0=; b=RBqQ6HAqLgit1eiDICor73/nR44Oe02+3zl7aqVec18q+rw9kpFq1ksasPDP6aJoD+oNy9 Dk35wlyTQFswpAuBqroFbirq9bpstAfOJqLnsKzrhgZrd9zm4pHOODYaHejKQZyj4zH44p 28U2HbV2iLJH7varzAE8EMWT8GxhqOOKY55IObyaIqoSlV4rJQRCoRQWsBDssZk/naODSp I+9l8jGU1xEdzTrYaINC/nEeXS0KStC548BU3nD0tq5L5FZDOym3MwzSiafew/M/TLBmxT p9BNFxRr847G2RbyXIhgYHYzCNeZ6VGuwFP150b8suLaz4z1BdpCt6ieiUKaLw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723481515; a=rsa-sha256; cv=none; b=NiQhWBYIr6nwPmYR67zT6oCQfDW3kynKN5DdEHOQeZtfM0Erc23MftTpgNoycnkW0ilVYw 6Yq475FeEpN32wkm1zLHvAZBsvyVxcYRM1UNU+q25okkOfUBVeXWE+0l1ZGuV7O7A5/xwG Rvk0xGoy1jRKVFiM8ihJt3WT2C0WJn+04xHP5Q35HF1iapInw+3TGDob4rPrluAjL0ex7+ SiLS8jrR13QGv6lvO+9KZ25bqg0DXnaSjL8HDVtVC4yzp8QRuJQYiou6iu0YR+T8aTzPTe IwS+bZcU5Wk0sgq/AGpymXkdSIIymGd853zgeozVkZn1FV6K+Ov6Hc2KJu3obA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723481515; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DsI6ie2S8GjCotwMqE8p0VFreSgwRIZN7xRpM8I+ut0=; b=JWuwL/dmBvYmRY+gKytzaLBJdcYX3Rx6m9lAr/MLstDTXs74xs5x4Sz3zxxcF8rBM5FWnr ZodOt2BuriDUjEkvWEwmjiFd1GG7Lv/Ozy3Y2Bn5KxIxe5LB5IgOLE4naF0rflEOmGLHJS yGK8F/Ewdi2S2swzSkSxg7INIwNhw5XwtPe2OByRmLGM71gfEH2ngqASSfQCiSUZvHykL4 1qrXbMXteR1hVl15Ob6vmBPPikSaJH7LUnI8A0TsVSHodb2sARDJY0k1dz1fGvKLOayLX+ yfvg91Nv+vw0XLQqm1hyeKHpwnOWHf4s18ildxJcMuevzpzd8icdYbUgiPzgCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WjLCG6hYlzbcK; Mon, 12 Aug 2024 16:51:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47CGpsBK045489; Mon, 12 Aug 2024 16:51:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47CGpsX8045486; Mon, 12 Aug 2024 16:51:54 GMT (envelope-from git) Date: Mon, 12 Aug 2024 16:51:54 GMT Message-Id: <202408121651.47CGpsX8045486@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Morozovsky Subject: git: 246e27fa9812 - releng/13.4 - mailer.conf for sendmail: remove duplicate word. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marck X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.4 X-Git-Reftype: branch X-Git-Commit: 246e27fa9812eb7d7676ceb99879bb9c99a92fc2 Auto-Submitted: auto-generated The branch releng/13.4 has been updated by marck: URL: https://cgit.FreeBSD.org/src/commit/?id=246e27fa9812eb7d7676ceb99879bb9c99a92fc2 commit 246e27fa9812eb7d7676ceb99879bb9c99a92fc2 Author: Dmitry Morozovsky AuthorDate: 2024-08-07 14:03:12 +0000 Commit: Dmitry Morozovsky CommitDate: 2024-08-12 16:49:57 +0000 mailer.conf for sendmail: remove duplicate word. MFC after: 3 days Approved by: re (cperciva@) (cherry picked from commit 2c2916a3ec3805ff7815633c0bf90c4339016821) (cherry picked from commit 3d2b2d8d02fda59ce3a8be6df91ea729970cdbb3) --- etc/mail/mailer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/mail/mailer.conf b/etc/mail/mailer.conf index 7947855fd2f7..f86403a9a68b 100644 --- a/etc/mail/mailer.conf +++ b/etc/mail/mailer.conf @@ -1,7 +1,7 @@ # # Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail # -# If dma(8) is installed, an example mailer.conf that uses dma(8) instead can +# If dma(8) is installed, an example mailer.conf that uses dma(8) instead # can be found in /usr/share/examples/dma. # sendmail /usr/libexec/sendmail/sendmail From nobody Tue Aug 13 07:52:04 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wjk9z6hZjz5SdJc; Tue, 13 Aug 2024 07:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wjk9z6MLvz4Rm8; Tue, 13 Aug 2024 07:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723535527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aAM+k9oHgAOL7NgkOt8+u36G+Kjr4+CC7GMFGr5QVW4=; b=XN4qFkxUPK/g4Q+kP6NFtpfoNAbDDGWnVAWUOE6KvFKFrG5ZcETipTU5T8Iq6+gchM8gut iha5uJiab5P2DFZQwDFVVBsjT5mAxvZN6BT9ovbdmnsFrQdGC2+lq1JrSyGZBVRHUFN0mK hBwunzaH8yaCBRJXAKOGukQ/5ShMzA6n1aQJJ/aablqYFwtkNGI1DGWSsSAJPPcst7qpoa GQxK3kiS2gihJHPzFGivHtRQ1z682L50zjP3XoVCg9/jtyk3hTYtNTzPSVjIeR3nYyhqw0 YNKgdT22SJCDZS1ze9eZAI9cWeD+TsfNJ9k512rpFsnoB92qUZr3EHgowIxYWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723535527; a=rsa-sha256; cv=none; b=i1stxW8esxc9/WM6THaKA1iBsy9UxDPeLj/JALzhyGXxOG/qYpc1Jxj/vBeOWmWos+Hhgm v8ZVmViFuH0w4bXW5Lca4e5yd3SunU/XjmTgjKkfCCATiPgfzIHB4l8y8Avs5G2d/BAi2C 1CF3oEQSlhxfC8fHtK9zyvR51jJL+WOVgA9wqtUlYGGf89ixgd0GfgHHzahGgwBQL546Oi +K2Z33JlVQln+ngQs9nQGIyWo2RqJ8+6/VZwft3VnqsN8y/gxL8wQwVlSN2uT+c99V3da+ p88zR7rwE70Kxak3q7Hhfb6GG63mdCFDujQ93b/9JwSsGaF0YG8hUsd1flm9Qw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723535527; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aAM+k9oHgAOL7NgkOt8+u36G+Kjr4+CC7GMFGr5QVW4=; b=Xj/p/GtF2icN1MCvJZ689kOju5+6Qje2bGUTkqz4S8kseC28rhw6Xrq+ankZOKe6dfonvA YkgsyB3j6rWbHdVIMnWFBY9TciLl9kaurbjRPf0Nt79aYJDJm6b1iyyMaqm7f93LM9QCDK g2D1LHy5GKaKjdhuCvYFWCMJxtcO5w25vPA+27FK/Ayb37SJPs8fF0jQdpXBcrkXawofy3 KZI3vXV55eUombWCG8NgYiD1BPwHgcpY5TGUAtXk0iVSvqQTTjDIhVQvmmKxlnzf6FdWwm nj25lnRC+FxI6EXrZsooZXfzJLxCnkjdplP/E85sqpyxIsUd04HII1P+uUKYdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wjk9z5yvzz135H; Tue, 13 Aug 2024 07:52:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47D7q71U064504; Tue, 13 Aug 2024 07:52:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47D7q4vY064501; Tue, 13 Aug 2024 07:52:04 GMT (envelope-from git) Date: Tue, 13 Aug 2024 07:52:04 GMT Message-Id: <202408130752.47D7q4vY064501@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: d27c97326439 - stable/14 - zfs: merge openzfs/zfs@33174af15 (zfs-2.2-release) into stable/14 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d27c97326439551596d63bfe9e7533fb49dbbb7b Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=d27c97326439551596d63bfe9e7533fb49dbbb7b commit d27c97326439551596d63bfe9e7533fb49dbbb7b Merge: 402db142e07a 33174af15112 Author: Martin Matuska AuthorDate: 2024-08-12 13:06:18 +0000 Commit: Martin Matuska CommitDate: 2024-08-13 07:52:28 +0000 zfs: merge openzfs/zfs@33174af15 (zfs-2.2-release) into stable/14 OpenZFS release 2.2.5 Notable upstream pull request merges: #15609 566841171 Only provide execvpe(3) when needed #15940 9edf6af4a Replace P2ALIGN with P2ALIGN_TYPED and delete P2ALIGN #16038 0f1e8ba2f L2ARC: Cleanup buffer re-compression #16104 b474dfad0 Refactor dbuf_read() for safer decryption #16118 938d1588e Make more taskq parameters writable #16131 672474659 Slightly improve dnode hash #16138 4c0fbd8d6 FreeBSD: Add zfs_link_create() error handling #16159 fa4b1a404 ZAP: Fix leaf references on zap_expand_leaf() errors #16162 41f2a9c81 Fix scn_queue races on very old pools #16165 4c484d66b Fix ZIL clone records for legacy holes #16206 27cc6df76 Use memset to zero stack allocations containing unions #16207 2eab4f7b3 Fix assertion in Persistent L2ARC #16214 13ccbbb47 Some improvements to metaslabs eviction #16216 ba3c7692c Destroy ARC buffer in case of fill error #16258 4d2f7f983 vdev_open: clear async fault flag after reopen #16264 ef08cb26d Fix long_free_dirty accounting for small files #16273 54ef0fdf6 head_errlog: fix use-after-free #16284 14cce09a6 FreeBSD: Use a statement expression to implement SET_ERROR() #16406 6f27c4cad Make 'rmmod zfs' work after zfs-2.2.4 Obtained from: OpenZFS OpenZFS commit: 33174af15112ed5c53299da2d28e763b0163f428 OpenZFS tag: zfs-2.2.5 sys/contrib/openzfs/.mailmap | 6 + sys/contrib/openzfs/AUTHORS | 13 + sys/contrib/openzfs/META | 4 +- sys/contrib/openzfs/cmd/zdb/zdb.c | 93 ++++++- sys/contrib/openzfs/cmd/zstream/zstream_redup.c | 4 +- sys/contrib/openzfs/cmd/ztest.c | 12 +- sys/contrib/openzfs/config/find_system_library.m4 | 4 +- sys/contrib/openzfs/config/kernel-blk-queue.m4 | 4 +- sys/contrib/openzfs/config/kernel-blkdev.m4 | 26 ++ sys/contrib/openzfs/config/kernel-types.m4 | 40 +++ sys/contrib/openzfs/config/kernel.m4 | 2 + sys/contrib/openzfs/config/user-backtrace.m4 | 14 + sys/contrib/openzfs/config/user-libunwind.m4 | 44 ++++ sys/contrib/openzfs/config/user.m4 | 4 +- .../openzfs/include/os/freebsd/spl/sys/ccompile.h | 3 +- .../openzfs/include/os/freebsd/spl/sys/sdt.h | 11 +- .../openzfs/include/os/freebsd/spl/sys/sysmacros.h | 3 +- .../openzfs/include/os/linux/spl/sys/kmem_cache.h | 19 +- .../openzfs/include/os/linux/spl/sys/sysmacros.h | 3 +- .../openzfs/include/os/linux/spl/sys/types.h | 2 + .../openzfs/include/os/linux/zfs/sys/trace_dbuf.h | 2 +- sys/contrib/openzfs/lib/libefi/rdwr_efi.c | 4 +- sys/contrib/openzfs/lib/libspl/Makefile.am | 8 +- sys/contrib/openzfs/lib/libspl/assert.c | 112 +++++++- .../lib/libspl/include/os/freebsd/sys/param.h | 4 + .../lib/libspl/include/os/linux/sys/sysmacros.h | 3 +- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 6 +- .../openzfs/lib/libzfs/os/freebsd/libzfs_compat.c | 4 +- .../openzfs/lib/libzfs/os/linux/libzfs_pool_os.c | 3 +- sys/contrib/openzfs/man/man4/zfs.4 | 8 +- sys/contrib/openzfs/man/man7/dracut.zfs.7 | 2 +- sys/contrib/openzfs/module/Kbuild.in | 2 + sys/contrib/openzfs/module/icp/io/aes.c | 8 +- .../openzfs/module/os/freebsd/zfs/vdev_geom.c | 2 +- .../openzfs/module/os/freebsd/zfs/zfs_dir.c | 1 + .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 54 +++- .../openzfs/module/os/freebsd/zfs/zfs_znode.c | 1 - .../openzfs/module/os/linux/spl/spl-kmem-cache.c | 12 +- sys/contrib/openzfs/module/os/linux/zfs/abd_os.c | 120 +++++---- .../openzfs/module/os/linux/zfs/vdev_disk.c | 14 +- .../openzfs/module/os/linux/zfs/zfs_sysfs.c | 13 +- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 290 +++++++++++++++------ sys/contrib/openzfs/module/zcommon/zfs_fletcher.c | 8 +- sys/contrib/openzfs/module/zfs/arc.c | 61 ++--- sys/contrib/openzfs/module/zfs/btree.c | 2 +- sys/contrib/openzfs/module/zfs/dbuf.c | 214 ++++++++------- sys/contrib/openzfs/module/zfs/dmu.c | 12 +- sys/contrib/openzfs/module/zfs/dmu_object.c | 2 +- sys/contrib/openzfs/module/zfs/dmu_objset.c | 6 +- sys/contrib/openzfs/module/zfs/dsl_dataset.c | 7 +- sys/contrib/openzfs/module/zfs/metaslab.c | 11 +- sys/contrib/openzfs/module/zfs/spa.c | 11 +- sys/contrib/openzfs/module/zfs/vdev.c | 12 +- sys/contrib/openzfs/module/zfs/zap.c | 27 +- sys/contrib/openzfs/module/zfs/zfs_log.c | 8 +- sys/contrib/openzfs/scripts/dkms.mkconf | 1 + sys/contrib/openzfs/scripts/zfs-tests.sh | 25 +- sys/contrib/openzfs/tests/runfiles/linux.run | 2 +- .../tests/test-runner/bin/test-runner.py.in | 23 +- .../openzfs/tests/test-runner/bin/zts-report.py.in | 2 +- .../tests/zfs-tests/cmd/libzfs_input_check.c | 4 +- .../openzfs/tests/zfs-tests/include/libtest.shlib | 30 ++- .../openzfs/tests/zfs-tests/tests/Makefile.am | 1 + .../cli_root/zfs_copies/zfs_copies.kshlib | 18 +- .../functional/fault/suspend_resume_single.ksh | 102 ++++++++ .../functional/redacted_send/redacted_deleted.ksh | 2 +- .../functional/redacted_send/redacted_mounts.ksh | 6 +- sys/modules/zfs/zfs_config.h | 29 ++- sys/modules/zfs/zfs_gitrev.h | 2 +- 69 files changed, 1178 insertions(+), 434 deletions(-) diff --cc sys/contrib/openzfs/config/kernel-types.m4 index 000000000000,ed76af28337b..ed76af28337b mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/kernel-types.m4 +++ b/sys/contrib/openzfs/config/kernel-types.m4 diff --cc sys/contrib/openzfs/config/user-backtrace.m4 index 000000000000,25706767cdc3..25706767cdc3 mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/user-backtrace.m4 +++ b/sys/contrib/openzfs/config/user-backtrace.m4 diff --cc sys/contrib/openzfs/config/user-libunwind.m4 index 000000000000,99ba3dcf452d..99ba3dcf452d mode 000000,100644..100644 --- a/sys/contrib/openzfs/config/user-libunwind.m4 +++ b/sys/contrib/openzfs/config/user-libunwind.m4 diff --cc sys/contrib/openzfs/tests/zfs-tests/tests/functional/fault/suspend_resume_single.ksh index 000000000000,041dadb1eadb..041dadb1eadb mode 000000,100755..100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/fault/suspend_resume_single.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/fault/suspend_resume_single.ksh diff --cc sys/modules/zfs/zfs_config.h index 35e6b4655832,000000000000..af6633ec205e mode 100644,000000..100644 --- a/sys/modules/zfs/zfs_config.h +++ b/sys/modules/zfs/zfs_config.h @@@ -1,1215 -1,0 +1,1236 @@@ +/* + */ + +/* zfs_config.h. Generated from zfs_config.h.in by configure. */ +/* zfs_config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* #undef ENABLE_NLS */ + +/* bio_end_io_t wants 1 arg */ +/* #undef HAVE_1ARG_BIO_END_IO_T */ + +/* lookup_bdev() wants 1 arg */ +/* #undef HAVE_1ARG_LOOKUP_BDEV */ + +/* submit_bio() wants 1 arg */ +/* #undef HAVE_1ARG_SUBMIT_BIO */ + +/* bdi_setup_and_register() wants 2 args */ +/* #undef HAVE_2ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 2 args */ +/* #undef HAVE_2ARGS_VFS_GETATTR */ + +/* zlib_deflate_workspacesize() wants 2 args */ +/* #undef HAVE_2ARGS_ZLIB_DEFLATE_WORKSPACESIZE */ + +/* bdi_setup_and_register() wants 3 args */ +/* #undef HAVE_3ARGS_BDI_SETUP_AND_REGISTER */ + +/* vfs_getattr wants 3 args */ +/* #undef HAVE_3ARGS_VFS_GETATTR */ + +/* vfs_getattr wants 4 args */ +/* #undef HAVE_4ARGS_VFS_GETATTR */ + +/* kernel has access_ok with 'type' parameter */ +/* #undef HAVE_ACCESS_OK_TYPE */ + +/* posix_acl has refcount_t */ +/* #undef HAVE_ACL_REFCOUNT */ + +/* add_disk() returns int */ +/* #undef HAVE_ADD_DISK_RET */ + +/* Define if host toolchain supports AES */ +#define HAVE_AES 1 + +/* Define if you have [rt] */ +#define HAVE_AIO_H 1 + +#ifdef __amd64__ +#ifndef RESCUE +/* Define if host toolchain supports AVX */ +#define HAVE_AVX 1 +#endif + +/* Define if host toolchain supports AVX2 */ +#define HAVE_AVX2 1 + +/* Define if host toolchain supports AVX512BW */ +#define HAVE_AVX512BW 1 + +/* Define if host toolchain supports AVX512CD */ +#define HAVE_AVX512CD 1 + +/* Define if host toolchain supports AVX512DQ */ +#define HAVE_AVX512DQ 1 + +/* Define if host toolchain supports AVX512ER */ +#define HAVE_AVX512ER 1 + +/* Define if host toolchain supports AVX512F */ +#define HAVE_AVX512F 1 + +/* Define if host toolchain supports AVX512IFMA */ +#define HAVE_AVX512IFMA 1 + +/* Define if host toolchain supports AVX512PF */ +#define HAVE_AVX512PF 1 + +/* Define if host toolchain supports AVX512VBMI */ +#define HAVE_AVX512VBMI 1 + +/* Define if host toolchain supports AVX512VL */ +#define HAVE_AVX512VL 1 +#endif + ++/* backtrace() is available */ ++/* #undef HAVE_BACKTRACE */ ++ +/* bdevname() is available */ +/* #undef HAVE_BDEVNAME */ + +/* bdev_check_media_change() exists */ +/* #undef HAVE_BDEV_CHECK_MEDIA_CHANGE */ + +/* bdev_file_open_by_path() exists */ +/* #undef HAVE_BDEV_FILE_OPEN_BY_PATH */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_63 */ + +/* bdev_*_io_acct() available */ +/* #undef HAVE_BDEV_IO_ACCT_OLD */ + +/* bdev_kobj() exists */ +/* #undef HAVE_BDEV_KOBJ */ + +/* bdev_max_discard_sectors() is available */ +/* #undef HAVE_BDEV_MAX_DISCARD_SECTORS */ + +/* bdev_max_secure_erase_sectors() is available */ +/* #undef HAVE_BDEV_MAX_SECURE_ERASE_SECTORS */ + ++/* bdev_nr_bytes() is available */ ++/* #undef HAVE_BDEV_NR_BYTES */ ++ +/* bdev_open_by_path() exists */ +/* #undef HAVE_BDEV_OPEN_BY_PATH */ + +/* bdev_release() exists */ +/* #undef HAVE_BDEV_RELEASE */ + +/* block_device_operations->submit_bio() returns void */ +/* #undef HAVE_BDEV_SUBMIT_BIO_RETURNS_VOID */ + +/* bdev_whole() is available */ +/* #undef HAVE_BDEV_WHOLE */ + +/* bio_alloc() takes 4 arguments */ +/* #undef HAVE_BIO_ALLOC_4ARG */ + +/* bio->bi_bdev->bd_disk exists */ +/* #undef HAVE_BIO_BDEV_DISK */ + +/* bio->bi_opf is defined */ +/* #undef HAVE_BIO_BI_OPF */ + +/* bio->bi_status exists */ +/* #undef HAVE_BIO_BI_STATUS */ + +/* bio has bi_iter */ +/* #undef HAVE_BIO_BVEC_ITER */ + +/* bio_*_io_acct() available */ +/* #undef HAVE_BIO_IO_ACCT */ + +/* bio_max_segs() is implemented */ +/* #undef HAVE_BIO_MAX_SEGS */ + +/* bio_set_dev() is available */ +/* #undef HAVE_BIO_SET_DEV */ + +/* bio_set_dev() GPL-only */ +/* #undef HAVE_BIO_SET_DEV_GPL_ONLY */ + +/* bio_set_dev() is a macro */ +/* #undef HAVE_BIO_SET_DEV_MACRO */ + +/* bio_set_op_attrs is available */ +/* #undef HAVE_BIO_SET_OP_ATTRS */ + +/* blkdev_get_by_path() exists and takes 4 args */ +/* #undef HAVE_BLKDEV_GET_BY_PATH_4ARG */ + +/* blkdev_get_by_path() handles ERESTARTSYS */ +/* #undef HAVE_BLKDEV_GET_ERESTARTSYS */ + +/* __blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_FLAGS */ + +/* __blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_ASYNC_NOFLAGS */ + +/* blkdev_issue_discard(flags) is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_FLAGS */ + +/* blkdev_issue_discard() is available */ +/* #undef HAVE_BLKDEV_ISSUE_DISCARD_NOFLAGS */ + +/* blkdev_issue_secure_erase() is available */ +/* #undef HAVE_BLKDEV_ISSUE_SECURE_ERASE */ + +/* blkdev_put() exists */ +/* #undef HAVE_BLKDEV_PUT */ + +/* blkdev_put() accepts void* as arg 2 */ +/* #undef HAVE_BLKDEV_PUT_HOLDER */ + +/* blkdev_reread_part() exists */ +/* #undef HAVE_BLKDEV_REREAD_PART */ + +/* blkg_tryget() is available */ +/* #undef HAVE_BLKG_TRYGET */ + +/* blkg_tryget() GPL-only */ +/* #undef HAVE_BLKG_TRYGET_GPL_ONLY */ + +/* blk_alloc_disk() exists */ +/* #undef HAVE_BLK_ALLOC_DISK */ + +/* blk_alloc_disk() exists and takes 2 args */ +/* #undef HAVE_BLK_ALLOC_DISK_2ARG */ + +/* blk_alloc_queue() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN */ + +/* blk_alloc_queue_rh() expects request function */ +/* #undef HAVE_BLK_ALLOC_QUEUE_REQUEST_FN_RH */ + +/* blk_cleanup_disk() exists */ +/* #undef HAVE_BLK_CLEANUP_DISK */ + +/* blk_mode_t is defined */ +/* #undef HAVE_BLK_MODE_T */ + +/* block multiqueue is available */ +/* #undef HAVE_BLK_MQ */ + +/* block multiqueue hardware context is cached in struct request */ +/* #undef HAVE_BLK_MQ_RQ_HCTX */ + +/* blk queue backing_dev_info is dynamic */ +/* #undef HAVE_BLK_QUEUE_BDI_DYNAMIC */ + +/* blk_queue_discard() is available */ +/* #undef HAVE_BLK_QUEUE_DISCARD */ + +/* blk_queue_flag_clear() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_CLEAR */ + +/* blk_queue_flag_set() exists */ +/* #undef HAVE_BLK_QUEUE_FLAG_SET */ + +/* blk_queue_flush() is available */ +/* #undef HAVE_BLK_QUEUE_FLUSH */ + +/* blk_queue_flush() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_FLUSH_GPL_ONLY */ + +/* blk_queue_secdiscard() is available */ +/* #undef HAVE_BLK_QUEUE_SECDISCARD */ + +/* blk_queue_secure_erase() is available */ +/* #undef HAVE_BLK_QUEUE_SECURE_ERASE */ + +/* blk_queue_update_readahead() exists */ +/* #undef HAVE_BLK_QUEUE_UPDATE_READAHEAD */ + +/* blk_queue_write_cache() exists */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE */ + +/* blk_queue_write_cache() is GPL-only */ +/* #undef HAVE_BLK_QUEUE_WRITE_CACHE_GPL_ONLY */ + +/* BLK_STS_RESV_CONFLICT is defined */ +/* #undef HAVE_BLK_STS_RESV_CONFLICT */ + +/* Define if release() in block_device_operations takes 1 arg */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_RELEASE_1ARG */ + +/* Define if revalidate_disk() in block_device_operations */ +/* #undef HAVE_BLOCK_DEVICE_OPERATIONS_REVALIDATE_DISK */ + +/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the + CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYCURRENT */ + +/* Define to 1 if you have the Mac OS X function + CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */ +/* #undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES */ + +/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in + the CoreFoundation framework. */ +/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */ + +/* check_disk_change() exists */ +/* #undef HAVE_CHECK_DISK_CHANGE */ + +/* clear_inode() is available */ +/* #undef HAVE_CLEAR_INODE */ + +/* dentry uses const struct dentry_operations */ +/* #undef HAVE_CONST_DENTRY_OPERATIONS */ + +/* copy_from_iter() is available */ +/* #undef HAVE_COPY_FROM_ITER */ + +/* copy_splice_read exists */ +/* #undef HAVE_COPY_SPLICE_READ */ + +/* copy_to_iter() is available */ +/* #undef HAVE_COPY_TO_ITER */ + +/* cpu_has_feature() is GPL-only */ +/* #undef HAVE_CPU_HAS_FEATURE_GPL_ONLY */ + +/* yes */ +/* #undef HAVE_CPU_HOTPLUG */ + +/* current_time() exists */ +/* #undef HAVE_CURRENT_TIME */ + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* #undef HAVE_DCGETTEXT */ + +/* DECLARE_EVENT_CLASS() is available */ +/* #undef HAVE_DECLARE_EVENT_CLASS */ + +/* dentry aliases are in d_u member */ +/* #undef HAVE_DENTRY_D_U_ALIASES */ + +/* dequeue_signal() takes 4 arguments */ +/* #undef HAVE_DEQUEUE_SIGNAL_4ARG */ + +/* lookup_bdev() wants dev_t arg */ +/* #undef HAVE_DEVT_LOOKUP_BDEV */ + +/* sops->dirty_inode() wants flags */ +/* #undef HAVE_DIRTY_INODE_WITH_FLAGS */ + +/* disk_check_media_change() exists */ +/* #undef HAVE_DISK_CHECK_MEDIA_CHANGE */ + +/* disk_*_io_acct() available */ +/* #undef HAVE_DISK_IO_ACCT */ + +/* disk_update_readahead() exists */ +/* #undef HAVE_DISK_UPDATE_READAHEAD */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* d_make_root() is available */ +/* #undef HAVE_D_MAKE_ROOT */ + +/* d_prune_aliases() is available */ +/* #undef HAVE_D_PRUNE_ALIASES */ + +/* dops->d_revalidate() operation takes nameidata */ +/* #undef HAVE_D_REVALIDATE_NAMEIDATA */ + +/* eops->encode_fh() wants child and parent inodes */ +/* #undef HAVE_ENCODE_FH_WITH_INODE */ + +/* sops->evict_inode() exists */ +/* #undef HAVE_EVICT_INODE */ + ++/* Define to 1 if you have the 'execvpe' function. */ ++#define HAVE_EXECVPE 1 ++ +/* FALLOC_FL_ZERO_RANGE is defined */ +/* #undef HAVE_FALLOC_FL_ZERO_RANGE */ + +/* fault_in_iov_iter_readable() is available */ +/* #undef HAVE_FAULT_IN_IOV_ITER_READABLE */ + +/* filemap_range_has_page() is available */ +/* #undef HAVE_FILEMAP_RANGE_HAS_PAGE */ + +/* fops->aio_fsync() exists */ +/* #undef HAVE_FILE_AIO_FSYNC */ + +/* file_dentry() is available */ +/* #undef HAVE_FILE_DENTRY */ + +/* fops->fadvise() exists */ +/* #undef HAVE_FILE_FADVISE */ + +/* file_inode() is available */ +/* #undef HAVE_FILE_INODE */ + +/* flush_dcache_page() is GPL-only */ +/* #undef HAVE_FLUSH_DCACHE_PAGE_GPL_ONLY */ + +/* iops->follow_link() cookie */ +/* #undef HAVE_FOLLOW_LINK_COOKIE */ + +/* iops->follow_link() nameidata */ +/* #undef HAVE_FOLLOW_LINK_NAMEIDATA */ + +/* Define if compiler supports -Wformat-overflow */ +/* #undef HAVE_FORMAT_OVERFLOW */ + +/* fsync_bdev() is declared in include/blkdev.h */ +/* #undef HAVE_FSYNC_BDEV */ + +/* fops->fsync() with range */ +/* #undef HAVE_FSYNC_RANGE */ + +/* fops->fsync() without dentry */ +/* #undef HAVE_FSYNC_WITHOUT_DENTRY */ + +/* yes */ +/* #undef HAVE_GENERIC_FADVISE */ + +/* generic_fillattr requires struct mnt_idmap* */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP */ + +/* generic_fillattr requires struct mnt_idmap* and u32 request_mask */ +/* #undef HAVE_GENERIC_FILLATTR_IDMAP_REQMASK */ + +/* generic_fillattr requires struct user_namespace* */ +/* #undef HAVE_GENERIC_FILLATTR_USERNS */ + +/* generic_*_io_acct() 3 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_3ARG */ + +/* generic_*_io_acct() 4 arg available */ +/* #undef HAVE_GENERIC_IO_ACCT_4ARG */ + +/* generic_readlink is global */ +/* #undef HAVE_GENERIC_READLINK */ + +/* generic_setxattr() exists */ +/* #undef HAVE_GENERIC_SETXATTR */ + +/* generic_write_checks() takes kiocb */ +/* #undef HAVE_GENERIC_WRITE_CHECKS_KIOCB */ + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* #undef HAVE_GETTEXT */ + ++/* Define to 1 if you have the 'gettid' function. */ ++/* #undef HAVE_GETTID */ ++ +/* iops->get_acl() exists */ +/* #undef HAVE_GET_ACL */ + +/* iops->get_acl() takes rcu */ +/* #undef HAVE_GET_ACL_RCU */ + +/* has iops->get_inode_acl() */ +/* #undef HAVE_GET_INODE_ACL */ + +/* iops->get_link() cookie */ +/* #undef HAVE_GET_LINK_COOKIE */ + +/* iops->get_link() delayed */ +/* #undef HAVE_GET_LINK_DELAYED */ + +/* group_info->gid exists */ +/* #undef HAVE_GROUP_INFO_GID */ + +/* has_capability() is available */ +/* #undef HAVE_HAS_CAPABILITY */ + +/* iattr->ia_vfsuid and iattr->ia_vfsgid exist */ +/* #undef HAVE_IATTR_VFSID */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* iops->getattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_GETATTR */ + +/* iops->setattr() takes struct mnt_idmap* */ +/* #undef HAVE_IDMAP_IOPS_SETATTR */ + +/* APIs for idmapped mount are present */ +/* #undef HAVE_IDMAP_MNT_API */ + +/* mnt_idmap does not have user_namespace */ +/* #undef HAVE_IDMAP_NO_USERNS */ + +/* Define if compiler supports -Wimplicit-fallthrough */ +/* #undef HAVE_IMPLICIT_FALLTHROUGH */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_INFINITE_RECURSION */ + +/* inode_get_atime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_ATIME */ + +/* inode_get_ctime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_CTIME */ + +/* inode_get_mtime() exists in linux/fs.h */ +/* #undef HAVE_INODE_GET_MTIME */ + +/* yes */ +/* #undef HAVE_INODE_LOCK_SHARED */ + +/* inode_owner_or_capable() exists */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE */ + +/* inode_owner_or_capable() takes mnt_idmap */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_IDMAP */ + +/* inode_owner_or_capable() takes user_ns */ +/* #undef HAVE_INODE_OWNER_OR_CAPABLE_USERNS */ + +/* inode_set_atime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_ATIME_TO_TS */ + +/* inode_set_ctime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_CTIME_TO_TS */ + +/* inode_set_flags() exists */ +/* #undef HAVE_INODE_SET_FLAGS */ + +/* inode_set_iversion() exists */ +/* #undef HAVE_INODE_SET_IVERSION */ + +/* inode_set_mtime_to_ts() exists in linux/fs.h */ +/* #undef HAVE_INODE_SET_MTIME_TO_TS */ + +/* inode->i_*time's are timespec64 */ +/* #undef HAVE_INODE_TIMESPEC64_TIMES */ + +/* timestamp_truncate() exists */ +/* #undef HAVE_INODE_TIMESTAMP_TRUNCATE */ + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* in_compat_syscall() is available */ +/* #undef HAVE_IN_COMPAT_SYSCALL */ + +/* iops->create() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_CREATE_IDMAP */ + +/* iops->create() takes struct user_namespace* */ +/* #undef HAVE_IOPS_CREATE_USERNS */ + +/* iops->mkdir() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKDIR_IDMAP */ + +/* iops->mkdir() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKDIR_USERNS */ + +/* iops->mknod() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_MKNOD_IDMAP */ + +/* iops->mknod() takes struct user_namespace* */ +/* #undef HAVE_IOPS_MKNOD_USERNS */ + +/* iops->permission() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_PERMISSION_IDMAP */ + +/* iops->permission() takes struct user_namespace* */ +/* #undef HAVE_IOPS_PERMISSION_USERNS */ + +/* iops->rename() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_RENAME_IDMAP */ + +/* iops->rename() takes struct user_namespace* */ +/* #undef HAVE_IOPS_RENAME_USERNS */ + +/* iops->setattr() exists */ +/* #undef HAVE_IOPS_SETATTR */ + +/* iops->symlink() takes struct mnt_idmap* */ +/* #undef HAVE_IOPS_SYMLINK_IDMAP */ + +/* iops->symlink() takes struct user_namespace* */ +/* #undef HAVE_IOPS_SYMLINK_USERNS */ + +/* iov_iter_advance() is available */ +/* #undef HAVE_IOV_ITER_ADVANCE */ + +/* iov_iter_count() is available */ +/* #undef HAVE_IOV_ITER_COUNT */ + +/* iov_iter_fault_in_readable() is available */ +/* #undef HAVE_IOV_ITER_FAULT_IN_READABLE */ + +/* iov_iter_revert() is available */ +/* #undef HAVE_IOV_ITER_REVERT */ + +/* iov_iter_type() is available */ +/* #undef HAVE_IOV_ITER_TYPE */ + +/* iov_iter types are available */ +/* #undef HAVE_IOV_ITER_TYPES */ + +/* yes */ +/* #undef HAVE_IO_SCHEDULE_TIMEOUT */ + +/* Define to 1 if you have the 'issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* iter_iov() is available */ +/* #undef HAVE_ITER_IOV */ + +/* kernel has kernel_fpu_* functions */ +/* #undef HAVE_KERNEL_FPU */ + +/* kernel has asm/fpu/api.h */ +/* #undef HAVE_KERNEL_FPU_API_HEADER */ + +/* kernel fpu internal */ +/* #undef HAVE_KERNEL_FPU_INTERNAL */ + +/* kernel has asm/fpu/internal.h */ +/* #undef HAVE_KERNEL_FPU_INTERNAL_HEADER */ + +/* uncached_acl_sentinel() exists */ +/* #undef HAVE_KERNEL_GET_ACL_HANDLE_CACHE */ + +/* Define if compiler supports -Winfinite-recursion */ +/* #undef HAVE_KERNEL_INFINITE_RECURSION */ + ++/* kernel defines intptr_t */ ++/* #undef HAVE_KERNEL_INTPTR_T */ ++ +/* kernel has kernel_neon_* functions */ +/* #undef HAVE_KERNEL_NEON */ + +/* kernel does stack verification */ +/* #undef HAVE_KERNEL_OBJTOOL */ + +/* kernel has linux/objtool.h */ +/* #undef HAVE_KERNEL_OBJTOOL_HEADER */ + +/* kernel_read() take loff_t pointer */ +/* #undef HAVE_KERNEL_READ_PPOS */ + +/* strlcpy() exists */ +/* #undef HAVE_KERNEL_STRLCPY */ + +/* strscpy() exists */ +/* #undef HAVE_KERNEL_STRSCPY */ + +/* timer_list.function gets a timer_list */ +/* #undef HAVE_KERNEL_TIMER_FUNCTION_TIMER_LIST */ + +/* struct timer_list has a flags member */ +/* #undef HAVE_KERNEL_TIMER_LIST_FLAGS */ + +/* timer_setup() is available */ +/* #undef HAVE_KERNEL_TIMER_SETUP */ + +/* kernel_write() take loff_t pointer */ +/* #undef HAVE_KERNEL_WRITE_PPOS */ + +/* kmem_cache_create_usercopy() exists */ +/* #undef HAVE_KMEM_CACHE_CREATE_USERCOPY */ + +/* kstrtoul() exists */ +/* #undef HAVE_KSTRTOUL */ + +/* ktime_get_coarse_real_ts64() exists */ +/* #undef HAVE_KTIME_GET_COARSE_REAL_TS64 */ + +/* ktime_get_raw_ts64() exists */ +/* #undef HAVE_KTIME_GET_RAW_TS64 */ + +/* kvmalloc exists */ +/* #undef HAVE_KVMALLOC */ + +/* Define if you have [aio] */ +/* #undef HAVE_LIBAIO */ + +/* Define if you have [blkid] */ +/* #undef HAVE_LIBBLKID */ + +/* Define if you have [crypto] */ +#define HAVE_LIBCRYPTO 1 + +/* Define if you have [tirpc] */ +/* #undef HAVE_LIBTIRPC */ + +/* Define if you have [udev] */ +/* #undef HAVE_LIBUDEV */ + ++/* Define if you have [unwind] */ ++/* #undef HAVE_LIBUNWIND */ ++ ++/* libunwind has unw_get_elf_filename */ ++/* #undef HAVE_LIBUNWIND_ELF */ ++ +/* Define if you have [uuid] */ +/* #undef HAVE_LIBUUID */ + +/* linux/blk-cgroup.h exists */ +/* #undef HAVE_LINUX_BLK_CGROUP_HEADER */ + +/* lseek_execute() is available */ +/* #undef HAVE_LSEEK_EXECUTE */ + +/* makedev() is declared in sys/mkdev.h */ +/* #undef HAVE_MAKEDEV_IN_MKDEV */ + +/* makedev() is declared in sys/sysmacros.h */ +/* #undef HAVE_MAKEDEV_IN_SYSMACROS */ + +/* Noting that make_request_fn() returns blk_qc_t */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_QC */ + +/* Noting that make_request_fn() returns void */ +/* #undef HAVE_MAKE_REQUEST_FN_RET_VOID */ + +/* iops->mkdir() takes umode_t */ +/* #undef HAVE_MKDIR_UMODE_T */ + +/* Define to 1 if you have the 'mlockall' function. */ +#define HAVE_MLOCKALL 1 + +/* page_size() is available */ +/* #undef HAVE_MM_PAGE_SIZE */ + +/* lookup_bdev() wants mode arg */ +/* #undef HAVE_MODE_LOOKUP_BDEV */ + +/* Define if host toolchain supports MOVBE */ +#define HAVE_MOVBE 1 + +/* new_sync_read()/new_sync_write() are available */ +/* #undef HAVE_NEW_SYNC_READ */ + +/* folio_wait_bit() exists */ +/* #undef HAVE_PAGEMAP_FOLIO_WAIT_BIT */ + +/* part_to_dev() exists */ +/* #undef HAVE_PART_TO_DEV */ + +/* iops->getattr() takes a path */ +/* #undef HAVE_PATH_IOPS_GETATTR */ + +/* Define if host toolchain supports PCLMULQDQ */ +#define HAVE_PCLMULQDQ 1 + +/* percpu_counter_add_batch() is defined */ +/* #undef HAVE_PERCPU_COUNTER_ADD_BATCH */ + +/* percpu_counter_init() wants gfp_t */ +/* #undef HAVE_PERCPU_COUNTER_INIT_WITH_GFP */ + +/* posix_acl_chmod() exists */ +/* #undef HAVE_POSIX_ACL_CHMOD */ + +/* posix_acl_from_xattr() needs user_ns */ +/* #undef HAVE_POSIX_ACL_FROM_XATTR_USERNS */ + +/* posix_acl_release() is available */ +/* #undef HAVE_POSIX_ACL_RELEASE */ + +/* posix_acl_release() is GPL-only */ +/* #undef HAVE_POSIX_ACL_RELEASE_GPL_ONLY */ + +/* posix_acl_valid() wants user namespace */ +/* #undef HAVE_POSIX_ACL_VALID_WITH_NS */ + +/* proc_ops structure exists */ +/* #undef HAVE_PROC_OPS_STRUCT */ + +/* iops->put_link() cookie */ +/* #undef HAVE_PUT_LINK_COOKIE */ + +/* iops->put_link() delayed */ +/* #undef HAVE_PUT_LINK_DELAYED */ + +/* iops->put_link() nameidata */ +/* #undef HAVE_PUT_LINK_NAMEIDATA */ + +/* If available, contains the Python version number currently in use. */ +#define HAVE_PYTHON "3.7" + +/* qat is enabled and existed */ +/* #undef HAVE_QAT */ + +/* struct reclaim_state has reclaimed */ +/* #undef HAVE_RECLAIM_STATE_RECLAIMED */ + +/* register_shrinker is vararg */ +/* #undef HAVE_REGISTER_SHRINKER_VARARG */ + +/* register_sysctl_table exists */ +/* #undef HAVE_REGISTER_SYSCTL_TABLE */ + +/* iops->rename2() exists */ +/* #undef HAVE_RENAME2 */ + +/* struct inode_operations_wrapper takes .rename2() */ +/* #undef HAVE_RENAME2_OPERATIONS_WRAPPER */ + +/* iops->rename() wants flags */ +/* #undef HAVE_RENAME_WANTS_FLAGS */ + +/* REQ_DISCARD is defined */ +/* #undef HAVE_REQ_DISCARD */ + +/* REQ_FLUSH is defined */ +/* #undef HAVE_REQ_FLUSH */ + +/* REQ_OP_DISCARD is defined */ +/* #undef HAVE_REQ_OP_DISCARD */ + +/* REQ_OP_FLUSH is defined */ +/* #undef HAVE_REQ_OP_FLUSH */ + +/* REQ_OP_SECURE_ERASE is defined */ +/* #undef HAVE_REQ_OP_SECURE_ERASE */ + +/* REQ_PREFLUSH is defined */ +/* #undef HAVE_REQ_PREFLUSH */ + +/* revalidate_disk() is available */ +/* #undef HAVE_REVALIDATE_DISK */ + +/* revalidate_disk_size() is available */ +/* #undef HAVE_REVALIDATE_DISK_SIZE */ + +/* struct rw_semaphore has member activity */ +/* #undef HAVE_RWSEM_ACTIVITY */ + +/* struct rw_semaphore has atomic_long_t member count */ +/* #undef HAVE_RWSEM_ATOMIC_LONG_COUNT */ + +/* linux/sched/signal.h exists */ +/* #undef HAVE_SCHED_SIGNAL_HEADER */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SECURITY_PAM_MODULES_H 1 + +/* setattr_prepare() accepts mnt_idmap */ +/* #undef HAVE_SETATTR_PREPARE_IDMAP */ + +/* setattr_prepare() is available, doesn't accept user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_NO_USERNS */ + +/* setattr_prepare() accepts user_namespace */ +/* #undef HAVE_SETATTR_PREPARE_USERNS */ + +/* iops->set_acl() exists, takes 3 args */ +/* #undef HAVE_SET_ACL */ + +/* iops->set_acl() takes 4 args, arg1 is struct mnt_idmap * */ +/* #undef HAVE_SET_ACL_IDMAP_DENTRY */ + +/* iops->set_acl() takes 4 args */ +/* #undef HAVE_SET_ACL_USERNS */ + +/* iops->set_acl() takes 4 args, arg2 is struct dentry * */ +/* #undef HAVE_SET_ACL_USERNS_DENTRY_ARG2 */ + +/* set_cached_acl() is usable */ +/* #undef HAVE_SET_CACHED_ACL_USABLE */ + +/* set_special_state() exists */ +/* #undef HAVE_SET_SPECIAL_STATE */ + +/* shrinker_register exists */ +/* #undef HAVE_SHRINKER_REGISTER */ *** 400 LINES SKIPPED *** From nobody Tue Aug 13 09:24:52 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WjmF02lnDz5Smxx; Tue, 13 Aug 2024 09:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WjmF020mDz4bdy; Tue, 13 Aug 2024 09:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723541092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nMUKK0zcH1LPizkAZ5qnJ8TPJCBk+IQvU73X+HK/3f8=; b=UiupDukYbs2UnC5lAHyZ2elCs11WvRCXR6X0zYg4sbiK9JDsog4/gx3IJZ4BojSJjqpTI4 kVB0Vuh73+8a8JD/8LC0L9FkDVikaYfgOAWDG4l1Qv4BmnLUiGueWuAfISe+WvAWXwj3vm G8FIw7n1trlgrTUePFMf5qF/i5hOinwFW6kFsvrcjYiml23M2MRG5Ul1ra5BJDZOaQZYiP WlCsyK5nUwF0R+oGRR2DQBNmbCrVKSg1J6ms5t/krnPcPLPIIffRGX0eIWoHpVOhLjV4es KJGnOE4d1laFcSFo4ToANUVIyvIwGEnoaFOLJjh2//hqDTIO3MKwY3f2LJI6fQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723541092; a=rsa-sha256; cv=none; b=EiNP7+0J30caM4h0q9CySWubBY9fWgKMvCHA7WA1egJYi8MvLBknW2nXXaJ+6FnfTMSUDV oa6q5N4BW5uPPgGpc/iPAa58p8I5c7UBK8ICtzE+xLCkhaAXTOYMJVcX1LWfZZFnN0dzAt U5f5+sHQeHViwjmcPY3kxxhAVUP4ZlPndKHgydL6rPzCV0xKhoBPwcz+USYaQawTgO/5tG kJW2tY/9RQrGzBVBkqjOLgpIiRffy4FXHRxs1VyO1mUXYpsfSFg9rmEAauThXRY53qd/VL vVQ4xWIlcMMROoBfNweK9KOWG0llA38PNnmrizwNZjsffIyYIg6PKpgfVV86RQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723541092; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nMUKK0zcH1LPizkAZ5qnJ8TPJCBk+IQvU73X+HK/3f8=; b=U312KGSpDWD+qSPS8EuuT7I7g8ZwMPZaRNcMrq72wkxly2tcRm9L8fE2K5gVjY6lkkbQE+ G3yn43o9HLKhMZFy/7iWDTF+nJHb9AMKs/PdjDyvNq/mRaWVRxEWvW21FjXqoBVvL4ffUd AdBr9T3P9++W2XmdzPKnF0Yw3Sf7EMrJS1qtB4nfBnRWMb5dZn7kXa8axVyhERXDpf/++G 1UKmd5EaezMWwqfA6uUhLZgPhTZ3AWioaAOdx+1M4+r0VbezUv1HuU5LmYDwHQhLDxBb5S 4tZuFf4cgpNEM2FCnqLY8AeH6ZzYBbG4OGQScK7VYgByiaOMsx5C4+NNCgwCbQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WjmF01bdxz155t; Tue, 13 Aug 2024 09:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47D9OqmZ021364; Tue, 13 Aug 2024 09:24:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47D9Oq9M021361; Tue, 13 Aug 2024 09:24:52 GMT (envelope-from git) Date: Tue, 13 Aug 2024 09:24:52 GMT Message-Id: <202408130924.47D9Oq9M021361@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: ae3598b7a1dc - stable/14 - Fix enum warnings in ath_hal's ar9300 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ae3598b7a1dc49874203e41ff77e7e6c2c9505aa Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ae3598b7a1dc49874203e41ff77e7e6c2c9505aa commit ae3598b7a1dc49874203e41ff77e7e6c2c9505aa Author: Dimitry Andric AuthorDate: 2024-07-31 09:37:20 +0000 Commit: Dimitry Andric CommitDate: 2024-08-13 09:24:12 +0000 Fix enum warnings in ath_hal's ar9300 This fixes a number of clang 19 warnings: sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c:709:25: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_FREQ_BAND') [-Werror,-Wenum-compare] 709 | freq_array[i] = FBIN2FREQ(p_freq_bin[i], is_2ghz); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h:148:11: note: expanded from macro 'FBIN2FREQ' 148 | (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x)) | ~~~ ^ ~~~~~~~~~~~~~~~~~~ sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c:745:25: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_FREQ_BAND') [-Werror,-Wenum-compare] 745 | freq_array[i] = FBIN2FREQ(p_freq_bin[i], is_2ghz); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h:148:11: note: expanded from macro 'FBIN2FREQ' 148 | (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x)) | ~~~ ^ ~~~~~~~~~~~~~~~~~~ sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c:781:25: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_FREQ_BAND') [-Werror,-Wenum-compare] 781 | freq_array[i] = FBIN2FREQ(p_freq_bin[i], is_2ghz); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h:148:11: note: expanded from macro 'FBIN2FREQ' 148 | (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x)) | ~~~ ^ ~~~~~~~~~~~~~~~~~~ The `FBIN2FREQ()` and `FREQ2FBIN()` macros in `ar9300eep.h` are invoked in most places around the `ath_hal` code with a (effectively) boolean second argument, corresponding to "is this 2GHz?". But in the code that is warned about, the value `HAL_FREQ_BAND_2GHZ` is of a different non-boolean type, `HAL_FREQ_BAND`. Update the `FBIN2FREQ()` and `FREQ2FBIN()` macros to interpret the second argument as boolean value, and rename the macro parameter names to better describe their meaning. Reviewed by: adrian, bz MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D46201 (cherry picked from commit 82246ac5d890e031c9978052e5a431e0960182d5) --- sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h index 9230fd57e2e4..b2a0862c7aee 100644 --- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h +++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h @@ -142,10 +142,10 @@ enum Ar9300EepromTemplate #define OSPREY_EEPMISC_WOW 0x02 #define OSPREY_CUSTOMER_DATA_SIZE 20 -#define FREQ2FBIN(x,y) \ - (u_int8_t)(((y) == HAL_FREQ_BAND_2GHZ) ? ((x) - 2300) : (((x) - 4800) / 5)) -#define FBIN2FREQ(x,y) \ - (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x)) +#define FREQ2FBIN(freq,is_2ghz) \ + (u_int8_t)((is_2ghz) ? ((freq) - 2300) : (((freq) - 4800) / 5)) +#define FBIN2FREQ(freq,is_2ghz) \ + ((is_2ghz) ? (2300 + freq) : (4800 + 5 * freq)) #define OSPREY_MAX_CHAINS 3 #define OSPREY_ANT_16S 25 #define OSPREY_FUTURE_MODAL_SZ 6 From nobody Tue Aug 13 09:24:53 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WjmF15Zsgz5Smxy; Tue, 13 Aug 2024 09:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WjmF12z6Qz4bLy; Tue, 13 Aug 2024 09:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723541093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cdCNaOqcqZJ2Lk96ovLCY61z1kQ5Wjpd69c5QPVyywY=; b=exK/ouJexc9igSJcwEghyDka7jTbTK+s1m9Bm1ZQv9QH94M0Suy2RerpQL7eHqwGT3mw2w SDpSk2SnLLYuTkVhUG7JVnqM3dqkRmnM9TJtnPQQ4lq9lWaOs/VlRsxXuOsK8H4ZwHxAf0 o5+HlyOpwGtiACOfxBxpP5ID8fEsp40Psms9mh7VREBzf6ijpVP6lGXEEGqHl/X1drQO88 sWrTn/dHApPiQsRG0b8Bdx9qxCkryEpoK7LNJx3in/EkSzYoNcBthX81i/9kzo+k1clyRF tejPYzNK3r5Hx9bQKlVI3Z5eXC466ZM2wYhJzilyeFQ9tMQFrNFegxZpHBdbjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723541093; a=rsa-sha256; cv=none; b=v/HINFifqCqf0A8YfsF9E25ICHiFcMHK6Mo93WoIsL/ROoGAYmtpSNEpjBTj5xDFRoGOo6 G/QEjDGJcXpldW/c9Qp0RVL+r1WJp5dsMEbroAdRBtjTD1ZRNGrWOMkOOrqT1dU6AzPKYZ bD42sIrs83hkVILpt7m7HEC7E3fs+/FRieWWDDULVkbzuoyC0lXlrNsuwyYkZNaxs78F7V 3SUOo5H9qu11rQ6i/pf/jUi9pYYIOIzjmhU7y7lU+kUwuQzcFGLFckZrKBMtkxhgLflCsw jJR3AW9f429h4uUYKgn+lOQcygbUvkoHyRMyoohsg8AQO+IPj5TUbcM8GbO2iQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723541093; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cdCNaOqcqZJ2Lk96ovLCY61z1kQ5Wjpd69c5QPVyywY=; b=O4cxbjia0z+1IcsFwNvcnW19kwkoJXHpplvrioCi3RiEltKy81zG3FQIVTznMGFZOotvH3 75oJCgnzSYIgCzg/WOkoPqhEL9TwoFBFbUpEsIOsHDp6lmQy8Yng038ycYMN7ntcgXJuZu iJqyjAQjhHDhr6IOMN4p0Gq57SjupID4kTzNOvKOiy5jPfiT+1IzOMsCDjNZDYFPoB4Ac1 paQpjjUKZhn47xI1aoveDKjn6WihdxgGMZCBpZEw5XkZrBrcg+y/uSUrArj18ZBTk7E91M iA2uHDRa43j6Iu20QmLkCZ3YNcOfTooNYA8Vsd6jq/aSWYi/7wl04H233UVe+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WjmF12ZMsz14XL; Tue, 13 Aug 2024 09:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47D9OrdT021424; Tue, 13 Aug 2024 09:24:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47D9OrcM021421; Tue, 13 Aug 2024 09:24:53 GMT (envelope-from git) Date: Tue, 13 Aug 2024 09:24:53 GMT Message-Id: <202408130924.47D9OrcM021421@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: b998525875c4 - stable/14 - Merge commit d2353ae00c3b from llvm git (by Argyrios Kyrtzidis): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b998525875c47602313ac223eb35f7e51df3b50a Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=b998525875c47602313ac223eb35f7e51df3b50a commit b998525875c47602313ac223eb35f7e51df3b50a Author: Dimitry Andric AuthorDate: 2024-08-10 21:03:27 +0000 Commit: Dimitry Andric CommitDate: 2024-08-13 09:24:24 +0000 Merge commit d2353ae00c3b from llvm git (by Argyrios Kyrtzidis): [utils/TableGen/X86CompressEVEXTablesEmitter.cpp] Make sure the tablegen output for the `checkPredicate` function is deterministic (#84533) The output for the `checkPredicate` function was depending on a `std::map` iteration that was non-deterministic from run to run, because the keys were pointer values. Make a change so that the keys are `StringRef`s so the ordering is stable. This avoids non-determinism in llvm-tblgen output, which could cause differences in the generated X86GenCompressEVEXTables.inc file. Although these differences are not influencing the meaning of the generated code, they still change a few bytes in libllvm. This in turn influences all the binaries linked with libllvm, such as clang, ld.lld, etc. Reported by: cperciva MFC after: 3 days (cherry picked from commit 7a8d05ba19b7762596c0ff22e668e4d50bac81cf) --- .../llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/llvm-project/llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp b/contrib/llvm-project/llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp index fef8dc7236f5..ee0a96ee5b53 100644 --- a/contrib/llvm-project/llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp +++ b/contrib/llvm-project/llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp @@ -46,7 +46,7 @@ class X86CompressEVEXTablesEmitter { typedef std::pair Entry; - typedef std::map> + typedef std::map> PredicateInstMap; std::vector Table; @@ -89,7 +89,7 @@ void X86CompressEVEXTablesEmitter::printCheckPredicate( for (const auto &[Key, Val] : PredicateInsts) { for (const auto &Inst : Val) OS << " case X86::" << Inst->TheDef->getName() << ":\n"; - OS << " return " << Key->getValueAsString("CondString") << ";\n"; + OS << " return " << Key << ";\n"; } OS << " }\n"; @@ -226,7 +226,7 @@ void X86CompressEVEXTablesEmitter::run(raw_ostream &OS) { Name == "HasAVXIFMA"; }); if(It!= Predicates.end()) - PredicateInsts[*It].push_back(NewInst); + PredicateInsts[(*It)->getValueAsString("CondString")].push_back(NewInst); } printTable(Table, OS); From nobody Tue Aug 13 09:25:05 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WjmFF294fz5Sn3X; Tue, 13 Aug 2024 09:25:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WjmFF1SWZz4c0Q; Tue, 13 Aug 2024 09:25:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723541105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=46oqRqsQFJi8Gee4jHi891Dnn1EnT2MqJsq78ICY3Pw=; b=N7Ig7fiPrDorDrrycb8UakkD6UbAWjZxrmiJFs0AHTjjjOxZ6DbmD0Rs++0qTcSX2Skp+H lvOs1ZLLeg0tqVW0CCpvzB61uORN3djvmBdpZrlym4JNHlZeU7xB9oYOq226g1sraySuKk OdZ7XYAb0X6YnMv4BVOZWEkfX0q4BAhUzzAP/rbKxMcUiif0dmRaOekV/odV9DkSBHshr9 skP1MEHGFUzWrJNv/GlKIYMMfl0mVuMh/3TtZgZusTrGt3D+GY6dl7wkXFn/Y7IONg14vV 7zSR3lyz8ErvuUOA2P1xfA0v2mqffO4bzv5THImc+qTHOEQ93PFuCiFyphk9Sw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723541105; a=rsa-sha256; cv=none; b=V4SxhtqUCh9UTAFttJZz7bDeCdf0MSsHZhmm7h/eX+TnMAUDwst0oCVgfit95Km6rl0D7p cv0tsuM3BsAvsQX/uDGuz5uoyfQqGFJlnkwIMBd01oJq+pTQpSIaxAxrCZXfgjo4d7+FKl RSwj5fqXEuij2OaTWr7S95Xr0td/PpG4NDBruHiLDzwzZ48GEADoAEl1Xw9Rq7HWupfD7I vz5MMY9sjpBSzZTgU6Bus4OO4iX2qi52ncAf6xzJ1v0TCBGIM0YI58mulWophMp7wCvyxL VTTwBHL4w9ZeDo94XM4PWyd6MkSetYrrdGfohe0SoeRllDVgj/oOxlJJk+dP4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723541105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=46oqRqsQFJi8Gee4jHi891Dnn1EnT2MqJsq78ICY3Pw=; b=r9Py6CL5QZzQOtzjChot8Yw+hohEUUt1MAQVjVgUadD6H5AqahjVq0Of7krJ8ALMBK6Z2i pKnQvEU8Um0Ak/hcZZFlh3lZCUDjb6ERFaAiagahw1g5BEYsBFL8bWK45VjKr/J+6DE1d6 Y1+8SNr+LRF5eMgzz8epUgxQTaeyQEvPNoS1jSILInYj7+gCIkvX8XOEYtDgDE5VBiRPw9 kC/G+0Z6flHMKbQ+RaNse9prM48ibWpgOAOfaQqZKDCWj7ftIhUzThjHHbnNAVHviMnN6n ANzZSLNih5VevwZ69w6mIuREAPtvq8hHCb0fDWuy7F8IvQRuL3PtWdko4OJoNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WjmFF12dlz1548; Tue, 13 Aug 2024 09:25:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47D9P5ns021615; Tue, 13 Aug 2024 09:25:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47D9P5oM021612; Tue, 13 Aug 2024 09:25:05 GMT (envelope-from git) Date: Tue, 13 Aug 2024 09:25:05 GMT Message-Id: <202408130925.47D9P5oM021612@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: dd88f2073cff - stable/13 - Fix enum warnings in ath_hal's ar9300 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: dd88f2073cff2d3d76d3700870f07ae8e83fbda5 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=dd88f2073cff2d3d76d3700870f07ae8e83fbda5 commit dd88f2073cff2d3d76d3700870f07ae8e83fbda5 Author: Dimitry Andric AuthorDate: 2024-07-31 09:37:20 +0000 Commit: Dimitry Andric CommitDate: 2024-08-13 09:24:16 +0000 Fix enum warnings in ath_hal's ar9300 This fixes a number of clang 19 warnings: sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c:709:25: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_FREQ_BAND') [-Werror,-Wenum-compare] 709 | freq_array[i] = FBIN2FREQ(p_freq_bin[i], is_2ghz); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h:148:11: note: expanded from macro 'FBIN2FREQ' 148 | (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x)) | ~~~ ^ ~~~~~~~~~~~~~~~~~~ sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c:745:25: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_FREQ_BAND') [-Werror,-Wenum-compare] 745 | freq_array[i] = FBIN2FREQ(p_freq_bin[i], is_2ghz); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h:148:11: note: expanded from macro 'FBIN2FREQ' 148 | (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x)) | ~~~ ^ ~~~~~~~~~~~~~~~~~~ sys/contrib/dev/ath/ath_hal/ar9300/ar9300_eeprom.c:781:25: error: comparison of different enumeration types ('HAL_BOOL' and 'HAL_FREQ_BAND') [-Werror,-Wenum-compare] 781 | freq_array[i] = FBIN2FREQ(p_freq_bin[i], is_2ghz); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h:148:11: note: expanded from macro 'FBIN2FREQ' 148 | (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x)) | ~~~ ^ ~~~~~~~~~~~~~~~~~~ The `FBIN2FREQ()` and `FREQ2FBIN()` macros in `ar9300eep.h` are invoked in most places around the `ath_hal` code with a (effectively) boolean second argument, corresponding to "is this 2GHz?". But in the code that is warned about, the value `HAL_FREQ_BAND_2GHZ` is of a different non-boolean type, `HAL_FREQ_BAND`. Update the `FBIN2FREQ()` and `FREQ2FBIN()` macros to interpret the second argument as boolean value, and rename the macro parameter names to better describe their meaning. Reviewed by: adrian, bz MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D46201 (cherry picked from commit 82246ac5d890e031c9978052e5a431e0960182d5) --- sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h index 9230fd57e2e4..b2a0862c7aee 100644 --- a/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h +++ b/sys/contrib/dev/ath/ath_hal/ar9300/ar9300eep.h @@ -142,10 +142,10 @@ enum Ar9300EepromTemplate #define OSPREY_EEPMISC_WOW 0x02 #define OSPREY_CUSTOMER_DATA_SIZE 20 -#define FREQ2FBIN(x,y) \ - (u_int8_t)(((y) == HAL_FREQ_BAND_2GHZ) ? ((x) - 2300) : (((x) - 4800) / 5)) -#define FBIN2FREQ(x,y) \ - (((y) == HAL_FREQ_BAND_2GHZ) ? (2300 + x) : (4800 + 5 * x)) +#define FREQ2FBIN(freq,is_2ghz) \ + (u_int8_t)((is_2ghz) ? ((freq) - 2300) : (((freq) - 4800) / 5)) +#define FBIN2FREQ(freq,is_2ghz) \ + ((is_2ghz) ? (2300 + freq) : (4800 + 5 * freq)) #define OSPREY_MAX_CHAINS 3 #define OSPREY_ANT_16S 25 #define OSPREY_FUTURE_MODAL_SZ 6 From nobody Tue Aug 13 09:25:06 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WjmFG32Dhz5Smy5; Tue, 13 Aug 2024 09:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WjmFG2BLPz4c2x; Tue, 13 Aug 2024 09:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723541106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6mkoJJ6T5SflCTAVzea4PcSQ8QyL2Qs+Ld+HOffdOKU=; b=XJGe9Qbsx3kIMK9uH0QWVfCGBH2G4RdHTKOw3SFVc8BBfi6T5ax1DUk/SujSI6cVWUBR5Q bYYwTZKnNLIsutdJ0zUvSsamNxK+mI3yeI7xCJGSESxIfKdAm/to5G+du2D56uX06Z4co0 dYiNgP4MpHC0V73+JYGPsCa/K4ZJtoC1ASB0HGyk3RscFFWQVD7ZjiTPIoegyZvc+IdfMk DN4TLkxZDfhmvQnT6aMZ3jVnBW0PgiUbMEUmPN4WPGLSVJNLFSPNmCRN0xdgI3aAEGmjfU Xsr2c89G9qsoxjD/35mwvHk4wyb246UZe3wfcZb02GZBsf8/zxab9dcCpmBqmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723541106; a=rsa-sha256; cv=none; b=pzsCVLfL217uy8q/UNPNBhl016O6bo/DLaIEU/LSY9iDeprOOennQGut50SgyDqC85wMo6 hM2v9xnyYuOmXBTDlbTU3aQX7OMHH9hXL/HEw5mvmYIwDbM8yte9mezwscJTJSQH+GhwU5 NcNTB+1qqMaI7EVJwHrf8+OYlMgbNwUA5+8nJWokNbmEbxt24IC8+ZAp12WELs4pEfh9xX cPbKpmrCNXwUwnkCf7Scz5FsO+gtoROUunVqjVG/OhLcYG0+ezWFutdkiyCRYyiCyvuyOI IKojpFNuMnglKG520288AmOHgPavDu+tcdgxeAg0gDKZJt5y1852NnL1D1Ogfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723541106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6mkoJJ6T5SflCTAVzea4PcSQ8QyL2Qs+Ld+HOffdOKU=; b=TTqyM5h+HLCHvh383CZF1w/Q/nzu76mArxWBcVWgOGmEgAMHQKm3a64+QkEsnVWwitnkVo qdcvpDVdbnYV1McwP2MJFBZw2ThlnwVJkreyzznEuqpE0MRIubTQbM6rRhceXyvoN2bSVR gJKCjb5NSFjpLf0oHujhjwo6j6gSVEBtJ2Er4WR+Mb+KesQE9f4pAT9+3Q1IfkznYFsdGx SMiiX1PZ3/A7dp2EmxlYEGIjuLFXiL6HFQOE2QYvWtzh/9II44X+5ibpvpHULbAxmqItU0 kG1TkkKxOlblxa4O4HgAk8IZKnqstU5bjREOvMKPLYU3i69jcWSc0aCEVJFt1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WjmFG1nylz155v; Tue, 13 Aug 2024 09:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47D9P6Di021669; Tue, 13 Aug 2024 09:25:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47D9P6cU021666; Tue, 13 Aug 2024 09:25:06 GMT (envelope-from git) Date: Tue, 13 Aug 2024 09:25:06 GMT Message-Id: <202408130925.47D9P6cU021666@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 4dac78525c44 - stable/13 - Merge commit d2353ae00c3b from llvm git (by Argyrios Kyrtzidis): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4dac78525c448c898473e2163660b38b705b3a34 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4dac78525c448c898473e2163660b38b705b3a34 commit 4dac78525c448c898473e2163660b38b705b3a34 Author: Dimitry Andric AuthorDate: 2024-08-10 21:03:27 +0000 Commit: Dimitry Andric CommitDate: 2024-08-13 09:24:27 +0000 Merge commit d2353ae00c3b from llvm git (by Argyrios Kyrtzidis): [utils/TableGen/X86CompressEVEXTablesEmitter.cpp] Make sure the tablegen output for the `checkPredicate` function is deterministic (#84533) The output for the `checkPredicate` function was depending on a `std::map` iteration that was non-deterministic from run to run, because the keys were pointer values. Make a change so that the keys are `StringRef`s so the ordering is stable. This avoids non-determinism in llvm-tblgen output, which could cause differences in the generated X86GenCompressEVEXTables.inc file. Although these differences are not influencing the meaning of the generated code, they still change a few bytes in libllvm. This in turn influences all the binaries linked with libllvm, such as clang, ld.lld, etc. Reported by: cperciva MFC after: 3 days (cherry picked from commit 7a8d05ba19b7762596c0ff22e668e4d50bac81cf) --- .../llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/llvm-project/llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp b/contrib/llvm-project/llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp index fef8dc7236f5..ee0a96ee5b53 100644 --- a/contrib/llvm-project/llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp +++ b/contrib/llvm-project/llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp @@ -46,7 +46,7 @@ class X86CompressEVEXTablesEmitter { typedef std::pair Entry; - typedef std::map> + typedef std::map> PredicateInstMap; std::vector Table; @@ -89,7 +89,7 @@ void X86CompressEVEXTablesEmitter::printCheckPredicate( for (const auto &[Key, Val] : PredicateInsts) { for (const auto &Inst : Val) OS << " case X86::" << Inst->TheDef->getName() << ":\n"; - OS << " return " << Key->getValueAsString("CondString") << ";\n"; + OS << " return " << Key << ";\n"; } OS << " }\n"; @@ -226,7 +226,7 @@ void X86CompressEVEXTablesEmitter::run(raw_ostream &OS) { Name == "HasAVXIFMA"; }); if(It!= Predicates.end()) - PredicateInsts[*It].push_back(NewInst); + PredicateInsts[(*It)->getValueAsString("CondString")].push_back(NewInst); } printTable(Table, OS); From nobody Tue Aug 13 13:55:05 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WjtDn6fZzz5Slbb; Tue, 13 Aug 2024 13:55:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WjtDn65R8z48hy; Tue, 13 Aug 2024 13:55:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723557305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xLI+rgytWj6HexS9ZxAEKqPKwtkbSP30YPBH7MfKuo0=; b=BkYWLlqufPShd81jwP8dihJaxMhOmK+rOQ3lgHrZrrPaTcadJov1jLcrMpFdF7csnCQkPK orQxfN9grXF1i8Z0YS8NlghlyQn88BojZj2ThlMO/fv1GDeF3QWvcTEHA9xZzY7vzCiKAc AzhncJJNgL2SC+bfMSVfEWUSIfmMZcq75luWF0ivuDLwudZJj0SnhLQFtukrJS8lHXiCpQ aBw5NVcVUJQIMTiEMzwQz83i7LrBkymN6V8fDilrTzboT0CLP3Sgfhd1w1cy7Pd/dh/d0o XEey7l9AUC7YTgY/EhMH+4eHCofdkCwd1xKOyNFAc+X5buZbuCaxlvSRW8l69Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723557305; a=rsa-sha256; cv=none; b=B/O7Hu/4MQS4zWanQNNbDw+eIsATzqYQH8zGYD/KdTWBw79Nu5rJy3u8lrAhS30mhdl9eh XCoqe2NgUOA5mtzD9qrQn+HPN76YvtP8t2LHQ/EPCIIOTotAUs85fz89qWhOfJoLOz+6cX bMCVNQjmC90F4mZxlQkJPi6ESiLSfo0vPMGv3YPOBAf2B/M4iiVxqoPr27NTa5rBDIW+Bb EGMYzxeOr9/7x5o6yHudGOTjqUk/okG1n8T59XSVULybv2S1D5QMdYRe1iyJi3JxTfNY87 biN37L+NtCJWN3CLGwrmNQ7DdNT6GBO7nhP0h4vBYLN5BjhkSmyC57n4iP5t2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723557305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xLI+rgytWj6HexS9ZxAEKqPKwtkbSP30YPBH7MfKuo0=; b=biMsGrBJvVei5sRKlkrAm00fDK5DY8c4ZKSEgswzv1Cs9pQBFxu3xDTlicXI1Wn/q55bY8 hF++vQxoGVCCraAAB1LTsX37wGOf0zp006ipI3xtea6FbnazMcQToPynaKk38AjPJyOKH4 CR92bRlWM8xu+1OXiyPvNAvhfPCHcgqbzk/5iZm0J3LH7T5qnA0snXmQi2WPpm2DuaStOq lKASlZWqPJ7fIwywnEF1GvdzvbZx58Ej+22YmR9kLjwQI+GK4LvvrENZO8s1QveHRORTeu jGeM3KMyWrKdfApHhCrDGRS6wekGyFp5ZH6SHfRka+7X5ia5YpbNgLaGx4WbZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WjtDn5hHZz1CrL; Tue, 13 Aug 2024 13:55:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47DDt5gP079302; Tue, 13 Aug 2024 13:55:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47DDt5WA079299; Tue, 13 Aug 2024 13:55:05 GMT (envelope-from git) Date: Tue, 13 Aug 2024 13:55:05 GMT Message-Id: <202408131355.47DDt5WA079299@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: d3c1df53f5bd - stable/14 - ddb: update printing of t_flags and tflags2 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d3c1df53f5bd73ee76f05e6f85c2766e54a4e454 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=d3c1df53f5bd73ee76f05e6f85c2766e54a4e454 commit d3c1df53f5bd73ee76f05e6f85c2766e54a4e454 Author: Michael Tuexen AuthorDate: 2024-08-05 09:17:30 +0000 Commit: Michael Tuexen CommitDate: 2024-08-13 13:54:17 +0000 ddb: update printing of t_flags and tflags2 Update the ddb printing of t_flags and t_flags2 to the current state of definitions in tcp_var.h. Reviewed by: cc Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D46222 (cherry picked from commit 093d9b46f4720392e53c171eaabfd7a6a8101170) --- sys/netinet/tcp_usrreq.c | 92 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 84 insertions(+), 8 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 384c27b3a6cd..d93ef200b97d 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -2897,6 +2897,14 @@ db_print_tflags(u_int t_flags) db_printf("%sTF_PREVVALID", comma ? ", " : ""); comma = 1; } + if (t_flags & TF_WAKESOR) { + db_printf("%sTF_WAKESOR", comma ? ", " : ""); + comma = 1; + } + if (t_flags & TF_GPUTINPROG) { + db_printf("%sTF_GPUTINPROG", comma ? ", " : ""); + comma = 1; + } if (t_flags & TF_MORETOCOME) { db_printf("%sTF_MORETOCOME", comma ? ", " : ""); comma = 1; @@ -2917,18 +2925,10 @@ db_print_tflags(u_int t_flags) db_printf("%sTF_FASTRECOVERY", comma ? ", " : ""); comma = 1; } - if (t_flags & TF_CONGRECOVERY) { - db_printf("%sTF_CONGRECOVERY", comma ? ", " : ""); - comma = 1; - } if (t_flags & TF_WASFRECOVERY) { db_printf("%sTF_WASFRECOVERY", comma ? ", " : ""); comma = 1; } - if (t_flags & TF_WASCRECOVERY) { - db_printf("%sTF_WASCRECOVERY", comma ? ", " : ""); - comma = 1; - } if (t_flags & TF_SIGNATURE) { db_printf("%sTF_SIGNATURE", comma ? ", " : ""); comma = 1; @@ -2941,6 +2941,30 @@ db_print_tflags(u_int t_flags) db_printf("%sTF_TSO", comma ? ", " : ""); comma = 1; } + if (t_flags & TF_TOE) { + db_printf("%sTF_TOE", comma ? ", " : ""); + comma = 1; + } + if (t_flags & TF_CLOSED) { + db_printf("%sTF_CLOSED", comma ? ", " : ""); + comma = 1; + } + if (t_flags & TF_SENTSYN) { + db_printf("%sTF_SENTSYN", comma ? ", " : ""); + comma = 1; + } + if (t_flags & TF_LRD) { + db_printf("%sTF_LRD", comma ? ", " : ""); + comma = 1; + } + if (t_flags & TF_CONGRECOVERY) { + db_printf("%sTF_CONGRECOVERY", comma ? ", " : ""); + comma = 1; + } + if (t_flags & TF_WASCRECOVERY) { + db_printf("%sTF_WASCRECOVERY", comma ? ", " : ""); + comma = 1; + } if (t_flags & TF_FASTOPEN) { db_printf("%sTF_FASTOPEN", comma ? ", " : ""); comma = 1; @@ -2989,10 +3013,62 @@ db_print_tflags2(u_int t_flags2) db_printf("%sTF2_ACE_PERMIT", comma ? ", " : ""); comma = 1; } + if (t_flags2 & TF2_HPTS_CPU_SET) { + db_printf("%sTF2_HPTS_CPU_SET", comma ? ", " : ""); + comma = 1; + } if (t_flags2 & TF2_FBYTES_COMPLETE) { db_printf("%sTF2_FBYTES_COMPLETE", comma ? ", " : ""); comma = 1; } + if (t_flags2 & TF2_ECN_USE_ECT1) { + db_printf("%sTF2_ECN_USE_ECT1", comma ? ", " : ""); + comma = 1; + } + if (t_flags2 & TF2_TCP_ACCOUNTING) { + db_printf("%sTF2_TCP_ACCOUNTING", comma ? ", " : ""); + comma = 1; + } + if (t_flags2 & TF2_HPTS_CALLS) { + db_printf("%sTF2_HPTS_CALLS", comma ? ", " : ""); + comma = 1; + } + if (t_flags2 & TF2_MBUF_L_ACKS) { + db_printf("%sTF2_MBUF_L_ACKS", comma ? ", " : ""); + comma = 1; + } + if (t_flags2 & TF2_MBUF_ACKCMP) { + db_printf("%sTF2_MBUF_ACKCMP", comma ? ", " : ""); + comma = 1; + } + if (t_flags2 & TF2_SUPPORTS_MBUFQ) { + db_printf("%sTF2_SUPPORTS_MBUFQ", comma ? ", " : ""); + comma = 1; + } + if (t_flags2 & TF2_MBUF_QUEUE_READY) { + db_printf("%sTF2_MBUF_QUEUE_READY", comma ? ", " : ""); + comma = 1; + } + if (t_flags2 & TF2_DONT_SACK_QUEUE) { + db_printf("%sTF2_DONT_SACK_QUEUE", comma ? ", " : ""); + comma = 1; + } + if (t_flags2 & TF2_CANNOT_DO_ECN) { + db_printf("%sTF2_CANNOT_DO_ECN", comma ? ", " : ""); + comma = 1; + } + if (t_flags2 & TF2_PROC_SACK_PROHIBIT) { + db_printf("%sTF2_PROC_SACK_PROHIBIT", comma ? ", " : ""); + comma = 1; + } + if (t_flags2 & TF2_IPSEC_TSO) { + db_printf("%sTF2_IPSEC_TSO", comma ? ", " : ""); + comma = 1; + } + if (t_flags2 & TF2_NO_ISS_CHECK) { + db_printf("%sTF2_NO_ISS_CHECK", comma ? ", " : ""); + comma = 1; + } } static void From nobody Tue Aug 13 16:44:41 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wjy0V27b7z5T22G; Tue, 13 Aug 2024 16:44:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wjy0V16pcz4RLC; Tue, 13 Aug 2024 16:44:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723567482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x0ORNvf+3goee9VCNmKRJbB8iy/ss8Zao92vfcIh9Yo=; b=pl+G2/18ZNmLzg81BpLlOuPip9MO1MeCPRmwXmJs10oSOTuPS92fZ1fxktSzUelvnBWvgh u86liogPzgADXKirDjK+zOQAS3XncgblBkbm2sKATV6ysZ8gIpENhSplCUwJcQFWtRaPIv pWo/ppiBhaVm2RK/ibOU8UESxxAhBa/ncdOzGwDE8JsNe3T7yWvNaaW4j7FMOBXzyaV/Tk Lb0nCFKLCfKbTp/PD7NCBGML8ZbG6xS2sFJc2s62C5fpVSWtMBe1lUZ8aO14CInDRFuhCh jydjQkM0d8ZvmwFo9GLr17addVTOdyLD2chvPvZ3sdLtgL5t0fMEY/gR+78eNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723567482; a=rsa-sha256; cv=none; b=V1XmExBoAciZaygspBGoEnEFjgpjnc+alSRg0a0PM8DK6+jkMeaQ5FM13scRY4ehPSTmwY 7kgfgrfUJgBzmxRx1u7uT4hQaFIcsuSllWbov8CicLh6NolgLiTJthB8+nCKG6X5oTT8NN sa7IALEnpw5QuDUtJtU469VOeY3Vo7PJ4dXk8VE5DV0Zi85hCkHbk8I8FxMS76HN0WtFHe ZE+TsnBMqSDhvDjJ049Jr8zG3tYScLJXvJzQUMGpfPGj9rbK3UHpkAunoY4T1dGbSI0yjk RUkcw76BOQErZw6izrbjSNrjQbdmigNxg44ZJYlM8InOc73BqAVYlmRdEmOOvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723567482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x0ORNvf+3goee9VCNmKRJbB8iy/ss8Zao92vfcIh9Yo=; b=mL0RNheIjcxN2+60njjKBpvDbaWQ36ABGZ4JD0iK7nmvONB+qK/Kp0Vuf/XEnDR2oKGp/Y Fw+o9N82BYwbysEEBVU/bvilxXJLSiqXZrN0Afbp+Hj5pZnk4dIXtwedgJMHhp3B+2FfRS LI1TqvgqvqOv41R66FipAb6VQUCW+cnoRlvmIaZD4uHw18yq7L0fxAi7akPdg9lJ5YZAiD ouZJuqpZP6oTQ9H216PmoD/MivSKT8GCQyM0aZcfqiL4Y5KkY1am/fyx12GzgSr8K9tQlv PqYHRrqYCq4IQEBEOkra49wToKKdnMdBmzv2xkAz5Asx+twL1hcFFCDNHzZBMA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wjy0V0ZcqzJSk; Tue, 13 Aug 2024 16:44:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47DGifKO067524; Tue, 13 Aug 2024 16:44:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47DGif72067521; Tue, 13 Aug 2024 16:44:41 GMT (envelope-from git) Date: Tue, 13 Aug 2024 16:44:41 GMT Message-Id: <202408131644.47DGif72067521@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 8807350405ce - releng/13.4 - pipe: keep uio_iovcnt consistent List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.4 X-Git-Reftype: branch X-Git-Commit: 8807350405ce08278dbd8d2d370f9f09d7c2ad47 Auto-Submitted: auto-generated The branch releng/13.4 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8807350405ce08278dbd8d2d370f9f09d7c2ad47 commit 8807350405ce08278dbd8d2d370f9f09d7c2ad47 Author: Ed Maste AuthorDate: 2024-07-17 14:33:53 +0000 Commit: Ed Maste CommitDate: 2024-08-13 16:39:56 +0000 pipe: keep uio_iovcnt consistent In pipe_build_write_buffer we increment uio_iov but did not update uio_iovcnt. This would not cause an OOB read (thanks to to uio_resid) but is inconsistent and could be an issue if other code changes are made in the future. Reported by: Synacktiv Reviewed by: jhb, markj, brooks Sponsored by: The Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45999 (cherry picked from commit d8ff42e816848a0d4a427755b46b8560cb86ebc8) (cherry picked from commit cbbc8d67301c650dd683566d44ff554993556224) (cherry picked from commit 0fb9da95f7cb1730fdf4308f9a12ff8a80c28c87) Approved by: re (cperciva) --- sys/kern/sys_pipe.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c index 19f5f07d7523..dd1fd9b6d2a9 100644 --- a/sys/kern/sys_pipe.c +++ b/sys/kern/sys_pipe.c @@ -901,8 +901,10 @@ pipe_build_write_buffer(struct pipe *wpipe, struct uio *uio) uio->uio_iov->iov_len -= size; uio->uio_iov->iov_base = (char *)uio->uio_iov->iov_base + size; - if (uio->uio_iov->iov_len == 0) + if (uio->uio_iov->iov_len == 0) { uio->uio_iov++; + uio->uio_iovcnt--; + } uio->uio_resid -= size; uio->uio_offset += size; return (0); From nobody Tue Aug 13 16:44:43 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wjy0W2Gc7z5T20G; Tue, 13 Aug 2024 16:44:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wjy0W1Yjdz4RTK; Tue, 13 Aug 2024 16:44:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723567483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GOfPAQzbTvHVRnFP7z9cK/rMk769s7amrHtLwFjb4QM=; b=F7N4FxlYL7lj8fIxPZfEDcmM1n4GN4GsQF82mHwMm6xQbNCZKC1MNc0DF9O2ww0FW0EhE8 QQIBp6LjbR1axsRspItiVJPReKhNtNcxkMtnhYX26UnF65Q1u5rOOqnasSFRz/7BbFnHUJ sr3VkCD6AYWngxi9mJlEe5qPqUR9dMyGfK9DP+5bpwZ1Szf7VsswmCHwsNBXvPCPmC9Xsj OMfF3p57p9opEloYXIWdCGpwVaM/odT+Kf+XTHIlod/vlkHq6AzfoaorUCMpvmMosyBsql xpZdB4JNA62lrJl3yFtiifjvKkin1REn9Y4ika7K40UtH9fwcqI3lJe2wtU7Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723567483; a=rsa-sha256; cv=none; b=iMcyJwMbwAgvwek9CWQLBZQ7ly8trQTpTMGPGTS6hM2PzstAilqNTH8leLuur7LQAHP7st H1k8m6jsPes6s4XP9Ejh59Lsyf4mTrF0Vg+wgprUrM8vstIlP4fpeTdHeYz3/LYUXH6ceX UaSU5Qg7/dEgpxgGAJdGGECWPcOFg2PI0HvGwWggNyMFR0Dho8kypptqpUR8Kx5sXadgmp xTrI7yYGFV15g/4iexLF0SG+QobyDWJWtE72qopVQIUSr8f3aNeS41LIYbFw6OLc5NUBcQ na/27HQO+YOOrVItU6TrnHXo6X/kMlTBIYPKQ19w/MXorrxlmgIN270XiCkk3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723567483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GOfPAQzbTvHVRnFP7z9cK/rMk769s7amrHtLwFjb4QM=; b=LbvmfM+OgLBbdtblstATUVwPHp6I1XnK/veGrnKL2az4cIwZzduQEmPnHbOB62CP8LfUtF Q05ewgouQVUbqI/KC+GnNdvni3lIQGBlIASCe4TA5zqqKhMTeiIS1SrXlODRI09xmr0ZKL IVzJFuiWBRtJhOuWT4hoddC7XgQHkfK/P/NPywn6s33CdY12TIsa2WSBPtzSXc28F0TmrJ hnqiiZhfl7uoW3uaFtOdG1JVDcICLW7cNdptza4eYvCOK47VVHGH8LJOSPbShV47ajnvW8 FzHyB8IFJ/vwurc+1c4irKx7lI3iNFUWwIft6UVeRbkZUlwB/RLWSW1Z4FwTbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wjy0W1B0ZzJvM; Tue, 13 Aug 2024 16:44:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47DGihCk067568; Tue, 13 Aug 2024 16:44:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47DGihux067565; Tue, 13 Aug 2024 16:44:43 GMT (envelope-from git) Date: Tue, 13 Aug 2024 16:44:43 GMT Message-Id: <202408131644.47DGihux067565@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 1b30c5d3a515 - releng/13.4 - acl_copyin: avoid returning uninitialized memory List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.4 X-Git-Reftype: branch X-Git-Commit: 1b30c5d3a51580530fb8275cd96c2241adfbea1d Auto-Submitted: auto-generated The branch releng/13.4 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=1b30c5d3a51580530fb8275cd96c2241adfbea1d commit 1b30c5d3a51580530fb8275cd96c2241adfbea1d Author: Pierre Pronchery AuthorDate: 2024-07-25 12:44:17 +0000 Commit: Ed Maste CommitDate: 2024-08-13 16:43:58 +0000 acl_copyin: avoid returning uninitialized memory acl_copyin did not validate the return value of acl_copy_oldacl_into_acl which could lead to uninitialized acl structure memory reads. Reported by: Synacktiv Reviewed by: markj, emaste Sponsored by: The Alpha-Omega Project Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D46125 (cherry picked from commit 6ee6c7b146643170602091e8c330314e4ef47b42) (cherry picked from commit 6bf5c32ad8aa1f1602b3cefb0b5e5918db287335) (cherry picked from commit 8f16d9f7dc8c119f8ba9ff27d4ce9c48d0b56d11) Approved by: re (cperciva) --- sys/kern/vfs_acl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/vfs_acl.c b/sys/kern/vfs_acl.c index f65f210abe97..ea250104aff4 100644 --- a/sys/kern/vfs_acl.c +++ b/sys/kern/vfs_acl.c @@ -146,7 +146,7 @@ acl_copyin(const void *user_acl, struct acl *kernel_acl, acl_type_t type) error = copyin(user_acl, &old, sizeof(old)); if (error != 0) break; - acl_copy_oldacl_into_acl(&old, kernel_acl); + error = acl_copy_oldacl_into_acl(&old, kernel_acl); break; default: From nobody Tue Aug 13 16:59:40 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WjyKm3Vj1z5T3G8; Tue, 13 Aug 2024 16:59:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WjyKm2vJTz4SrB; Tue, 13 Aug 2024 16:59:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723568380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w9YtRebyZ4bNNOR/ue7oQAa6kVY5X2LIw7ybbAIf75w=; b=odJy10pHXKJO3J52Iwi7tisd+Jvl/g5X2UhL4p/hJTfudaCPQnUE12i6duMVXEHGld9dI2 PMBMBsclZBTexda2hed9agd2oepTEqKVPnhNRjt4Q6LU19BEb1oXksSzdICLC54lIfOVoz fvcWA14zi6sJzGHKJ5YWFlfMxrFtFhji8tVmmB1p4KY1a+7RZn3PizPjmWDj6iTTyPL6wK 92Vamt0D6zJx4HWAGZEuXW9XR31Sdki+UqquE4xv6M+iQWIEkcFGgGAG1+9Vd95v8OJb47 6CgwFrgij9UnrILKGuZc7+tgNGl6xudn6QWUq7wgjpNXqE/DRWflvz3FTOKylQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723568380; a=rsa-sha256; cv=none; b=DmcCg7vaS3QA5knpLcgyW5V+rAOk8vI37qqIUvrFNkYvj90Upt6mZBcZRKUazXK8NPesOn KJJxFUq1vTrHCLoNUPVPX6sAOPlUli4uvxzQB0YPy0F3j2xblE1MQhVBVO8G9nRGzGeztb 5D2Ypj4JbohRm3XcNTxMnIjOuYWKReeJTVupbz3KwZOpjv9s9uWPDdxKL9xJ6LLGVt/X7x 0gH7rVmPDucVDHF0XOsS7ntygG/H2iFhklJ6p/OvkKbT31acKlGzGQGhD4rcgOSC6FMt1k ql9ISFjbuEp8ksjYDvsGvg+edfRLLCDEm6O9FvVOFCUrTlCpFK5xDBVqJvEFYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723568380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w9YtRebyZ4bNNOR/ue7oQAa6kVY5X2LIw7ybbAIf75w=; b=OIWLSAGjDamV/sbR411Txm0WOcwhEEqlcMO/k0ise7BQQc2x1a2b5a18bfR1zd9GRmJ0/U HNoGWD5kduZ0OnIn7mnoPtTTkf65SZrxnUf9OenvQJsq7NGZCH35ezso7P0o0EMxnZFv/N V7FlWOI01BCLMFxxlWE/G4uLnARhLzdeMrTv9YY2GL6RY3ZWSxyo3wfQS48ww2ZzcPsjkY TKRbrEHlP0HgA9kTb8GmiDEqAIFpgJ9PZkmhp3nZY54SSMoljVYep5bKPkg5NlOcmZjDUT 11xSoDGoAaT8O+1hIABCsfhTq4gfr6MB4TfyxVWmEAhUtq21a4NTlqB5Sos8MQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WjyKm2N2qzJCd; Tue, 13 Aug 2024 16:59:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47DGxecd085574; Tue, 13 Aug 2024 16:59:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47DGxeWB085571; Tue, 13 Aug 2024 16:59:40 GMT (envelope-from git) Date: Tue, 13 Aug 2024 16:59:40 GMT Message-Id: <202408131659.47DGxeWB085571@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 140f361aa60f - releng/13.4 - Merge commit d2353ae00c3b from llvm git (by Argyrios Kyrtzidis): List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.4 X-Git-Reftype: branch X-Git-Commit: 140f361aa60fbf3fd48fdfe1936fef4faa25c720 Auto-Submitted: auto-generated The branch releng/13.4 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=140f361aa60fbf3fd48fdfe1936fef4faa25c720 commit 140f361aa60fbf3fd48fdfe1936fef4faa25c720 Author: Dimitry Andric AuthorDate: 2024-08-10 21:03:27 +0000 Commit: Dimitry Andric CommitDate: 2024-08-13 16:59:05 +0000 Merge commit d2353ae00c3b from llvm git (by Argyrios Kyrtzidis): [utils/TableGen/X86CompressEVEXTablesEmitter.cpp] Make sure the tablegen output for the `checkPredicate` function is deterministic (#84533) The output for the `checkPredicate` function was depending on a `std::map` iteration that was non-deterministic from run to run, because the keys were pointer values. Make a change so that the keys are `StringRef`s so the ordering is stable. This avoids non-determinism in llvm-tblgen output, which could cause differences in the generated X86GenCompressEVEXTables.inc file. Although these differences are not influencing the meaning of the generated code, they still change a few bytes in libllvm. This in turn influences all the binaries linked with libllvm, such as clang, ld.lld, etc. Reported by: cperciva Approved by: re (cperciva) MFC after: 3 days (cherry picked from commit 7a8d05ba19b7762596c0ff22e668e4d50bac81cf) (cherry picked from commit 4dac78525c448c898473e2163660b38b705b3a34) --- .../llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/llvm-project/llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp b/contrib/llvm-project/llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp index fef8dc7236f5..ee0a96ee5b53 100644 --- a/contrib/llvm-project/llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp +++ b/contrib/llvm-project/llvm/utils/TableGen/X86CompressEVEXTablesEmitter.cpp @@ -46,7 +46,7 @@ class X86CompressEVEXTablesEmitter { typedef std::pair Entry; - typedef std::map> + typedef std::map> PredicateInstMap; std::vector Table; @@ -89,7 +89,7 @@ void X86CompressEVEXTablesEmitter::printCheckPredicate( for (const auto &[Key, Val] : PredicateInsts) { for (const auto &Inst : Val) OS << " case X86::" << Inst->TheDef->getName() << ":\n"; - OS << " return " << Key->getValueAsString("CondString") << ";\n"; + OS << " return " << Key << ";\n"; } OS << " }\n"; @@ -226,7 +226,7 @@ void X86CompressEVEXTablesEmitter::run(raw_ostream &OS) { Name == "HasAVXIFMA"; }); if(It!= Predicates.end()) - PredicateInsts[*It].push_back(NewInst); + PredicateInsts[(*It)->getValueAsString("CondString")].push_back(NewInst); } printTable(Table, OS); From nobody Tue Aug 13 17:02:33 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WjyP62ll1z5T3xV; Tue, 13 Aug 2024 17:02:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WjyP5644xz4TZf; Tue, 13 Aug 2024 17:02:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723568553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qW2YzQXfN2qbHi6TXS31naxh4VvRdVCDVV8FsWeD2kA=; b=TlNYIHX2wGQ05m3jxQB9mugK3EdJmeSH8Jq8hm88LoxKUzNxqPF+9jHqUbcK0vshTkbpA/ dglYKZ0ewAKGi2VG3qWxoYadu83hKj6AcSle3j0Cm6zNKs8w6HTfcvlZbb8/cx/V40Eb55 OhsWnBWX2B7UsgXO051U8uvUrqOE4hKCe1/VrMjyESrTfGUPt8dFbjP91H4X2HOpETqkbn 0X3FVZ97Jvkv3QoLdt7ws7OEQO4n/4CBaWx765X6gpqt2mhzV+E+DD70oLY14PQONFV9Gu mgWBKQenOYW1BjBoxMOWlMLe96/Rpv3GBZRiNmbhMep0FW5a78gFSq5axpDgUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723568553; a=rsa-sha256; cv=none; b=FrRDOhh3NPcVNDMNuj9rxxvugn1xWoRVWNGilGOO9vrmJKotm9RoGbKGOlc2KofyZg5hjQ 3jQhYS3qLbmuW2Ji8EzVoHStJZZjI3FrbuId7XA7fSCPy22GbH52jgh8VuF71CztLXZMdy Ph6CBtFjrxnqi5cc4EbPpVJQpWv5ZxQGJBFdsNbW88eAeejKw24oVs4bahGgSVnrQjspT2 81k3myfilKEAu6zTwxAgGeIlkunxJIRT+qZfFPeMGG/FdwHa2q4iPGpkm5gG5sIuTAa3vV 1u7orMibk76AuRlevMEntPQaeQwX3sBAnI64ysPb0nPr+xCQmELw1nXySCP85w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723568553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qW2YzQXfN2qbHi6TXS31naxh4VvRdVCDVV8FsWeD2kA=; b=IVfNF+2TdicsxWjJz9yo9EXCBqyOlB4KUdA8YpAX7nchaEvwLU6ymRmVQx84r0RhNMpdbB KFz3EXhhcY/IcqpBJEGl+UBgRk9oFJXq7+ZD2KRa1VEWWsrjqjPYCBd5/mRPh12MpHLZ+5 ocU++RKEDf6e2/nsAljfLBenXqr4qkFAd4VgGug2uhs4r0VbO66zF8tMrmmc5yWuV+72Do iOVGy73OgPZgVKAcWLsWKRKaqEQz3RQUezPh9IpJhlnRnlbRV+zTyl2Moccxfu2ej7UVQ8 oblb5uUgf/3EiXLjdG/eT7Pb4gx8KvuBv3a62gAU/PN7MDkCyjoWaHnQ2/G0fQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WjyP55dFyzJty; Tue, 13 Aug 2024 17:02:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47DH2Xtb002103; Tue, 13 Aug 2024 17:02:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47DH2XaU002100; Tue, 13 Aug 2024 17:02:33 GMT (envelope-from git) Date: Tue, 13 Aug 2024 17:02:33 GMT Message-Id: <202408131702.47DH2XaU002100@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: b97b3dead5dd - stable/14 - Revert "ddb: update printing of t_flags and tflags2" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b97b3dead5ddd9e4035e55680ad0f301688b8215 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=b97b3dead5ddd9e4035e55680ad0f301688b8215 commit b97b3dead5ddd9e4035e55680ad0f301688b8215 Author: Michael Tuexen AuthorDate: 2024-08-13 17:02:20 +0000 Commit: Michael Tuexen CommitDate: 2024-08-13 17:02:20 +0000 Revert "ddb: update printing of t_flags and tflags2" This reverts commit d3c1df53f5bd73ee76f05e6f85c2766e54a4e454. --- sys/netinet/tcp_usrreq.c | 92 +++++------------------------------------------- 1 file changed, 8 insertions(+), 84 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index d93ef200b97d..384c27b3a6cd 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -2897,14 +2897,6 @@ db_print_tflags(u_int t_flags) db_printf("%sTF_PREVVALID", comma ? ", " : ""); comma = 1; } - if (t_flags & TF_WAKESOR) { - db_printf("%sTF_WAKESOR", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_GPUTINPROG) { - db_printf("%sTF_GPUTINPROG", comma ? ", " : ""); - comma = 1; - } if (t_flags & TF_MORETOCOME) { db_printf("%sTF_MORETOCOME", comma ? ", " : ""); comma = 1; @@ -2925,10 +2917,18 @@ db_print_tflags(u_int t_flags) db_printf("%sTF_FASTRECOVERY", comma ? ", " : ""); comma = 1; } + if (t_flags & TF_CONGRECOVERY) { + db_printf("%sTF_CONGRECOVERY", comma ? ", " : ""); + comma = 1; + } if (t_flags & TF_WASFRECOVERY) { db_printf("%sTF_WASFRECOVERY", comma ? ", " : ""); comma = 1; } + if (t_flags & TF_WASCRECOVERY) { + db_printf("%sTF_WASCRECOVERY", comma ? ", " : ""); + comma = 1; + } if (t_flags & TF_SIGNATURE) { db_printf("%sTF_SIGNATURE", comma ? ", " : ""); comma = 1; @@ -2941,30 +2941,6 @@ db_print_tflags(u_int t_flags) db_printf("%sTF_TSO", comma ? ", " : ""); comma = 1; } - if (t_flags & TF_TOE) { - db_printf("%sTF_TOE", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_CLOSED) { - db_printf("%sTF_CLOSED", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_SENTSYN) { - db_printf("%sTF_SENTSYN", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_LRD) { - db_printf("%sTF_LRD", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_CONGRECOVERY) { - db_printf("%sTF_CONGRECOVERY", comma ? ", " : ""); - comma = 1; - } - if (t_flags & TF_WASCRECOVERY) { - db_printf("%sTF_WASCRECOVERY", comma ? ", " : ""); - comma = 1; - } if (t_flags & TF_FASTOPEN) { db_printf("%sTF_FASTOPEN", comma ? ", " : ""); comma = 1; @@ -3013,62 +2989,10 @@ db_print_tflags2(u_int t_flags2) db_printf("%sTF2_ACE_PERMIT", comma ? ", " : ""); comma = 1; } - if (t_flags2 & TF2_HPTS_CPU_SET) { - db_printf("%sTF2_HPTS_CPU_SET", comma ? ", " : ""); - comma = 1; - } if (t_flags2 & TF2_FBYTES_COMPLETE) { db_printf("%sTF2_FBYTES_COMPLETE", comma ? ", " : ""); comma = 1; } - if (t_flags2 & TF2_ECN_USE_ECT1) { - db_printf("%sTF2_ECN_USE_ECT1", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_TCP_ACCOUNTING) { - db_printf("%sTF2_TCP_ACCOUNTING", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_HPTS_CALLS) { - db_printf("%sTF2_HPTS_CALLS", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_MBUF_L_ACKS) { - db_printf("%sTF2_MBUF_L_ACKS", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_MBUF_ACKCMP) { - db_printf("%sTF2_MBUF_ACKCMP", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_SUPPORTS_MBUFQ) { - db_printf("%sTF2_SUPPORTS_MBUFQ", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_MBUF_QUEUE_READY) { - db_printf("%sTF2_MBUF_QUEUE_READY", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_DONT_SACK_QUEUE) { - db_printf("%sTF2_DONT_SACK_QUEUE", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_CANNOT_DO_ECN) { - db_printf("%sTF2_CANNOT_DO_ECN", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_PROC_SACK_PROHIBIT) { - db_printf("%sTF2_PROC_SACK_PROHIBIT", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_IPSEC_TSO) { - db_printf("%sTF2_IPSEC_TSO", comma ? ", " : ""); - comma = 1; - } - if (t_flags2 & TF2_NO_ISS_CHECK) { - db_printf("%sTF2_NO_ISS_CHECK", comma ? ", " : ""); - comma = 1; - } } static void From nobody Tue Aug 13 17:05:36 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WjySc6b5Zz5T3yX; Tue, 13 Aug 2024 17:05:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WjySc609jz4TnG; Tue, 13 Aug 2024 17:05:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723568736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nU20z5wWHVBuFkISlrNOH7I4syzQ3B6ChIf12rKzltc=; b=tbjTmfxoeegtc0bWSALPI9qbkbyDaTqzUshMb788CgvcHklND2yOHpm6QX2zXjxqxQsZ7z 0Kb/t0U9DjR86UZ30HLJ7aXFVwTJ6Gnm27Gq7+jRp2IJF1s8xgGHbxSX/2jRvJ2DfgWOn5 eyPs9GB4uA1tZV0tRY63KIjodWnGIjQh1Oxh0DPbNbmrqwSVnsjUFmUaW4YOrXTMC8sh9e WddMje2gjsN+yKLKDYS5TrCatfdX+3S9nfdfKeC3DVG+AUQ1zStxf0KQRngtayxjrd1wlx cGbryanVax6IXpeXAdJY1kLIaksfQyv9Veur8+0EsKJGxPPTEV6C336CPgOP9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723568736; a=rsa-sha256; cv=none; b=qKKQskqI+co9BXk8l5/oMrW2DGHMaowXcnHkiqCVPtPiCBI9crtgFWIfkXgJ2xSSoTQaKB sJPzJdEqqhjkrFjL4YX3n+NRVk9XNSSKwPfeOQOk1ITgPs2xELgtul95ZAP5Sdx7ezFzPi rjaq8ryqx6ok6WaFPqTCEh0c4kLxR7v9WvhQb7n8KjlCxuRwC21IsaAElk4n/36KrVZ+Ne /Yuica1HTT4ovkIRUwdagvdJ7K1KR0pSXB8POgh37DHoYwvU4IIQU03sewr+TEswHTAXey E8TRzNFrgLYjdgDovMH/oj7IX+XA2vsNHA0jSIKJfVvQWsbKRORUDc2ZLVRu7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723568736; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nU20z5wWHVBuFkISlrNOH7I4syzQ3B6ChIf12rKzltc=; b=Ro4Xpr26jWF8ZRwSwluQBlKWfqY6HRvLvv5DAKSBvIy2qyn/7439op/R6DEvP8agkh55tG 8tuf0HId2VFaelPmBsuW22gorq3uci/L+eAwUqR4P+WmE8VBVWHbjQbuXHg4dZAL68AgMO afUsoWOXhKpZ2ss8KHIZamlez4o3zg5gCjF557Y5KgY8MXJbg4sr1mvC6V58OWFTrgWvyv Eat91T0nU6Wij5LijexLYcO/i9/gA9Wd8cJ1Aq7y3bFa7HbM88zMTUMeyO2d/nrtr/xoqb yBAcTiJEv3IwMs1HENo6hjhJ2J9jCQDt0UdS+NamHP84GArMt+1i+h2/bqp9Rw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WjySc5VN8zKPS; Tue, 13 Aug 2024 17:05:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47DH5aLI002664; Tue, 13 Aug 2024 17:05:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47DH5an9002661; Tue, 13 Aug 2024 17:05:36 GMT (envelope-from git) Date: Tue, 13 Aug 2024 17:05:36 GMT Message-Id: <202408131705.47DH5an9002661@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Michael Tuexen Subject: git: f18b9b2b95fd - stable/14 - ddb: update printing of t_flags and tflags2 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f18b9b2b95fd5feeb5372a8e0d2ff1eb0bd64891 Auto-Submitted: auto-generated The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=f18b9b2b95fd5feeb5372a8e0d2ff1eb0bd64891 commit f18b9b2b95fd5feeb5372a8e0d2ff1eb0bd64891 Author: Michael Tuexen AuthorDate: 2024-08-05 09:17:30 +0000 Commit: Michael Tuexen CommitDate: 2024-08-13 17:05:06 +0000 ddb: update printing of t_flags and tflags2 Update the ddb printing of t_flags and t_flags2 to the current state of definitions in tcp_var.h. Reviewed by: cc Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D46222 (cherry picked from commit 093d9b46f4720392e53c171eaabfd7a6a8101170) --- sys/netinet/tcp_usrreq.c | 84 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 76 insertions(+), 8 deletions(-) diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index 384c27b3a6cd..6bc11c6bbd13 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -2897,6 +2897,14 @@ db_print_tflags(u_int t_flags) db_printf("%sTF_PREVVALID", comma ? ", " : ""); comma = 1; } + if (t_flags & TF_WAKESOR) { + db_printf("%sTF_WAKESOR", comma ? ", " : ""); + comma = 1; + } + if (t_flags & TF_GPUTINPROG) { + db_printf("%sTF_GPUTINPROG", comma ? ", " : ""); + comma = 1; + } if (t_flags & TF_MORETOCOME) { db_printf("%sTF_MORETOCOME", comma ? ", " : ""); comma = 1; @@ -2917,18 +2925,10 @@ db_print_tflags(u_int t_flags) db_printf("%sTF_FASTRECOVERY", comma ? ", " : ""); comma = 1; } - if (t_flags & TF_CONGRECOVERY) { - db_printf("%sTF_CONGRECOVERY", comma ? ", " : ""); - comma = 1; - } if (t_flags & TF_WASFRECOVERY) { db_printf("%sTF_WASFRECOVERY", comma ? ", " : ""); comma = 1; } - if (t_flags & TF_WASCRECOVERY) { - db_printf("%sTF_WASCRECOVERY", comma ? ", " : ""); - comma = 1; - } if (t_flags & TF_SIGNATURE) { db_printf("%sTF_SIGNATURE", comma ? ", " : ""); comma = 1; @@ -2941,6 +2941,30 @@ db_print_tflags(u_int t_flags) db_printf("%sTF_TSO", comma ? ", " : ""); comma = 1; } + if (t_flags & TF_TOE) { + db_printf("%sTF_TOE", comma ? ", " : ""); + comma = 1; + } + if (t_flags & TF_CLOSED) { + db_printf("%sTF_CLOSED", comma ? ", " : ""); + comma = 1; + } + if (t_flags & TF_UNUSED1) { + db_printf("%sTF_UNUSED1", comma ? ", " : ""); + comma = 1; + } + if (t_flags & TF_LRD) { + db_printf("%sTF_LRD", comma ? ", " : ""); + comma = 1; + } + if (t_flags & TF_CONGRECOVERY) { + db_printf("%sTF_CONGRECOVERY", comma ? ", " : ""); + comma = 1; + } + if (t_flags & TF_WASCRECOVERY) { + db_printf("%sTF_WASCRECOVERY", comma ? ", " : ""); + comma = 1; + } if (t_flags & TF_FASTOPEN) { db_printf("%sTF_FASTOPEN", comma ? ", " : ""); comma = 1; @@ -2989,10 +3013,54 @@ db_print_tflags2(u_int t_flags2) db_printf("%sTF2_ACE_PERMIT", comma ? ", " : ""); comma = 1; } + if (t_flags2 & TF2_HPTS_CPU_SET) { + db_printf("%sTF2_HPTS_CPU_SET", comma ? ", " : ""); + comma = 1; + } if (t_flags2 & TF2_FBYTES_COMPLETE) { db_printf("%sTF2_FBYTES_COMPLETE", comma ? ", " : ""); comma = 1; } + if (t_flags2 & TF2_ECN_USE_ECT1) { + db_printf("%sTF2_ECN_USE_ECT1", comma ? ", " : ""); + comma = 1; + } + if (t_flags2 & TF2_TCP_ACCOUNTING) { + db_printf("%sTF2_TCP_ACCOUNTING", comma ? ", " : ""); + comma = 1; + } + if (t_flags2 & TF2_HPTS_CALLS) { + db_printf("%sTF2_HPTS_CALLS", comma ? ", " : ""); + comma = 1; + } + if (t_flags2 & TF2_MBUF_L_ACKS) { + db_printf("%sTF2_MBUF_L_ACKS", comma ? ", " : ""); + comma = 1; + } + if (t_flags2 & TF2_MBUF_ACKCMP) { + db_printf("%sTF2_MBUF_ACKCMP", comma ? ", " : ""); + comma = 1; + } + if (t_flags2 & TF2_SUPPORTS_MBUFQ) { + db_printf("%sTF2_SUPPORTS_MBUFQ", comma ? ", " : ""); + comma = 1; + } + if (t_flags2 & TF2_MBUF_QUEUE_READY) { + db_printf("%sTF2_MBUF_QUEUE_READY", comma ? ", " : ""); + comma = 1; + } + if (t_flags2 & TF2_DONT_SACK_QUEUE) { + db_printf("%sTF2_DONT_SACK_QUEUE", comma ? ", " : ""); + comma = 1; + } + if (t_flags2 & TF2_CANNOT_DO_ECN) { + db_printf("%sTF2_CANNOT_DO_ECN", comma ? ", " : ""); + comma = 1; + } + if (t_flags2 & TF2_NO_ISS_CHECK) { + db_printf("%sTF2_NO_ISS_CHECK", comma ? ", " : ""); + comma = 1; + } } static void From nobody Tue Aug 13 17:31:36 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wjz2d0khHz5T644; Tue, 13 Aug 2024 17:31:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wjz2d01khz4ZFB; Tue, 13 Aug 2024 17:31:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723570297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lPN4z41OY8leXdKqmoRyNPHrD7Ia8BZebpY03f7eCpM=; b=EpJuyjWrAhP9Yy3BUJaH0GM66bY9RZaWG3RVGpujql/EcOGSp9PHoGPr/ocEnlrw5ZCKPo d/T3YZax6kNNR03d/XCFUV+9fHb5gxyph3dsuniunZHsAlhfyniX69ywlgLlJKSUq5hMzV G8oux5QgjZPtxce3ys1nMGkbzkw+YtzDPDcjemeRmZlLBPXEP42DBGyzg7Khs1dyaXsIFa B/fFXIPnbchEZ3uUQx9x/IoEreuHmfE9l/3ysY5RSd06om+bYqmALi5McQbm3GHPIJnUBK JnJ415/lDK8YdHOUO5s89Cxf+gKcKNJtEisjyJUEQGXDF86frEjex/zTEcHi8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723570297; a=rsa-sha256; cv=none; b=Bb8B6mihnDzbynJGlqp8piDCqP6wpCuxwOC1yCgpQ90m+8OdZ+eZsNjoMuqbmN21JoVAHP j5edt2jSC30lWv8TPI/knCW4iqweC5oSBUHHWKdXPpyDagCwe2dwxjTkzCDKRlQaeIUreK mU/85CkQe62jEsgqFIeyMsJQbKvWpVDwjNaLQoLX/wdDFmIFCc+k8Gjm+spRJS0N6FqSGV hS7TO/vlmlMHKHw7sPA0Pn0TvbSVzaL0ZsuQCdfEjouP/W0wNBwRp446VXbAt9i0wKS2gE TMV38g9/fEHBXWAZPMpgByXI75oOlD5LS+HLPZGaQhxRSbYg9b0A93ExnXeeIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723570297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lPN4z41OY8leXdKqmoRyNPHrD7Ia8BZebpY03f7eCpM=; b=JzJEvxvv1xyg0LzF5cajEnx3kewuAJlcsAcbJPgdVpELQpdkVVBs8SFWMyzh1fsl7k7PWZ NjdoW4kY1HVAQMNa579arECBQHUAPSagQPz9JGQxDBroGHd+R77gOWg2GZWdZF2N10U673 aPiKTWPs9dCGy1ae/yZTbuyvWz9XGZR1cYGIYYgRxchfKCmTOporQq0xSTKIo8Ltd3gmE/ VxsOLvapzpDWW72xFOwMCE26Y4vTgLrIf12bc+Uwdh5sgUtV1dk5WK4peYygcsG9QZtERo vko6uKeT4UJXUNJ+UpH4oCmMYv95swRU8XeBFoC7OrQg2objaQC9gljtwavzQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wjz2c6l81zKg7; Tue, 13 Aug 2024 17:31:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47DHVa7s050882; Tue, 13 Aug 2024 17:31:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47DHVa9l050879; Tue, 13 Aug 2024 17:31:36 GMT (envelope-from git) Date: Tue, 13 Aug 2024 17:31:36 GMT Message-Id: <202408131731.47DHVa9l050879@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: c19ac840d345 - stable/14 - pxeboot: Allow a different default loader for pxeboot List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c19ac840d345245887b0e797fd10e7a13b0fd2c9 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c19ac840d345245887b0e797fd10e7a13b0fd2c9 commit c19ac840d345245887b0e797fd10e7a13b0fd2c9 Author: Warner Losh AuthorDate: 2024-08-05 21:19:29 +0000 Commit: Warner Losh CommitDate: 2024-08-13 17:31:38 +0000 pxeboot: Allow a different default loader for pxeboot Sometimes you need / want a different boot loader than loader_lua for pkeldr. Provide an option to get either the 4th one or the simp one. MFC After: 3 days Sponsored by: Netflix Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D46213 (cherry picked from commit f4762e9135d181f5d4f2a9d688ff803ee53ad808) --- stand/i386/Makefile | 7 ++++++- stand/i386/pxeldr/Makefile | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/stand/i386/Makefile b/stand/i386/Makefile index e323a2cef9cd..883cd4a556bb 100644 --- a/stand/i386/Makefile +++ b/stand/i386/Makefile @@ -21,6 +21,11 @@ SUBDIR.yes+= pxeldr SUBDIR.${MK_LOADER_ZFS}+= zfsboot gptzfsboot -SUBDIR_DEPEND_pxeldr+= loader_${LOADER_DEFAULT_INTERP} +.if defined(PXEBOOT_DEFAULT_INTERP) +L=${PXEBOOT_DEFAULT_INTERP} +.else +L=${LOADER_DEFAULT_INTERP} +.endif +SUBDIR_DEPEND_pxeldr+= loader_${L} .include diff --git a/stand/i386/pxeldr/Makefile b/stand/i386/pxeldr/Makefile index b2ecedd45940..27f9a44cf21c 100644 --- a/stand/i386/pxeldr/Makefile +++ b/stand/i386/pxeldr/Makefile @@ -23,7 +23,11 @@ CFLAGS+=-DALWAYS_SERIAL CFLAGS+=-I${BOOTSRC}/i386/common +.if defined(PXEBOOT_DEFAULT_INTERP) +L=${PXEBOOT_DEFAULT_INTERP} +.else L=${LOADER_DEFAULT_INTERP} +.endif LOADERBIN= ${BOOTOBJ}/i386/loader_${L}/loader_${L}.bin CLEANFILES+= ${BOOT}.tmp From nobody Tue Aug 13 17:31:37 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wjz2f2NFgz5T5xt; Tue, 13 Aug 2024 17:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wjz2f10qmz4Z6n; Tue, 13 Aug 2024 17:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723570298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FKyON0x8glbfP4TARQrSoQk9JAGJgvY276zLIKkjYDA=; b=MHXYENFMBczCmzM5nTCe3Ju8A5OPUaZNUJTqPGkasglzk5uIKYVvfXPQysZMfeWGnbyElZ Aw3SrZmHmum3kTd0U2AugLqIChPkVV/mnHhksA5TOwtHWlMH/mDUKXilJaNw40/e39gRz/ dqQqvnezV0qtZkoJEkJ4M5kJD9CCXCxj17gQ++/CWDflWTqj9yuygVJOSwNK4LDcaDPFaF XTLx/kpdVOPD341NiQUFbn38/n9Ye+wBIwXQx7dXSDPwJJQT8usQx8nkMh4xaUa8/klhuB +R608bpgSKj+XmLAxJvi040ddtqVzh57wpMVnZNBlfuTloyaqxtz7puYp2ttsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723570298; a=rsa-sha256; cv=none; b=vWQXDdwq8FV1f1X+odBu8VboQlZvVV+MfHFrIse/1YbyKM/5q4dK6YbNywT+E9kXXSt+XW KxHCP1eoAKDg3KhZYEJjM9rxViB/wGRpV3FaOUFHl0NYqTtu2mdAbbefHBPRJCp4oDurah y1HX4toLnBSr1TuGFyAJrILiYr6FWpc46W5G4YTahZJVAJAwZcZAYtgPYwj4UeOuk6YMm+ ArihgJWr1y3kbD7/SOTuU5svqnzsyWBAVIyuYG0a3aZnMGbdjucLc+Z7870kINRDm/4WJy GB0mwVGDMnutIh6kuFhGA1DXxmsv3lVieBPePjMKkyl+sgMi5rovENGaTOe2kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723570298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FKyON0x8glbfP4TARQrSoQk9JAGJgvY276zLIKkjYDA=; b=uvl538ESctYJIII0q97qfeRfs8b0ChteBORcCRju6g0kRJdPMvBHkoMWvQDBPnQkcQfz0P IpSFXnO0XvfnpbIPZY3bXdq5QF4l0lxcHhbepLCXE/KK0gRlXzrdGc77gtRuQ+lncXPygS 3RZow3QrREaJJGzml0kbkBMT8ccte+T15JitqOlryR8pugtbUi6NFVQHhz7FKc5eDy6RyO GZCqOpLXN1tAUBPRAkHu+V4sDatDuwTHjEj5j30lZjdZlarsjcNDKl2FY0mKVbiXyLT4Xm uV8vzuq01QVaB9Cu2FijW1mYMvh61Sk/sSMfxtXNqB7LqM485FdGJbXgDmUnWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wjz2f0cX7zKP5; Tue, 13 Aug 2024 17:31:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47DHVbfE050936; Tue, 13 Aug 2024 17:31:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47DHVbSe050932; Tue, 13 Aug 2024 17:31:37 GMT (envelope-from git) Date: Tue, 13 Aug 2024 17:31:37 GMT Message-Id: <202408131731.47DHVbSe050932@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: e91ae9079619 - stable/14 - pxeboot: Enforce a 500k limit here List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e91ae90796195afb6c58adb601f6d04dea865877 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e91ae90796195afb6c58adb601f6d04dea865877 commit e91ae90796195afb6c58adb601f6d04dea865877 Author: Warner Losh AuthorDate: 2024-08-05 21:19:36 +0000 Commit: Warner Losh CommitDate: 2024-08-13 17:31:38 +0000 pxeboot: Enforce a 500k limit here Have a separate PXEBOOTSIZE variable that acts much like LOADERSIZE variable to limit the size of the loader used for pxeldr. This allows people to override it independently of LOADERSIZE, which they may need to set larger for other reasons. Combined with PXEBOOT_DEFAULT_INTERP, you can build a larger lua loader, while still being able to build pxeldr with the 4th one, for example. MFC After: 3 days Sponsored by: Netflix Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D46214 (cherry picked from commit e1a6d93155cea7fbb038dee671ecf005c4846fd3) --- stand/i386/pxeldr/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/stand/i386/pxeldr/Makefile b/stand/i386/pxeldr/Makefile index 27f9a44cf21c..36d3d3ad878e 100644 --- a/stand/i386/pxeldr/Makefile +++ b/stand/i386/pxeldr/Makefile @@ -29,6 +29,12 @@ L=${PXEBOOT_DEFAULT_INTERP} L=${LOADER_DEFAULT_INTERP} .endif LOADERBIN= ${BOOTOBJ}/i386/loader_${L}/loader_${L}.bin +# pxeboot runs in an environment where there's 500k or less of space available +# due to space for packet buffers, network drivers, etc. While some environments +# may have a bit more, the limit of 500,000 (488k) provides enough margin to +# work in a huge array of environments. Larger values may work for specific +# environments. +PXEBOOTSIZE?=500000 CLEANFILES+= ${BOOT}.tmp @@ -44,6 +50,8 @@ CLEANFILES+= ${LOADER} # Note: pxeldr.S assumes a.out and will require changes for ELF if the output # format is changed to ELF. ${LOADER}: ${LOADERBIN} ${BTXLDR} ${BTXKERN} + @set -- `ls -l ${LOADERBIN}` ; x=$$((${PXEBOOTSIZE}-$$5)); \ + echo "$$x bytes available"; test $$x -ge 0 btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \ -b ${BTXKERN} ${LOADERBIN} From nobody Tue Aug 13 17:31:39 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wjz2g4KRbz5T5xw; Tue, 13 Aug 2024 17:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wjz2g23gCz4Z93; Tue, 13 Aug 2024 17:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723570299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BdfCTqxZ4nK1mMHFpKjtTKX/m07iOHI+H01cRY4DUoc=; b=BrYZyqrLJdGP+PXeTi4xxusARJRQIP5CySk5JQb9FimDr5rxJP4n4UcyM4nB7XYk/aR16I zoQiRDs+yugpygJS6gkiqFZVJucDUba22GJV357kduSuv5OkjLPRxEUt8ADTKlSjgCDlxJ nTq3SbmOlihoyPGIW6KpF5qJW8FUBnu1R4zWXj/nKmSU3dWoclmnu3U4409QO1/tYqCfmj S7KnJJ75p7MYQ3WciwvtntHavcHyC+uiu5OEQWrZkKXsj5j0CRuDln9xGnH6EIu9oHNH6j 35nLZ88xlxjj2XcNutO6uv0g8PfmEfAhvwi/BKs40dhLHi+2TTfGdi20clRxkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723570299; a=rsa-sha256; cv=none; b=v1pJeyyLAFwuM4qhXaZDkkWRKlkF9eWWJlbQif56dX+xgusZAfGVHo6Wa9Ui97uifCS1rR MN3J7jGbKZwPYWQpyAMyFugsJf2iHuEDa+fogBgsbtjWjofQ4Ji6A0SHmWBbmMzYoZNtGp Afc+7fIHgXx6Saa0ckHvHyRhfTQP8EYYvv1rOOi4RUoL8AUUE8xXwG30O28KM5iLnVFybV GnwJ/LbkuEvIqsxIx1PJkWmSOFkVBCC2Zy8j890jtua+5Mp8CHZvcFYAM9DDVLm96pLIYT 1EhWKAY/3Sb+jOKzJ7nlQD108J5G/JF2Se3z33oD7OLVv1iPyyzO6BAClbFDhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723570299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BdfCTqxZ4nK1mMHFpKjtTKX/m07iOHI+H01cRY4DUoc=; b=a20BYqmw2BQrHxmuZOwdhWWcS7Byter/ZWj8oaVQm0yh2Elr50kEELdYS+eYb0f1dEORql 70R49AeJ3vZ5cmtTMo58HH1ORTnwLTtCBIEIYdR2XaEti3duWJhVJ6MfM2wj4lf/EYnERJ ty8gzVPIz3h3HQdMcKog4Huz2iDdLCHrCqrtzSu2q28gf4A/I5kxBKgS3LemYD7ZZu1s5Z fAOnjDd7uqDtQQySX0l9BjkE4TgjYfW5NKz2PBY6ylxRBwcdQxbxsQQ5rc6tdBjRKAXfsY NCvPMkjqAqmIhKmI7SbcsG7gBeFZXlsfMwQLeG1HInWfKCNcDBv/3RFMQ4xkGA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wjz2g1h2kzKvB; Tue, 13 Aug 2024 17:31:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47DHVdv9050991; Tue, 13 Aug 2024 17:31:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47DHVdPP050988; Tue, 13 Aug 2024 17:31:39 GMT (envelope-from git) Date: Tue, 13 Aug 2024 17:31:39 GMT Message-Id: <202408131731.47DHVdPP050988@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: b013b81a03ba - stable/14 - loader: Document that WITH_BEARSSL may need other tweaks List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b013b81a03bad3741c50523ba5bcd9445429dbd6 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b013b81a03bad3741c50523ba5bcd9445429dbd6 commit b013b81a03bad3741c50523ba5bcd9445429dbd6 Author: Warner Losh AuthorDate: 2024-08-05 21:16:37 +0000 Commit: Warner Losh CommitDate: 2024-08-13 17:31:38 +0000 loader: Document that WITH_BEARSSL may need other tweaks /boot/loader is right up aginst the 500k limit we have to make sure everything works in a wide variety of environments. However, adding WITH_BEARSSL can push it over the edge since we are so close to the limit with it enabled. One may also need to increase LOADERSIZE when enabling it. It's often safe to go much higher, especially when you don't plan on using pxeldr. Document this trade off here. MFC After: 3 days Sponsored by: Netflix Reviewed by: sjg, markj Differential Revision: https://reviews.freebsd.org/D46211 (cherry picked from commit 7ee781e2bfc2558060dec95564414a0bff4415c1) --- tools/build/options/WITH_BEARSSL | 19 +++++++++++++++++++ tools/build/options/WITH_LOADER_VERIEXEC | 2 ++ 2 files changed, 21 insertions(+) diff --git a/tools/build/options/WITH_BEARSSL b/tools/build/options/WITH_BEARSSL index 6a4447d723ed..9dcebbf1ae30 100644 --- a/tools/build/options/WITH_BEARSSL +++ b/tools/build/options/WITH_BEARSSL @@ -8,3 +8,22 @@ This library is currently only used to perform signature verification and related operations for Verified Exec and .Xr loader 8 . +.Pp +Due to size constraints, one may need to set +.Va LOADERSIZE +larger than the +default 500000, although often loader is under the 500k limit even with +this option. +Setting +.Va LOADERSIZE +larger than 500000 may cause +.Xr pxeboot 8 +to be too large to work. +Careful testing of the loader in the target environment when built with a larger +limit to establish safe limits is critical because different BIOS environments +reserve differing amounts of the low 640k space, making a precise limit for +everybody impossible. +.Pp +See also +.Va WITH_LOADER_PXEBOOT +for other considerations. diff --git a/tools/build/options/WITH_LOADER_VERIEXEC b/tools/build/options/WITH_LOADER_VERIEXEC index a50ff9a317e6..d784df968949 100644 --- a/tools/build/options/WITH_LOADER_VERIEXEC +++ b/tools/build/options/WITH_LOADER_VERIEXEC @@ -4,3 +4,5 @@ with support for verification similar to Verified Exec. .Pp Depends on .Va WITH_BEARSSL . +May require a larger +.Va LOADERSIZE . From nobody Tue Aug 13 17:31:40 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wjz2j2t48z5T613; Tue, 13 Aug 2024 17:31:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wjz2h319Dz4ZFR; Tue, 13 Aug 2024 17:31:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723570300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=47ypGrWThteSTOXGfWToXoKv9Qtflf+jG9gSzdDF/0E=; b=LrmqO64zmv2r5EizIHYF+fVE078meXzvagZ5tlT0BSjkLOx9vma88lLOm0eLgytU1vZV0C +wzFfPpKcOz2QbYqS1vIkudfdQ4DTZ6BA7pMI3f0S2hkBj7lIAHAfbz70ooiUW9WXtAjAo 1AB2m9oRrvZVLY5PsdOTZ2fK0p4l/hOxyRxAcbxWKwtCWDrlW/HcBg3gHhWJwCLOqFZkE6 JWX7fPQPIfvvjK80tqpF7jVPF5XiYilRdktRE7s9+2zNrH6pOfom3zyQM1u2gEP9XlClLX LGH5DvxuroKDqA3zbdT6OuT+fax7W/i4rvauJtk+hZ3FRAkbq92kSM245Qu27A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723570300; a=rsa-sha256; cv=none; b=WwX5SFZcndxu0MzcfedJ8MlHEE1pGcXuElyCkcDpBTdexGOWRH4ytVFqhC9mMwtT7LTfbE o/S7KKyKbrBuBlbgjjWRLohgfSquj5KdDbqEbUoQxMAk1MyPb0elkITJCnj6TxT0GQqKMP gyM1BX0hDJOciV0YueKV/xxhAomsWn4IzJwQYvcUCcZnsuGYgVZPney9CwzXUlOjL2GCow MblJmh77z2O5k2DX1w0IMtiCBHBvxs/dpqxHaN0hRhGXPDHDAhaM2GkNaIRRo94OBvaFl7 H+mhNkhSmLLPOTqFq95yvZDEaAGkzXKqEh2DW91vEcg3qXvCTnjyoWtP3iAxWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723570300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=47ypGrWThteSTOXGfWToXoKv9Qtflf+jG9gSzdDF/0E=; b=AtYAxzX0NHThmKbhtrb7sQirHTDvHd4sC2Q92agw/VR2ZNteNw1ResMh6exR+KJpz7vx/2 213u2tmzUX8QrXDp+VYXxlpJoWvYjZXq1DIcssS1H39T/QqfanZL6M1Jb9f/cPP+C+PEFJ BEFJLjGBafRSLP6doyV7Wkz5nYFyKAnGm3THF4nt2EKmbuGkOueXdw4OiRLcAGSQBXnQJ+ l4+4GlB3ZgfBAoTKppfAw9GltWRgr9f5aGN4KV/Cf3Rkr1fuWEQ/YnJh/mCfonFc5y5l/3 Bewj1dUc4zhJ+NJExtLK3umdjczGWWH+bH1K9Gb/3/lL257gB+LO2qckMDjPsg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wjz2h2ZzZzKP6; Tue, 13 Aug 2024 17:31:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47DHVegh051033; Tue, 13 Aug 2024 17:31:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47DHVex3051030; Tue, 13 Aug 2024 17:31:40 GMT (envelope-from git) Date: Tue, 13 Aug 2024 17:31:40 GMT Message-Id: <202408131731.47DHVex3051030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: e179ee000ef2 - stable/14 - loader: Add WITH/WITHOUT_LOADER_PXEBOOT build option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e179ee000ef2731a7baa6edc32ed8bfcca751f8b Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e179ee000ef2731a7baa6edc32ed8bfcca751f8b commit e179ee000ef2731a7baa6edc32ed8bfcca751f8b Author: Warner Losh AuthorDate: 2024-08-05 21:19:21 +0000 Commit: Warner Losh CommitDate: 2024-08-13 17:31:38 +0000 loader: Add WITH/WITHOUT_LOADER_PXEBOOT build option Make it possible to disable pxeboot. This loader will fail to build when it's too large. When /boot/loader needs to be larger like that, this options will disable a component whose build will fail. It is an explicit option rather than implicit when things are too large to force the user to make the explicit tradeoffs rather than wonder why they have a stale pxeboot or other odd failure mode. MFC After: 3 days Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D46212 (cherry picked from commit 20d35d5817851df3a6d20e75df2e14a192b94940) --- share/mk/src.opts.mk | 1 + stand/i386/Makefile | 2 +- tools/build/options/WITHOUT_LOADER_PXEBOOT | 10 ++++++++++ tools/build/options/WITH_LOADER_PXEBOOT | 25 +++++++++++++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 788c6a9b956f..3ff71df3e0da 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -132,6 +132,7 @@ __DEFAULT_YES_OPTIONS = \ LOADER_KBOOT \ LOADER_LUA \ LOADER_OFW \ + LOADER_PXEBOOT \ LOADER_UBOOT \ LOCALES \ LOCATE \ diff --git a/stand/i386/Makefile b/stand/i386/Makefile index 883cd4a556bb..5e52b1e12c30 100644 --- a/stand/i386/Makefile +++ b/stand/i386/Makefile @@ -17,7 +17,7 @@ SUBDIR.${MK_LOADER_LUA}+= loader_lua SUBDIR.yes+= loader_simp # special boot programs, 'self-extracting boot2+loader' -SUBDIR.yes+= pxeldr +SUBDIR.${MK_LOADER_PXEBOOT}+= pxeldr SUBDIR.${MK_LOADER_ZFS}+= zfsboot gptzfsboot diff --git a/tools/build/options/WITHOUT_LOADER_PXEBOOT b/tools/build/options/WITHOUT_LOADER_PXEBOOT new file mode 100644 index 000000000000..e6b09381884e --- /dev/null +++ b/tools/build/options/WITHOUT_LOADER_PXEBOOT @@ -0,0 +1,10 @@ +Do not build pxeboot on i386/amd64. +When the pxeboot is too large, or unneeded, it may be disabled with this option. +See +.Va WITH_LOADER_PXEBOOT +for how to adjust the defaults when you need both a larger +.Pa /boot/loader +and +.Pa /boot/pxeboot +.Pp +This option only has an effect on x86. diff --git a/tools/build/options/WITH_LOADER_PXEBOOT b/tools/build/options/WITH_LOADER_PXEBOOT new file mode 100644 index 000000000000..01d4a0b86a66 --- /dev/null +++ b/tools/build/options/WITH_LOADER_PXEBOOT @@ -0,0 +1,25 @@ +Build pxeboot on i386/amd64. +The PXE Boot loader package needs more space than we may have in the boot loader. +If you need to increase +.Va LOADERSIZE +beyond 500000, then building +.Xr pxeboot 8 +will fail. +To allow a larger +.Va LOADERSIZE +for some environments, it may be necessary to disable pxeboot builds or adjust +its defaults. +You can set the default loader for pxeboot to use independently of the system +default by setting +.Va PXEBOOT_DEFAULT_INTERP +to one of +.Dq lua , +.Dq 4th , +or +.Dq simp . +The limit on the size of the loader used for +.Xr pxeboot 8 +can be set independently with +.Va PXEBOOTSIZE . +.Pp +This option only has an effect on x86. From nobody Tue Aug 13 19:34:31 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wk1mS1sD7z5THdn; Tue, 13 Aug 2024 19:34:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wk1mS1KzTz4sCS; Tue, 13 Aug 2024 19:34:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723577672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rtbKu6HER3rZYq1EXNQ7HZv5Q1QFPhqciB/NYrf9ypg=; b=H/XJOgMoAhF/hS/c5Js70HN0pv7Qj6OKa6jSjpbdL+UdSnaawGDC7SPEpNs0G4EEtyZ7ot uHcmX31ZctPBMCAGzaasDDYLBKUCCRQ+luQ7BSVatk9aFTiJSe24k1uqkqOSEth+mjVE+j oVRSgoTFhPQq59pEXStmQoTbP0L76h2LB2vY0d+A0rhPXbQRl7mQoFYOlpmyyWjbmZL208 ihrqc7MQX9xxTK8l+u08jukkh6T/TLx/m7wzlNuPTt99q7pOn8cV6zRe6I6s5N3kx8S1T8 z56PXSkzrcKHCe6fqL9gppccPq6M5DXvXGaFdXPMfnBIb5Vk2152VCzixC1TUw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723577672; a=rsa-sha256; cv=none; b=VVcc1fUk6Dd8rSQFafjHtgs42/ZAPqwq9KDC4vWOMDqDp2dJ4+SgtBkXgQiF6q6UTcP09i QY/ED5PZh65der3BvKDQgBhR7QnvbTn3rPqX/z9yTJC5VHUToNHpjSFcDFtCoHmEGuTsa9 RqwT08V8VGCjcNMHYrakfXTEIAmNVJR01M0KkJ9Bou+Ed7TVePXTVr7K1Q/x9TD4i+H1T8 MCvmErxAwMGrVX6d2Nqo/qXpCuEu4texK3eo6ph+mfWaOEWaIv9dEtBQEvhH6T/3+fORiA p/sD6d8DjmYXMAy5OZVYSrIDnMvM7R6K5+5hSL59DVNN+jrgqAWMWkVEajNTzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723577672; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rtbKu6HER3rZYq1EXNQ7HZv5Q1QFPhqciB/NYrf9ypg=; b=DoMMl4NBRhVxSsY0HwYQFXxoTb0m3w6rzPqdaR9OP2nq1uDj6A37rfcL6NDldFwzpIW9qX LXli++GNHhrefH7EPAq+vNu8NrPRPA3AXILHG/7lNdjhTC/DggKA+OnGAR43yrHYhJ7NG/ k4M0kInLFZ/9qXHAsyDmjaCvrCn9GeNSFOgoJs6PlQVrGglLVNmCLHIuZQ/73NHx4KNFkU /aPMYdUXaro1icymN7GIqaErmm6nv34+ZEmbrouvQ/+ZGAA4AMQL34DyvIaypLkaEz5r36 4d8BWEGi6afL7q901dz0F7RSGZWrbTBNideodFg/v69vpWOYpY2yVPOCJGLySw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wk1mS0dwGzNnJ; Tue, 13 Aug 2024 19:34:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47DJYVjZ056426; Tue, 13 Aug 2024 19:34:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47DJYVRa056423; Tue, 13 Aug 2024 19:34:31 GMT (envelope-from git) Date: Tue, 13 Aug 2024 19:34:31 GMT Message-Id: <202408131934.47DJYVRa056423@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: a9376f5caf1c - stable/14 - qlnxe: Allow MAC address override List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a9376f5caf1cdcee074601dbd838a1c5450e283c Auto-Submitted: auto-generated The branch stable/14 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=a9376f5caf1cdcee074601dbd838a1c5450e283c commit a9376f5caf1cdcee074601dbd838a1c5450e283c Author: Keith Reynolds AuthorDate: 2024-08-05 19:10:18 +0000 Commit: Kevin Bowling CommitDate: 2024-08-13 19:34:10 +0000 qlnxe: Allow MAC address override The qlnxe driver always sets the NIC's rx mac address to the card's default MAC, ignoring any MAC address set via ifconfig. PR: 278085 (cherry picked from commit 792226e53023cb09566cb78b2135b052e9b62e0e) --- sys/dev/qlnx/qlnxe/qlnx_os.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/dev/qlnx/qlnxe/qlnx_os.c b/sys/dev/qlnx/qlnxe/qlnx_os.c index 6665894d058d..49d3f20aa0c2 100644 --- a/sys/dev/qlnx/qlnxe/qlnx_os.c +++ b/sys/dev/qlnx/qlnxe/qlnx_os.c @@ -7055,8 +7055,17 @@ qlnx_set_rx_mode(qlnx_host_t *ha) { int rc = 0; uint8_t filter; + const struct ifnet *ifp = ha->ifp; + struct sockaddr_dl *sdl; - rc = qlnx_set_ucast_rx_mac(ha, ECORE_FILTER_REPLACE, ha->primary_mac); + if (ifp->if_type == IFT_ETHER && ifp->if_addr != NULL && + ifp->if_addr->ifa_addr != NULL) { + sdl = (struct sockaddr_dl *) ifp->if_addr->ifa_addr; + + rc = qlnx_set_ucast_rx_mac(ha, ECORE_FILTER_REPLACE, LLADDR(sdl)); + } else { + rc = qlnx_set_ucast_rx_mac(ha, ECORE_FILTER_REPLACE, ha->primary_mac); + } if (rc) return rc; From nobody Wed Aug 14 03:26:16 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WkDDm5ltHz5SVGr; Wed, 14 Aug 2024 03:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WkDDm59JVz4n1n; Wed, 14 Aug 2024 03:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723605976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DcO80OQa27xczedqyuBkmFFJ0yPw7ZK25pXeAzOt0qI=; b=rAsHc3ADmfDVndbXUlZ59sjMXe3awXOUvQZsq1pAmPqDVmQG/lNgVgKSYGX07tPsdqUY7k n0zRqKfFe7Y81smpborlT1BaIphpBnCTdx0VfWOax9UAaYKkwXtUDaubJwCH/SdlxFmSSK CNTZ82VhaZUahs6FarTLh+Y7OF7c9In+l658JSQipOogSCFkLWzBPtojCuWNivL18qgDqj 49wrsvWz/ZbSOVGtT8fESaczdPYcSXp+1QiNuPrtbDn2XAAfEXg6EUC+qgFJq749kZvlwh iCw+d5xU23lxo3jCOr/dN5Z6qCQmP6vNB/m3mlFMtbNDLUxojbsQr1hVJs+vvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723605976; a=rsa-sha256; cv=none; b=YWE+KiX+yNcje/qWzHg8EmHiGa6dc1O1EHpuR4YOv0wNSY6DLHSvWMtd7N9xFIyAgwov24 aiw8vOYqyZm0HUFkUTZ6MsdFOxpX13QF83tFqZVbO+ncPXvDNuyE3b/k9ASLuQB4uUS2WP PUjq39B0FGH37XZMIxLUhZuT6eT33XC1G3NjCgKaC3tqinXAodoHHKaLOea0IaoYq/eNzT 3trnbYAIppxmf9RHGZcNX4cLFbid4Jv3vutUp4DuL0et/NPBDzNMjxvy2uvQsJhd3X04ba ZpgqHQbqShNE7XFv5r38of89a1kxpK3lDdoqztjUsw6ebY8LIGqSTh2KD2OnFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723605976; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DcO80OQa27xczedqyuBkmFFJ0yPw7ZK25pXeAzOt0qI=; b=Tn51k2hfmfCQSYU6gkL0rQItZc0/YK3e2X6FiGTduphHM7cZcEZ8ePz3Rtr3c1RCoRW1B2 t6RdKETgnvY1UOzxRmdQwXVv2PDPXji2gdNnSYngP7uZq1RYdrI6bEYJdK5X3oAZvXqVQ3 T8yYTw41JaKacCTshjy2FHITxVdZuilqUdRDljSCPbihbOulNlJQMxfZnTNEHbZev1oQBf onWEDHhAR9O2AcfD9fchtSpA3FsrA2uyaYmKJ+mjbzLMDq9BzSVtzTVxJvXp5tt6Ru9tqD 6M5kS4snfla/g1GqU6p8HP9LFTaRsXckkNeo4RKC1P10XVTRk+yxO+M4nKbDJw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WkDDm4nVgzdhX; Wed, 14 Aug 2024 03:26:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47E3QG82052145; Wed, 14 Aug 2024 03:26:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47E3QGmc052141; Wed, 14 Aug 2024 03:26:16 GMT (envelope-from git) Date: Wed, 14 Aug 2024 03:26:16 GMT Message-Id: <202408140326.47E3QGmc052141@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: ac4866f142d8 - stable/14 - msun/ld80/e_powl.c: add const qualifiers to the static immutable values List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ac4866f142d8ba9ee8f102ce38071f17f5c100f5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ac4866f142d8ba9ee8f102ce38071f17f5c100f5 commit ac4866f142d8ba9ee8f102ce38071f17f5c100f5 Author: Konstantin Belousov AuthorDate: 2024-08-06 14:49:09 +0000 Commit: Konstantin Belousov CommitDate: 2024-08-14 03:25:55 +0000 msun/ld80/e_powl.c: add const qualifiers to the static immutable values (cherry picked from commit 10ac6c48a3e4ec6bb6f09d9c93e6ce5eb3381251) --- lib/msun/ld80/e_powl.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/msun/ld80/e_powl.c b/lib/msun/ld80/e_powl.c index b028d3cb7ff2..34978b964559 100644 --- a/lib/msun/ld80/e_powl.c +++ b/lib/msun/ld80/e_powl.c @@ -23,10 +23,10 @@ * P[0] x^n + P[1] x^(n-1) + ... + P[n] */ static inline long double -__polevll(long double x, long double *PP, int n) +__polevll(long double x, const long double *PP, int n) { long double y; - long double *P; + const long double *P; P = PP; y = *P++; @@ -42,10 +42,10 @@ __polevll(long double x, long double *PP, int n) * x^n + P[0] x^(n-1) + P[1] x^(n-2) + ... + P[n] */ static inline long double -__p1evll(long double x, long double *PP, int n) +__p1evll(long double x, const long double *PP, int n) { long double y; - long double *P; + const long double *P; P = PP; n -= 1; @@ -126,13 +126,13 @@ __p1evll(long double x, long double *PP, int n) /* log(1+x) = x - .5x^2 + x^3 * P(z)/Q(z) * on the domain 2^(-1/32) - 1 <= x <= 2^(1/32) - 1 */ -static long double P[] = { +static const long double P[] = { 8.3319510773868690346226E-4L, 4.9000050881978028599627E-1L, 1.7500123722550302671919E0L, 1.4000100839971580279335E0L, }; -static long double Q[] = { +static const long double Q[] = { /* 1.0000000000000000000000E0L,*/ 5.2500282295834889175431E0L, 8.4000598057587009834666E0L, @@ -141,7 +141,7 @@ static long double Q[] = { /* A[i] = 2^(-i/32), rounded to IEEE long double precision. * If i is even, A[i] + B[i/2] gives additional accuracy. */ -static long double A[33] = { +static const long double A[33] = { 1.0000000000000000000000E0L, 9.7857206208770013448287E-1L, 9.5760328069857364691013E-1L, @@ -176,7 +176,7 @@ static long double A[33] = { 5.1094857432705833910408E-1L, 5.0000000000000000000000E-1L, }; -static long double B[17] = { +static const long double B[17] = { 0.0000000000000000000000E0L, 2.6176170809902549338711E-20L, -1.0126791927256478897086E-20L, @@ -199,7 +199,7 @@ static long double B[17] = { /* 2^x = 1 + x P(x), * on the interval -1/32 <= x <= 0 */ -static long double R[] = { +static const long double R[] = { 1.5089970579127659901157E-5L, 1.5402715328927013076125E-4L, 1.3333556028915671091390E-3L, From nobody Wed Aug 14 03:26:17 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WkDDp0PDHz5SVJY; Wed, 14 Aug 2024 03:26:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WkDDn6SS8z4mh7; Wed, 14 Aug 2024 03:26:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723605977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rhL+iHdrfTCljvcnw/jBfA9idr/kSUzaVSQ3jyGlCYk=; b=OZI6gTIZfPKKcD0OZ6faMVQ7XYllhbwoWEZZHiEB9lf0J9a/kGiduU5TPIAimwCRzdKkw2 CGXV9EQzM3Es9mN8XnnffPEiPdUcuzFuCYZIBjwCe7GyJemdXCZTcCihUpV/4d/0xx838J P+nRkAAgFWAfIGbDxs9O0ib8J186UhQ2T0wx4ADMikLrPXcZklxUXJdYkECPctraKuzY+y +MpQnBGc1j3UY/34c7HK3IZLDs0jny/Hh2Ry6FvdJe5aRFC+35rk3swhH2rD0x+VBuPkiD KExDf9XSaiz3HJK69R5vTzI58oZMbRQK3w5+lDyGjGToBGT2ISLrMYfiUK9xrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723605977; a=rsa-sha256; cv=none; b=we7BeX1ZYLXEp70d5EanJ1Jmrt6THJyqglkIp22fogKRwyoXQKW/QTlmrLIHNrbF+1M6YZ WKySyjDYcqX1dqDbOaBwg6C1hHN66t4UGFzK0fUkuvqmJYhEyJ2Jnaujz+6Oku93ya6Aq5 xg8EVLan8uFcLuWiLsljN2VD0u41VDBt8N7aPY/gGo5DWf1CRm6520SmkZOQDzAP+3nZI4 xLHY1+l1jY1OXu+icU6ky8qSh/QjYa5qtjIK7rPT9cOtLYjlNj3DnDlEk7AN/9aNJ9plBd ZDiWJSlv4k1lSqZ3ZvfFLR/oLQK+Tn13pUCtKLibCzj7fXoZSwUxkDo5vNjjSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723605977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rhL+iHdrfTCljvcnw/jBfA9idr/kSUzaVSQ3jyGlCYk=; b=geAlbpINIjNpmlh904BEARXir0el7uhrwpyffFGamPyBqjRUwC51PWBEUJ62j4hUPRYu7F ESLjRIo1qEToLCELDZ6vuutvjykLIeewpyaQO1kAcquv49Ei2/PgoP4nDTiIg5Rd1S8hdp WGo4PdDy2WiXF8p1OBOwdt2PZn79hAWYr9SUSQJl17bS0qclLSpJ4Vdg7Aj5o7ws8TlSdQ kD8Dbtfj1DFvxIXU+bmSLs+b5Z3POYrsRDaJXoNtPhhfTEaZBrZZUetyhW8uD3sDOJQhRR HI3itiKaTeO9ofYc7WYuwA2bGugnvBj5sB77LJyP+Smd+t1hxBiGr2E+FWrKTA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WkDDn64sGzdfV; Wed, 14 Aug 2024 03:26:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47E3QH2Y052205; Wed, 14 Aug 2024 03:26:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47E3QHXr052202; Wed, 14 Aug 2024 03:26:17 GMT (envelope-from git) Date: Wed, 14 Aug 2024 03:26:17 GMT Message-Id: <202408140326.47E3QHXr052202@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 023b97a69969 - stable/14 - msun/ld80/e_powl.c: make powl() thread-safe by making static variables thread-local List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 023b97a69969257cf3e8ea9f1a9cefce6218fa3a Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=023b97a69969257cf3e8ea9f1a9cefce6218fa3a commit 023b97a69969257cf3e8ea9f1a9cefce6218fa3a Author: Konstantin Belousov AuthorDate: 2024-08-06 14:50:57 +0000 Commit: Konstantin Belousov CommitDate: 2024-08-14 03:25:55 +0000 msun/ld80/e_powl.c: make powl() thread-safe by making static variables thread-local (cherry picked from commit 0c00dbfeb0c814c3a87a4d490db3692c1f9441e9) --- lib/msun/ld80/e_powl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/msun/ld80/e_powl.c b/lib/msun/ld80/e_powl.c index 34978b964559..d04d77a5ee98 100644 --- a/lib/msun/ld80/e_powl.c +++ b/lib/msun/ld80/e_powl.c @@ -230,13 +230,13 @@ static const long double R[] = { static const long double MAXLOGL = 1.1356523406294143949492E4L; static const long double MINLOGL = -1.13994985314888605586758E4L; static const long double LOGE2L = 6.9314718055994530941723E-1L; -static volatile long double z; -static long double w, W, Wa, Wb, ya, yb, u; +static _Thread_local volatile long double z; +static _Thread_local long double w, W, Wa, Wb, ya, yb, u; static const long double huge = 0x1p10000L; #if 0 /* XXX Prevent gcc from erroneously constant folding this. */ static const long double twom10000 = 0x1p-10000L; #else -static volatile long double twom10000 = 0x1p-10000L; +static _Thread_local volatile long double twom10000 = 0x1p-10000L; #endif static long double reducl( long double ); From nobody Wed Aug 14 03:37:16 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WkDTS4CHmz5SWW4; Wed, 14 Aug 2024 03:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WkDTS3hMbz4pFP; Wed, 14 Aug 2024 03:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723606636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TBo6l1L3IPJiesjPRM6MmHqSdZan3zxpLm2Gw9OYx94=; b=NH+u4Kv92l+JfqzV0ypdc8fuzmeHU5DLfVF6k+ZEqgDWJioaH2ICJ/RQroGUC4iGTNyX6d xTW6RDTjaqLZZbE+QpHNx/1Rjsf2XRIGewDdnvYFFwVbSKo8wasvpYIw37EmFj7jIP6t9o KrA9cDYebv6qeAqqts3i87KjiNV9Q0sZEd/dOTtbPa9b2kqrPRu2U11my0gISZcnDx1mDd GLc3vT7yLzP19gtmr+851chvs7krHqgq1oDHtQuWGK/s6d3Lgz2mHt/AXKaQwRRRlfpwoG 0DugAbRaWMFjRB16r0fuz/SDI3uLCbgRZCtw83eZonoWSxfriQESrapzeAaQfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723606636; a=rsa-sha256; cv=none; b=jijAJgoGyQWPYVZ6SSty+sPZ/Eaa5aMWM0fdVvlIBlwCwlfZsix3VWYMHMsJeFzNIWG3dx 88InP2LEhKgZngCkZt+v7rpj4h2KG9RKMBNCYCqBhqx8KtXJA53cD4wXK4PzQQchYxtHxj EfR5+TmYtJLLiV/8c7EQVvFI0hx+JTcxSxpcbkZoaR3PbWnQycvS/TVtgXYvq1ykjfBzKJ obsg4qKQP51pf7c4mKr+Kw+G6TAht0ArwhRHqmkuscocRMhx1GdBoElihbCEjCKMBTk9QQ nUaXq9IyiVotkL/H6B2/pex/di64z2JPF8FEgo5+wuUFSQGJ73/KXjk4pl4VCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723606636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TBo6l1L3IPJiesjPRM6MmHqSdZan3zxpLm2Gw9OYx94=; b=Ac4DzGcemlPhQXm7tIKqODXEWB5vslNQiAgXC+rQkrfgfiTAJLzFc8YKniN7voTF7f3J6s blmX/ZUbpOCKhPWOAAGCeYvKX5yjOdUe+B2ErMAqsvK4zpvxGDf7QCjH/QAhdZZ8FfdiVy Cs5HCTOT2PjJCWKgcsPAkR3OAsMzvRHzf40Jl7KWDpYBJ8g2DG+uc8gCFwa6lxf72THeam jVAbyLyq80KwiBKABJFtvWxzpPjjfjDM016anVubGe/wgQRrzJg++9VUgqFgqiqvWeJboU Brj2QidCckbvPsqxBLzHwKbViW8NQwGYX3zU4/pVNV0V955Q33NSt1pbniP0wQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WkDTS3Cf8zdjF; Wed, 14 Aug 2024 03:37:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47E3bGuA069839; Wed, 14 Aug 2024 03:37:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47E3bGlt069836; Wed, 14 Aug 2024 03:37:16 GMT (envelope-from git) Date: Wed, 14 Aug 2024 03:37:16 GMT Message-Id: <202408140337.47E3bGlt069836@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 7088bf662d46 - releng/13.4 - calendar: don't setlogin(2) in the -a user handlers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.4 X-Git-Reftype: branch X-Git-Commit: 7088bf662d46ef321a5838d290285086cd6446d2 Auto-Submitted: auto-generated The branch releng/13.4 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=7088bf662d46ef321a5838d290285086cd6446d2 commit 7088bf662d46ef321a5838d290285086cd6446d2 Author: Kyle Evans AuthorDate: 2024-08-05 18:43:56 +0000 Commit: Kyle Evans CommitDate: 2024-08-14 03:36:52 +0000 calendar: don't setlogin(2) in the -a user handlers As of e67975d331 ("Fix 'calendar -a' in several ways."), `calendar -a` will now fork off a new process for each user and do all of its own processing in the user's own context. As a side-effect, calendar(1) started calling setlogin(2) in each of the forked processes and inadvertently hijacked the login name for the session it was running under, which was typically not a fresh session but rather that of whatever cron/periodic run spawned it. Thus, daily and security e-mails started coming from completely arbitrary user. We could create a new session, but it appears that nothing calendar(1) does really needs the login name to be clobbered; opt to just avoid the setlogin(2) call entirely rather than incur the overhead of a new session for each process. PR: 280418 Reviewed by: des, olce Approved by: re (cperciva) Fixes: e67975d331 ("Fix 'calendar -a' in several ways.") (cherry picked from commit 6cb8b61efe8899ee9194563108d0ae90c1eb89e3) (cherry picked from commit 3a9010c98b3d9676307fac20d42cdd3cfd4bc46d) --- usr.bin/calendar/calendar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/calendar/calendar.c b/usr.bin/calendar/calendar.c index 476c0495d218..2e3baee7d57f 100644 --- a/usr.bin/calendar/calendar.c +++ b/usr.bin/calendar/calendar.c @@ -224,7 +224,7 @@ main(int argc, char *argv[]) lc = login_getpwclass(pw); if (setusercontext(lc, pw, pw->pw_uid, - LOGIN_SETALL) != 0) + LOGIN_SETALL & ~LOGIN_SETLOGIN) != 0) errx(1, "setusercontext"); setenv("HOME", pw->pw_dir, 1); cal(); From nobody Thu Aug 15 06:33:53 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WkwLn5kqPz5T2xP; Thu, 15 Aug 2024 06:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WkwLn558jz4STj; Thu, 15 Aug 2024 06:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723703633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fU1NKXW1upOFw091DB/LZpk1S7eMYRSvUfsK/2k5aDs=; b=dL4imPTearh4n/Jo0U7ELQdCYP2UY14/aeeSDpy5phy5Y+R+21SzUf+Wrf34OKNnsRciQL BOS0Ausiu5QqGgkfhO6FfwJRssUZ77nmwcxzqoRYEtZyx0q+J6JrrpxewY3J6PZ3cRJfxM A7jDI0dZXEmPFYKuTFI/2czfZsSaz2p5fMm3wbNJiHwWZFVuBAF/JRVNEN9zMrERdP96jq I7eIwt0r+v5RgKxTFUNvcx07Bc2f0Kg5yPyJImvLTX0Jwm37YncqwigwgzYNdqkkn7tDRT DBZEwRuQ48ZVwQ3QuBXLU4L3f+4QbdWI6PHaAkGR91UGVh+9cC9x0g8eD6doBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723703633; a=rsa-sha256; cv=none; b=LkjbXzbvnLpRYwqCwNuqgPfkASdJgdZ1XacmUdQmJcndOERp8AdQXOzb4/PCfixFWR/0+V Y78lXvoCaPLeHUhzXDBUSAsgCXVqcvi3FVJeiOxkx+V1slfjp+e8d/4+UiuUFJT2YGOjKO zhf22aMOl2PqJrmuvcqcUvSKWRubApPnTlaxnzyhB2zolIksze58mtinUCnR8KpjUcwxy8 Wvb/j7XtGeIK5OxTO129p1eVrGptIxbrfe76tnrN3kYOcKxGaj8NcHkYqOvyqiiPAxWrnv ohPkw0EN8eSFWjvS5+mkM0VUYTUUkqHxAZK0dLrAF8zKBahPFlBJu5lTqzd2rQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723703633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fU1NKXW1upOFw091DB/LZpk1S7eMYRSvUfsK/2k5aDs=; b=r3sdbCcxHaHBNUGYCgE9CoNnhWMfF3lo+aH1bKe556X722MQyHP51V4wQPm2Jm6uHK/X1J TrY06OCCpR4XLqt0Bv31TXHqh8xrpYQgy/Vyv2b6I2OvbIKjdTsid76lsP7nL8dvIoSc2B wEQgZrykKQpf7c9DHWqav/NF+OZaX6ksCYpWfXmeoDVwxfp5JO1KErY2pArtqfFLnYsjK3 om2nEn+Ca0GLc5dOSAK7QLc3vbD8wCEAqQ2bxwLuGHlTJqy8y321NadThrzr1rMeLurgS9 beyxw4T+SWkXo9zYOqWuOygZIz7ghDD8S8jkW61Thvj2Oa0pXPKODC4qxHNVFg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WkwLn4J0wz1RHp; Thu, 15 Aug 2024 06:33:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47F6XrQw013877; Thu, 15 Aug 2024 06:33:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47F6Xr81013874; Thu, 15 Aug 2024 06:33:53 GMT (envelope-from git) Date: Thu, 15 Aug 2024 06:33:53 GMT Message-Id: <202408150633.47F6Xr81013874@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 85434cac6ef2 - stable/14 - Fix EFI loader reproducibility with lld List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 85434cac6ef20d42653c966b317d5b2ae9c95973 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=85434cac6ef20d42653c966b317d5b2ae9c95973 commit 85434cac6ef20d42653c966b317d5b2ae9c95973 Author: Dimitry Andric AuthorDate: 2024-08-11 19:48:27 +0000 Commit: Dimitry Andric CommitDate: 2024-08-15 06:33:35 +0000 Fix EFI loader reproducibility with lld When the various loaders under stand/efi are built, the resulting binaries differ over multiple runs, even if WITH_REPRODUCIBLE_BUILD is used. This is caused by lld multithreading and the custom linker scripts for the loaders, and affects the following binaries: * loader_4th.efi * loader_4th.sym * loader_4th.sym.full * loader_lua.efi * loader_lua.sym * loader_lua.sym.full * loader_simp.efi * loader_simp.sym * loader_simp.sym.full Work around this by disabling lld threading for these binaries. Reviewed by: emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D46271 (cherry picked from commit f5ce3f4ef562ea9fc4d8f9c13c268f48a5bacba7) --- stand/efi/loader/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index b3395bdfdf53..02563681c3e8 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -106,6 +106,11 @@ LDFLAGS+= -Wl,-T${LDSCRIPT},-Bsymbolic,-znotext -pie LDFLAGS+= -Wl,--no-dynamic-linker .endif +# When lld is using multiple threads, which it does by default, it can +# result in non-reproducible output with the custom linker script. Work +# around this by disabling threading. +LDFLAGS.lld+= -Wl,--threads=1 + CLEANFILES+= ${LOADER}.efi ${LOADER}.efi: ${PROG} From nobody Thu Aug 15 06:38:40 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WkwSJ1rHYz5T31f; Thu, 15 Aug 2024 06:38:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WkwSJ1DWlz4SyB; Thu, 15 Aug 2024 06:38:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723703920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ov5ztVuQvBZq27Jw3eRlaVZ10kjTASI5+eC1N8tFZwI=; b=YhlFooZVcijQnJWruDksmLdflW2age2LQSMYLSuXTdB5SgwZbbzifrg2XR8tTB1iT/K/62 wvOentQO8nxUiPTTYx8wJytrDkN6sm32gnl7zuv2zoiVOLf7Fl9DMWXKoFve6BPxxdSsYb FFgSAX/06iwUEkDKHgDCYvorLbl30HA9te6ee5ZveP11dyTAayNoTZjhq3XLUUFTl0IvmK aXk6sZL+P9vFSD8y02Wu8mE3AomrwDu+d334X2/djTUqqfBJYMZDE5qFm1EuVetPIxeGCY dDW0vKfsXcYlFfTFDGGkUgvaGgLktPbHkoPQAr1P1ie8TIcfk7ugvaddOol3LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723703920; a=rsa-sha256; cv=none; b=lwhk7Mfqj7pawgyr7WfLmvbYxThtAj6BWnpr3XWIkcW6EGKtjdcfhfLHUApa01RxT7IEI6 Isl2lzMsSJ8ExaO51EJYgU7wcZFTndoiVtR57ptAalAnkudNay4MIRcjfKtYMRFhrI4biT npTHItkyAWklkZym29Gz8lgtSs5vSs2tnD93Yqn3HIfgEuUyIiUUJ+2c3M9pW5FCNqbjMR p5d4CmImkrN26nfYEPaQHr3UjaVXUakFujK0iiuWlOafqKZpCnCnZS3BL7B+5L6guhy59L jES/G92tj4ap3sJ5CBAbBOZncUgnv+OFplaLax4SUgkC38GerKdnHW+cZU6ACw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723703920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ov5ztVuQvBZq27Jw3eRlaVZ10kjTASI5+eC1N8tFZwI=; b=a9pRzztx/U9ZGEmynMZUug5XVXOiJCnSSq9iCy/jXlVjZ1G+yw1H5oNaWmff3g+s3Dfd9U k8QFP1wDVYMSW4wk81Zn4zKyvjLx08gKZfibS8moJEpPWFLdHPFJBi/ai4SghPW+yvtbyh sfG7gvRYRvXUObV42wOtt//C9M+P8759MW3fcpMg2un7bKS851jqvdgjbyxvE4OBn2X+k8 Lv2S5j+TmIeiLKDZ6NR8+4VamPlo5D/oFoDAUjBdeQ4T2SvoXwcEH8zhH232OhNlSfzkSP jzbT+qLCkWr+HEItd0p2xSxEyIvJHimQfNmbpJiRuVxiCVngroJT/Cq71SOrdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WkwSJ0qVqz1QwH; Thu, 15 Aug 2024 06:38:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47F6cejk014614; Thu, 15 Aug 2024 06:38:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47F6ce9u014611; Thu, 15 Aug 2024 06:38:40 GMT (envelope-from git) Date: Thu, 15 Aug 2024 06:38:40 GMT Message-Id: <202408150638.47F6ce9u014611@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 8a4fd438ef6c - stable/13 - Fix EFI loader reproducibility with lld List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8a4fd438ef6c874110b9ed320d3cd54e2bf93459 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=8a4fd438ef6c874110b9ed320d3cd54e2bf93459 commit 8a4fd438ef6c874110b9ed320d3cd54e2bf93459 Author: Dimitry Andric AuthorDate: 2024-08-11 19:48:27 +0000 Commit: Dimitry Andric CommitDate: 2024-08-15 06:33:40 +0000 Fix EFI loader reproducibility with lld When the various loaders under stand/efi are built, the resulting binaries differ over multiple runs, even if WITH_REPRODUCIBLE_BUILD is used. This is caused by lld multithreading and the custom linker scripts for the loaders, and affects the following binaries: * loader_4th.efi * loader_4th.sym * loader_4th.sym.full * loader_lua.efi * loader_lua.sym * loader_lua.sym.full * loader_simp.efi * loader_simp.sym * loader_simp.sym.full Work around this by disabling lld threading for these binaries. Reviewed by: emaste MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D46271 (cherry picked from commit f5ce3f4ef562ea9fc4d8f9c13c268f48a5bacba7) --- stand/efi/loader/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index ec2a147bd69f..c5503da655f9 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -105,6 +105,11 @@ LDFLAGS+= -Wl,-T${LDSCRIPT},-Bsymbolic,-znotext -pie LDFLAGS+= -Wl,--no-dynamic-linker .endif +# When lld is using multiple threads, which it does by default, it can +# result in non-reproducible output with the custom linker script. Work +# around this by disabling threading. +LDFLAGS.lld+= -Wl,--threads=1 + CLEANFILES+= ${LOADER}.efi ${LOADER}.efi: ${PROG} From nobody Thu Aug 15 07:28:36 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WkxYy5VNCz5T75p for ; Thu, 15 Aug 2024 07:28:38 +0000 (UTC) (envelope-from 0100019154f03fca-f79e4596-8a39-44d7-bb4c-3ecb9eb4effc-000000@amazonses.com) Received: from a8-176.smtp-out.amazonses.com (a8-176.smtp-out.amazonses.com [54.240.8.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4WkxYx4VCjz4Wv7 for ; Thu, 15 Aug 2024 07:28:37 +0000 (UTC) (envelope-from 0100019154f03fca-f79e4596-8a39-44d7-bb4c-3ecb9eb4effc-000000@amazonses.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=tarsnap.com header.s=dqtolf56kk3wpt62c3jnwboqvr7iedax header.b=LGtyVTKp; dkim=pass header.d=amazonses.com header.s=ug7nbtf4gccmlpwj322ax3p6ow6yfsug header.b=Spgk4NH+; dmarc=pass (policy=none) header.from=tarsnap.com; spf=pass (mx1.freebsd.org: domain of 0100019154f03fca-f79e4596-8a39-44d7-bb4c-3ecb9eb4effc-000000@amazonses.com designates 54.240.8.176 as permitted sender) smtp.mailfrom=0100019154f03fca-f79e4596-8a39-44d7-bb4c-3ecb9eb4effc-000000@amazonses.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=dqtolf56kk3wpt62c3jnwboqvr7iedax; d=tarsnap.com; t=1723706916; h=Message-ID:Date:MIME-Version:Subject:To:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding; bh=RIx/r4uXox9au90V+Y0W1MC9x2pfzYl2qvlX2p253m8=; b=LGtyVTKpFn70bTx09bJzZCsGXvqXGs99E+2omlxNa8LdkkUDFL/gMp4AqH7XFPlG +83r+c2KtshyGApR6BspH4tg+9ImspS/d4U2lNAoimPP69q2rYeXrcgO8ocv42UlVrD 1DbLndWLoa1ZEVnUWS7VZSo5bPs+tAdblF9qHFoQ= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=ug7nbtf4gccmlpwj322ax3p6ow6yfsug; d=amazonses.com; t=1723706916; h=Message-ID:Date:MIME-Version:Subject:To:References:From:In-Reply-To:Content-Type:Content-Transfer-Encoding:Feedback-ID; bh=RIx/r4uXox9au90V+Y0W1MC9x2pfzYl2qvlX2p253m8=; b=Spgk4NH+Wj7n3Vz4RTHArLDzog+rQArLFwxY+LOXmrjBb7OmANDVZpFYcBSkoqy+ tFAPDiBgf+beC8IKcOIRayslDnA6WYlzidJB2ZMcXml4GYEcSuj3hdOew372mawPd8Y PyXYEVBb+7Xqnq7Fr7pz5pPo1hJrSji606cZTebw= Message-ID: <0100019154f03fca-f79e4596-8a39-44d7-bb4c-3ecb9eb4effc-000000@email.amazonses.com> Date: Thu, 15 Aug 2024 07:28:36 +0000 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: d27c97326439 - stable/14 - zfs: merge openzfs/zfs@33174af15 (zfs-2.2-release) into stable/14 To: Martin Matuska , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org References: <202408130752.47D7q4vY064501@gitrepo.freebsd.org> Content-Language: en-US From: Colin Percival Autocrypt: addr=cperciva@tarsnap.com; keydata= xsFNBGWMSrYBEACdWRqDn3B3SKO7IG0/fGHYtfs26f3Q5QeAcasy1fQLniwGQWn5rlILhbCD K/jdNoDm5Zxq20eqyffoDNObCjnHgg4tGANdi+RmDy+7CDpE789H8dss9y7Pt5DlGGAXQQnt hxush3EYS/Ctprd9UUL/lzOOLOU1aNtzB84tNrJBtcJmL7OYHfyTSNFxvedqJrrasejIQOLI t/DQ89BPzz+vsKHz7FJPXh3fsVkzLA00DJYcfkgxyABfJNA7U6yMwd4DVSdx/SsvfIDMVXnu UXCXswo106WPZbYGlZPpq0wW6iibtTerJix+8AeuwXvl9O1p8yESK4ErkIxCnmghTSz+pdzj z/6xBRkdDM9VdZ0r+CzsaNXMpDOzFuKyjaiYBdgCLljbDnXIHFcqXenrZ7Xwkm09g/M4uVSh pIUG2RYa6tsHSQoGCp3f2RZv1znfViKQFbbL83QjtPA20AhseZSYbHp1FPhXyy9J0wkGL16L e99g6gdGeIRE82BZjBjKGDkoyDPq+oDRSFl8NtzmIKy+cfz00nViqcTF4bREXEawFGhlpO0X O9q8mijI9iFB6zaPBiSdJGBL5ML5qLTNCl8Zlf4m1TBvmRTqF/lzMHVXHidDoUhpSh/y3AFZ 1KrYc27ztJQywDJPJPWPbtY8YhFLFs377gfP8WldsZjzp8nvoQARAQABzSVDb2xpbiBQZXJj aXZhbCA8Y3BlcmNpdmFAdGFyc25hcC5jb20+wsGRBBMBCAA7FiEEglY7hNBiDtwN+4ZBOJfy 4i5lrT8FAmWMSyYCGwMICwkNCAwHCwMFFQoJCAsFFgMCAQACHgUCF4AACgkQOJfy4i5lrT+i Yg/+PYyJNoFuygtV5t/skcjYmvEC93mnazEvh+x99vGYZnGKeJ8NDOF4QCUzeHquOWxDi8Zl reXyswKcrIquPxxX6+YyGe97VbvLnez3ksfzOYRj1F4qV0Rq8ZNK51+bvIrbcS3SfDaRioAk D7WWwFor8y/hSwxYkfsKbtP5PRcem20JUxuC085zqWLaKv5t5n2CBzAGMjwJaQ3tM3AXVwWJ uJaHA6ot/6fntJlmkfcyCYyyr0D6b0guRj3STbZ2hNn5o2AI+f6LJJ31s2sPFjl6rs7fORf3 hFSNOHDd2HxfVBXFdQy24ROkC4orBBz2xh9GScjxxT/hbXkfufkubFubw7n0HkvHzA3UF+Qq A8JiI3n+d7ocsP0/5BQ2sZdeqPGJgHx6RkAMuW1tJ29wSvCN1qMgFwhYkpQdfvHlociQrimU fvlRfSrBEe8o7tvIuEdpvwvCZSTJqQbVoMw8UHFE7nzyCXUSab5h6PbjakCqim13ekVO2KFF TTPcz5o5jEeUY75tzbIwcDfFbT5KqNjWy06TVdM9VEJDHSfOfxHR3kSEwZ+tT2aTvL3grsUn gFwSNcj4Cl4CRFfUw8zVZY+7O7RiMlhBqykikvUurrdGKc1Scwa0yuppdA6eVvylyTWSQGrQ +uLWtV1LUKN7ZqKJWBkLPt9nS4XZWGyBvxOHYqjOwU0EZYxKtgEQANYfgbtUMVnhjxDHhWLp g5kLHK3YW0TfJKzpXqDB7NiqxHofn4OcbZnVC3MKggcbs9o1/UtsjnlsG8550PfiYkDXvPiO RJwgbGs6MGIDK797C6cnBLQ8xwBa9SL4cl5iQFnhWmt6vwnJ+an/cm5JpYves3wL7jV09qU9 57hkHXEUcl38r4FssZzVcLKPUVTa3Un+QGRTGDGe/f4ctjMaqv0ZCM+l2ixPhf/vqESrfSLv V/+T3dmtUfXjazO3SABvsHwxgGuTTYOlKoPCaebr+BRdqm0xeIShoIlhvTI8y4clchqx/Uxg UG5X2kvU13k3DS3Q8uLE4Et9x1CcZT6WGgBZSR6R0WfD0SDnzufNnRWJ0dEPA2MtJHE7+85R Vi9j/IgZV+y5Ur+bnPkjDG1s2SVciX5v9HQ0oilcBhvx0j5lGE9hhurD9F+fCvkr4KdbCknE 6Y8ce8pCNBUoB/DqibJivOzTk9K9MGB5x0De5TerIrFiaw3/mQC9nGeO9dtE7wvDJetWeoTq 4BEaCzpufNqbkpOaTQILr4V6Gp7M6v97g83TVAwZntz/q8ptwuKQPZ2JaSFLZn7oWUpYXA5s +SIODFHLn6iMoYpBQskHQjnj4lEPJadl4qj+ZKA89iDAKsniyoFXsbJe2CPbMS1yzBxKZq6K D/jpt7BOnuHr/JrXABEBAAHCwXYEGAEIACAWIQSCVjuE0GIO3A37hkE4l/LiLmWtPwUCZYxK tgIbDAAKCRA4l/LiLmWtP3jmEACQrh9gWe8F1Tkw3m6VoHKwLc5he4tX3WpQa//soPO6iGG3 S3WPruQ46NrAaAojoOcKI9UONDO5rxG0ZTX53S+lu2EO47jbcLwOCjaEpjKpDRt9ZXBQE8Xl mtBE9Bp3W9gpjB1nE3KNM1mJYgsK0QdRpwwfh4pVgGpOj8j23I6MCK+v99zEBnpgCn2GX8W/ kctRXHqWwndHysOJtRP/zrl7dDaABF1f9efUl0LL3TD3GJ9VDz+DNOin/uK2a1hiJo8QzTRk PpfUQ2ebzDsrd1i/pOWkMSkdH+rEu4AGrXWtaBwrMyrGkL6Icb6yO+P9/z0W2wlgBf3P1YRt JPgQt/Dj3yvA/UnaV/QmuVQPjl13o24UnJGsZM8XGnNdfWBKkC1Q6VXC4QT+dyBHYH9MuE9d 6oGl8pFM1+cTfEfbM62/rRoPkF1yHMsI/903VxEvuUIKfhEZAVLFyHldooNxuchntHQP9y8J 8Ou9bWYQP7MnEn+kwSwrZkjurfPkan+xQvp6dDYnj3V0GwA5pprBMaB928VIDVOv+1PNQI3t Cvk5VPv/skq+TJRMHW7bFSt8PRa91cUf1FOLIz9APDiJOzXkwxUEHGV3zPSaUhs1JYjyBeGT wDAvtLUdjOnRhEUOwlnIrztmvyciutjJoVzKEEjj5WXnHk9L9kQ1bpAjkjTONw== In-Reply-To: <202408130752.47D7q4vY064501@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Feedback-ID: ::1.us-east-1.Lv9FVjaNvvR5llaqfLoOVbo2VxOELl7cjN0AOyXnPlk=:AmazonSES X-SES-Outgoing: 2024.08.15-54.240.8.176 X-Spamd-Bar: - X-Spamd-Result: default: False [-1.21 / 15.00]; FORGED_MUA_THUNDERBIRD_MSGID_UNKNOWN(2.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.92)[-0.920]; DMARC_POLICY_ALLOW(-0.50)[tarsnap.com,none]; FORGED_SENDER(0.30)[cperciva@tarsnap.com,0100019154f03fca-f79e4596-8a39-44d7-bb4c-3ecb9eb4effc-000000@amazonses.com]; R_SPF_ALLOW(-0.20)[+ip4:54.240.0.0/18:c]; R_DKIM_ALLOW(-0.20)[tarsnap.com:s=dqtolf56kk3wpt62c3jnwboqvr7iedax,amazonses.com:s=ug7nbtf4gccmlpwj322ax3p6ow6yfsug]; MIME_GOOD(-0.10)[text/plain]; RWL_MAILSPIKE_GOOD(-0.10)[54.240.8.176:from]; XM_UA_NO_VERSION(0.01)[]; MIME_TRACE(0.00)[0:+]; FROM_NEQ_ENVFROM(0.00)[cperciva@tarsnap.com,0100019154f03fca-f79e4596-8a39-44d7-bb4c-3ecb9eb4effc-000000@amazonses.com]; TO_DN_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[54.240.8.176:from]; FROM_HAS_DN(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-branches@FreeBSD.org]; ASN(0.00)[asn:14618, ipnet:54.240.8.0/21, country:US]; RCPT_COUNT_THREE(0.00)[4]; DWL_DNSWL_NONE(0.00)[amazonses.com:dkim]; ARC_NA(0.00)[]; RCVD_COUNT_ZERO(0.00)[0]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[tarsnap.com:+,amazonses.com:+] X-Rspamd-Queue-Id: 4WkxYx4VCjz4Wv7 On 8/13/24 00:52, Martin Matuska wrote: > The branch stable/14 has been updated by mm: > > URL: https://cgit.FreeBSD.org/src/commit/?id=d27c97326439551596d63bfe9e7533fb49dbbb7b > > commit d27c97326439551596d63bfe9e7533fb49dbbb7b > Merge: 402db142e07a 33174af15112 > Author: Martin Matuska > AuthorDate: 2024-08-12 13:06:18 +0000 > Commit: Martin Matuska > CommitDate: 2024-08-13 07:52:28 +0000 > > zfs: merge openzfs/zfs@33174af15 (zfs-2.2-release) into stable/14 > > OpenZFS release 2.2.5 /usr/src/sys/contrib/openzfs/cmd/zdb/zdb.c:1241:8: error: format specifies type 'unsigned long' but the argument has type 'uint64_t' (aka 'unsigned long long') [-Werror,-Wformat] Looks like f029f6277996760be4be42148295231af425cc2d needs to be merged too? -- Colin Percival FreeBSD Release Engineering Lead & EC2 platform maintainer Founder, Tarsnap | www.tarsnap.com | Online backups for the truly paranoid From nobody Thu Aug 15 07:43:18 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wkxtt391Kz5T88Q; Thu, 15 Aug 2024 07:43:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wkxtt2bHbz4Yv5; Thu, 15 Aug 2024 07:43:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723707798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HP7dDUWlr+dVmJoPUUTCdbrntenISxYrRnRD5eE/9eQ=; b=cVqDDy4FBtHg5oTkBwjUTvgOfdFsz3iC0NpuuyRXdrUnrkwJREF5fuo+bWtmfjB9PAmy1t DmOIUgD0uOgY3fk+0bN8PwO/3hesvsBaxU9G9Amqd+fyfIl7Fhg+F6GHRBaiLjZ/5+x2pW RyF0WrlBLnrzgpEHlqtICEwDxwCq4hKY8qkW3oDByMEBib5tglXJoRXf2m/2ehiAP2Icoe 51OwDbPdhO0L2cEdfJnEirOQN1fr+HVlplEltJkIhoePZA9cAxeV1XbhF4RBtRyXxvLQMG Rzvonzkk3ZxzX4aOoZR/uM/yiSoI7KPP+0z626IH77RxmQdYdEGejTXFTSZp0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723707798; a=rsa-sha256; cv=none; b=xRO3lkb7jVU4QuAI2MaZDdvjG5MyBuMWFk8jOyYygqBmjszYjjaUr/9Om9b4LbIL51LkOl wGqVhA7B3ZibQ6Q0k8AR4ubmQTTIfBbpXSb8H+d58ad3fL1hmfig3VimWPx3f6MZ0faU/g rkpgavp+wMbsfteUWnkf54yvDopU+GZF1zx7/MkDlBjaK1zotV7BkZknyMO3aHlP18nM+t lV6MijBnO9CSgvmLYtu6pNLHPueNqcBmettGUHc/D9ELl6krroh/ei+yBW7jwGhsE43KJl 1DYf9jOzynNcUIWwT8FfVOe5vwHlVF9+n462yA0dUhsbPvQIHXE89+8hHJ+8+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723707798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HP7dDUWlr+dVmJoPUUTCdbrntenISxYrRnRD5eE/9eQ=; b=wMHlLwpGdRWK1ijR1Ug3FFh9pBIKJZ5qdRn9MEFNgctkyWiBxNIHB4VsCyyA8JY5XIukRj 5Jd0FvCPMjPjbQC8klEpxz0DWyn5uIBi1cnrcuXaJhKDJECuJJu5Ml2hrMeGEjrkqcSYNB 7kRogtpWm00PK4As6wgOaP2FVU4oMoVcneFJ0fl5s8fBLBIdScBUIlFWhXpFs8+ptkHrx4 TR9PBlb3eYY98n/TNjIByLX/62QgpAEHibqwmlJfoId3K8RLRq6jHAANrchpOxsPBDs9pK e/lH2UocLntq1HMZO9UmLykeTRz8VAh5RXRQX8RFeLdHfMpmEfjRn11w4mwO5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wkxtt27CKzDt3; Thu, 15 Aug 2024 07:43:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47F7hIbU032206; Thu, 15 Aug 2024 07:43:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47F7hIM5032203; Thu, 15 Aug 2024 07:43:18 GMT (envelope-from git) Date: Thu, 15 Aug 2024 07:43:18 GMT Message-Id: <202408150743.47F7hIM5032203@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: e664cd1dc5fb - releng/13.4 - Fix EFI loader reproducibility with lld List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.4 X-Git-Reftype: branch X-Git-Commit: e664cd1dc5fb66d0802db84f469a5c500dd3688a Auto-Submitted: auto-generated The branch releng/13.4 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e664cd1dc5fb66d0802db84f469a5c500dd3688a commit e664cd1dc5fb66d0802db84f469a5c500dd3688a Author: Dimitry Andric AuthorDate: 2024-08-11 19:48:27 +0000 Commit: Dimitry Andric CommitDate: 2024-08-15 07:42:36 +0000 Fix EFI loader reproducibility with lld When the various loaders under stand/efi are built, the resulting binaries differ over multiple runs, even if WITH_REPRODUCIBLE_BUILD is used. This is caused by lld multithreading and the custom linker scripts for the loaders, and affects the following binaries: * loader_4th.efi * loader_4th.sym * loader_4th.sym.full * loader_lua.efi * loader_lua.sym * loader_lua.sym.full * loader_simp.efi * loader_simp.sym * loader_simp.sym.full Work around this by disabling lld threading for these binaries. Reviewed by: emaste Approved by: re (cperciva) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D46271 (cherry picked from commit f5ce3f4ef562ea9fc4d8f9c13c268f48a5bacba7) (cherry picked from commit 8a4fd438ef6c874110b9ed320d3cd54e2bf93459) --- stand/efi/loader/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index ec2a147bd69f..c5503da655f9 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -105,6 +105,11 @@ LDFLAGS+= -Wl,-T${LDSCRIPT},-Bsymbolic,-znotext -pie LDFLAGS+= -Wl,--no-dynamic-linker .endif +# When lld is using multiple threads, which it does by default, it can +# result in non-reproducible output with the custom linker script. Work +# around this by disabling threading. +LDFLAGS.lld+= -Wl,--threads=1 + CLEANFILES+= ${LOADER}.efi ${LOADER}.efi: ${PROG} From nobody Thu Aug 15 14:29:57 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wl6w60mzLz5SGK9; Thu, 15 Aug 2024 14:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wl6w60J0mz4NY3; Thu, 15 Aug 2024 14:29:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723732198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O4RrTHWsQtQileqWsK5OdwN+bXiCSRt+WGJtX8FdvXI=; b=eacCNhLRXdRjK0yvCchuTMEqzhoUfw7HILQX+kQI7OqIbLv6tfFvbuQcgq6iLvYrC4BFqF VqiFWm2coq+LpVHuKy9NFyEReSdBDXgk4q/3TXEMZHHlDhokjo2X0Y1QWIgEzbEepqe6MS LoWhGk9Kp5NhOAFAtafbrtJOaHsjj5FNvn+FRoxtvBaQ2a0+qz9M2gBicLUXrelwbaG/m1 /lY5BT/Sb7/q0FF9QSneAuftYAF3L7ph6UoFluBkg5RdhXdVF5NmD23N3H+Ch8gdKjMFp0 I5DcthEViQEfh/IcCq1Hs6kUR3L813Q/bmjKZ1A1eUpRdGYdd3dLg8aG3F5nGw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723732198; a=rsa-sha256; cv=none; b=Ql25fzHdXA9MrJiqAx37Sq4g2i/LTx3FkzlbCkRpx3RB5dSFG8tP4VYigD+u46C9OYl1xQ vIa3B34r0199xY0sQSOTU1lQepqxWh7BsuexmQq7yh7UOMDg4HjHyAPIngYvQRHI2nRsfc jE2d8SeLlQhc586nLcckVnekXx67erfCyW8w3vfGIalCzuflV/Uqq40uVieF4emeZ9Ow38 W60UwCCDLCLyfq2DYJF2JAG1cNzWeodfaqn626EAX6YTfObtir1sDrz1m3JgxMYp6idzBg i152FrIWt1kiQMUyBDL7g5QPFvSxlKke8fLc3sr1rHOLMzcqZvxaThD4SYXC8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723732198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O4RrTHWsQtQileqWsK5OdwN+bXiCSRt+WGJtX8FdvXI=; b=xrpgpW/Uh9tX1Mk8s2RguNsz9LDElXk2AAdidBTAa8IBLe4zXI0dYqOqbi1rO3ybf7XdeR 9peOFpmI2xijyVuen0I0Gs5BdrenNN8gOmvm8jtUVJiyPBKgiK9gKG5eNNYlJFtL2ypsTo C0wa2o5yeYQ0E9R48aKjiGJHTz0+xwrlfIjZF8vnq6e9v5a/ljZgUOSLy3gPUDjgh7J/O2 rgvTWzzfG7tvnFLKaMIsSY118DHubqFEvwSLJlyJkx3p8TmFodn0BOozVNO4wi62iU/tRH P9TcSMSiHZ9fqX9a4u10cHif9D3AQiqAqw6E6u9gOhm6KN2fjeOOPN5EPkj/Lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wl6w571LQzRGC; Thu, 15 Aug 2024 14:29:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47FETvlI016636; Thu, 15 Aug 2024 14:29:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47FETv8u016633; Thu, 15 Aug 2024 14:29:57 GMT (envelope-from git) Date: Thu, 15 Aug 2024 14:29:57 GMT Message-Id: <202408151429.47FETv8u016633@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 665b21f583e8 - stable/14 - intr: Remove dead code from intr_event_remove_handler() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 665b21f583e8066df90e9e07d66657ddd8a02a53 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=665b21f583e8066df90e9e07d66657ddd8a02a53 commit 665b21f583e8066df90e9e07d66657ddd8a02a53 Author: Mark Johnston AuthorDate: 2024-07-30 14:35:53 +0000 Commit: Mark Johnston CommitDate: 2024-08-15 14:29:49 +0000 intr: Remove dead code from intr_event_remove_handler() We currently destroy the ithread in intr_event_destroy(). In preparation for fixing a bug there, remove this dead code and reorganize a bit to avoid some code duplication. No functional change intended. Reviewed by: kib, jhb MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D45490 (cherry picked from commit 177624f2f425901bb241789d639a16bded2247ae) --- sys/kern/kern_intr.c | 64 ++++++++++++++++------------------------------------ 1 file changed, 19 insertions(+), 45 deletions(-) diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c index 912504f8b1d0..6869d9112ea9 100644 --- a/sys/kern/kern_intr.c +++ b/sys/kern/kern_intr.c @@ -851,9 +851,6 @@ intr_event_remove_handler(void *cookie) struct intr_event *ie; struct intr_handler *ih; struct intr_handler **prevptr; -#ifdef notyet - int dead; -#endif if (handler == NULL) return (EINVAL); @@ -874,53 +871,30 @@ intr_event_remove_handler(void *cookie) "interrupt event \"%s\"", handler->ih_name, ie->ie_name); } - /* - * If there is no ithread, then directly remove the handler. Note that - * intr_event_handle() iterates ie_handlers in a lock-less fashion, so - * care needs to be taken to keep ie_handlers consistent and to free - * the removed handler only when ie_handlers is quiescent. - */ if (ie->ie_thread == NULL) { + /* + * If there is no ithread, then directly remove the handler. + * Note that intr_event_handle() iterates ie_handlers in a + * lock-less fashion, so care needs to be taken to keep + * ie_handlers consistent and to free the removed handler only + * when ie_handlers is quiescent. + */ CK_SLIST_REMOVE_PREVPTR(prevptr, ih, ih_next); intr_event_barrier(ie); - intr_event_update(ie); - mtx_unlock(&ie->ie_lock); - free(handler, M_ITHREAD); - return (0); + } else { + /* + * Let the interrupt thread do the job. The interrupt source is + * disabled when the interrupt thread is running, so it does not + * have to worry about interaction with intr_event_handle(). + */ + KASSERT((handler->ih_flags & IH_DEAD) == 0, + ("duplicate handle remove")); + handler->ih_flags |= IH_DEAD; + intr_event_schedule_thread(ie, NULL); + while (handler->ih_flags & IH_DEAD) + msleep(handler, &ie->ie_lock, 0, "iev_rmh", 0); } - - /* - * Let the interrupt thread do the job. - * The interrupt source is disabled when the interrupt thread is - * running, so it does not have to worry about interaction with - * intr_event_handle(). - */ - KASSERT((handler->ih_flags & IH_DEAD) == 0, - ("duplicate handle remove")); - handler->ih_flags |= IH_DEAD; - intr_event_schedule_thread(ie, NULL); - while (handler->ih_flags & IH_DEAD) - msleep(handler, &ie->ie_lock, 0, "iev_rmh", 0); intr_event_update(ie); - -#ifdef notyet - /* - * XXX: This could be bad in the case of ppbus(8). Also, I think - * this could lead to races of stale data when servicing an - * interrupt. - */ - dead = 1; - CK_SLIST_FOREACH(ih, &ie->ie_handlers, ih_next) { - if (ih->ih_handler != NULL) { - dead = 0; - break; - } - } - if (dead) { - ithread_destroy(ie->ie_thread); - ie->ie_thread = NULL; - } -#endif mtx_unlock(&ie->ie_lock); free(handler, M_ITHREAD); return (0); From nobody Thu Aug 15 14:29:59 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wl6w71lM3z5SGCQ; Thu, 15 Aug 2024 14:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wl6w71KKxz4NSl; Thu, 15 Aug 2024 14:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723732199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3NYd0OVURzHtsVl5dzRjnftjjfYWlenufMxKsZbPY6M=; b=DrnTm1ENiDeYVQFnC1C19XNDRu6da5XfCbyawpADOP1eeCc/zHalU8ovA4EB0xv4Mvymxo 0uQZH6sfx6g0E3xaXVazRUVDYgoiUXWQweBY013SzkNy6+KdpJPRp8p2J5H7Gr7fN5F4Js GITYyonz69nIyqUBSJkioBIUlKeqdKA9nrZNqeNS9MmqQ9dwJUFYLdOLHIH7GSkdfIIOUa oq84kBBRGL3x/f2bG0jgPvgsHTLVzKsHPOMYdUX5Ldht8PTQbq0UrE891GdpTeU0lhGRq6 2SOv+sS1iNMF+/5WCcCSUIR2qOMfi6ddbJOVCyY9wndVl+26m00rGQONueXg2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723732199; a=rsa-sha256; cv=none; b=s1qpU7LhjlZqoJLiyGAsP2S1mO5/I3CPwGv8AcQ6aMByhYqufScC2cORQPM1GPSxox1/YZ ny0zpnax1SkWDg29dgC9onpbH1rsMGjVp8c9ba6fgXJvha06CgaRs49dnVpC1FR3FdipWm /6mxvP00pEo+mG7Dac0fVg4w1u2E312tIYX2iFtzpveXcioFWZM0K99sRXHTvZAU1ct5wW gvphKM9ViSfeyB7+CJEdSSnZXCd+nMytHJexoQtVg0OKhZrAjoDIIq0yDPDQs3+Uq4L8V0 IMVj5YNc2VewDHVDMY0yTOnESQeaMhdWeMIvX+fdCHUIZOWSr2e/2ThsmfPGxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723732199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3NYd0OVURzHtsVl5dzRjnftjjfYWlenufMxKsZbPY6M=; b=wm7Od74icsXz4BUd+XXW0ySJJ/9JOcHIVhdEjPeGSj5KCQXXPPX36tvMP0Bq44AgggitKn DfTPEmAFN9u/OMksAAZWfd93mxe2A7OpzUpAcHBMeL99onnhOLH0tIoku5IAgj2Wk3UVOA 55evqciZdl4xA9KlHYymFYoUs6EkdEr1yyQx8iQJUXT7E+reBpARS7W8jFuFxJhkqA6fkA afgDRjYW5jgQQDf3Q3k0Md4D7bBy8nJ6lnuNEu2Q4sLdysdlL2F88hCfs7xq75VhyPJNbT cA5eNt5XmHdyaG2iG28pTPheT7eBrTjn9gahfzjruljQEYN+w4BRwESwmA7TNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wl6w70ty1zQnV; Thu, 15 Aug 2024 14:29:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47FETx05016681; Thu, 15 Aug 2024 14:29:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47FETxKR016678; Thu, 15 Aug 2024 14:29:59 GMT (envelope-from git) Date: Thu, 15 Aug 2024 14:29:59 GMT Message-Id: <202408151429.47FETxKR016678@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: c8d02c3763b9 - stable/14 - ithread: Annotate a branch in ithread_execute_handlers() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c8d02c3763b9c19c5829741336ff84f97819a143 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c8d02c3763b9c19c5829741336ff84f97819a143 commit c8d02c3763b9c19c5829741336ff84f97819a143 Author: Mark Johnston AuthorDate: 2024-07-30 14:36:35 +0000 Commit: Mark Johnston CommitDate: 2024-08-15 14:29:49 +0000 ithread: Annotate a branch in ithread_execute_handlers() No functional change intended. Reviewed by: kib, jhb MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D45491 (cherry picked from commit c122d7ffad5efb31e1aa5035cb1a26ad2e479074) --- sys/kern/kern_intr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c index 6869d9112ea9..2e8ed6c5ece9 100644 --- a/sys/kern/kern_intr.c +++ b/sys/kern/kern_intr.c @@ -1203,8 +1203,9 @@ ithread_execute_handlers(struct proc *p, struct intr_event *ie) * number of back to back interrupts exceeds the storm threshold, * then enter storming mode. */ - if (intr_storm_threshold != 0 && ie->ie_count >= intr_storm_threshold && - !(ie->ie_flags & IE_SOFT)) { + if (__predict_false(intr_storm_threshold != 0 && + ie->ie_count >= intr_storm_threshold && + (ie->ie_flags & IE_SOFT) == 0)) { /* Report the message only once every second. */ if (ppsratecheck(&ie->ie_warntm, &ie->ie_warncnt, 1)) { printf( From nobody Thu Aug 15 14:30:00 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wl6w840Lyz5SFgB; Thu, 15 Aug 2024 14:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wl6w82hDpz4NYP; Thu, 15 Aug 2024 14:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723732200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nmnkqjE41dk21fLlV0RlDuYXDEPSbiyl9u7mepDpnLY=; b=u47N2U9DkAoQtoOC1yQQdZImZbIGuDCAYfWB7Y3VLkEjuTjEcK0xVoySgjmxHseLcXHoIi XjB98nrWX091yS4bovWzmlvIuVFBtlXyRs3U/tg1VhToBBSU11vD5OZV3m8EkEShdMaqOe y3Z6siNITqkAHEno3FPioUft/NjP3q5ULmi/OVoFaJpY9sVYWoBhmAGI8zIOtDzGr4kTDc gAXLLcCtMP6MjrlV8vny/x3LCO96IAJlLXDnJzGLH/vqyHZMoHXpfz+b/TpgN3nCfhAc67 Pcl81k5p2Jl6qr3tsCL/4aB6WcMmdSk/Y04y7pF9F7E3E7or4tsW3fBDZy5LbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723732200; a=rsa-sha256; cv=none; b=nTT4THSEu82+tKKKySYKipmqh1nb1MPz6EoIfnJTDMjWcM4xTbtMyS1jySMPbXJQaPEUpS 47gNQBPaa4CCbC4b+ta2BSiyyUS76dXIPdlM7zz7VSGaBwygKwX4SvImk7P1FduO8QlRW/ +T2l+9SjyhSuZgkiryhSFP8tQQIVdk9SL+ZY1mtI1br/uulMFYmfchb+P16cq+D5IVVsrS uOq6o4M1F74cI+VoPq7OAnXfh2e16hOSy/b6cRQUwCANiBFjNX+0hDFeDIESLfhrFOyaeW NBTJ+pTj9mmDGV+6hqDpv7tSDmdTGXpTm5hnzm2fl/iacPUi8ZvvhMs5+8lKqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723732200; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nmnkqjE41dk21fLlV0RlDuYXDEPSbiyl9u7mepDpnLY=; b=x70CsGbZ3sB+i/Ox5iDF5WEDQFLgtCg4Ysj2gVRfZqUHhKJoAN94zsyCJdhe6y3xDqrB65 Ei0M3ONRDb0UaqX+FOf/Hx6XZzRRKa/T2sBlpZGWCRsqKt4z0aXulDcBN/AncGXrqWgb4b JShioHMvJUKTasTxQXcV/+RALp3dutPAHGb/sk5vOm55cUnocOAjCuxiQz06otpBFRIg/4 ArBkfJnKLuisOAUVKqBkuwjJZBSFhU/o5fejxWXP2SXOPUjcN7/ve/t5FOpEVOEdty201+ Cq+xlESTj6t/47Q+FXUoOo0Gp0mk2zzmsnJmvp9HuhV+HuNTWXG7Fp9bPt6ekw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wl6w81lxRzR1B; Thu, 15 Aug 2024 14:30:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47FEU0GE017017; Thu, 15 Aug 2024 14:30:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47FEU09B016996; Thu, 15 Aug 2024 14:30:00 GMT (envelope-from git) Date: Thu, 15 Aug 2024 14:30:00 GMT Message-Id: <202408151430.47FEU09B016996@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 58f9c14235f6 - stable/14 - ktrace tests: Add a test case for handling of exec+setuid binaries List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 58f9c14235f62f8e39992608bec9bd1398eeedff Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=58f9c14235f62f8e39992608bec9bd1398eeedff commit 58f9c14235f62f8e39992608bec9bd1398eeedff Author: Mark Johnston AuthorDate: 2024-08-07 15:53:37 +0000 Commit: Mark Johnston CommitDate: 2024-08-15 14:29:49 +0000 ktrace tests: Add a test case for handling of exec+setuid binaries MFC after: 1 week (cherry picked from commit 3852a5a226509551e72c13bce443707f80e863ce) --- tests/sys/kern/ktrace_test.c | 133 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 116 insertions(+), 17 deletions(-) diff --git a/tests/sys/kern/ktrace_test.c b/tests/sys/kern/ktrace_test.c index 9d4c2dbdcd74..dfd60b73a5cd 100644 --- a/tests/sys/kern/ktrace_test.c +++ b/tests/sys/kern/ktrace_test.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -86,6 +87,16 @@ child_fail_require(const char *file, int line, const char *fmt, ...) _exit(32); } +static void * +xmalloc(size_t size) +{ + void *p; + + p = malloc(size); + ATF_REQUIRE(p != NULL); + return (p); +} + /* * Determine sysdecode ABI based on proc's ABI in sv_flags. */ @@ -105,36 +116,47 @@ syscallabi(u_int sv_flags) return (SYSDECODE_ABI_UNKNOWN); } -/* - * Start tracing capability violations and notify child that it can execute. - * Return @numv capability violations from child in @v. - */ -static void -cap_trace_child(int cpid, struct ktr_cap_fail *v, int numv) +static int +trace_child(int cpid, int facility, int status) { - struct ktr_header header; - int error, fd, i; + int error, fd; ATF_REQUIRE((fd = open("ktrace.out", O_RDONLY | O_CREAT | O_TRUNC, 0600)) != -1); - ATF_REQUIRE(ktrace("ktrace.out", KTROP_SET, - KTRFAC_CAPFAIL, cpid) != -1); + ATF_REQUIRE_MSG(ktrace("ktrace.out", KTROP_SET, facility, cpid) != -1, + "ktrace failed: %s", strerror(errno)); /* Notify child that we've starting tracing. */ ATF_REQUIRE(kill(cpid, SIGUSR1) != -1); /* Wait for child to raise violation and exit. */ ATF_REQUIRE(waitpid(cpid, &error, 0) != -1); ATF_REQUIRE(WIFEXITED(error)); - ATF_REQUIRE_EQ(WEXITSTATUS(error), 0); + ATF_REQUIRE_EQ(WEXITSTATUS(error), status); + return (fd); +} + +/* + * Start tracing capability violations and notify child that it can execute. + * Return @numv capability violations from child in @v. + */ +static void +cap_trace_child(pid_t cpid, struct ktr_cap_fail *v, int numv) +{ + struct ktr_header header; + ssize_t n; + int fd; + + fd = trace_child(cpid, KTRFAC_CAPFAIL, 0); + /* Read ktrace header and ensure violation occurred. */ - for (i = 0; i < numv; ++i) { - ATF_REQUIRE((error = read(fd, &header, sizeof(header))) != -1); - ATF_REQUIRE_EQ(error, sizeof(header)); + for (int i = 0; i < numv; ++i) { + ATF_REQUIRE((n = read(fd, &header, sizeof(header))) != -1); + ATF_REQUIRE_EQ(n, sizeof(header)); ATF_REQUIRE_EQ(header.ktr_len, sizeof(*v)); ATF_REQUIRE_EQ(header.ktr_pid, cpid); /* Read the capability violation. */ - ATF_REQUIRE((error = read(fd, v + i, + ATF_REQUIRE((n = read(fd, v + i, sizeof(*v))) != -1); - ATF_REQUIRE_EQ(error, sizeof(*v)); + ATF_REQUIRE_EQ(n, sizeof(*v)); } ATF_REQUIRE(close(fd) != -1); } @@ -301,7 +323,11 @@ ATF_TC_BODY(ktrace__cap_signal, tc) * Test if opening a socket with a restricted protocol is reported * as a protocol violation. */ -ATF_TC_WITHOUT_HEAD(ktrace__cap_proto); +ATF_TC(ktrace__cap_proto); +ATF_TC_HEAD(ktrace__cap_proto, tc) +{ + atf_tc_set_md_var(tc, "require.user", "root"); +} ATF_TC_BODY(ktrace__cap_proto, tc) { struct ktr_cap_fail violation; @@ -507,6 +533,78 @@ ATF_TC_BODY(ktrace__cap_shm_open, tc) ATF_REQUIRE_STREQ(violation.cap_data.cap_path, "/ktrace_shm"); } +/* + * Make sure that ktrace is disabled upon exec of a setuid binary. + */ +ATF_TC(ktrace__setuid_exec); +ATF_TC_HEAD(ktrace__setuid_exec, tc) +{ + atf_tc_set_md_var(tc, "require.user", "unprivileged"); +} +ATF_TC_BODY(ktrace__setuid_exec, tc) +{ + struct ktr_header header; + struct ktr_syscall *syscall; + sigset_t set = { }; + off_t off, off1; + ssize_t n; + pid_t pid; + int error, fd; + + /* Block SIGUSR1 so child does not terminate. */ + ATF_REQUIRE(sigaddset(&set, SIGUSR1) != -1); + ATF_REQUIRE(sigprocmask(SIG_BLOCK, &set, NULL) != -1); + + ATF_REQUIRE((pid = fork()) != -1); + if (pid == 0) { + /* Wait until ktrace has started. */ + CHILD_REQUIRE(sigwait(&set, &error) != -1); + CHILD_REQUIRE_EQ(error, SIGUSR1); + + execve("/usr/bin/su", (char *[]){ "su", "whoami", NULL }, NULL); + _exit(0); + } + + fd = trace_child(pid, KTRFAC_SYSCALL, 1); + + n = read(fd, &header, sizeof(header)); + ATF_REQUIRE(n >= 0); + ATF_REQUIRE_EQ((size_t)n, sizeof(header)); + ATF_REQUIRE_EQ(header.ktr_pid, pid); + ATF_REQUIRE(header.ktr_len >= (int)sizeof(*syscall)); + + syscall = xmalloc(header.ktr_len); + n = read(fd, syscall, header.ktr_len); + ATF_REQUIRE(n >= 0); + ATF_REQUIRE_EQ(n, header.ktr_len); + if (syscall->ktr_code == SYS_sigwait) { + free(syscall); + + /* Skip the sigwait() syscall. */ + n = read(fd, &header, sizeof(header)); + ATF_REQUIRE(n >= 0); + ATF_REQUIRE_EQ((size_t)n, sizeof(header)); + ATF_REQUIRE_EQ(header.ktr_pid, pid); + ATF_REQUIRE(header.ktr_len >= (int)sizeof(*syscall)); + + syscall = xmalloc(header.ktr_len); + n = read(fd, syscall, header.ktr_len); + ATF_REQUIRE(n >= 0); + ATF_REQUIRE_EQ(n, header.ktr_len); + } + ATF_REQUIRE_EQ(syscall->ktr_code, SYS_execve); + free(syscall); + + /* su is setuid root, so this should have been the last entry. */ + off = lseek(fd, 0, SEEK_CUR); + ATF_REQUIRE(off != -1); + off1 = lseek(fd, 0, SEEK_END); + ATF_REQUIRE(off1 != -1); + ATF_REQUIRE_EQ(off, off1); + + ATF_REQUIRE(close(fd) == 0); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, ktrace__cap_not_capable); @@ -518,5 +616,6 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, ktrace__cap_namei); ATF_TP_ADD_TC(tp, ktrace__cap_cpuset); ATF_TP_ADD_TC(tp, ktrace__cap_shm_open); + ATF_TP_ADD_TC(tp, ktrace__setuid_exec); return (atf_no_error()); } From nobody Thu Aug 15 14:30:01 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wl6w93qX8z5SGDK; Thu, 15 Aug 2024 14:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wl6w92tWpz4NTC; Thu, 15 Aug 2024 14:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723732201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HQfiJdeksuQDs9IplC5X0atJFNDSvB2LQFyi2u5+XCo=; b=t8PLDZIT6rgWZll60AqWO7Fzq/modub3X/Is+/a1E4ccl1P/0Oy+LMQQ6LilKqTTwJzkFH +rT2pCVkIkaT6RWtGdMzfyuSz42p2guASePl6CixtXFPk3Tqq2XKT836Hl93L7TPZDK5x5 GQjk8GJfKGPGeUEfrIeP87L0I/qNLAw4XjXQ/vZl6u769STN08Yljkr/6b3z1zXAA5n4Nc CozCg7NWuVBfzYPRWwZlrTioQkMr0RbPocLbfkvXil9r6FGC1c+XYjqj8CjCj6XqHh+sCa vu1wuJ4vVyFUpCUr4P9IXeGLyADak5YynGMrfjW4G1HgOngDZd9dLy9t9ZJzIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723732201; a=rsa-sha256; cv=none; b=SETMD2BdujMXe5Rlw8swYOpUsRPMZMVHR5wS6SJURp5cr2319fVel/pQJXHsweEeKXK5Cl j3B/2tJsYNrrJzz3N/OMCVnZMPBT/FJGLue6WG3Sc9uxWGA6YL+9ft0ObtLijCbkUjpitE uciSbURD8xHFKcilm2CzV+/rcNr2vPgohi+A/Urv2EI7/xISmRgnRB7vHTkCIXbck0tT1o pDkPXZHHUmabi4LC6+cu5ZrWefnQaL35djLUbLv0xhjICxDytECgVS9vFazTOHKaPh/+2O YeyhozVyWaQScxto00dcMI6nPzoUX0DOZsbiK8uMsREbyn1y+wHAuYTCVYhCRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723732201; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HQfiJdeksuQDs9IplC5X0atJFNDSvB2LQFyi2u5+XCo=; b=vCzvggvcC9AE39EokjGHmMgF+dY601RCAXvlMd9LOCJx8YDGHcWh/A2bFeMwLQrU2SbDH1 ZMMU2VFleKN2yqYo8z/Dd451BErbqguYiRSHrgrVPIsP3oDkAw4IrI6butrrlyRN+HTfSP VIjTjYKZm/ooyuBedH/5Y3P1KlgvFiNi+ImXfZ2Nci0IW24S1Ew+Qe8MgKWsuYfpHlLA0q Ghdr42CKCDBwwtn0fiCxZ+gX00v9QPyfCV0B8TUIpKX2kSa527+731SG1SO8KKhY23pj4F yNEdzzQdUXOgw2st6hS0RjCsnnQd7JS1TyPfNRZVe9z+4ujYqKJ7C5lMjUduoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wl6w92ML3zQqb; Thu, 15 Aug 2024 14:30:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47FEU1u4018642; Thu, 15 Aug 2024 14:30:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47FEU1EY018637; Thu, 15 Aug 2024 14:30:01 GMT (envelope-from git) Date: Thu, 15 Aug 2024 14:30:01 GMT Message-Id: <202408151430.47FEU1EY018637@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f4d580a54734 - stable/14 - bhyve: Escape binary data sent in reply packets List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f4d580a547341362cacc79383a24e51c6875ff9a Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f4d580a547341362cacc79383a24e51c6875ff9a commit f4d580a547341362cacc79383a24e51c6875ff9a Author: Mark Johnston AuthorDate: 2024-07-31 22:41:13 +0000 Commit: Mark Johnston CommitDate: 2024-08-15 14:29:49 +0000 bhyve: Escape binary data sent in reply packets Per https://sourceware.org/gdb/current/onlinedocs/gdb.html/Overview.html#Binary-Data certain bytes must be escaped. The XML register definitions we have so far do not run afoul of that rule, but the stub should handle them anyway. Reviewed by: jhb MFC after: 2 weeks Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D46194 (cherry picked from commit b4fb947923b566a3a8a6ad8e5f8ea8dec0c68ee4) --- usr.sbin/bhyve/gdb.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/gdb.c b/usr.sbin/bhyve/gdb.c index 0319aaf0a9cd..abdc64a4a75a 100644 --- a/usr.sbin/bhyve/gdb.c +++ b/usr.sbin/bhyve/gdb.c @@ -564,6 +564,28 @@ append_packet_data(const uint8_t *data, size_t len) } } +static void +append_binary_data(const uint8_t *data, size_t len) +{ + uint8_t buf[2]; + + for (; len > 0; data++, len--) { + switch (*data) { + case '}': + case '#': + case '$': + case '*': + buf[0] = 0x7d; + buf[1] = *data ^ 0x20; + append_packet_data(buf, 2); + break; + default: + append_packet_data(data, 1); + break; + } + } +} + static void append_string(const char *str) { @@ -1675,10 +1697,10 @@ gdb_query(const uint8_t *data, size_t len) append_char('l'); } else if (doff + dlen >= xmllen) { append_char('l'); - append_packet_data(xml + doff, xmllen - doff); + append_binary_data(xml + doff, xmllen - doff); } else { append_char('m'); - append_packet_data(xml + doff, dlen); + append_binary_data(xml + doff, dlen); } finish_packet(); (void)munmap(__DECONST(void *, xml), xmllen); From nobody Thu Aug 15 14:44:13 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Wl7DZ0MsXz5SHRx; Thu, 15 Aug 2024 14:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wl7DY6h0sz4QCT; Thu, 15 Aug 2024 14:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723733053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=68gN9Jdy4dxoyb2rtzCdtJfPd+1ZoxK9AywbaCp5vXs=; b=oF87ANERFWYPpQ/FCQQvGG45KUxInFVJRePDMSFfSkPpNoILMUpkqHIReAF+9+HxWGuTkl Xh4nV+WzNe+DPwDcxD8er1ZJoWGvNdUrC9Fdaryyod9qRIYJrr4r8Y2NTtaLGZXq/gsw/E jW8G4Otd11CU621L0CjXH2EVybB1nSimGvIkae2iSwSLFXjNLNTRkbQQZe5aEJcwF7BKe8 IaxK10v3zD3UupHcFt73/1pDIWVlq7SnFm+vU8/CJ1HMvyf4raik+iTRmgYYZwzfflQvV/ MlybOkDDi+EZf9pA7TuGMYmUYL9RWgCxEFHK7JXlCRvKxJzLhih+7CzgCja3pA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723733053; a=rsa-sha256; cv=none; b=ZM39iloF482hMU0aZ1NdKjTbJWCFe/dnmNgR+A5pjSLQAQoK5BJmx2EU0Uwc5S7wAML4UK r2HNoZgDJYK5F2BNFbJ3c5YPL4NGrlssZ0/gMH+psx+dKILUqUKQ+4SLXdVQYCobPw8KIh 1WwWfF1k6xPQ7Fa7gV9kfhWhD2Ncji1Ov5tb4/xX3EJ0hAQJzQCgG/sMJatB/dErPUeO6I lYc5ruBSMxseCjA/DO2rKbpyk5McYr59XF/BQy4Xw/8Wh3ENZF+VK1LcOo08vbp3As+TMQ kN/MteDVg1EknVOxrfruIafJXgy46NhQ40qcJ73U1Nk+E57cWGzgVwdJFS8JaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723733053; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=68gN9Jdy4dxoyb2rtzCdtJfPd+1ZoxK9AywbaCp5vXs=; b=UPE1HdKdX5aJ0ZnJheToQwhGD0HAq6RaGZ75IdIatiMPZo8twu8cQmeDH8wV64jlxBOLTE CMTk0Qletv0OeMQiwiCObHjjtCfPXDIxSpfv8qMztOR1D+VIvreuPkJH0tyNp+bl1iBxNh WAqhMIYEoqXc+nJYRtZtRqnWNWqw6quSMpgqtaj/+FGV1Ygn1L+YDsJwBmcips6YrC5aWl NRyb211M1/ML0bLy1U3AWatQ4w7hcnfEiiq78rRCvdbWTkvEaGQGvxnoE5xc5i7uvSYNRY RBM9JwadS64xvROSNvC1+xtrARP59ivhk2QYrJT3n9pZl/FF8PPid3G7x6vMPQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wl7DY6HKtzRYs; Thu, 15 Aug 2024 14:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47FEiDwh050063; Thu, 15 Aug 2024 14:44:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47FEiDwe050060; Thu, 15 Aug 2024 14:44:13 GMT (envelope-from git) Date: Thu, 15 Aug 2024 14:44:13 GMT Message-Id: <202408151444.47FEiDwe050060@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: b5ce60dffd5d - stable/14 - zdb: Fix printf formatting of a uint64_t List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b5ce60dffd5d50c1d79561e1616c9463d8c081b4 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=b5ce60dffd5d50c1d79561e1616c9463d8c081b4 commit b5ce60dffd5d50c1d79561e1616c9463d8c081b4 Author: Mark Johnston AuthorDate: 2024-07-18 14:52:52 +0000 Commit: Martin Matuska CommitDate: 2024-08-15 14:44:48 +0000 zdb: Fix printf formatting of a uint64_t This fixes the build on 32-bit platforms. Fixes: dc91e7452482 ("zdb: dump ZAP_FLAG_UINT64_KEY ZAPs properly (#16334)") (cherry picked from commit f029f6277996760be4be42148295231af425cc2d) --- sys/contrib/openzfs/cmd/zdb/zdb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/contrib/openzfs/cmd/zdb/zdb.c b/sys/contrib/openzfs/cmd/zdb/zdb.c index 2caa83f5c636..609e2c707b4b 100644 --- a/sys/contrib/openzfs/cmd/zdb/zdb.c +++ b/sys/contrib/openzfs/cmd/zdb/zdb.c @@ -1237,8 +1237,8 @@ dump_zap(objset_t *os, uint64_t object, void *data, size_t size) !!(zap_getflags(zc.zc_zap) & ZAP_FLAG_UINT64_KEY); if (key64) - (void) printf("\t\t0x%010lx = ", - *(uint64_t *)attr.za_name); + (void) printf("\t\t0x%010llx = ", + (u_longlong_t)*(uint64_t *)attr.za_name); else (void) printf("\t\t%s = ", attr.za_name); From nobody Thu Aug 15 19:06:19 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WlF2z6GV0z5ShDK; Thu, 15 Aug 2024 19:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WlF2z4YZXz4qv6; Thu, 15 Aug 2024 19:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723748779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0nXeQQG4uCPfAXpo64kEY3FZCFecXPYT8x5AuvmTOCc=; b=bMaOk0GbAD0k9oL9bVb9d4NSJ3KEFZvLuYrz2YAEoKJ9jMJ/OR+8Jj0VmUxcSK5x0csFK4 LXw+b1Gal9zLfqKVPqeZXbbH7MSrALQxho1vOWFsdrOlUtarUc5bbtvDeoQwKI0FC0nbeH Q52Eyt/aV6VDGvHd3939S+iaLS38Y+ySO8JBu9EZpQ5EzNXMdernpxzjpWdBx0obD8tUNZ X6FxX6I9iyNTWXkvdYOM26TSvtfyDM3U4ZjEMgd0Fv4VBGLfy6CxVJMCJFBD1unBz1OZ5y t/QyF3N7JAVOVksGoGdZfqY2f/n4WFjZg4gOcA49cKSWYEYnSi7rK1bBpR2v/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723748779; a=rsa-sha256; cv=none; b=w0R5Hk7Gm5w0KHX1GCOIkbQZe9wfXCkdokNrH4rGH1LojTiKIYU3mv6/fZXkFqBmwSs8m6 CACBm+zfhNXjifcIZCzjJVXt6VPeJMlNpS8ghtjcs0mHA5ZRUGkWYrDJI7R3ImpH3K75ZX kA4nno25Z93WTnuXiFc28YQnq9d20WgdTxgOv+EpVysUGh1lXxbVGShQH3wrRrJYw74drm 4knZfu/M9nDQ1NTzaVXvZrIszVVTGmytR3x2Ev5URKFRXaHjuSz1i0lamFe3iKJeZ9Kvth W7LHY0Fyvu3yX3LTxYTDZZbVbFudLoKQ1Lxo/zl6745Mui/fGZMN6KfhaTJ5Dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723748779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0nXeQQG4uCPfAXpo64kEY3FZCFecXPYT8x5AuvmTOCc=; b=JopFN/XsIyNQXv1XfmzGFdxkgNY8HsRz8R0czUGq9b09JFVYzwMMFafUCpo5Y/U8J4aKKD rZYdC5npoecgG8bM+g13jXNzXkaIh7RLbFUVVZ9EKucM3Uso3IOt6F2wUnKaSWKxUtIaU+ DypKZ0MG48QTjAH8Gtwoue/RRQt+CLYnXfAEJfUKj3JTfQc+RSslfBq4lErKz71gwGfiU1 rudxikQYA0kFigBxy149hiZ8q+Pb0i2Yb1SJSCm3XidZB42GE0M2Hlxc0RJBhzaDAzHP7O F/3Afa46t7sj8f4fYtfL79Gw/COxV0/7+/ZcRdTGx/bjhmjOaKSOQXwRRs6jRQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WlF2z49mNzbNF; Thu, 15 Aug 2024 19:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47FJ6JgX092154; Thu, 15 Aug 2024 19:06:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47FJ6JBq092151; Thu, 15 Aug 2024 19:06:19 GMT (envelope-from git) Date: Thu, 15 Aug 2024 19:06:19 GMT Message-Id: <202408151906.47FJ6JBq092151@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Stefan =?utf-8?Q?E=C3=9Fer?= Subject: git: e8f52a86ee27 - stable/13 - msdosfs: fix cluster limit when mounting FAT-16 file systems List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e8f52a86ee279a1270e31bc5bad436939e44f555 Auto-Submitted: auto-generated The branch stable/13 has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=e8f52a86ee279a1270e31bc5bad436939e44f555 commit e8f52a86ee279a1270e31bc5bad436939e44f555 Author: Stefan Eßer AuthorDate: 2024-08-09 17:26:27 +0000 Commit: Stefan Eßer CommitDate: 2024-08-15 19:05:50 +0000 msdosfs: fix cluster limit when mounting FAT-16 file systems The maximum cluster number was calculated based on the number of data cluters that fit in the givem partition size and the size of the FAT area. This limit did not take into account that the highest 10 cluster numbers are reserved and must not be used for files. PR: 280347 Reported by: pho@FreeBSD.org (cherry picked from commit 45d4e82bf61f91792142a2b9e2af657dab8500fd) --- sys/fs/msdosfs/msdosfs_vfsops.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index b5392e62b578..4326dc1f0a6d 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -724,7 +724,9 @@ mountmsdosfs(struct vnode *odevvp, struct mount *mp) } } - clusters = (pmp->pm_fatsize / pmp->pm_fatmult) * pmp->pm_fatdiv ; + clusters = (pmp->pm_fatsize / pmp->pm_fatmult) * pmp->pm_fatdiv; + if (clusters >= (CLUST_RSRVD & pmp->pm_fatmask)) + clusters = CLUST_RSRVD & pmp->pm_fatmask; if (pmp->pm_maxcluster >= clusters) { #ifdef MSDOSFS_DEBUG printf("Warning: number of clusters (%ld) exceeds FAT " From nobody Thu Aug 15 19:06:25 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WlF361K4lz5Sh7Y; Thu, 15 Aug 2024 19:06:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WlF356bgrz4rDv; Thu, 15 Aug 2024 19:06:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723748785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ApqpvPYDZ4EpaQ9IbbVZdJYinMxfJkEna2qGgRMHLuo=; b=QH8kKFis/vRMmu0rGW+hVxMH3aa4VaR+RsUGB5IQAImiB9jxjywovt6Etvw40RngdSrpCz MSiUQtkZSRVBy2nGomyqhOGR4rWNgxer+FWiix5a0INLTka7h1MEsYQpymSSVskbMQSVji omofSriqYUdu0hzBBOh1AqzHtqXEcoH0iR4DpiGACuEEl5RMEIerjlYHcBBk7bRLtVvhdP pjsy9Ie7nO2fR7IUKniyp2xFHdwEo/SDaSn+fkbfLQZ4B/yj8GyWwKTYgYydIiZR6HplX8 Tq2tKTnK4f1VMW4B+v8ZW+kkc40Go8N2bJbpS39/ujnNHr/MCH5S/gRFzYetHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723748785; a=rsa-sha256; cv=none; b=GfrvWTCyzTbBS++6L30DG8nic5+YoYRMpWGmnFDdPkJUHLTClgiHRxKWZhA+6HOH8jNjr6 q3s5UAGh4NgDsdu7PgfUeEvz0VyDx493wlSIdfx0i4v3Nekx1SiEPPm0H9clKmujAMv/yC dgAYPQ+4Dfwf9hjkOBQgiUQAJaBrxgm/vlAisTy2ddnfFc/YwqrdflH3KDh954iiiPTWUQ 3Pt4Q9L6uEXqLUg2VCxv0rvpeP55TvjSIJnWOqhEx00SOlMqMf8ZfpK5JhfB9rASywfCEV eFV9iQHikGpa6i1JEeIv2E5aou5mWRBf38dsOwYdhzo6O344AQmhjG+xiJDFng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723748785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ApqpvPYDZ4EpaQ9IbbVZdJYinMxfJkEna2qGgRMHLuo=; b=pAwAlL5+a/bMePmKV7u3QXqttJDuyYdlfyRpb0qZdK6/6cytR6RID6NRumxevuW96xEalM GzZw6q6FjqG38BI5K1SxmbYJP7xsU9PXLoWvP896wo/te/UfPyndV9MY+EmnizwoSGUwtA qPYtDSMGxiSW3U7mMBzij3FpIMTHK/CtIjORRlApHntboEhB2/Uk6vy83pPYhkh7cONkS3 dLJ01LmFupnSF/2eb5PiDRqti4CigGq/oGqHcCGN/G0gmYcc1qp3WlvctpEwok43/1kB72 +6oFJEfUSmEcdmPS2Ltp5s+GwaY1JZTKl4wvlcIxSFK2Ma4yjCMNNbVRbS74cA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WlF356D22zZdY; Thu, 15 Aug 2024 19:06:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47FJ6P1a092323; Thu, 15 Aug 2024 19:06:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47FJ6PrG092321; Thu, 15 Aug 2024 19:06:25 GMT (envelope-from git) Date: Thu, 15 Aug 2024 19:06:25 GMT Message-Id: <202408151906.47FJ6PrG092321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Stefan =?utf-8?Q?E=C3=9Fer?= Subject: git: 8774fa749d4e - stable/14 - msdosfs: fix cluster limit when mounting FAT-16 file systems List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8774fa749d4e6d2726c0ed662a36657782ad0cec Auto-Submitted: auto-generated The branch stable/14 has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=8774fa749d4e6d2726c0ed662a36657782ad0cec commit 8774fa749d4e6d2726c0ed662a36657782ad0cec Author: Stefan Eßer AuthorDate: 2024-08-09 17:26:27 +0000 Commit: Stefan Eßer CommitDate: 2024-08-15 19:05:08 +0000 msdosfs: fix cluster limit when mounting FAT-16 file systems The maximum cluster number was calculated based on the number of data cluters that fit in the givem partition size and the size of the FAT area. This limit did not take into account that the highest 10 cluster numbers are reserved and must not be used for files. PR: 280347 Reported by: pho@FreeBSD.org (cherry picked from commit 45d4e82bf61f91792142a2b9e2af657dab8500fd) --- sys/fs/msdosfs/msdosfs_vfsops.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index 258c701bd300..adcffe45df82 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -722,7 +722,9 @@ mountmsdosfs(struct vnode *odevvp, struct mount *mp) } } - clusters = (pmp->pm_fatsize / pmp->pm_fatmult) * pmp->pm_fatdiv ; + clusters = (pmp->pm_fatsize / pmp->pm_fatmult) * pmp->pm_fatdiv; + if (clusters >= (CLUST_RSRVD & pmp->pm_fatmask)) + clusters = CLUST_RSRVD & pmp->pm_fatmask; if (pmp->pm_maxcluster >= clusters) { #ifdef MSDOSFS_DEBUG printf("Warning: number of clusters (%ld) exceeds FAT " From nobody Thu Aug 15 21:47:13 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WlJcf0glVz5Swy0; Thu, 15 Aug 2024 21:47:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WlJcd6JrDz4CgM; Thu, 15 Aug 2024 21:47:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723758433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RhzWBMYWfLwjjyUtuaD4z64vFSPnDYSxdZ8D+CtrKm4=; b=huvIqLXNAihyTWuG+LUpXgGHR0oSAn32oJnRKscVr2Ya6HY5Ml3VD3I4v1plmo2C6tQNef AMubEXDiG45e5wmi9fokrjKS/2EizvZoWG5V0Ne9qw6syovmoQrAWOEplSzdpjMk+ScVZh pQ5RDhPf6JMa3BNBWT10vs296IUg4hYD+re+fmta2V3/7wnZ1afrgTv2ZY0zeJqdHMb8kD PLz6CIns8iHMNzr26bK3qifa0Ly0FZMsPLrhY8bvIb5FCxU1Ps1gRu+ypWWbNPpZTlFstu OsH/7vBzm+21tob9X0uIFxigbiGZiBbL+rAZeo08XgGTJKzwdW7OCbrFOsZi7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723758433; a=rsa-sha256; cv=none; b=ZAeY5DvHJBDwLipBltt0uqZHxR0FjmElsbrxoeT1N5YjELf5Cp+gTVN81fYSE2QnQvU8/v uVhv4ZMcjOhkBOWMmbJUqprg5Onew5yrZ1xp3ty+fcJRJNXmZ9PPv55Z9Ito5GhNnwsjRM 2MPirNHG6BsFEemeG6SqnK9rdBHIG6FKCZRsLhUPvQcQ8r/XQlHsurQ9TbmJ0RjTOZGUwN BJu+S4JOoZEFT/W0H0voi+Qfi7mnjceNCjM6VD/kz9WpXHx7gOsSRWggHtRg1DsdNQndl3 cnuhRrOwPiPuwPL7Aq6hGL5xb7MB4sciQra5EG+693Ga05jZSfRwt0AYQ+3Cmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723758433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RhzWBMYWfLwjjyUtuaD4z64vFSPnDYSxdZ8D+CtrKm4=; b=ZpPwCeOWdrWMhYUgWZa+NA2alEl9mcmF35uCngfe/razxsMf8qOH6OJkKz86RcpaqIH6I1 3n9dC+PHuwRGzskCPAwjr3lqGLj00L+LE93W2WMNZQnjbDejaaPr6qFwBqXkQz0PGvBxup waCL6tov9MrevHcwwHKGdgzVt1STZUIc54RozqZqv0ODvV9FmsYfdzn7yEmIKRlI5zpR6A X/Nm7txbWEJgltewwtvJC2MjKrm0YsRW3ducMQ9YZKvq0KWlR08QYkYbdidfVx6I3Bq+X/ saXOU90STJ0WjcXi8h6HVovTDoB+ad9150mKTM6LsZe2+5zonfa2zUrIMXwKhA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WlJcd5wDKzgKk; Thu, 15 Aug 2024 21:47:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47FLlDum063503; Thu, 15 Aug 2024 21:47:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47FLlDc3063500; Thu, 15 Aug 2024 21:47:13 GMT (envelope-from git) Date: Thu, 15 Aug 2024 21:47:13 GMT Message-Id: <202408152147.47FLlDc3063500@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Stefan =?utf-8?Q?E=C3=9Fer?= Subject: git: d5c1fa0ec09e - releng/13.4 - msdosfs: fix cluster limit when mounting FAT-16 file systems List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.4 X-Git-Reftype: branch X-Git-Commit: d5c1fa0ec09e34040c9c9941c27e38b583c60d86 Auto-Submitted: auto-generated The branch releng/13.4 has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=d5c1fa0ec09e34040c9c9941c27e38b583c60d86 commit d5c1fa0ec09e34040c9c9941c27e38b583c60d86 Author: Stefan Eßer AuthorDate: 2024-08-09 17:26:27 +0000 Commit: Stefan Eßer CommitDate: 2024-08-15 21:46:57 +0000 msdosfs: fix cluster limit when mounting FAT-16 file systems The maximum cluster number was calculated based on the number of data cluters that fit in the givem partition size and the size of the FAT area. This limit did not take into account that the highest 10 cluster numbers are reserved and must not be used for files. Approved by: re PR: 280347 Reported by: pho@FreeBSD.org (cherry picked from commit 45d4e82bf61f91792142a2b9e2af657dab8500fd) (cherry picked from commit e8f52a86ee279a1270e31bc5bad436939e44f555) --- sys/fs/msdosfs/msdosfs_vfsops.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/fs/msdosfs/msdosfs_vfsops.c b/sys/fs/msdosfs/msdosfs_vfsops.c index b5392e62b578..4326dc1f0a6d 100644 --- a/sys/fs/msdosfs/msdosfs_vfsops.c +++ b/sys/fs/msdosfs/msdosfs_vfsops.c @@ -724,7 +724,9 @@ mountmsdosfs(struct vnode *odevvp, struct mount *mp) } } - clusters = (pmp->pm_fatsize / pmp->pm_fatmult) * pmp->pm_fatdiv ; + clusters = (pmp->pm_fatsize / pmp->pm_fatmult) * pmp->pm_fatdiv; + if (clusters >= (CLUST_RSRVD & pmp->pm_fatmask)) + clusters = CLUST_RSRVD & pmp->pm_fatmask; if (pmp->pm_maxcluster >= clusters) { #ifdef MSDOSFS_DEBUG printf("Warning: number of clusters (%ld) exceeds FAT " From nobody Fri Aug 16 00:05:19 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WlMgz60Fdz5T7wD; Fri, 16 Aug 2024 00:05:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WlMgz5D6nz4Q60; Fri, 16 Aug 2024 00:05:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723766719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q/QKUvmnzXSVo724gVbJdl1rKXlbAghbyuMgw87dBH4=; b=DStEbuKQKoJ76CMm9Nc64J4YTNM5Trge0NLrE1q3iiQWAD93R1bTHhxh93l8SQovWEivEL 7+B3m8DP8yk0R2V4QMVDlYS5pzslKiVkKoWasikNfYWQsyAAO6UhhoMg/Rd/p42EN470sf pnMRNsfNtboU3s6Oxmj/nFbygaVBL8fWjkyiQyK0MbFC5/+tylI+HBzpIw0hMJlUoOn8BZ esfW+6BybLTqwuCTSqS6e+yjPzL1Y4y0SKrOzDbRAFgqo4BhE+FyF9PhcgxqY0qmfosKCC c4hC3Vr63NvGxgO7rbaZWc01x1/bX1H9GGIFPqE0krbbrikz4uMJ6dppHJEt1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723766719; a=rsa-sha256; cv=none; b=XnRI7AB5/9Mp4srXPwv6QyPf8pJu4sdMUkH73xfmmivDFV5nCfBcDsL+eE80eThMQRd7MV fFvEQIwwmD5xG8NJEzVBkEs/nc5hTxYIOScN7SgK8ME2GKwUya6kB5+dFeeLzc1aHxvou/ 6slh85a2zpgAhQqLg3oHvfILZZrvqeO2gi3FoTLH8s9gPF//9i2JNAKY3hfIyyvA1UHGdE +Es8qFAQq2v1JYomv2kseUW2smyPzDZNlUN+jg3cb2FNGvWAj0RF1TmZjs5cfUy4/p42U8 vB8afiNRpQM4KgjekbkS6P3vD37npz7ddbNJs+1Hk1VLeocq0TD3mfnra9bXuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723766719; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q/QKUvmnzXSVo724gVbJdl1rKXlbAghbyuMgw87dBH4=; b=WN/5ZP3DjvZrYBsay6f1UWlpPJd8ONPQwC5Mz4BW4MnSPUbwOCYcJb9PRu+Bcm1qjhEuVs JSMJP7HZpQm3R/knDzka+ln2PnEBOA/THEqJ6uLLuQEoL3EEcsUgNqV4GfiO1XWygRzHfu gI2YUgpWyo1fNCXaLqMF6mGgrKW09oRX6ZO5Bn5q45oUbSCx+h03FtWFVPU/mqFgB5S7kY YSM9ax7rKoQVTJfW1+Ri2/mhGyeJIvC5pARo3n1dYMxbDonHPwl7Za1T9UKLHjTanBSS1U czaQ/gZgnYkWGy0yPn0uBk/CafghD7J3duh+bsNV297GpGMUEZuICisiIeu92w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WlMgz4PZQzkpK; Fri, 16 Aug 2024 00:05:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47G05Jtg000554; Fri, 16 Aug 2024 00:05:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47G05J0e000551; Fri, 16 Aug 2024 00:05:19 GMT (envelope-from git) Date: Fri, 16 Aug 2024 00:05:19 GMT Message-Id: <202408160005.47G05J0e000551@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: abf370e4000a - releng/13.4 - 13.4: Update to BETA3 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.4 X-Git-Reftype: branch X-Git-Commit: abf370e4000ac18ffe338e413464fb87f00791ad Auto-Submitted: auto-generated The branch releng/13.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=abf370e4000ac18ffe338e413464fb87f00791ad commit abf370e4000ac18ffe338e413464fb87f00791ad Author: Colin Percival AuthorDate: 2024-08-16 00:04:43 +0000 Commit: Colin Percival CommitDate: 2024-08-16 00:05:08 +0000 13.4: Update to BETA3 Approved by: re (implicit) Sponsored by: Amazon --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index b145530cc66a..9a74c5f15d09 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="13.4" -BRANCH="BETA2" +BRANCH="BETA3" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Aug 16 17:12:40 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WlpTP1z0dz5TG3g; Fri, 16 Aug 2024 17:12:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WlpTP0rdmz4qSl; Fri, 16 Aug 2024 17:12:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723828361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pgtCP6+5myvnBH8J87eeBRCew6cCpMuo/E6EwG4jgbE=; b=pTXz0p+99cVF9VbiVaFjHOw7Re6QPrKf/URm9nnJcNd/Lt4YcUEq5xjxqcNVrdp6n5mV0D WkXRBbFTu/RckrwU0u3wxHlsKXpiRQAYzLpchJFTag1iJ9prwu/tWek+XlmGR4g+Jz83ZA tiamIfmbBuHj0Ko/utSsAlJgI9eCT16N1fjXf+P7xv/PZxG46nxCevGI9emzurUCXcF+Qm tGxNiEBoPTC1KPDbe3r6JCpzpgQdpQXU1zIxV/7yoe3dvUzueH9VQ/WltwgQxkL7EAp7VD c2E6cSG7Q0bwPLoAPPRj7BsN1pgw1PShWquk5bkSsCscFwOIJpZulT2ty2m+IA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723828361; a=rsa-sha256; cv=none; b=ifysY1W9Q/mjMT7JMakgVXUezt3jskztmY+6m6hDi7B5otevd8DmnYNjp7d2c7LVHwouIw yyCNHy8TCCnhx4B+LCDMrSqEjxkQfqjPSOVMN2XV8Qel3muQ2QO/fKiiuZ3TEmzRgHZkti R1I7T5RCjurd0WRzZlcLq4O7cAgdYsEiJpxQaC4XcjvmKSmQjx0/n3oBft7jHNHVVjBIM6 FfpdW5ksbM+H5NAYcO0uLcnjAiV81pFx87bcfUHwdJow2ZrOEt2Bpc9402SKGsRd1Ou1UK mGKjYyrO7tISRL+HG5I+XaEZSp9xFuOif21BJkJlboVZn71Zdng+zUXGysILew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723828361; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pgtCP6+5myvnBH8J87eeBRCew6cCpMuo/E6EwG4jgbE=; b=CWIB8A4jZ6T7N+AmeZ5xQNXwm+UIcpAVtWC86DV9es8+BWSyjbcHgjEbYG05uc/0TyidDX 1TL4ZTH4H2TR+X1ceRp9iPBkEvw1N18zQ9uyJiamd1iYj7oV6B4hXdHeiaFY7cUn7Hv8/k USohsTvsb9HeTy91ZkDHlFlfxdGQxKplqTGFZ14n7q0PiWjPbHxwLs5Rrpaho98MKeo+tI 5MXHqZhQe1zYdMx52glS/K1MZMDLP1Bgk5BswYWJO2+4DLDUOwNGtR43pAmrabaB60cgFp FsZwxJamWbJGPEjBDVrMxac1gjXD1zNd7drthss129cWmb3+VLErDKArzdaXaA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WlpTP0RFDzFlv; Fri, 16 Aug 2024 17:12:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47GHCeoT049205; Fri, 16 Aug 2024 17:12:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47GHCe3m049202; Fri, 16 Aug 2024 17:12:40 GMT (envelope-from git) Date: Fri, 16 Aug 2024 17:12:40 GMT Message-Id: <202408161712.47GHCe3m049202@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jamie Gritton Subject: git: 1ff3118d72b1 - stable/14 - MFC jail: only chdir to user's home directory when user is specified List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jamie X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1ff3118d72b15fb4c02ee156a5073e3e40528587 Auto-Submitted: auto-generated The branch stable/14 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=1ff3118d72b15fb4c02ee156a5073e3e40528587 commit 1ff3118d72b15fb4c02ee156a5073e3e40528587 Author: Jamie Gritton AuthorDate: 2024-08-12 22:23:28 +0000 Commit: Jamie Gritton CommitDate: 2024-08-16 17:12:24 +0000 MFC jail: only chdir to user's home directory when user is specified jail(8) with the "exec.clean" parameter not only cleans the enviromnent variables before running commands, but also changes to the user's home directory. While this makes sense when auser is specified (via one of the exec.*_user parameters), it leads to all commands being run in the jail's /root directory even in the absence of an explicitly specified user. This can lead to problems when e.g. rc scripts are run from that non-world-readable directory, and run counter to expectations that jail startup is analogous to system startup. Restrict this behvaiour to only users exlicitly specified, either via the command line or jail parameters, but not the implicit root user. While this changes long-stand practice, it's the more intuitive action. jexec(8) has the same problem, and the same fix. PR: 277210 Reported by: johannes.kunde at gmail Differential Revision: https://reviews.freebsd.org/D46226 (cherry picked from commit 5cf705491727dd963485f9911ee3d52c3bf148db) --- usr.sbin/jail/command.c | 2 +- usr.sbin/jail/jail.8 | 7 ++++++- usr.sbin/jexec/jexec.8 | 7 ++++++- usr.sbin/jexec/jexec.c | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/usr.sbin/jail/command.c b/usr.sbin/jail/command.c index 9eabcc5ff53c..9004b4729fec 100644 --- a/usr.sbin/jail/command.c +++ b/usr.sbin/jail/command.c @@ -764,7 +764,7 @@ run_command(struct cfjail *j) setenv("HOME", pwd->pw_dir, 1); setenv("SHELL", *pwd->pw_shell ? pwd->pw_shell : _PATH_BSHELL, 1); - if (clean && chdir(pwd->pw_dir) < 0) { + if (clean && username && chdir(pwd->pw_dir) < 0) { jail_warnx(j, "chdir %s: %s", pwd->pw_dir, strerror(errno)); exit(1); diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8 index 3a6e46b065b2..75a0b86eed4c 100644 --- a/usr.sbin/jail/jail.8 +++ b/usr.sbin/jail/jail.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd June 24, 2024 +.Dd August 12, 2024 .Dt JAIL 8 .Os .Sh NAME @@ -847,8 +847,13 @@ are set to the target login's default values. is set to the target login. .Ev TERM is imported from the current environment. +.Ev PATH +is set to "/bin:/usr/bin". The environment variables from the login class capability database for the target login are also set. +If a user is specified (as with +.Va exec.jail_user ) , +commands are run from that (possibly jailed) user's directory. .It Va exec.jail_user The user to run commands as, when running in the jail environment. The default is to run the commands as the current user. diff --git a/usr.sbin/jexec/jexec.8 b/usr.sbin/jexec/jexec.8 index 4400cbbe56a3..431978c4d0ae 100644 --- a/usr.sbin/jexec/jexec.8 +++ b/usr.sbin/jexec/jexec.8 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd October 7, 2023 +.Dd August 12, 2024 .Dt JEXEC 8 .Os .Sh NAME @@ -55,6 +55,11 @@ The environment is discarded except for and anything from the login class capability database for the user. .Ev PATH is set to "/bin:/usr/bin". +If a user is specified (via +.Fl u +or +.Fl U ) , +commands are run from that (possibly jailed) user's directory. .It Fl u Ar username The user name from host environment as whom the .Ar command diff --git a/usr.sbin/jexec/jexec.c b/usr.sbin/jexec/jexec.c index 7a32efa34031..35fd9c8d20e4 100644 --- a/usr.sbin/jexec/jexec.c +++ b/usr.sbin/jexec/jexec.c @@ -129,7 +129,7 @@ main(int argc, char *argv[]) setenv("HOME", pwd->pw_dir, 1); setenv("SHELL", *pwd->pw_shell ? pwd->pw_shell : _PATH_BSHELL, 1); - if (clean && chdir(pwd->pw_dir) < 0) + if (clean && username && chdir(pwd->pw_dir) < 0) err(1, "chdir: %s", pwd->pw_dir); endpwent(); }