From nobody Mon Feb 19 05:19:11 2024 X-Original-To: dev-commits-src-main@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 4TdW6m08YLz59c8R; Mon, 19 Feb 2024 05:19:12 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TdW6l6Zttz54sS; Mon, 19 Feb 2024 05:19:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708319951; 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=gi0j2JXI2hDIbk388Ng63oHeTMRCnLYq1sxB0ojCMlo=; b=dKb+jR+YtBoDifSNoZPokU+j4AXl78ezYDHCEFMAmq35mf4myXhbdNNLQfDLRdouV6nP8i hGUutcpu531nSup1xGQSk08MffmLdBbtFHNOBqv84xni4uK6Mp7NteHSze6/m2kxR7h1zP Js31HwG+tasKkei0zTp9+SCg4I8kEfDmXhKj7ErKu5EoHD5UGQDMCtf8sdu/laz8AIvsmu 4Nl+4XCdpSwRxNhUz3gTHKzgE5qGDR5GSj0ljp6jjxoKv5MQz3NkT6FEBaLU63rmNJoWj2 ceiEM9kwhWj5+wFGIFmGDxv7PvBMX5c2/W1bSnM2UqpNokt/H5hJ5fP8JAgOGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708319951; 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=gi0j2JXI2hDIbk388Ng63oHeTMRCnLYq1sxB0ojCMlo=; b=upaGnJHOu8aL742/J3oup3JODe76EhaEmofITFZDwFoj+xfHOy2TzglIFtChKSmcKeWKwK o7GfZGYH1JYa8q5ViGNt88ovIaqP+jw6fN3JNPO+mFJB5bZ+B1YN4H2P5MitRkq+57puyt LC8TIjF/Ub0ji58BOFji/ez5fhCHtEy0oIkqEfyVGNGh6QVWUGdpISfoKmgf1bxi9y2mcw Vgu/yvTx/rUBIa19PVfoYljN0v5kvFRhS7g1iGFwXshBlxDFvvsU3/QittWsIsNDXf+84v T/whYwOfXm7sNFamGdYIthHBCgRyDvO7DqQ8ffHxaIVHHR0hIjOfxWbjdAbynA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708319951; a=rsa-sha256; cv=none; b=guhLEAd3RDzpxRrG5b8enaPcU8JC9K78OO+399IDcs7ngRXBmT+GIdwnysFQgOhReKbJD3 J2eCG9NvcB8Tr2blEhM+dzDYiOXqx/27kzuo4rv8gcbStQxFNwz0mxbbe1HWCP524FHRR7 CovkiwCZjbaewK8WbYT75QLhwr9t1Hf0bluJ4/80wZeNBSom4+lWz1a2ZWfT5FK3Yznpig qX7Sa1BP7XzhWjq8QrEiScrzkUQmlphaWeUbGVkyFw/xQia2+rrVmlMLGU+TRlmhdp3nIr nRPaMWj/BspugqZ3+HLaMtNVvoVotNQEQK8mtsTb8im7r94kdXOnVXGJ4raShw== 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 4TdW6l5b1VzM9w; Mon, 19 Feb 2024 05:19:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41J5JBja028920; Mon, 19 Feb 2024 05:19:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41J5JBrO028917; Mon, 19 Feb 2024 05:19:11 GMT (envelope-from git) Date: Mon, 19 Feb 2024 05:19:11 GMT Message-Id: <202402190519.41J5JBrO028917@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: a6cef617660a - main - ada: Another NCQ Trim instability drive List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: a6cef617660a424fcaa8343787f96d0ae720a284 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a6cef617660a424fcaa8343787f96d0ae720a284 commit a6cef617660a424fcaa8343787f96d0ae720a284 Author: Warner Losh AuthorDate: 2024-02-19 05:10:55 +0000 Commit: Warner Losh CommitDate: 2024-02-19 05:18:38 +0000 ada: Another NCQ Trim instability drive The Seagate IronWolf 110 SATA SSD drive has been reported to be unstable with NCQ trim enabled. PR: 264139 Sponsored by: Netflix --- sys/cam/ata/ata_da.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index ba02f33082b0..f5d3aeca9329 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -813,6 +813,11 @@ static struct ada_quirk_entry ada_quirk_table[] = { T_DIRECT, SIP_MEDIA_FIXED, "*", "WDC WDS?????G0*", "*" }, /*quirks*/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN }, + { + /* Seagate IronWolf 110 SATA SSD NCQ Trim is unstable */ + { T_DIRECT, SIP_MEDIA_FIXED, "*", "ZA*NM*", "*" }, + /*quirks*/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN + }, { /* Default */ { From nobody Mon Feb 19 07:52:47 2024 X-Original-To: dev-commits-src-main@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 4TdZX00Jm8z5B0x1; Mon, 19 Feb 2024 07:52:48 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TdZWz6yJcz4GDc; Mon, 19 Feb 2024 07:52:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708329168; 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=4NxnXhizWRY1FEoyHff1ZAWvdbigMjwEU8pPhTB7LNc=; b=D8ytJV7+7B+LxCJ+H4XqURQOFx+bjrrN9GHfU+MaUuvIU8pZ1ouYIP5sa4s/V9yH6xRnLr G3HeJyVTiQfc4ySt+0aCdNT9wgV67QWHS6OgzWOeghsmNFfsJ+K4FMu3FzlcPIwvKBXKhS B1qlShqEI2GnHZbH+0XzAq4awN1frKtA2/esN/p/plsdbtXeJ9Hm7gs/60SnEgjuofuqj0 QoUPdyOqsFOkzDnpwlVHjWOVhvQJT/pQk3Ha4FIO55wKxOhcm75WQuzKE0zBo5AuQ8/Qy/ kW1o56XQc7Q5+esekYEClPN8gKvzd2nnaD/y32UEo62Afw3DrbOHydVLD4Pq9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708329168; 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=4NxnXhizWRY1FEoyHff1ZAWvdbigMjwEU8pPhTB7LNc=; b=REQynZNVM1e3x9ayUsZLdBaeilupbSHAnMUmk9TB9+uA0uFnA+vNXvNVBHG5OFS3+OdPf7 lZlGg41IP8eZ1ZEtfQdlOrniu89tIzA7Dg/dB3uZBIL9nimtrnjWRWLfz3SXWhYY7J1aiV O6HMt/3FHpehMOOu7X0Y6n2yU3oxfEg3mHAsN/Bun2T3awWqZYwdGVVdDUaualBuHc3IoG jlrAX+QCHfvynR6msdg+jzMQyxI5w0bHsR/4JXx7sGnNQ1mdGX+Xk/EC2c3LEcIFKtikL0 0ZaWZ9onm1w041OYNPyfTeLauQQEVl8bDqUBUpGAZdIcuFasIZWs6o4rNOgwxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708329168; a=rsa-sha256; cv=none; b=JdDAP5M2JqRrlBvEDebiAMRajLMzfa6/n1uI71biJ6y/VNqPfR4EGIZQ7Bvut2A5kM93D1 0sb2Vv0jkfObQgi8aPXM3ky2pP3Qi9cHgMV1GP/d+dG0MSJvs+Oqr409qR/sJI4wPcitnE xCOGI9X6VXYJ+zmwWlwrMcrFt8XFRRQcFfwNDAESxQ0PJaoG13hn0WOnsMdYKd2hd3AaBM hamfLnuy2955CoEJaBjybfXXTP0CqR7YKugp23hFEepTl97J1yOoME/y26PLE0SL9tAQjM GK47h4d1GpliAM+onRX53tlC+qQQhdTay+SMAWOTeNXjLu4t5zBZGDeBORgDDQ== 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 4TdZWz60s1zQj5; Mon, 19 Feb 2024 07:52:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41J7qlSm096842; Mon, 19 Feb 2024 07:52:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41J7qlxV096839; Mon, 19 Feb 2024 07:52:47 GMT (envelope-from git) Date: Mon, 19 Feb 2024 07:52:47 GMT Message-Id: <202402190752.41J7qlxV096839@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Andrey V. Elsukov" Subject: git: 03cc3489a02d - main - ndp(8): increase buffer size in rtsock mode List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ae X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03cc3489a02da0eba3b2737210486723d1072b21 Auto-Submitted: auto-generated The branch main has been updated by ae: URL: https://cgit.FreeBSD.org/src/commit/?id=03cc3489a02da0eba3b2737210486723d1072b21 commit 03cc3489a02da0eba3b2737210486723d1072b21 Author: Boris Lytochkin AuthorDate: 2024-02-19 07:44:52 +0000 Commit: Andrey V. Elsukov CommitDate: 2024-02-19 07:44:52 +0000 ndp(8): increase buffer size in rtsock mode On a router with many connected devices (~10k+) `ndp -an` can fail with ENOMEM because of some additional NDP records were added between sysctl() buffer size estimate and data fetch calls. Allocate more space based on size estimate: 1/64 (~2%) of additional space, but not less that 4 m_rtmsg structures. Obtained from: Yandex LLC MFC after: 2 weeks Sponsored by: Yandex LLC Differential Revision: https://reviews.freebsd.org/D43956 --- usr.sbin/ndp/ndp.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/usr.sbin/ndp/ndp.c b/usr.sbin/ndp/ndp.c index 9ade2469742e..9d9ae02dc1e2 100644 --- a/usr.sbin/ndp/ndp.c +++ b/usr.sbin/ndp/ndp.c @@ -652,6 +652,12 @@ again:; if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0) xo_err(1, "sysctl(PF_ROUTE estimate)"); if (needed > 0) { + /* + * Add ~2% additional space in case some records + * will appear between sysctl() calls. + * Round it up so it can fit 4 additional messages at least. + */ + needed += ((needed >> 6) | (sizeof(m_rtmsg) * 4)); if ((buf = malloc(needed)) == NULL) xo_err(1, "malloc"); if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) From nobody Mon Feb 19 10:09:02 2024 X-Original-To: dev-commits-src-main@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 4TddYB4tKtz5BLVs; Mon, 19 Feb 2024 10:09:02 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TddYB31rmz4hf1; Mon, 19 Feb 2024 10:09:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708337342; 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=8jVmV0wRGX/ULl+4Gu6t81AFpqd67D6AoONukSYV1Uc=; b=EHzrHSWySb85nl2N+sptEmItESzCSX7Dsn0G2otrLHG/kDroibFvi9ZJEY3j+5Ul92RQCR 3jq5+t1o2gQaKIHu11uuqgtrk3vcwAf4An18xDtUbiZK2/OL/Y7Xc1stW/eNSeJCaFt1rd cvfZ0U7dZxF3cPju6bGKhTdETnIwGaefMnIg5+QvH8JANHyQDmrL6jYKL8aYOtSzvvfUjH cunz3w1TNMdcmczmJAXuxSmpm63yZB2G7pMFh8JJyhSm6vH+fyzY3yQTEz/pfx27LxuRVz HhFnh2JkAo0gm6bHW2lGTe2HK2GHX5NcY3X/GPsmzIWZW6uBwkckB16HDR9nrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708337342; 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=8jVmV0wRGX/ULl+4Gu6t81AFpqd67D6AoONukSYV1Uc=; b=rJKPKk/FOlxj/fshfnGag7gDcBwQWgMYMWx8PYSXVJRWAuLiGxd79wmF/KPevdaDEr61S/ IvQgorZPermJDMkk/XiWSJjYw947toWCUm5AFa1euIFW6adjEs8VZgp5i02k73N8Oy9PMy Gx91A53rBo6yPd4YxU/CMmHVGRAJkc27hAIXFMYyxdMxMSwR8z2tkClLHi0/OT69UPwdkO nhgebQFTg16TEUy0fOkPET2GMTUhPScL/1ltOmp+LAbvhO/L+c6eCMXmAZt1a74i9gngkH 3cKMUHC8gOFbBHr6RgnK2X0fhblfJxCg30ud5Vu0X5yUvQPTjHlHvydL7+IP1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708337342; a=rsa-sha256; cv=none; b=o5f7dGqoWdMJb/pnWzd7EQ8xlJ+Irk6QFDJASQf/ApkHw0SdpGTGyuu18nRfjYtv3pL/zZ aZmpHHr00cLj6YlpSzWOJ9B/AAWvdJZt1+tXnhdOJrFEJ/j2wpJDfCv6kLnfzXIhAblzL5 vjzRR09afa6mI3MwAz+7BzC7x0cpLiH9h9YortFRr6Hk69N+8l5f8XIiicBVIbrJ2GhCpj RhFvKISfN2f0KCdM4gNzd/JvAPx6ccI46EtqWB/qbwcpCvmezh2fcPZMse5Rtq74Ra9hyD B0g3ffA9Ctcqc8Cb5DS7wWTpFrA5Q9cd9eYNHhX9BE80pu5Kxo7cgAViH5QWBg== 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 4TddYB25xkzV95; Mon, 19 Feb 2024 10:09:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41JA92XR018708; Mon, 19 Feb 2024 10:09:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JA925j018706; Mon, 19 Feb 2024 10:09:02 GMT (envelope-from git) Date: Mon, 19 Feb 2024 10:09:02 GMT Message-Id: <202402191009.41JA925j018706@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: c01af41c3c8f - main - ata_da: add quirk to disable NCQ TRIM for Samsung 860/870 SSDs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c01af41c3c8fdd570764ff9b6bfbad6ac9ca1664 Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=c01af41c3c8fdd570764ff9b6bfbad6ac9ca1664 commit c01af41c3c8fdd570764ff9b6bfbad6ac9ca1664 Author: Andriy Gapon AuthorDate: 2024-02-19 10:08:12 +0000 Commit: Andriy Gapon CommitDate: 2024-02-19 10:08:12 +0000 ata_da: add quirk to disable NCQ TRIM for Samsung 860/870 SSDs NCQ TRIM for Samsung 860/870 SSDs results in data corruption on systems with some SATA controllers. This can be easily reproduced using ZFS which uses TRIM and is able to detect block content changes. Linux bug report for this issue: https://bugzilla.kernel.org/show_bug.cgi?id=201693 Since at present we can not limit a quirk based on the contorller / SIM, apply the quirk in all cases. Reviewed by: imp MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43961 --- sys/cam/ata/ata_da.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c index f5d3aeca9329..d4a591943307 100644 --- a/sys/cam/ata/ata_da.c +++ b/sys/cam/ata/ata_da.c @@ -727,6 +727,22 @@ static struct ada_quirk_entry ada_quirk_table[] = { T_DIRECT, SIP_MEDIA_FIXED, "*", "Samsung SSD 850*", "*" }, /*quirks*/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN }, + { + /* + * Samsung 860 SSDs + * 4k optimised, NCQ TRIM broken (normal TRIM fine) + */ + { T_DIRECT, SIP_MEDIA_FIXED, "*", "Samsung SSD 860*", "*" }, + /*quirks*/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN + }, + { + /* + * Samsung 870 SSDs + * 4k optimised, NCQ TRIM broken (normal TRIM fine) + */ + { T_DIRECT, SIP_MEDIA_FIXED, "*", "Samsung SSD 870*", "*" }, + /*quirks*/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN + }, { /* * Samsung SM863 Series SSDs (MZ7KM*) From nobody Mon Feb 19 10:27:35 2024 X-Original-To: dev-commits-src-main@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 4Tddyc1MZZz5BNvN; Mon, 19 Feb 2024 10:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tddyc0RQkz4kW7; Mon, 19 Feb 2024 10:27:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708338456; 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=bkmo+vPpuO421DgvS68IQxxmW1yLqfFhmmIK9Fd9pdY=; b=froziOJArgthv9KRuToIg/AonvG9JvbBsgbPHHCPkbC1JGaNDdukLi+GTw2oslF3+Dt6e9 10CllK3v03/RbXre0cOA74e324Log8IfDXNp1VclPb4ik5Ws/wYVmnsAP2yPVTIdfnhECO 4QdAekn7eTn9LTjvA9Sntwwo+EOakHajiT7PLcvje8M/tYadQYtMOMdfoiPzeol3B6FMPG CxcJpkghpqQTI+cBCP3szoj+jvd+TzN7eZvfwJQuL7WSkLmrJUnhZGXAm5sh1QD2NOukG/ cZl4iZKg0GIPBBEJmw+ke2bc5lUrefs74h4RL9E5MCkpjRwo4tUqZtvAM2AMMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708338456; 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=bkmo+vPpuO421DgvS68IQxxmW1yLqfFhmmIK9Fd9pdY=; b=Tlp4BT3iRWawTQNf0da3q6FsDWnyQB/56ZOAv9clzvL061vnG1yQwmEqGTcdPo9VAH780k TNALjcVAxJeXHrn3RqotEM2KBxcT7ZS0TaVNoFUJC9nbFoufF4+MCuX6Itsi0IQ5jqPKRs pn2F++hBBmWelKI7pRHkD4y0k2VoxAc96pmWh/Ygk7NKFW2RmBFV1TmsbfIci4VsoF81Is /2pGei7OGqhkv8Dczg9bvtKQw6G59hOrFYzCuCk8eo5uVjGRnnOXZ3VAmy8/CWLLq58EsM +7fRqArPEXTjiq6LXArJM6jMNvaZPbtmmm9UWaTBEmknyKfKS9WfVi9B9/BG5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708338456; a=rsa-sha256; cv=none; b=oqxmYuYEj0pzSyNklgz98UQp4WrNmzYCc1Kf+WLYiGQ3fZmmcfoXZjYoy5JZEj8Ns14rlG u/mcFccWGu8G/ZrDvusRYWJrvIDR3KS8LL7g9kmDaNNV5Rwe2YTBrubeMsxCRnsk1W/yBf quMt/Ap4fl+qKM1qF0TSHgaujCHgsTr4HbD/hTO03ZwHpDWufCPrjpkJiBwHYQ3vFlkvqR uP6wndMtyO9vTifPgUxSSX7VV2kQvrw68VS1ruxJbv7FNs8P1sLCLJveJZ9IgTFcOQrC6H Ubd891Hhnz2D4BCi/ULGP4HQCQvC/CmF8fDVzRhU0mXW2VgiO/qo9geHYudyfA== 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 4Tddyb6bl9zWwH; Mon, 19 Feb 2024 10:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41JARZ5W052312; Mon, 19 Feb 2024 10:27:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JARZST052309; Mon, 19 Feb 2024 10:27:35 GMT (envelope-from git) Date: Mon, 19 Feb 2024 10:27:35 GMT Message-Id: <202402191027.41JARZST052309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: b7dce5b8e988 - main - scsi_da: add 4K quirks for Samsung SSD 860 and 870 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b7dce5b8e988f47784c55aa096541deda7b1aaeb Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=b7dce5b8e988f47784c55aa096541deda7b1aaeb commit b7dce5b8e988f47784c55aa096541deda7b1aaeb Author: Andriy Gapon AuthorDate: 2024-02-19 10:16:47 +0000 Commit: Andriy Gapon CommitDate: 2024-02-19 10:16:47 +0000 scsi_da: add 4K quirks for Samsung SSD 860 and 870 Although the actual flash page size is either 8K or 16K for those devices (according to different sources of various reliability), they seem to be optimized for the "industry-standard" emulated 4K block size. To do: consolidate very similar Samsung SSD entries for 830 - 870 models. MFC after: 2 weeks --- sys/cam/scsi/scsi_da.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sys/cam/scsi/scsi_da.c b/sys/cam/scsi/scsi_da.c index d578e4ccb712..9b3d706d6168 100644 --- a/sys/cam/scsi/scsi_da.c +++ b/sys/cam/scsi/scsi_da.c @@ -1395,6 +1395,22 @@ static struct da_quirk_entry da_quirk_table[] = { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Samsung SSD 850*", "*" }, /*quirks*/DA_Q_4K }, + { + /* + * Samsung 860 SSDs + * 4k optimised & trim only works in 4k requests + 4k aligned + */ + { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Samsung SSD 860*", "*" }, + /*quirks*/DA_Q_4K + }, + { + /* + * Samsung 870 SSDs + * 4k optimised & trim only works in 4k requests + 4k aligned + */ + { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Samsung SSD 870*", "*" }, + /*quirks*/DA_Q_4K + }, { /* * Samsung 843T Series SSDs (MZ7WD*) From nobody Mon Feb 19 10:44:44 2024 X-Original-To: dev-commits-src-main@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 4TdfLN5j9Rz5BQqw; Mon, 19 Feb 2024 10:44:44 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TdfLN4zBXz4lpc; Mon, 19 Feb 2024 10:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708339484; 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=Y8dJh06/2cfJxCRZWC2AzvfvRzMEFfTBPxcp8wiKguM=; b=L+pkHUfc3VDUeAew5PEN3GJYhDy/dH5jcMp2KgB0qWlYRfxbo58acdBnexbCNAPxIw3O7g TJKtBqDznJPl6EhU63xZG3EU5msmIQyBEMXfAbK9aJlrQsjJjdLzI4oaUInDRpo1Em7uN4 X3HIRB0QuG4bq15SxUAXlZrSKUxHEaEXhFMoyfdXjU2xIeWC4NVo856oaQ5O629L+s+AT3 eKEJvmqMdS0klnCUyZd/7hbsPvKoJeHga67Kge9YoXl0+a3sVT/QaVfDWnUuZAtufJ2EFz FrbwpiXE5gVa5ae8CTdvU/S2cLSn78rbOCfSjgjC+L01nRkUFUTJ8d3w+P10Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708339484; 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=Y8dJh06/2cfJxCRZWC2AzvfvRzMEFfTBPxcp8wiKguM=; b=balIZuj6XoS5GBpqR/uxkdoc6T0rA7QvZ6b8kj0pnm+UuOxDADAcILTMz0vXt22oVNJtUz u49lk/E5hL6GmOYLo+v1lcVqlOdoCImac+DgVoLQLjZnGdW75XM7PnIAyH2g0r3WMvKDlQ fQXHFP99fTSzt5TaJceH5lifP6E/Ux4pRtZMglJH46PyEYb60Uyjdpy8Y7b9Xhg6mSRIcv 8ldVwBeyPHVocli6t4WQ2cg2akkx+lcJ99oG0F5W2i5fttPH3IxCNJ01bMItZMeWoxG5G+ tBxlGmVe8G+J3nIx466goevocxKkswx45j9zLhhRXAnRFNeSY2+h8d7OPaFRZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708339484; a=rsa-sha256; cv=none; b=to0kFA1ZmGJ0QU5EY/qH4PBd6YOTz0XFQc5UAU2SfwVKyMDME9OLOpYIWiZl6Sj2z9K9Lo tByxQXcgq43EPDwvf4HzJ0oGq+89icm8LMp1lNt9UTWCa8bovS28YAh8MEHPIyBBcBwqep fIgdGVLUon15syZ9+/BmOXZSweXBMeqnfvWasG+ShD7lZ1QBn08HinCR4Fix0YH8firi+M 3hwaM07I1TrZa3FYa6OX5B82FMhqsoSeG9AoneyNkUECwZp1x1ADEJgG/+qFv8Z8hyUZQL ZH/TXhHec9ymLvFbnCl3zJpkuEo2pd8jj9Zbfi6ipXfhWKm0fUw6//s8Eh++UA== 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 4TdfLN41kHzXR8; Mon, 19 Feb 2024 10:44:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41JAii7w085538; Mon, 19 Feb 2024 10:44:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JAiiAD085535; Mon, 19 Feb 2024 10:44:44 GMT (envelope-from git) Date: Mon, 19 Feb 2024 10:44:44 GMT Message-Id: <202402191044.41JAiiAD085535@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andriy Gapon Subject: git: 8f374fa528d7 - main - ugen: fix USB_IFACE_DRIVER_ACTIVE after detaching a driver List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: avg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f374fa528d7643919bca1b4153dde03996305fe Auto-Submitted: auto-generated The branch main has been updated by avg: URL: https://cgit.FreeBSD.org/src/commit/?id=8f374fa528d7643919bca1b4153dde03996305fe commit 8f374fa528d7643919bca1b4153dde03996305fe Author: Andriy Gapon AuthorDate: 2024-02-19 10:44:00 +0000 Commit: Andriy Gapon CommitDate: 2024-02-19 10:44:00 +0000 ugen: fix USB_IFACE_DRIVER_ACTIVE after detaching a driver Previosuly, USB_IFACE_DRIVER_ACTIVE would report that the driver is active even after it detached. That's because a device(9) still remains. So, add device_is_alive(9) check for more accurate reporting. Reviewed by: markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D43960 --- sys/dev/usb/usb_generic.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/dev/usb/usb_generic.c b/sys/dev/usb/usb_generic.c index d8bc3a828282..c0af27d77e5d 100644 --- a/sys/dev/usb/usb_generic.c +++ b/sys/dev/usb/usb_generic.c @@ -2377,12 +2377,10 @@ ugen_ioctl_post(struct usb_fifo *f, u_long cmd, void *addr, int fflags) break; case USB_IFACE_DRIVER_ACTIVE: - n = *u.pint & 0xFF; - iface = usbd_get_iface(f->udev, n); - - if (iface && iface->subdev) + if (iface != NULL && iface->subdev != NULL && + device_is_alive(iface->subdev)) error = 0; else error = ENXIO; From nobody Mon Feb 19 10:44:39 2024 X-Original-To: dev-commits-src-main@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 4TdfLf654Gz5BQlv for ; Mon, 19 Feb 2024 10:44:58 +0000 (UTC) (envelope-from bT.kezu4kmf30=81c2qhn7wp41=yx3ehig6m6@em790814.fubar.geek.nz) Received: from e2i197.smtp2go.com (e2i197.smtp2go.com [103.2.140.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4TdfLf38MQz4mFP for ; Mon, 19 Feb 2024 10:44:58 +0000 (UTC) (envelope-from bT.kezu4kmf30=81c2qhn7wp41=yx3ehig6m6@em790814.fubar.geek.nz) Authentication-Results: mx1.freebsd.org; dkim=none ("invalid DKIM record") header.d=smtpservice.net header.s=mgy720.a1-4.dyn header.b=d133WGMq; dkim=pass header.d=fubar.geek.nz header.s=s790814 header.b=Q11ZWv22; spf=pass (mx1.freebsd.org: domain of "bT.kezu4kmf30=81c2qhn7wp41=yx3ehig6m6@em790814.fubar.geek.nz" designates 103.2.140.197 as permitted sender) smtp.mailfrom="bT.kezu4kmf30=81c2qhn7wp41=yx3ehig6m6@em790814.fubar.geek.nz"; dmarc=pass (policy=none) header.from=fubar.geek.nz DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=smtpservice.net; s=mgy720.a1-4.dyn; x=1708340398; h=Feedback-ID: X-Smtpcorp-Track:To:Message-Id:Date:From:Subject:Reply-To:Sender: List-Unsubscribe; bh=HT2KVKgzwjoqf4qj0uuhH3h7UlqtC7zCEbV0Mz6T8Z4=; b=d133WGMq rKBe870UF9zlnbBCa3nXZufDJErdjwYyp/yNJlEpuJIW2Dews5g4UMTHrEVLOMR74uUZyxYG9Qgbg UFSdgbnkVQajCyt0c1uXmD35awgMdm4YF39CkwGcexVysNA7HgPjPwGmkxFWPYCTlNzmVF8gNDZmf 0moOL2F/FlLSRNjGrsgx3ZBuC3q6vJaVnj3XVt0tOao4zen1qWNQJbTOPDBBx5qyUXnXE5pX3koxI DUae40ruS+/j1yDgZ4+5h+Oa0N0o/xESbIMsxeJsHnYPrvEQ0IEQlfwWJZgH1fDxJ/+ndg8G51L1I Xm5/0Vi618qj4a9ywtBn7dDDDw==; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fubar.geek.nz; i=@fubar.geek.nz; q=dns/txt; s=s790814; t=1708339498; h=from : subject : to : message-id : date; bh=HT2KVKgzwjoqf4qj0uuhH3h7UlqtC7zCEbV0Mz6T8Z4=; b=Q11ZWv22kV7veaY7yuh01odIEMTMC3G0FNt0+rFrfpkuOgeEc6TtlUCA/s3KOflc4LorB RnVwTk4rjbtGPHflg9mVIFcJ4hajmShfsOSPeuvCNTJh8wZujH9JenMAIrW2yrmZ4eNf9ZP 07yd20zHhBAKYqd1BGrlAf8o23kMH41IcnI3527h1aOjUqOTl0Qj4WbVWhVTRJVEduH2fWO 79XyYoDxxUdh7AIaCuocPBePSLt69V9xGSWhqDJ2FxfCffrKRx1iv2mreEQ1ZBkWpPKil1c 7PFQUqDoM0o6mGM6WtMymQU1N/38LCA8BH1v0lggfVxWNeK/KXxaR+EqjakQ== Received: from [10.139.162.187] (helo=SmtpCorp) by smtpcorp.com with esmtpsa (TLS1.3:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94.2-S2G) (envelope-from ) id 1rc18k-Y8PLYt-T0; Mon, 19 Feb 2024 10:44:50 +0000 Received: from [10.99.243.232] (helo=morbo.fubar.geek.nz) by smtpcorp.com with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.96.1-S2G) (envelope-from ) id 1rc18k-4XlQf7-2E; Mon, 19 Feb 2024 10:44:50 +0000 Received: from smtpclient.apple (92.40.184.195.threembb.co.uk [92.40.184.195]) by morbo.fubar.geek.nz (Postfix) with ESMTPSA id 304233962E; Mon, 19 Feb 2024 10:44:50 +0000 (UTC) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.100.2.1.4\)) Subject: Re: git: 5bda26333a8e - main - gpiobus: Use bus_generic_rman_* From: Andrew Turner In-Reply-To: <202402142252.41EMqcLK086071@gitrepo.freebsd.org> Date: Mon, 19 Feb 2024 10:44:39 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202402142252.41EMqcLK086071@gitrepo.freebsd.org> To: John Baldwin X-Mailer: Apple Mail (2.3774.100.2.1.4) X-Smtpcorp-Track: 1rc18k4b_Qf72E.0AEg3yj8XSDK- Feedback-ID: 790814m:790814amQcrys:790814sCmxiK80xC X-Report-Abuse: Please forward a copy of this message, including all headers, to X-Rspamd-Queue-Id: 4TdfLf38MQz4mFP X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.88 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.98)[-0.978]; DMARC_POLICY_ALLOW(-0.50)[fubar.geek.nz,none]; MV_CASE(0.50)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; FORGED_SENDER(0.30)[andrew@fubar.geek.nz,bT.kezu4kmf30=81c2qhn7wp41=yx3ehig6m6@em790814.fubar.geek.nz]; R_SPF_ALLOW(-0.20)[+ip4:103.2.140.0/22:c]; R_DKIM_ALLOW(-0.20)[fubar.geek.nz:s=s790814]; RCVD_IN_DNSWL_MED(-0.20)[103.2.140.197:from]; MIME_GOOD(-0.10)[text/plain]; DKIM_TRACE(0.00)[smtpservice.net:~,fubar.geek.nz:+]; RCVD_COUNT_THREE(0.00)[3]; ARC_NA(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; R_DKIM_PERMFAIL(0.00)[smtpservice.net:s=mgy720.a1-4.dyn]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_MIXED(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@FreeBSD.org]; RCPT_COUNT_THREE(0.00)[4]; FROM_NEQ_ENVFROM(0.00)[andrew@fubar.geek.nz,bT.kezu4kmf30=81c2qhn7wp41=yx3ehig6m6@em790814.fubar.geek.nz]; ASN(0.00)[asn:23352, ipnet:103.2.140.0/22, country:US]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[] > On 14 Feb 2024, at 22:52, John Baldwin wrote: >=20 > The branch main has been updated by jhb: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D5bda26333a8ebf34190e3a9124895e6a= 18e58e93 >=20 > commit 5bda26333a8ebf34190e3a9124895e6a18e58e93 > Author: John Baldwin > AuthorDate: 2024-02-14 22:07:32 +0000 > Commit: John Baldwin > CommitDate: 2024-02-14 22:07:32 +0000 >=20 > gpiobus: Use bus_generic_rman_* >=20 > Reviewed by: imp > Differential Revision: https://reviews.freebsd.org/D43887 > --- > sys/dev/gpio/gpiobus.c | 57 = +++++++++++++++++--------------------------------- > 1 file changed, 19 insertions(+), 38 deletions(-) >=20 > diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c > index 99d3114d51da..6d739597b759 100644 > --- a/sys/dev/gpio/gpiobus.c > +++ b/sys/dev/gpio/gpiobus.c > @@ -809,20 +809,29 @@ gpiobus_write_ivar(device_t dev, device_t child, = int which, uintptr_t value) > return (0); > } >=20 > +static struct rman * > +gpiobus_get_rman(device_t bus, int type, u_int flags) This is unused now. It looks like it=E2=80=99s missing = "DEVMETHOD(bus_get_rman, gpiobus_get_rman)=E2=80=9D. Andrew From nobody Mon Feb 19 10:47:37 2024 X-Original-To: dev-commits-src-main@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 4TdfPx5dFzz5BRSd for ; Mon, 19 Feb 2024 10:47:49 +0000 (UTC) (envelope-from cglogic@protonmail.com) Received: from mail-4319.protonmail.ch (mail-4319.protonmail.ch [185.70.43.19]) (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 "protonmail.com", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TdfPx2Gq1z4mlq; Mon, 19 Feb 2024 10:47:49 +0000 (UTC) (envelope-from cglogic@protonmail.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1708339666; x=1708598866; bh=ZyHJ1pfTi2eLBFL05V1Uo09EGrAJjQZtVytjPAgHq+E=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=uDdzWsKoc/vDaXC8pd1gMt+E9WGn4X/eezJPLqVIpa724mAxyC2w84al3GAjWbR9C If38EZrAujfxuQV8uVvbPuslx5L2qlqTtR+fl1RUcOchSfjZp7RG4dZc5VjWP92e2k js80BYKLwi34j+qx3YXkbwgoyn5q/MwAWMtoaH2n3/sm+ICPiKsZV5vS2qNewF8b4R Ub0OR813w3tn4xdNhKP/fHg1tLHwUIMZW1TD8glfbNZTKAZsitJJk9BS5gB14Ot4tg PvXjU3t17qV6tfRm6EII3JQYLLYLy7Umr5PWpV8DrabRp5kR9HVgxR5+eDpmUvj6P8 N8lOh50yajRyQ== Date: Mon, 19 Feb 2024 10:47:37 +0000 To: Andriy Gapon From: cglogic Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: c01af41c3c8f - main - ata_da: add quirk to disable NCQ TRIM for Samsung 860/870 SSDs Message-ID: In-Reply-To: <202402191009.41JA925j018706@gitrepo.freebsd.org> References: <202402191009.41JA925j018706@gitrepo.freebsd.org> Feedback-ID: 25313618:user:proton List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4TdfPx2Gq1z4mlq X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:62371, ipnet:185.70.43.0/24, country:CH] Hello Andriy, I use ZFS with autotrim enabled on Samsung 860 PRO connected to Intel AHCI = SATA controller for 9 years without any issue. Can I disable this quirk locally or have I revert the patch to continue use= NCQ TRIM with this SSD? Thank you. On Monday, February 19th, 2024 at 12:09 PM, Andriy Gapon = wrote: > The branch main has been updated by avg: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dc01af41c3c8fdd570764ff9b6b= fbad6ac9ca1664 > > commit c01af41c3c8fdd570764ff9b6bfbad6ac9ca1664 > Author: Andriy Gapon avg@FreeBSD.org > > AuthorDate: 2024-02-19 10:08:12 +0000 > Commit: Andriy Gapon avg@FreeBSD.org > > CommitDate: 2024-02-19 10:08:12 +0000 > > ata_da: add quirk to disable NCQ TRIM for Samsung 860/870 SSDs > > NCQ TRIM for Samsung 860/870 SSDs results in data corruption on systems > with some SATA controllers. > > This can be easily reproduced using ZFS which uses TRIM and is able to > detect block content changes. > > Linux bug report for this issue: > https://bugzilla.kernel.org/show_bug.cgi?id=3D201693 > > Since at present we can not limit a quirk based on the contorller / SIM, > apply the quirk in all cases. > > Reviewed by: imp > MFC after: 2 weeks > Differential Revision: https://reviews.freebsd.org/D43961 > --- > sys/cam/ata/ata_da.c | 16 ++++++++++++++++ > 1 file changed, 16 insertions(+) > > diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c > index f5d3aeca9329..d4a591943307 100644 > --- a/sys/cam/ata/ata_da.c > +++ b/sys/cam/ata/ata_da.c > @@ -727,6 +727,22 @@ static struct ada_quirk_entry ada_quirk_table[] =3D > { T_DIRECT, SIP_MEDIA_FIXED, "", "Samsung SSD 850", "" }, > /quirks/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN > }, > + { > + / > + * Samsung 860 SSDs > + * 4k optimised, NCQ TRIM broken (normal TRIM fine) > + / > + { T_DIRECT, SIP_MEDIA_FIXED, "", "Samsung SSD 860*", "" }, > + /quirks/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN > + }, > + { > + / > + * Samsung 870 SSDs > + * 4k optimised, NCQ TRIM broken (normal TRIM fine) > + / > + { T_DIRECT, SIP_MEDIA_FIXED, "", "Samsung SSD 870*", "" }, > + /quirks/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN > + }, > { > / > * Samsung SM863 Series SSDs (MZ7KM*) From nobody Mon Feb 19 11:03:08 2024 X-Original-To: dev-commits-src-main@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 4Tdflh2brgz5BTN0; Mon, 19 Feb 2024 11:03:12 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tdflh22tQz4nh7; Mon, 19 Feb 2024 11:03:12 +0000 (UTC) (envelope-from avg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708340592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=05OLxZiBA2GIrDdjeDfDQXQdjwe6Q3NlBOqyMX0sFhk=; b=x79pMYeoIT4B0m+iU0s1MUKgaGG2G31RC39L7cHLxDNdfsVdjnuHxopSa7UODS8cCXggac TcJ1y4lB8mW8cmyLuwYUO6RuqupJWMMFmOftftkofvitZaOWFMxFrc8rQqyooC3aURdq3o bwiiX/z0nOf5Vy4Qq2Usg57nNDWvDIHStOcfdW1xbG6G6E7Gx00xnj2DIaaUMILxZLL/Ng NXm0sKnQkem3BvEjDS4tAA58q4QwmVlwXlXeNpHPxsFEOHCk+lKGAnnb3wcQeZuWXE47b1 13+lmMvG2iRuQu8epKqGq1F9fxmuefYoWVDulKen49f/pClmXY3FpUdoxFWO4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708340592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=05OLxZiBA2GIrDdjeDfDQXQdjwe6Q3NlBOqyMX0sFhk=; b=ExagxBaJUMdg5vrfS9PdhCmy05Vnfb8Vl3HI1uEDWpsQTa85u62/2K6BL/nExdwj365oaQ IbEkQPYpkL80xWdWpGtM2rjw7sm724SjjZrLLuHuyrEcDY+nb/zqVlPlJE6xksQjLp/ZJG 7vUDYdMcPwfmzj/S67ocqT2UnuD3hJtrcbXBH9pfxHk4Y0b2/u99P2auNmuVk+5Ktc4lzz d+PapfkqLWzPP3g7Ljq/rcpLVjFEyJpI/lXHHQwapM6yN/ftlyXpOEW9BKaOt0FqhJBOmi +7qhvmFeGzhb9gz4TCdVXeEZlM4okJQbokycKve3lZgDRXez7zzhOkzQuHhAlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708340592; a=rsa-sha256; cv=none; b=DLyLw2xwzWiDS9vvVb0pLdDoR7x2pC8MOKr17NlQjZ7+TcJUT9GhJIZhbInSGvANp/Wu2R FftU+8aKiO6LuKzSd+6NO+KklYw0sn1RYrAc0nMaYyGggQOYyUkhw8u/jpxsVcLBQ036sH FwBoskufAGYitIJz7RxxtLplVs0prRHF1F7GZkYfPj0sT/1mIq1LGJZJHwlHJMYnVOAA5Y UyAHDzVzS9/ag2WcB/dJ8wsuTziQnTj/UrABRshYlcl1UvDasfIdAG/x8LKcxHkEt+3Ojp UcI+M6/BdWV3vYW2NoEXzMADP+hMeooI/BijkK/SGwpYUPrK+N0Yq/X7gOqpbw== Received: from [192.168.0.88] (unknown [93.188.39.137]) (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) (Authenticated sender: avg/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Tdflg43zlzhjd; Mon, 19 Feb 2024 11:03:11 +0000 (UTC) (envelope-from avg@FreeBSD.org) Message-ID: Date: Mon, 19 Feb 2024 13:03:08 +0200 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Andriy Gapon Subject: Re: git: c01af41c3c8f - main - ata_da: add quirk to disable NCQ TRIM for Samsung 860/870 SSDs Content-Language: en-US To: cglogic Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 19/02/2024 12:47, cglogic wrote: > Hello Andriy, > > I use ZFS with autotrim enabled on Samsung 860 PRO connected to Intel AHCI SATA controller for 9 years without any issue. I think that it was released in 2018? > Can I disable this quirk locally or have I revert the patch to continue use NCQ TRIM with this SSD? I don't think that there is a way to disable the quirk, so you'll have to revert. Note that ATA TRIM is still enabled, it's only NCQ TRIM that got disabled. > On Monday, February 19th, 2024 at 12:09 PM, Andriy Gapon wrote: > >> The branch main has been updated by avg: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=c01af41c3c8fdd570764ff9b6bfbad6ac9ca1664 >> >> commit c01af41c3c8fdd570764ff9b6bfbad6ac9ca1664 >> Author: Andriy Gapon avg@FreeBSD.org >> >> AuthorDate: 2024-02-19 10:08:12 +0000 >> Commit: Andriy Gapon avg@FreeBSD.org >> >> CommitDate: 2024-02-19 10:08:12 +0000 >> >> ata_da: add quirk to disable NCQ TRIM for Samsung 860/870 SSDs >> >> NCQ TRIM for Samsung 860/870 SSDs results in data corruption on systems >> with some SATA controllers. >> >> This can be easily reproduced using ZFS which uses TRIM and is able to >> detect block content changes. >> >> Linux bug report for this issue: >> https://bugzilla.kernel.org/show_bug.cgi?id=201693 >> >> Since at present we can not limit a quirk based on the contorller / SIM, >> apply the quirk in all cases. >> >> Reviewed by: imp >> MFC after: 2 weeks >> Differential Revision: https://reviews.freebsd.org/D43961 >> --- >> sys/cam/ata/ata_da.c | 16 ++++++++++++++++ >> 1 file changed, 16 insertions(+) >> >> diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c >> index f5d3aeca9329..d4a591943307 100644 >> --- a/sys/cam/ata/ata_da.c >> +++ b/sys/cam/ata/ata_da.c >> @@ -727,6 +727,22 @@ static struct ada_quirk_entry ada_quirk_table[] = >> { T_DIRECT, SIP_MEDIA_FIXED, "", "Samsung SSD 850", "" }, >> /quirks/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN >> }, >> + { >> + / >> + * Samsung 860 SSDs >> + * 4k optimised, NCQ TRIM broken (normal TRIM fine) >> + / >> + { T_DIRECT, SIP_MEDIA_FIXED, "", "Samsung SSD 860*", "" }, >> + /quirks/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN >> + }, >> + { >> + / >> + * Samsung 870 SSDs >> + * 4k optimised, NCQ TRIM broken (normal TRIM fine) >> + / >> + { T_DIRECT, SIP_MEDIA_FIXED, "", "Samsung SSD 870*", "" }, >> + /quirks/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN >> + }, >> { >> / >> * Samsung SM863 Series SSDs (MZ7KM*) -- Andriy Gapon From nobody Mon Feb 19 11:03:19 2024 X-Original-To: dev-commits-src-main@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 4Tdflq3R1sz5BT7J; Mon, 19 Feb 2024 11:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tdflq2dYcz4pPY; Mon, 19 Feb 2024 11:03:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708340599; 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=4TS8XwSp3NZYU2uSThi9y86hfrLY40Y3kVwxwrL+pDs=; b=Jl5eoTMKfkYoK8doRAjYP4foQsFxycZZPEDaIZcxzkGPtLunKg3P4wQNzFk2ihCwX/Yfdg jEzzGl2pM3x9M2pLdRh0ayeVOGNyGc69AWPIqrvnGOSZJAIKBO6bUCTyYuAhfgk4tqVGIY KldP+L+OFW10rKTOID1+yfvCA+efs98NWY/dlXs66aNrSvTs6iNGxausE40Q5AubzWS53a dUFUBL5bFxqfKhCWlox+7OpQ2uyvn4/CzA2Qq68aSMpyCalS3xOkX7YokYyUyeARAtkOff wEUqHXBejko7/spfqW2wTbK6jJvgCiKlW0wIyEz3I1U8yXIhrOnqUF3PlLyliA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708340599; 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=4TS8XwSp3NZYU2uSThi9y86hfrLY40Y3kVwxwrL+pDs=; b=gQfZ+3TizMb0nqpFGHEUqhBImIGiDHi41kt7avAn0cZj88QFscmyDg1drm5j8wJLfiGSao RPhAGpDumys4b/wT/qKWr2tKCxcjd84IDGsjftlnYUoU5bp1cR4JbMiit+3/xD6mZrMg3J cosF37fV1SRdqbvnB8Qf1mJTp+eV8lNbhWVoDQaXwFWmkfPJUL7Kk0NCg7yvtfHZu5gI1r 41JUnz3BD4bURS2JPmIdmQfL348HtPQ59y3hWKdBwGtdqj5424sJwOSxqMXuqB5ityNim6 AmNgE0HhVc45F0xeE/UUyFGCEa7Vx0vk4cHGVuac/6jPpDFd/uSpSEK6GyQ4YA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708340599; a=rsa-sha256; cv=none; b=BVqCND7B4w6QWu3DYrPO5tMobBX0jTisTxUYg3AYq5BbC5L7aq8iMY++1ltLLNM+Qor9i4 RvWjzaN4Uy7G9NFXLHwp0oPCBLngyIXd+paeHHbmlD+QoqsF3puMkUwOPaZ5leVu0Owj8x kv9GFDZXa5mCvd8qH4R2HRMvPkdRwHAbTh7GD4ztZEUETDit884Qcof1wh+FJJpRUh+X6z X7DQMtl7pmO3qm+28iKwO66BGWseIBOiylF0Njyr2/ccKZnVA00VayKEXPtrYD6rRb15Av 2hkCyIAbwadNHvM77Uet3VT4JgUnHNy9j3dsbo+n7gzjuR/pC3vzkbH8qIWXoQ== 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 4Tdflq1jshzXVV; Mon, 19 Feb 2024 11:03:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41JB3JBB019776; Mon, 19 Feb 2024 11:03:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JB3JBl019773; Mon, 19 Feb 2024 11:03:19 GMT (envelope-from git) Date: Mon, 19 Feb 2024 11:03:19 GMT Message-Id: <202402191103.41JB3JBl019773@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: f24c816daa00 - main - iov.h: Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: f24c816daa00852f4a1d37649d00905a0d67f1b3 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=f24c816daa00852f4a1d37649d00905a0d67f1b3 commit f24c816daa00852f4a1d37649d00905a0d67f1b3 Author: Gordon Bergling AuthorDate: 2024-02-19 11:02:57 +0000 Commit: Gordon Bergling CommitDate: 2024-02-19 11:02:57 +0000 iov.h: Fix a typo in a source code comment - s/subystem/subsystem/ MFC after: 3 days --- sys/sys/iov.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/sys/iov.h b/sys/sys/iov.h index cc9074489559..0171fc5a98cf 100644 --- a/sys/sys/iov.h +++ b/sys/sys/iov.h @@ -209,7 +209,7 @@ struct pci_iov_schema * (PF or individual VF). * Note: We will refer to the section of the configuration schema that * specifies the parameters for this subsystem and device - * configuration as the device/subystem schema. + * configuration as the device/subsystem schema. * 2) The subsystem node must contain only keys that correspond to parameters * that are specified in the device/subsystem schema. * 3) Every parameter specified as required in the device/subsystem schema is From nobody Mon Feb 19 11:08:20 2024 X-Original-To: dev-commits-src-main@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 4Tdfsd0Y14z5BTpt; Mon, 19 Feb 2024 11:08:21 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tdfsc71cRz4ppF; Mon, 19 Feb 2024 11:08:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708340901; 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=zZfqkp7Z3ZO8eeU9xoerR5FzrTq99Dp+JTH6dzoj7xI=; b=n8lE6+NAp++DKN63lIoYxqRZFJfPiayQGLIVjtZ6NWvxF5T2s2QfNluwIIroRHc4ab12PR RVXjpVCS4dNNwqSArvbcxmu/5wIfMPs1ev9kwgMRAdKJLoPJkpLAONweW9wOANcXYy6uwi G//niA+tUlKEASsmxxgIxCgcKO0lDZXvU7TBmc67eucuFwMwL/RdVBTaT1ttljk5J7IcX9 hQa3EhImAgy/9toBWZztnT50CuA3zJ243lGwhQMo1PpKJDdi1j+ZwfVZ2dAK8DQ31GG3+Z 03LwkPgjWBE5Zwrawaa7ULWwkndqO938zIoakDfRjWSG+nKHfXRiB6dF0J4smA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708340901; 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=zZfqkp7Z3ZO8eeU9xoerR5FzrTq99Dp+JTH6dzoj7xI=; b=D4lTasI9xSTQOzx9BojhebVQytBREVFfx2ZnR5vTQXXTi3uT/8FRcnvRe5up352hBpTee6 zz6t0qj3lDBvvOLXA+B8w9Wk6mHqcG6aetXfHkAwRn7K3M/wG5lmXaAefOwFx0N3/zJ6ob KdS4CW36L5UBaI/yQiUlWJZGMVsYchJa22a/lbJiGeFUivsdPHUfB5YU0KOg1oRoihRRyD u0GoLwYvRD3rnkcDm6F6iPG9UlE1rKHO8AnzNjRndGraq0lhMpgpSKVUu9Uf8EFEl9mvfP Pj4qryA8rZV2WUX9xu0oBbpfspnDpWSuW5znhJzaQsh+d7rt6AysahmKALiNHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708340901; a=rsa-sha256; cv=none; b=SFb/fJb+7Ip8d2/T8beowvGNWW7QVqyBzOQcnqlaCtqXN3Gzodg0H+8MiJ9pY4JCyVt7C/ Ue5VVR1cLo6R8zDe+fUUs0Jd7IaBnpKcyqzKF0ir7gwbV0AmArISlX+Jx0KWapgdPaS7w9 0/J0nnfl+Okzcwlralecm+rh32arHK6kP0C8jM0vzmOd0em+zztsTYcmEkg2zKMfUxDdHb XA+yDgdRkxKRjpvFUCGsgpFfdDyR7vgYBJOOCkJEUbLOAb0m9baapf/Pj/iQIT68iOwgVf wOedVQidD2eynFTnvFz35bruUJtnIaUIuESF2Cs9su22jtxW2+QWDXkZjML7WA== 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 4Tdfsc64mpzY66; Mon, 19 Feb 2024 11:08:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41JB8KHj020618; Mon, 19 Feb 2024 11:08:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JB8Kib020615; Mon, 19 Feb 2024 11:08:20 GMT (envelope-from git) Date: Mon, 19 Feb 2024 11:08:20 GMT Message-Id: <202402191108.41JB8Kib020615@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 94fc800f5bf2 - main - net80211: Fix two typos in kernel messages List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 94fc800f5bf20f573bef0d407c2f61ebcdc15bae Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=94fc800f5bf20f573bef0d407c2f61ebcdc15bae commit 94fc800f5bf20f573bef0d407c2f61ebcdc15bae Author: Gordon Bergling AuthorDate: 2024-02-19 11:08:07 +0000 Commit: Gordon Bergling CommitDate: 2024-02-19 11:08:07 +0000 net80211: Fix two typos in kernel messages - s/defered/deferred/ MFC after: 5 days --- sys/net80211/ieee80211_hostap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net80211/ieee80211_hostap.c b/sys/net80211/ieee80211_hostap.c index 67c45bd38935..82d8f8b2907b 100644 --- a/sys/net80211/ieee80211_hostap.c +++ b/sys/net80211/ieee80211_hostap.c @@ -974,7 +974,7 @@ hostap_auth_open(struct ieee80211_node *ni, struct ieee80211_frame *wh, */ IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_AUTH | IEEE80211_MSG_ACL, ni->ni_macaddr, - "%s", "station authentication defered (radius acl)"); + "%s", "station authentication deferred (radius acl)"); ieee80211_notify_node_auth(ni); } else { IEEE80211_SEND_MGMT(ni, IEEE80211_FC0_SUBTYPE_AUTH, seq + 1); @@ -1124,7 +1124,7 @@ hostap_auth_shared(struct ieee80211_node *ni, struct ieee80211_frame *wh, IEEE80211_NOTE_MAC(vap, IEEE80211_MSG_AUTH | IEEE80211_MSG_ACL, ni->ni_macaddr, - "%s", "station authentication defered (radius acl)"); + "%s", "station authentication deferred (radius acl)"); ieee80211_notify_node_auth(ni); return; } From nobody Mon Feb 19 11:29:28 2024 X-Original-To: dev-commits-src-main@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 4TdgLL2jVDz5BWwv for ; Mon, 19 Feb 2024 11:29:46 +0000 (UTC) (envelope-from cglogic@protonmail.com) Received: from mail-40137.protonmail.ch (mail-40137.protonmail.ch [185.70.40.137]) (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 "protonmail.com", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TdgLK5c8Vz4rmf; Mon, 19 Feb 2024 11:29:45 +0000 (UTC) (envelope-from cglogic@protonmail.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1708342183; x=1708601383; bh=3GOD66GUPPafzimTGaHIIJc0n5kxMUfoVKYlw7WWbkI=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=s1LDpEo/5KGQX1sdpKAyV13eRU4FTPBCQywIqvb+ouceDnY+y0xUiCXNSdtaQi6Ff 8fby8kXyRyyf072RiqI7C6v9dgXAtqpMB0iFmEGZjY+y6EPKiSt9AGG6nxRwy4jAAI EENGLniziHGCTfBxFjnx/7v/98hLHSJMD6+9yKpjE4t0eC6LkToB6ftSCCcpUmunkH WzxNorI7AE/AzMdh2BbDMJ7vbf5DuD5vbpsy7XN5/Dgok9fTsFyxZ/Fy9uzNDrnhlZ p3fS43L2OttmjZiQJgTRlczwCv+qIpJOIMcMy04wsdTHnICM5FNNIIu1WUicf2gJp8 +lROLNaaiJv7w== Date: Mon, 19 Feb 2024 11:29:28 +0000 To: Andriy Gapon From: cglogic Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: c01af41c3c8f - main - ata_da: add quirk to disable NCQ TRIM for Samsung 860/870 SSDs Message-ID: In-Reply-To: References: Feedback-ID: 25313618:user:proton List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4TdgLK5c8Vz4rmf X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:62371, ipnet:185.70.40.0/24, country:CH] On Monday, February 19th, 2024 at 1:03 PM, Andriy Gapon w= rote: > On 19/02/2024 12:47, cglogic wrote: >=20 > > Hello Andriy, > >=20 > > I use ZFS with autotrim enabled on Samsung 860 PRO connected to Intel A= HCI SATA controller for 9 years without any issue. >=20 >=20 > I think that it was released in 2018? You are right, it's 9 years old computer, SSD was added later. >=20 > > Can I disable this quirk locally or have I revert the patch to continue= use NCQ TRIM with this SSD? >=20 >=20 > I don't think that there is a way to disable the quirk, so you'll have to= revert. > Note that ATA TRIM is still enabled, it's only NCQ TRIM that got disabled= . >From my understanding ATA TRIM is non-queued TRIM as opposed to NCQ TRIM. With only ATA TRIM enabled, drive will have increased latency when large am= ount of files deleted. However I'm not sure how ZFS handles TRIMs, maybe it groups several TRIMs a= nd then sends when drive is idle. Another question is how this affects TRIM enabled swap partition. In general, if I'm correct here, disabling NCQ TRIM should not be an issue = for desktop usage, except for large git repository updates, etc. >=20 > > On Monday, February 19th, 2024 at 12:09 PM, Andriy Gapon avg@FreeBSD.or= g wrote: > >=20 > > > The branch main has been updated by avg: > > >=20 > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dc01af41c3c8fdd570764ff= 9b6bfbad6ac9ca1664 > > >=20 > > > commit c01af41c3c8fdd570764ff9b6bfbad6ac9ca1664 > > > Author: Andriy Gapon avg@FreeBSD.org > > >=20 > > > AuthorDate: 2024-02-19 10:08:12 +0000 > > > Commit: Andriy Gapon avg@FreeBSD.org > > >=20 > > > CommitDate: 2024-02-19 10:08:12 +0000 > > >=20 > > > ata_da: add quirk to disable NCQ TRIM for Samsung 860/870 SSDs > > >=20 > > > NCQ TRIM for Samsung 860/870 SSDs results in data corruption on syste= ms > > > with some SATA controllers. > > >=20 > > > This can be easily reproduced using ZFS which uses TRIM and is able t= o > > > detect block content changes. > > >=20 > > > Linux bug report for this issue: > > > https://bugzilla.kernel.org/show_bug.cgi?id=3D201693 > > >=20 > > > Since at present we can not limit a quirk based on the contorller / S= IM, > > > apply the quirk in all cases. > > >=20 > > > Reviewed by: imp > > > MFC after: 2 weeks > > > Differential Revision: https://reviews.freebsd.org/D43961 > > > --- > > > sys/cam/ata/ata_da.c | 16 ++++++++++++++++ > > > 1 file changed, 16 insertions(+) > > >=20 > > > diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c > > > index f5d3aeca9329..d4a591943307 100644 > > > --- a/sys/cam/ata/ata_da.c > > > +++ b/sys/cam/ata/ata_da.c > > > @@ -727,6 +727,22 @@ static struct ada_quirk_entry ada_quirk_table[] = =3D > > > { T_DIRECT, SIP_MEDIA_FIXED, "", "Samsung SSD 850", "" }, > > > /quirks/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN > > > }, > > > + { > > > + / > > > + * Samsung 860 SSDs > > > + * 4k optimised, NCQ TRIM broken (normal TRIM fine) > > > + / > > > + { T_DIRECT, SIP_MEDIA_FIXED, "", "Samsung SSD 860*", "" }, > > > + /quirks/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN > > > + }, > > > + { > > > + / > > > + * Samsung 870 SSDs > > > + * 4k optimised, NCQ TRIM broken (normal TRIM fine) > > > + / > > > + { T_DIRECT, SIP_MEDIA_FIXED, "", "Samsung SSD 870*", "" }, > > > + /quirks/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN > > > + }, > > > { > > > / > > > * Samsung SM863 Series SSDs (MZ7KM*) >=20 >=20 > -- > Andriy Gapon From nobody Mon Feb 19 15:18:48 2024 X-Original-To: dev-commits-src-main@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 4TdmQl0XS1z5C02N for ; Mon, 19 Feb 2024 15:18:55 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) (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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TdmQj4TDjz4HV4 for ; Mon, 19 Feb 2024 15:18:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-5120ecfd75cso6572906e87.0 for ; Mon, 19 Feb 2024 07:18:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1708355931; x=1708960731; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=ywsswnEXsq0zSd4Remvb5qKzn/MeXXvMxtYKC19c+QM=; b=QYht2iZ27tVh0kLWCxTZEcHiFFWj2FiznSUuxr2TLwmj860WgY3ZoAICPgsBrrd0J8 c2BcC8gTel72BsMj6vGhmStlK1ZmN8g8Sy7jSdAjJXgLNm/UV2Nu84LCjxXnNvd0Ne2c R4ox0b2JaVGDLQPfu8KXl/6iMINgE1qcPDrgJE8dZ46l2wrBcv4Xm3zLcmLJ7vooyOve TfVNQ/WfOn8GL6G6Kv6KaeNp5qWaC1GeqI5YE+kP2L3xdL/zEXpNO+nW9guxVpM0Ixky 1YkvpEh1vrAXs4eYKotqgVU6LCEsRGVSMJfqcqOCmYsF7umdNHiFer/WLm9xOHFj2Ha6 NMIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708355931; x=1708960731; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ywsswnEXsq0zSd4Remvb5qKzn/MeXXvMxtYKC19c+QM=; b=ItPzfuKkGvthJ/MF/LeywJK8mriKo23Ub+0LRUZcVYdTCKkezUouDkDZBSNZ95gIt0 rdJffpOCHSy+ar3n3wgg5BGEGuXHuVS9IKoueOhxDfOWvtmuAiP9rJRI3wobCUa7syEF IUsHHya50OiK+ZlNn1JjMQ8UD4L9SiEgm1Vq0xvwkqRTuN4Gb2CehYcUPGbg3uPxC6hA ZbOcgQPZJkI4kLQc8gZi7JqCNeqjD9PZ9xDtnjShWaNIPwUd81Mz87P7hL+JVEg3bVSc goocbDBleUqZV87pj95Khw1nvUD2wtrLWoqxCSBXR8RX0hzzPwQxOLy50HIsADUxNvcl vPtg== X-Forwarded-Encrypted: i=1; AJvYcCXR0KRs8c8eVMuHjWbFWcol7ev3vwFtVuSRXKyHBWqaTX3AvEuKzUuxIE9Xk6G1nt0ndgAgmYUEzyTbTC5UVw8R6eLuN/5QjiqhCVBJn2ccIQ== X-Gm-Message-State: AOJu0YwVgfZufL+ab0KdMVQ5larSlkWFcBr5f1OY2bo27/c7o7kpio4l L8FVGHrShdhxREMr24ib6/GZ5i+OQyVFtic8/LxreYNuQ/whbAOpb0X1x9JuQILZJS19ED088vZ sTpiUAl3WKzC73H/7cgE1kBzJI3TGeeHL1PpatFm3N8dnX6OjtoI= X-Google-Smtp-Source: AGHT+IEZWX/okq2QAfWYujcH/Wg8q3+gNdH1d4Iup1LIQzidb0ChpIZTmARv9DyZeo6Mee0+fkldkIjblf5jXxS/npk= X-Received: by 2002:a05:6512:4026:b0:512:a009:6e21 with SMTP id br38-20020a056512402600b00512a0096e21mr5134562lfb.31.1708355930798; Mon, 19 Feb 2024 07:18:50 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Mon, 19 Feb 2024 08:18:48 -0700 Message-ID: Subject: Re: git: c01af41c3c8f - main - ata_da: add quirk to disable NCQ TRIM for Samsung 860/870 SSDs To: cglogic Cc: Andriy Gapon , src-committers , "" , "" Content-Type: multipart/alternative; boundary="00000000000067d1ca0611bd9cb8" X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4TdmQj4TDjz4HV4 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] --00000000000067d1ca0611bd9cb8 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Feb 19, 2024, 4:29=E2=80=AFAM cglogic wrot= e: > On Monday, February 19th, 2024 at 1:03 PM, Andriy Gapon > wrote: > > > On 19/02/2024 12:47, cglogic wrote: > > > > > Hello Andriy, > > > > > > I use ZFS with autotrim enabled on Samsung 860 PRO connected to Intel > AHCI SATA controller for 9 years without any issue. > > > > > > I think that it was released in 2018? > > You are right, it's 9 years old computer, SSD was added later. > > > > > > Can I disable this quirk locally or have I revert the patch to > continue use NCQ TRIM with this SSD? > > > > > > I don't think that there is a way to disable the quirk, so you'll have > to revert. > > Note that ATA TRIM is still enabled, it's only NCQ TRIM that got > disabled. > > From my understanding ATA TRIM is non-queued TRIM as opposed to NCQ TRIM. > With only ATA TRIM enabled, drive will have increased latency when large > amount of files deleted. > > However I'm not sure how ZFS handles TRIMs, maybe it groups several TRIMs > and then sends when drive is idle. > Another question is how this affects TRIM enabled swap partition. > > In general, if I'm correct here, disabling NCQ TRIM should not be an issu= e > for desktop usage, except for large git repository updates, etc. > In general, it won't matter a ton. Unless you are seeing stalls because of read/write I/O waiting behind trims that have to go to the drive one at a time, the effects are in the noise. If you are seeing that, though, the effects can be quite helpful in terms of latency... assuming the drive is cooperative. The benefits of it vary a lot from drive to drive as well. Some early drives still serialize the trims, so the latency benefit is not so great. Some enterprise drives do trims instantly and keep some internal state that is helped a lot by them. But if NCQ trims are unstable, we likely should err on the side of disabling. The errors that Andriy was seeing typically are cable or controller issues. In his case, it was a controller issue (apparently, and surprisingly, paired with a specific type of drive). Linux has a specific workaround for the pair, which is unusual. But there's two issues at play. The first issue is that these drives should have NCQ Trim turned off, according to Linux's commit log. This may be firmware revision based or may just be some people are luckier with newer firmware (it's hard to say from the mixed reports, but they read more like luck than version for the sampling I did). So Andriy's change is good. The second issue, and one I was confused on earlier, is that Linux goes a step further and disables NCQ entirely for these old controllers for 860 and 870 drives. This isn't too surprising. We have a workaround for PMP for these controllers already.... One can disable NCQ entirely by setting the tags to 0... Given the specificity of the problem, and the age of the controllers, I'm inclined to not implement the Linux workaround for this specific pair. Warner > > > > On Monday, February 19th, 2024 at 12:09 PM, Andriy Gapon > avg@FreeBSD.org wrote: > > > > > > > The branch main has been updated by avg: > > > > > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dc01af41c3c8fdd570764ff9b6bfbad6= ac9ca1664 > > > > > > > > commit c01af41c3c8fdd570764ff9b6bfbad6ac9ca1664 > > > > Author: Andriy Gapon avg@FreeBSD.org > > > > > > > > AuthorDate: 2024-02-19 10:08:12 +0000 > > > > Commit: Andriy Gapon avg@FreeBSD.org > > > > > > > > CommitDate: 2024-02-19 10:08:12 +0000 > > > > > > > > ata_da: add quirk to disable NCQ TRIM for Samsung 860/870 SSDs > > > > > > > > NCQ TRIM for Samsung 860/870 SSDs results in data corruption on > systems > > > > with some SATA controllers. > > > > > > > > This can be easily reproduced using ZFS which uses TRIM and is able > to > > > > detect block content changes. > > > > > > > > Linux bug report for this issue: > > > > https://bugzilla.kernel.org/show_bug.cgi?id=3D201693 > > > > > > > > Since at present we can not limit a quirk based on the contorller / > SIM, > > > > apply the quirk in all cases. > > > > > > > > Reviewed by: imp > > > > MFC after: 2 weeks > > > > Differential Revision: https://reviews.freebsd.org/D43961 > > > > --- > > > > sys/cam/ata/ata_da.c | 16 ++++++++++++++++ > > > > 1 file changed, 16 insertions(+) > > > > > > > > diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c > > > > index f5d3aeca9329..d4a591943307 100644 > > > > --- a/sys/cam/ata/ata_da.c > > > > +++ b/sys/cam/ata/ata_da.c > > > > @@ -727,6 +727,22 @@ static struct ada_quirk_entry ada_quirk_table[= ] > =3D > > > > { T_DIRECT, SIP_MEDIA_FIXED, "", "Samsung SSD 850", "" }, > > > > /quirks/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN > > > > }, > > > > + { > > > > + / > > > > + * Samsung 860 SSDs > > > > + * 4k optimised, NCQ TRIM broken (normal TRIM fine) > > > > + / > > > > + { T_DIRECT, SIP_MEDIA_FIXED, "", "Samsung SSD 860*", "" }, > > > > + /quirks/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN > > > > + }, > > > > + { > > > > + / > > > > + * Samsung 870 SSDs > > > > + * 4k optimised, NCQ TRIM broken (normal TRIM fine) > > > > + / > > > > + { T_DIRECT, SIP_MEDIA_FIXED, "", "Samsung SSD 870*", "" }, > > > > + /quirks/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN > > > > + }, > > > > { > > > > / > > > > * Samsung SM863 Series SSDs (MZ7KM*) > > > > > > -- > > Andriy Gapon > --00000000000067d1ca0611bd9cb8 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Mon, Feb 19, 2024, 4:29=E2=80=AFAM= cglogic <cg= logic@protonmail.com> wrote:
On Monday, February 19th, 2024 at 1:03 PM, Andriy Gapon <avg@FreeBSD.or= g> wrote:

> On 19/02/2024 12:47, cglogic wrote:
>
> > Hello Andriy,
> >
> > I use ZFS with autotrim enabled on Samsung 860 PRO connected to I= ntel AHCI SATA controller for 9 years without any issue.
>
>
> I think that it was released in 2018?

You are right, it's 9 years old computer, SSD was added later.

>
> > Can I disable this quirk locally or have I revert the patch to co= ntinue use NCQ TRIM with this SSD?
>
>
> I don't think that there is a way to disable the quirk, so you'= ;ll have to revert.
> Note that ATA TRIM is still enabled, it's only NCQ TRIM that got d= isabled.

>From my understanding ATA TRIM is non-queued TRIM as opposed to NCQ TRIM. With only ATA TRIM enabled, drive will have increased latency when large am= ount of files deleted.

However I'm not sure how ZFS handles TRIMs, maybe it groups several TRI= Ms and then sends when drive is idle.
Another question is how this affects TRIM enabled swap partition.

In general, if I'm correct here, disabling NCQ TRIM should not be an is= sue for desktop usage, except for large git repository updates, etc.

In general, it won't = matter a ton. Unless you are seeing stalls because of read/write I/O waitin= g behind trims that have to go to the drive one at a time, the effects are = in the noise. If you are seeing that, though, the effects can be quite help= ful in terms of latency... assuming the drive is cooperative. The benefits = of it vary a lot from drive to drive as well. Some early drives still seria= lize the trims, so the latency benefit is not so great. Some enterprise dri= ves do trims instantly and keep some internal state that is helped a lot by= them. But if NCQ trims are unstable, we likely should err on the side of d= isabling.

The errors that Andriy = was seeing typically are cable or controller issues. In his case, it was a = controller issue (apparently, and surprisingly, paired with a specific type= of drive). Linux has a specific workaround for the pair, which is unusual.= But there's two issues at play.

The first= issue is that these drives should have NCQ Trim turned off, according to L= inux's commit log. This may be firmware revision based or may just be s= ome people are luckier with newer firmware (it's hard to say from the m= ixed reports, but they read more like luck than version for the sampling I = did). So Andriy's change is good. The second issue, and one I was confu= sed on earlier, is that Linux goes a step further and disables NCQ entirely= for these old controllers for 860 and 870 drives. This isn't too surpr= ising. We have a workaround for PMP for these controllers already.... One c= an disable NCQ entirely by setting the tags to 0... Given the specificity o= f the problem, and the age of the controllers, I'm inclined to not impl= ement the Linux workaround for this specific pair.

=
Warner

>
> > On Monday, February 19th, 2024 at 12:09 PM, Andriy Gapon avg@Free= BSD.org wrote:
> >
> > > The branch main has been updated by avg:
> > >
> > > URL: https://cgit.FreeBSD.org/src/commit/?id=3Dc01af41c3c8fdd570764= ff9b6bfbad6ac9ca1664
> > >
> > > commit c01af41c3c8fdd570764ff9b6bfbad6ac9ca1664
> > > Author: Andriy Gapon avg@FreeBSD.org
> > >
> > > AuthorDate: 2024-02-19 10:08:12 +0000
> > > Commit: Andriy Gapon avg@FreeBSD.org
> > >
> > > CommitDate: 2024-02-19 10:08:12 +0000
> > >
> > > ata_da: add quirk to disable NCQ TRIM for Samsung 860/870 SS= Ds
> > >
> > > NCQ TRIM for Samsung 860/870 SSDs results in data corruption= on systems
> > > with some SATA controllers.
> > >
> > > This can be easily reproduced using ZFS which uses TRIM and = is able to
> > > detect block content changes.
> > >
> > > Linux bug report for this issue:
> > > https://bugzilla.kerne= l.org/show_bug.cgi?id=3D201693
> > >
> > > Since at present we can not limit a quirk based on the conto= rller / SIM,
> > > apply the quirk in all cases.
> > >
> > > Reviewed by: imp
> > > MFC after: 2 weeks
> > > Differential Revision: https://reviews.f= reebsd.org/D43961
> > > ---
> > > sys/cam/ata/ata_da.c | 16 ++++++++++++++++
> > > 1 file changed, 16 insertions(+)
> > >
> > > diff --git a/sys/cam/ata/ata_da.c b/sys/cam/ata/ata_da.c
> > > index f5d3aeca9329..d4a591943307 100644
> > > --- a/sys/cam/ata/ata_da.c
> > > +++ b/sys/cam/ata/ata_da.c
> > > @@ -727,6 +727,22 @@ static struct ada_quirk_entry ada_quirk= _table[] =3D
> > > { T_DIRECT, SIP_MEDIA_FIXED, "", "Samsung SSD= 850", "" },
> > > /quirks/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN
> > > },
> > > + {
> > > + /
> > > + * Samsung 860 SSDs
> > > + * 4k optimised, NCQ TRIM broken (normal TRIM fine)
> > > + /
> > > + { T_DIRECT, SIP_MEDIA_FIXED, "", "Samsung S= SD 860*", "" },
> > > + /quirks/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN
> > > + },
> > > + {
> > > + /
> > > + * Samsung 870 SSDs
> > > + * 4k optimised, NCQ TRIM broken (normal TRIM fine)
> > > + /
> > > + { T_DIRECT, SIP_MEDIA_FIXED, "", "Samsung S= SD 870*", "" },
> > > + /quirks/ADA_Q_4K | ADA_Q_NCQ_TRIM_BROKEN
> > > + },
> > > {
> > > /
> > > * Samsung SM863 Series SSDs (MZ7KM*)
>
>
> --
> Andriy Gapon
--00000000000067d1ca0611bd9cb8-- From nobody Mon Feb 19 15:26:50 2024 X-Original-To: dev-commits-src-main@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 4Tdmc06tpBz5C0ld for ; Mon, 19 Feb 2024 15:26:56 +0000 (UTC) (envelope-from amelia.franklin@targettechnopro.org) Received: from IND01-MAX-obe.outbound.protection.outlook.com (mail-maxind01on20701.outbound.protection.outlook.com [IPv6:2a01:111:f403:2020::701]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "DigiCert Cloud Services CA-1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tdmbz6rQsz4JRc for ; Mon, 19 Feb 2024 15:26:55 +0000 (UTC) (envelope-from amelia.franklin@targettechnopro.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of amelia.franklin@targettechnopro.org designates 2a01:111:f403:2020::701 as permitted sender) smtp.mailfrom=amelia.franklin@targettechnopro.org; dmarc=none; arc=pass ("microsoft.com:s=arcselector9901:i=1") ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hgs5fzvfjw9eLu5pivX/z4ffAQI3B8ep+syerON+sZu+xADlZjgdbDfEMzt3bfB/jT0gtVV/WRkEwXsnyz1e6/qamRuoJgCLVlg6RZLmnrPXJT7MIRL2Y9UJaVzsafam26w4Z4I4qOleKdIO9wvV41vjw6gFnkqez3WC4RvDgLeOdNTfOeXA6DIyD8cjDgVPExFsCiqmLtPwbyFZPyzqxdM8XaOxHe1dD/AvEZQEDDgcUGNzdn8aOkUCMGMrm4bWmSZvbVLCWqUpVePE4OrU5GSAnHSUOf92AS+4UGTtKEOB54Ok9PFM5ZEOx6jLbd1UWCSokU1iJC9G6kEA3BPdbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4ODRImFr2lRAoNqc8haBjQspsOPih7KaayybM5CTfpA=; b=Rl2oaCbNWGwQ1yTVuk57cBAY4RmpAWTlYj4lWaLl7IrT2yJU1u5PtT1uVGg5aY/b1oUXRR6rI4iWhG1EX0qLX5CqqI7z5CWcKaawPyUAwRopg/eL1/IanCzBuomjp+l5k7Fy1eEb1gCpWnXXOJDp8gnxSUJkWKSyOj9RCoNFf1j35KVnJ1owPo90l5tmxC6ZIEOOpzwEzDfYs48TNPIkDy8TfugCIwxuMLezLYmDBNQ/DeRvb6yu5HdPdQPMs+zKbsrt0u6ZwpVG23HfSZVXQ5l2ADYqo5t7qE38WPsnK5VZ65f4pjXhFg2lbRePDVeIQv3WefeXh09TTU15ruCEEw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=targettechnopro.org; dmarc=pass action=none header.from=targettechnopro.org; dkim=pass header.d=targettechnopro.org; arc=none Received: from PN2P287MB1390.INDP287.PROD.OUTLOOK.COM (2603:1096:c01:1ae::9) by PN0P287MB1828.INDP287.PROD.OUTLOOK.COM (2603:1096:c01:18b::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.19; Mon, 19 Feb 2024 15:26:50 +0000 Received: from PN2P287MB1390.INDP287.PROD.OUTLOOK.COM ([fe80::c955:5a9f:af2c:9bc3]) by PN2P287MB1390.INDP287.PROD.OUTLOOK.COM ([fe80::c955:5a9f:af2c:9bc3%7]) with mapi id 15.20.7316.018; Mon, 19 Feb 2024 15:26:50 +0000 From: Amelia Franklin To: =?iso-8859-1?Q?Food_Ingredients=A0China_2024?= Subject: =?iso-8859-1?Q?Freebsd_-_Food_Ingredients=A0China_2024?= Thread-Topic: =?iso-8859-1?Q?Freebsd_-_Food_Ingredients=A0China_2024?= Thread-Index: AdpjSA22EJvLOtf1Qy6evFZOA4FFEw== Disposition-Notification-To: Amelia Franklin Return-Receipt-To: Date: Mon, 19 Feb 2024 15:26:50 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PN2P287MB1390:EE_|PN0P287MB1828:EE_ x-ms-office365-filtering-correlation-id: 82ff350d-555a-4980-93c1-08dc315f319c x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: UoDM7CPUx/sTxmK/5kSe0T2hFZ2dI6xVp5jR469IIBa5Kdk7AFMKj7Fs9MXZeu5XXIKqk3ZEfaJ+T/Zp3POJXgJ1UUu1Z9X/uRWpr2cddFV2y4C/2k2PYsjAKOE9zD98adA+wadndp1NqGywBOpwsmhz7NDCcYaFr+H0hrebfzPUjqdtTn8Xm0bPq/QTWktMkO3FRs+KEuEuaGZhUhyNlG937/pIb4miKW+Ly2ofzKZzL5uERAkJY0q+yPJmFsX0WwzIROiKhgID+46x7eYqHdB9fK12Lpnv90kQQnwDiA7+MqbORQWIahOazSo//eMNp4A36tIa25lQGpk8ec4D6QRCx9v/S6Edo6BHVoBI4V1UA8vYaWUwXO2PML1ccRPIZXcO6vKXA4DAWTgGiHGdG6Jd91l3eOWAeMO5z9bnPiegyrU3VjCeO4bSXOA/wVjZz3L6N7PFiR/lXPD62t5y2q7gkLbFGjcMgGGHO1r1VM5MrTf35v6gwCmDSzfqTgBhmLfCbHNpBsQJfhwkSmu66Ke9kNd018G8DfQh7+RnEQ3VgpFvoi5pPredX9zCrV3f+GduxQOnX8HheIO+6hz/ZiQoxIgdOhWF9eS/tkDs8ZP/cvGQlv0TEGjW4825jYXu x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PN2P287MB1390.INDP287.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(38070700009);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?RdIqZhcHsTtneMjLo8WrI1P6hInAW1yJA9r1lzzXh4AoCXpA/vFdUQfTFH?= =?iso-8859-1?Q?YqCseFKFjKAL6xkDNzw4+R2FoKqgH4Ph/K1y0Y4+wbKO/AxK7gT1+Xdi8w?= =?iso-8859-1?Q?UI2fYDxHLayICOEhz+YQrNLYiJrNnaXvX1I46HU8KBznCU7LU8PnkbbXKi?= =?iso-8859-1?Q?r+xMyFc4nuVQflbOHlTOzHWefxnHK5J6IAhTi4IkqaoOv/zKR5UpAvkfOi?= =?iso-8859-1?Q?Sqdr7qqTa4gd2VN9Xu9WhGX0kYL4tWX2yr7AbaOPsVGrLYdTKPS6Asp3wW?= =?iso-8859-1?Q?zWfsZGdMKXN/1WiflY7wn3h/lAxxb8PeZeiWmNixYf8DdUqazRFzDVMv78?= =?iso-8859-1?Q?N7CIehsOS1Bwo/BqUlXFCF2kDvZFfixZ5ylFtoArQ7Dx+3UMO9BiUJxqEm?= =?iso-8859-1?Q?p9UEqZRIix4N3J20JfQthCxq9zU6mW3+O6/ZzHqTr6JWJFyTipGtphtlAz?= =?iso-8859-1?Q?SeZPL0fPZNc21K5ep9TpjZ/UJD5VrF77YRRodxxN/cs8Anm3/agrQcVRLV?= =?iso-8859-1?Q?WLKc7m7jc4F8ngNu9A9gXvHv4iZI4J6RTxpjXlrUb9uC/ADBQdqXNaIkjO?= =?iso-8859-1?Q?auhBKAk7dEo4seVl/0jtBkAuwKpyX7NwBG8biIH1vYWBJHZqLdV+Ipva8o?= =?iso-8859-1?Q?oZosZVOL5TvZtOBHVQ29kHkKENH6F2sSfM4b6KARBB4Q5A5mJVXHggKXqS?= =?iso-8859-1?Q?B/p/awvEKufZNACQI6tpy5lX7kY+EcTQ+rAWuW3x31Ljo5wFrpBUw3lFSQ?= =?iso-8859-1?Q?ANThaRBB8J4CevBR6ua+wFFeIZX0ImaT53IOqIzSnFfydLuFwYL9NDUZzk?= =?iso-8859-1?Q?hPIEEzua38px7DTH/nsSB/DCgAaiKzHyv2SjgY2sXz43fPoSqVCe1Xa2hv?= =?iso-8859-1?Q?/qXW7fCrXdKa/gv+4+Iuw5+b/Oag3PKeCTYeF1+b7gLGe97nQUcNRYX0GE?= =?iso-8859-1?Q?HKZDK9c6f03STBpBCSAVFjX+4rysj75cF3smdSXfwKzVYo1zgll7yAH4+s?= =?iso-8859-1?Q?ltqZE0doZyA8IaI+CDAVJWt4G4bhcb8kO2y71M4EtE8xGKqrA7R5auMlZ8?= =?iso-8859-1?Q?OiX57IO5UKrRoRywzQ4SPzFZxVkesYzQRjpRqnXGuHcoHtoeIqd2fHBE0+?= =?iso-8859-1?Q?EV7MT28/ZkdHdCVcAv6kV6B3cN7v+sjaEvAwKUZoNZkzHSryZ8OMfn+Tw1?= =?iso-8859-1?Q?MCF8mmrBI1SVQWgiPbvaQkBBEe+VfMs0dHVbXhQFlsap+JIDBG5fLWhzNL?= =?iso-8859-1?Q?o4Idu4ym2vFuEhExpP3uysm2E9+2ew3vWZMmsOu0vZrzAMiPj+dOcFd3bl?= =?iso-8859-1?Q?qArEAw95KrQyIT7jeqSeir754u2yZbqO3DEGAd++rnOXlGVJwof+JMQbnH?= =?iso-8859-1?Q?+j/CqiJBPws8kowUUUHZ01GiQl7BlVUDD1TV3iG4/dhEM96r5GTwz94M4+?= =?iso-8859-1?Q?QyXqhk6mblrlf5ff+wXmXBggnqGsObr+TqQolUnG2WCKfjjF6+qWWHsCLb?= =?iso-8859-1?Q?B7aJvLl+tB7tp2of6YlmF6YKosIXVN3GenAvvNJ/4NBIxNgmn24lkGUoAI?= =?iso-8859-1?Q?sJoht/qVVnRYw6oIT7kS/fs/n+6A0s6od4WgU1pPPkXsevOCVKd8TN4rNU?= =?iso-8859-1?Q?yxDtPuHXlZ7uu6WNfetP4XhP+jZSJYB1GLgrQqh4wFucGVfAi/Dpd5BMKj?= =?iso-8859-1?Q?kfmSY8uP7PGuD7wUisOVzLI0bfy8MU+6wtTJv028v9Xy0+9myw+Vj+DUDp?= =?iso-8859-1?Q?bmEw=3D=3D?= Content-Type: multipart/alternative; boundary="_000_PN2P287MB139073B73D5746C062CA26D4F1512PN2P287MB1390INDP_" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 X-OriginatorOrg: targettechnopro.org X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PN2P287MB1390.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 82ff350d-555a-4980-93c1-08dc315f319c X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Feb 2024 15:26:50.3556 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 6f1af8d6-3684-4a7a-b57c-24cbf25ae847 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: xAN+jZUn7y/V11zqO5y63yY478Zs2MVkZw5wlyWK+jpZef3Ojf14sPZ5mmtC/8t0DHbeMzwOuqO7uxVezzmMLVbCkjF2TbWy+TUJzD7QrJ4uk3IZ9PnR2XLr37k4pn8u X-MS-Exchange-Transport-CrossTenantHeadersStamped: PN0P287MB1828 X-Rspamd-Queue-Id: 4Tdmbz6rQsz4JRc X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.06 / 15.00]; ARC_ALLOW(-1.00)[microsoft.com:s=arcselector9901:i=1]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-0.98)[-0.977]; NEURAL_HAM_SHORT(-0.79)[-0.786]; R_SPF_ALLOW(-0.20)[+ip6:2a01:111:f403::/49]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; RCPT_COUNT_ONE(0.00)[1]; MISSING_XM_UA(0.00)[]; ASN(0.00)[asn:8075, ipnet:2a01:111:f000::/36, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_TLS_LAST(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DMARC_NA(0.00)[targettechnopro.org]; RCVD_COUNT_TWO(0.00)[2]; TO_DN_ALL(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[] --_000_PN2P287MB139073B73D5746C062CA26D4F1512PN2P287MB1390INDP_ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Hi there, We are pleased to inform you that Food Ingredients China 2024 list is avail= able for you to obtain at unlimited usage. If I can be of any further assistance, please, let me know. So, that I will= get back to you with the price and other details ASAP. Awaiting your response. Many thanks, Amelia Franklin- Demand Generation --_000_PN2P287MB139073B73D5746C062CA26D4F1512PN2P287MB1390INDP_ Content-Type: text/html; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable

Hi there,

 

We are pleased to inform you that Food Ingredients China 2024 list is available for you to obtain= at unlimited usage.

 

If I can be of any further assistance, please, let me know. So, that I wil= l get back to you with the price and other details ASAP.

 

Awaiting your response.

 

Many thanks,

 

Amelia Franklin- Demand Generation

 

--_000_PN2P287MB139073B73D5746C062CA26D4F1512PN2P287MB1390INDP_-- From nobody Mon Feb 19 15:57:14 2024 X-Original-To: dev-commits-src-main@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 4TdnGy2byBz5C3dh; Mon, 19 Feb 2024 15:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TdnGy24y9z4MYp; Mon, 19 Feb 2024 15:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708358234; 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=VA21FzKxFCk/aJf6p4ECUjnbSOm11oM9tQjvnZpt7Uo=; b=yHqJUpKRD+BVEVr3/Ny9USCRppss+LBpmvg4OU95yBmUdm/ezKe5vo1p1+HzruiZ//D0EI wUqIVLVZxiQxpT+es6x4xEMkNFuiR+eFiUIzKwz4+48qrNEM/SgtTRkX5QA0B0wt5ESmf4 TpB7WWbuD5tshJvf8o4uXrMPM84v/hG/ryPthAwldSKkN9Ug6qNy1DPTwAbGvxEegzRSaZ eIHpwCRWQL5tQ3559Y/dUS5m0PYC95ga22ZzNlY/MVNEc59PTo2sFDElxcpXJwIOQo4Q64 ZsmF4SpiyNIwYk3Az8yGrwH8bs6rr8BrqU1TACAOcFi9JI8SkPEHw2plzGNNpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708358234; 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=VA21FzKxFCk/aJf6p4ECUjnbSOm11oM9tQjvnZpt7Uo=; b=pft2mxi9Mgq+w1RgxFb5j1whU6kes1+eHqYfpG4D8pmmrtvuBCrw/qrdWLcSiJTnPKhgOU Xr6DGB8rH1HhM/KF8+8lXBUXFC7n2PPrCvHL/UChZgLAdLz1bcZeVNKl5RlZRftx8MsGcj vjOnrHgiQa1u+zh75p4qNMKCaYfSwSimyPHOGMBjRaqveI8THWE5LyqYAzRh+IBz5atrod DiZtaQafi5Ktya8Uw5rMWDscFK1YZlAEyBNrFSeLLeJY1XVRMM5NDUPT3eMGnCr4sx4GZr iArZ8em0jKUlv9m1mHsnchzde9VfK/YqSsEemhMrEf8kWD46RFk8Mqz/mn1eRw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708358234; a=rsa-sha256; cv=none; b=tr1ucjm0DgwcTP6PAi9D8uJ+GN7qqlPNjSZB8KpRXZlhIwtfYKit4ShNXPGf0enzuq+eXf kiDOCBJT81bbpZhicx6q3Vt3aLGWUTETNyNg4ZjK4YgHen6NQjW2wGFtOYvDLxv9diMUPQ NsSXSGc6dxUMZB1cTB0HTFML7tr9qu8V9XIQ0MEH/pNm6ODWbDPQ46h2O3W9M+fkiLo9FQ M8hp9k9Vukv43C5IJV2nBG8EbKu/ebW+vh+yFrdqxotqQwP9SxouIzY08HykR0nIeqXQJl +6ctCoyAqtogACNGaO46VIk8q0P6SjRIBueQGA/yK64SJVj1yjclVZ6C3Nh3Rg== 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 4TdnGy17vQzgh8; Mon, 19 Feb 2024 15:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41JFvE9N008451; Mon, 19 Feb 2024 15:57:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JFvEVu008448; Mon, 19 Feb 2024 15:57:14 GMT (envelope-from git) Date: Mon, 19 Feb 2024 15:57:14 GMT Message-Id: <202402191557.41JFvEVu008448@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 849599e28a87 - main - committers-src: Add bnovkov@ with markj@ and jhb@ as mentors List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 849599e28a8708b137be2c8ed2c7ca114d0caf1e Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=849599e28a8708b137be2c8ed2c7ca114d0caf1e commit 849599e28a8708b137be2c8ed2c7ca114d0caf1e Author: Bojan Novković AuthorDate: 2024-02-19 15:55:31 +0000 Commit: Bojan Novković CommitDate: 2024-02-19 15:55:31 +0000 committers-src: Add bnovkov@ with markj@ and jhb@ as mentors Add mentorship information for bnovkov@. Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D43963 --- share/misc/committers-src.dot | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index 6201c0c69894..d9fd06cd6597 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -131,6 +131,7 @@ bdrewery [label="Bryan Drewery\nbdrewery@FreeBSD.org\n2013/12/14"] benl [label="Ben Laurie\nbenl@FreeBSD.org\n2011/05/18"] benno [label="Benno Rice\nbenno@FreeBSD.org\n2000/11/02"] bms [label="Bruce M Simpson\nbms@FreeBSD.org\n2003/08/06"] +bnovkov [label="Bojan Novkovic\nbnovkov@FreeBSD.org\n2024/02/13"] br [label="Ruslan Bukin\nbr@FreeBSD.org\n2013/09/02"] brian [label="Brian Somers\nbrian@FreeBSD.org\n1996/12/16"] brooks [label="Brooks Davis\nbrooks@FreeBSD.org\n2001/06/21"] @@ -636,6 +637,7 @@ jfv -> erj jhb -> arr jhb -> avg +jhb -> bnovkov jhb -> jch jhb -> jeff jhb -> kbyanc @@ -750,6 +752,7 @@ marcel -> marius marcel -> nwhitehorn marcel -> sjg +markj -> bnovkov markj -> cem markj -> christos markj -> dougm From nobody Mon Feb 19 16:06:12 2024 X-Original-To: dev-commits-src-main@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 4TdnTs15ssz5C4gK for ; Mon, 19 Feb 2024 16:06:41 +0000 (UTC) (envelope-from cglogic@protonmail.com) Received: from mail-4324.protonmail.ch (mail-4324.protonmail.ch [185.70.43.24]) (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 "protonmail.com", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TdnTr5GJKz4NVQ; Mon, 19 Feb 2024 16:06:40 +0000 (UTC) (envelope-from cglogic@protonmail.com) Authentication-Results: mx1.freebsd.org; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1708358791; x=1708617991; bh=c+n0Lfhlit3DriGeZsNdDwtT47mGBnL5RuUgsQke3Is=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=PtULJrPepI2jdEr1Ee6smDMRvU1YS/G/nnqn9mFcgI/UAtK0IuppzlJgYM5QOiKHC 6jL9H9rvOGZnmjVhV/5vLrNlnYeuAzsugSX86OoJ38b34kA/ndN6zIryEHZJF8p+Tb HIsrXB6ZQcvXDkArgVlWMZvo7X0GHae4xrllxJh22UYdaWV5LwJNTfT36MEe11f99P A9e/UZEjoH5/GOJQAlmnAd7Vu0+kKszYvc/KkBCK/FR39KnnWt9DviVyz5EirkpIJc oM7+Mhp+PeQFgZ8rngdTBRW/KizHx4ZN1jGqj4rKXKejJPMk7tvKLkDbH0NNMYrdQN ef9uAxbBPjtSg== Date: Mon, 19 Feb 2024 16:06:12 +0000 To: Warner Losh From: cglogic Cc: Andriy Gapon , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: c01af41c3c8f - main - ata_da: add quirk to disable NCQ TRIM for Samsung 860/870 SSDs Message-ID: In-Reply-To: References: Feedback-ID: 25313618:user:proton List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="b1_mkkyEVwy7Drn1aJ6XvL9VSap6ONAxAQ7RuVaO0HPR9Y" X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4TdnTr5GJKz4NVQ X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:62371, ipnet:185.70.43.0/24, country:CH] This is a multi-part message in MIME format. --b1_mkkyEVwy7Drn1aJ6XvL9VSap6ONAxAQ7RuVaO0HPR9Y Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: base64 SGVsbG8gV2FybmVyLAoKVGhhbmsgeW91IGZvciBkZXRhaWxlZCBleHBsYW5hdGlvbi4gTG9va3Mg bGlrZSBpdCBoYXMgbm8gc2Vuc2UgZm9yIG1lIHRvIHdvcnJ5IGFib3V0IGRpc2FibGluZyBOQ1Eg VFJJTSBvbiB0aGF0IG9sZCBQQy4KCkhvd2V2ZXIgaXQgd291bGQgYmUgZ3JlYXQgdG8gaGF2ZSBw b3NzaWJpbGl0eSB0byBhcHBseSBzdWNoIGhhcmR3YXJlIGJ1ZyB3b3JrYXJvdW5kcyBmb3IgYWZm ZWN0ZWQgY29udHJvbGxlci9kcml2ZSBwYWlycyBvbmx5LgpPciwgYXQgbGVhc3QsIGhhdmUgcG9z c2liaWxpdHkgdG8gZGlzYWJsZSBzdWNoIHF1aXJrcyBvbiBwZXIgZHJpdmUgYmFzaXMgdmlhIHN5 c2N0bC4gSSBkaWRuJ3QgZmluZCBzdWNoIGEgcG9zc2liaWxpdHkuCgpPbiBNb25kYXksIEZlYnJ1 YXJ5IDE5dGgsIDIwMjQgYXQgNToxOCBQTSwgV2FybmVyIExvc2ggPGltcEBic2RpbXAuY29tPiB3 cm90ZToKCj4gT24gTW9uLCBGZWIgMTksIDIwMjQsIDQ6MjnigK9BTSBjZ2xvZ2ljIDxjZ2xvZ2lj QHByb3Rvbm1haWwuY29tPiB3cm90ZToKPgo+PiBPbiBNb25kYXksIEZlYnJ1YXJ5IDE5dGgsIDIw MjQgYXQgMTowMyBQTSwgQW5kcml5IEdhcG9uIDxhdmdARnJlZUJTRC5vcmc+IHdyb3RlOgo+Pgo+ Pj4gT24gMTkvMDIvMjAyNCAxMjo0NywgY2dsb2dpYyB3cm90ZToKPj4+Cj4+PiA+IEhlbGxvIEFu ZHJpeSwKPj4+ID4KPj4+ID4gSSB1c2UgWkZTIHdpdGggYXV0b3RyaW0gZW5hYmxlZCBvbiBTYW1z dW5nIDg2MCBQUk8gY29ubmVjdGVkIHRvIEludGVsIEFIQ0kgU0FUQSBjb250cm9sbGVyIGZvciA5 IHllYXJzIHdpdGhvdXQgYW55IGlzc3VlLgo+Pj4KPj4+Cj4+PiBJIHRoaW5rIHRoYXQgaXQgd2Fz IHJlbGVhc2VkIGluIDIwMTg/Cj4+Cj4+IFlvdSBhcmUgcmlnaHQsIGl0J3MgOSB5ZWFycyBvbGQg Y29tcHV0ZXIsIFNTRCB3YXMgYWRkZWQgbGF0ZXIuCj4+Cj4+Pgo+Pj4gPiBDYW4gSSBkaXNhYmxl IHRoaXMgcXVpcmsgbG9jYWxseSBvciBoYXZlIEkgcmV2ZXJ0IHRoZSBwYXRjaCB0byBjb250aW51 ZSB1c2UgTkNRIFRSSU0gd2l0aCB0aGlzIFNTRD8KPj4+Cj4+Pgo+Pj4gSSBkb24ndCB0aGluayB0 aGF0IHRoZXJlIGlzIGEgd2F5IHRvIGRpc2FibGUgdGhlIHF1aXJrLCBzbyB5b3UnbGwgaGF2ZSB0 byByZXZlcnQuCj4+PiBOb3RlIHRoYXQgQVRBIFRSSU0gaXMgc3RpbGwgZW5hYmxlZCwgaXQncyBv bmx5IE5DUSBUUklNIHRoYXQgZ290IGRpc2FibGVkLgo+Pgo+PiBGcm9tIG15IHVuZGVyc3RhbmRp bmcgQVRBIFRSSU0gaXMgbm9uLXF1ZXVlZCBUUklNIGFzIG9wcG9zZWQgdG8gTkNRIFRSSU0uCj4+ IFdpdGggb25seSBBVEEgVFJJTSBlbmFibGVkLCBkcml2ZSB3aWxsIGhhdmUgaW5jcmVhc2VkIGxh dGVuY3kgd2hlbiBsYXJnZSBhbW91bnQgb2YgZmlsZXMgZGVsZXRlZC4KPj4KPj4gSG93ZXZlciBJ J20gbm90IHN1cmUgaG93IFpGUyBoYW5kbGVzIFRSSU1zLCBtYXliZSBpdCBncm91cHMgc2V2ZXJh bCBUUklNcyBhbmQgdGhlbiBzZW5kcyB3aGVuIGRyaXZlIGlzIGlkbGUuCj4+IEFub3RoZXIgcXVl c3Rpb24gaXMgaG93IHRoaXMgYWZmZWN0cyBUUklNIGVuYWJsZWQgc3dhcCBwYXJ0aXRpb24uCj4+ Cj4+IEluIGdlbmVyYWwsIGlmIEknbSBjb3JyZWN0IGhlcmUsIGRpc2FibGluZyBOQ1EgVFJJTSBz aG91bGQgbm90IGJlIGFuIGlzc3VlIGZvciBkZXNrdG9wIHVzYWdlLCBleGNlcHQgZm9yIGxhcmdl IGdpdCByZXBvc2l0b3J5IHVwZGF0ZXMsIGV0Yy4KPgo+IEluIGdlbmVyYWwsIGl0IHdvbid0IG1h dHRlciBhIHRvbi4gVW5sZXNzIHlvdSBhcmUgc2VlaW5nIHN0YWxscyBiZWNhdXNlIG9mIHJlYWQv d3JpdGUgSS9PIHdhaXRpbmcgYmVoaW5kIHRyaW1zIHRoYXQgaGF2ZSB0byBnbyB0byB0aGUgZHJp dmUgb25lIGF0IGEgdGltZSwgdGhlIGVmZmVjdHMgYXJlIGluIHRoZSBub2lzZS4gSWYgeW91IGFy ZSBzZWVpbmcgdGhhdCwgdGhvdWdoLCB0aGUgZWZmZWN0cyBjYW4gYmUgcXVpdGUgaGVscGZ1bCBp biB0ZXJtcyBvZiBsYXRlbmN5Li4uIGFzc3VtaW5nIHRoZSBkcml2ZSBpcyBjb29wZXJhdGl2ZS4g VGhlIGJlbmVmaXRzIG9mIGl0IHZhcnkgYSBsb3QgZnJvbSBkcml2ZSB0byBkcml2ZSBhcyB3ZWxs LiBTb21lIGVhcmx5IGRyaXZlcyBzdGlsbCBzZXJpYWxpemUgdGhlIHRyaW1zLCBzbyB0aGUgbGF0 ZW5jeSBiZW5lZml0IGlzIG5vdCBzbyBncmVhdC4gU29tZSBlbnRlcnByaXNlIGRyaXZlcyBkbyB0 cmltcyBpbnN0YW50bHkgYW5kIGtlZXAgc29tZSBpbnRlcm5hbCBzdGF0ZSB0aGF0IGlzIGhlbHBl ZCBhIGxvdCBieSB0aGVtLiBCdXQgaWYgTkNRIHRyaW1zIGFyZSB1bnN0YWJsZSwgd2UgbGlrZWx5 IHNob3VsZCBlcnIgb24gdGhlIHNpZGUgb2YgZGlzYWJsaW5nLgo+Cj4gVGhlIGVycm9ycyB0aGF0 IEFuZHJpeSB3YXMgc2VlaW5nIHR5cGljYWxseSBhcmUgY2FibGUgb3IgY29udHJvbGxlciBpc3N1 ZXMuIEluIGhpcyBjYXNlLCBpdCB3YXMgYSBjb250cm9sbGVyIGlzc3VlIChhcHBhcmVudGx5LCBh bmQgc3VycHJpc2luZ2x5LCBwYWlyZWQgd2l0aCBhIHNwZWNpZmljIHR5cGUgb2YgZHJpdmUpLiBM aW51eCBoYXMgYSBzcGVjaWZpYyB3b3JrYXJvdW5kIGZvciB0aGUgcGFpciwgd2hpY2ggaXMgdW51 c3VhbC4gQnV0IHRoZXJlJ3MgdHdvIGlzc3VlcyBhdCBwbGF5Lgo+Cj4gVGhlIGZpcnN0IGlzc3Vl IGlzIHRoYXQgdGhlc2UgZHJpdmVzIHNob3VsZCBoYXZlIE5DUSBUcmltIHR1cm5lZCBvZmYsIGFj Y29yZGluZyB0byBMaW51eCdzIGNvbW1pdCBsb2cuIFRoaXMgbWF5IGJlIGZpcm13YXJlIHJldmlz aW9uIGJhc2VkIG9yIG1heSBqdXN0IGJlIHNvbWUgcGVvcGxlIGFyZSBsdWNraWVyIHdpdGggbmV3 ZXIgZmlybXdhcmUgKGl0J3MgaGFyZCB0byBzYXkgZnJvbSB0aGUgbWl4ZWQgcmVwb3J0cywgYnV0 IHRoZXkgcmVhZCBtb3JlIGxpa2UgbHVjayB0aGFuIHZlcnNpb24gZm9yIHRoZSBzYW1wbGluZyBJ IGRpZCkuIFNvIEFuZHJpeSdzIGNoYW5nZSBpcyBnb29kLiBUaGUgc2Vjb25kIGlzc3VlLCBhbmQg b25lIEkgd2FzIGNvbmZ1c2VkIG9uIGVhcmxpZXIsIGlzIHRoYXQgTGludXggZ29lcyBhIHN0ZXAg ZnVydGhlciBhbmQgZGlzYWJsZXMgTkNRIGVudGlyZWx5IGZvciB0aGVzZSBvbGQgY29udHJvbGxl cnMgZm9yIDg2MCBhbmQgODcwIGRyaXZlcy4gVGhpcyBpc24ndCB0b28gc3VycHJpc2luZy4gV2Ug aGF2ZSBhIHdvcmthcm91bmQgZm9yIFBNUCBmb3IgdGhlc2UgY29udHJvbGxlcnMgYWxyZWFkeS4u Li4gT25lIGNhbiBkaXNhYmxlIE5DUSBlbnRpcmVseSBieSBzZXR0aW5nIHRoZSB0YWdzIHRvIDAu Li4gR2l2ZW4gdGhlIHNwZWNpZmljaXR5IG9mIHRoZSBwcm9ibGVtLCBhbmQgdGhlIGFnZSBvZiB0 aGUgY29udHJvbGxlcnMsIEknbSBpbmNsaW5lZCB0byBub3QgaW1wbGVtZW50IHRoZSBMaW51eCB3 b3JrYXJvdW5kIGZvciB0aGlzIHNwZWNpZmljIHBhaXIuCj4KPiBXYXJuZXIKPgo+Pj4KPj4+ID4g T24gTW9uZGF5LCBGZWJydWFyeSAxOXRoLCAyMDI0IGF0IDEyOjA5IFBNLCBBbmRyaXkgR2Fwb24g YXZnQEZyZWVCU0Qub3JnIHdyb3RlOgo+Pj4gPgo+Pj4gPiA+IFRoZSBicmFuY2ggbWFpbiBoYXMg YmVlbiB1cGRhdGVkIGJ5IGF2ZzoKPj4+ID4gPgo+Pj4gPiA+IFVSTDogaHR0cHM6Ly9jZ2l0LkZy ZWVCU0Qub3JnL3NyYy9jb21taXQvP2lkPWMwMWFmNDFjM2M4ZmRkNTcwNzY0ZmY5YjZiZmJhZDZh YzljYTE2NjQKPj4+ID4gPgo+Pj4gPiA+IGNvbW1pdCBjMDFhZjQxYzNjOGZkZDU3MDc2NGZmOWI2 YmZiYWQ2YWM5Y2ExNjY0Cj4+PiA+ID4gQXV0aG9yOiBBbmRyaXkgR2Fwb24gYXZnQEZyZWVCU0Qu b3JnCj4+PiA+ID4KPj4+ID4gPiBBdXRob3JEYXRlOiAyMDI0LTAyLTE5IDEwOjA4OjEyICswMDAw Cj4+PiA+ID4gQ29tbWl0OiBBbmRyaXkgR2Fwb24gYXZnQEZyZWVCU0Qub3JnCj4+PiA+ID4KPj4+ ID4gPiBDb21taXREYXRlOiAyMDI0LTAyLTE5IDEwOjA4OjEyICswMDAwCj4+PiA+ID4KPj4+ID4g PiBhdGFfZGE6IGFkZCBxdWlyayB0byBkaXNhYmxlIE5DUSBUUklNIGZvciBTYW1zdW5nIDg2MC84 NzAgU1NEcwo+Pj4gPiA+Cj4+PiA+ID4gTkNRIFRSSU0gZm9yIFNhbXN1bmcgODYwLzg3MCBTU0Rz IHJlc3VsdHMgaW4gZGF0YSBjb3JydXB0aW9uIG9uIHN5c3RlbXMKPj4+ID4gPiB3aXRoIHNvbWUg U0FUQSBjb250cm9sbGVycy4KPj4+ID4gPgo+Pj4gPiA+IFRoaXMgY2FuIGJlIGVhc2lseSByZXBy b2R1Y2VkIHVzaW5nIFpGUyB3aGljaCB1c2VzIFRSSU0gYW5kIGlzIGFibGUgdG8KPj4+ID4gPiBk ZXRlY3QgYmxvY2sgY29udGVudCBjaGFuZ2VzLgo+Pj4gPiA+Cj4+PiA+ID4gTGludXggYnVnIHJl cG9ydCBmb3IgdGhpcyBpc3N1ZToKPj4+ID4gPiBodHRwczovL2J1Z3ppbGxhLmtlcm5lbC5vcmcv c2hvd19idWcuY2dpP2lkPTIwMTY5Mwo+Pj4gPiA+Cj4+PiA+ID4gU2luY2UgYXQgcHJlc2VudCB3 ZSBjYW4gbm90IGxpbWl0IGEgcXVpcmsgYmFzZWQgb24gdGhlIGNvbnRvcmxsZXIgLyBTSU0sCj4+ PiA+ID4gYXBwbHkgdGhlIHF1aXJrIGluIGFsbCBjYXNlcy4KPj4+ID4gPgo+Pj4gPiA+IFJldmll d2VkIGJ5OiBpbXAKPj4+ID4gPiBNRkMgYWZ0ZXI6IDIgd2Vla3MKPj4+ID4gPiBEaWZmZXJlbnRp YWwgUmV2aXNpb246IGh0dHBzOi8vcmV2aWV3cy5mcmVlYnNkLm9yZy9ENDM5NjEKPj4+ID4gPiAt LS0KPj4+ID4gPiBzeXMvY2FtL2F0YS9hdGFfZGEuYyB8IDE2ICsrKysrKysrKysrKysrKysKPj4+ ID4gPiAxIGZpbGUgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKQo+Pj4gPiA+Cj4+PiA+ID4gZGlm ZiAtLWdpdCBhL3N5cy9jYW0vYXRhL2F0YV9kYS5jIGIvc3lzL2NhbS9hdGEvYXRhX2RhLmMKPj4+ ID4gPiBpbmRleCBmNWQzYWVjYTkzMjkuLmQ0YTU5MTk0MzMwNyAxMDA2NDQKPj4+ID4gPiAtLS0g YS9zeXMvY2FtL2F0YS9hdGFfZGEuYwo+Pj4gPiA+ICsrKyBiL3N5cy9jYW0vYXRhL2F0YV9kYS5j Cj4+PiA+ID4gQEAgLTcyNyw2ICs3MjcsMjIgQEAgc3RhdGljIHN0cnVjdCBhZGFfcXVpcmtfZW50 cnkgYWRhX3F1aXJrX3RhYmxlW10gPQo+Pj4gPiA+IHsgVF9ESVJFQ1QsIFNJUF9NRURJQV9GSVhF RCwgIiIsICJTYW1zdW5nIFNTRCA4NTAiLCAiIiB9LAo+Pj4gPiA+IC9xdWlya3MvQURBX1FfNEsg fCBBREFfUV9OQ1FfVFJJTV9CUk9LRU4KPj4+ID4gPiB9LAo+Pj4gPiA+ICsgewo+Pj4gPiA+ICsg Lwo+Pj4gPiA+ICsgKiBTYW1zdW5nIDg2MCBTU0RzCj4+PiA+ID4gKyAqIDRrIG9wdGltaXNlZCwg TkNRIFRSSU0gYnJva2VuIChub3JtYWwgVFJJTSBmaW5lKQo+Pj4gPiA+ICsgLwo+Pj4gPiA+ICsg eyBUX0RJUkVDVCwgU0lQX01FRElBX0ZJWEVELCAiIiwgIlNhbXN1bmcgU1NEIDg2MCoiLCAiIiB9 LAo+Pj4gPiA+ICsgL3F1aXJrcy9BREFfUV80SyB8IEFEQV9RX05DUV9UUklNX0JST0tFTgo+Pj4g PiA+ICsgfSwKPj4+ID4gPiArIHsKPj4+ID4gPiArIC8KPj4+ID4gPiArICogU2Ftc3VuZyA4NzAg U1NEcwo+Pj4gPiA+ICsgKiA0ayBvcHRpbWlzZWQsIE5DUSBUUklNIGJyb2tlbiAobm9ybWFsIFRS SU0gZmluZSkKPj4+ID4gPiArIC8KPj4+ID4gPiArIHsgVF9ESVJFQ1QsIFNJUF9NRURJQV9GSVhF RCwgIiIsICJTYW1zdW5nIFNTRCA4NzAqIiwgIiIgfSwKPj4+ID4gPiArIC9xdWlya3MvQURBX1Ff NEsgfCBBREFfUV9OQ1FfVFJJTV9CUk9LRU4KPj4+ID4gPiArIH0sCj4+PiA+ID4gewo+Pj4gPiA+ IC8KPj4+ID4gPiAqIFNhbXN1bmcgU004NjMgU2VyaWVzIFNTRHMgKE1aN0tNKikKPj4+Cj4+Pgo+ Pj4gLS0KPj4+IEFuZHJpeSBHYXBvbg== --b1_mkkyEVwy7Drn1aJ6XvL9VSap6ONAxAQ7RuVaO0HPR9Y Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: base64 PGRpdiBzdHlsZT0iZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyBmb250LXNpemU6IDE0 cHg7Ij5IZWxsbyBXYXJuZXIsPC9kaXY+PGRpdiBzdHlsZT0iZm9udC1mYW1pbHk6IEFyaWFsLCBz YW5zLXNlcmlmOyBmb250LXNpemU6IDE0cHg7Ij48YnI+PC9kaXY+PGRpdiBzdHlsZT0iZm9udC1m YW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyBmb250LXNpemU6IDE0cHg7Ij5UaGFuayB5b3UgZm9y IGRldGFpbGVkIGV4cGxhbmF0aW9uLiBMb29rcyBsaWtlIGl0IGhhcyBubyBzZW5zZSBmb3IgbWUg dG8gd29ycnkgYWJvdXQgZGlzYWJsaW5nIE5DUSBUUklNIG9uIHRoYXQgb2xkIFBDLjwvZGl2Pjxk aXYgc3R5bGU9ImZvbnQtZmFtaWx5OiBBcmlhbCwgc2Fucy1zZXJpZjsgZm9udC1zaXplOiAxNHB4 OyI+PGJyPjwvZGl2PjxkaXYgc3R5bGU9ImZvbnQtZmFtaWx5OiBBcmlhbCwgc2Fucy1zZXJpZjsg Zm9udC1zaXplOiAxNHB4OyI+SG93ZXZlciBpdCB3b3VsZCBiZSBncmVhdCB0byBoYXZlIHBvc3Np YmlsaXR5IHRvIGFwcGx5IHN1Y2ggaGFyZHdhcmUgYnVnIHdvcmthcm91bmRzIGZvciBhZmZlY3Rl ZCBjb250cm9sbGVyL2RyaXZlIHBhaXJzIG9ubHkuPC9kaXY+PGRpdiBzdHlsZT0iZm9udC1mYW1p bHk6IEFyaWFsLCBzYW5zLXNlcmlmOyBmb250LXNpemU6IDE0cHg7Ij5PciwgYXQgbGVhc3QsIGhh dmUgcG9zc2liaWxpdHkgdG8gZGlzYWJsZSBzdWNoIHF1aXJrcyBvbiBwZXIgZHJpdmUgYmFzaXMg dmlhIHN5c2N0bC4mbmJzcDs8c3Bhbj5JIGRpZG4ndCBmaW5kIHN1Y2ggYSBwb3NzaWJpbGl0eS48 L3NwYW4+PGJyPjxzcGFuPjwvc3Bhbj48L2Rpdj48ZGl2IGNsYXNzPSJwcm90b25tYWlsX3NpZ25h dHVyZV9ibG9jayIgc3R5bGU9ImZvbnQtZmFtaWx5OiBBcmlhbCwgc2Fucy1zZXJpZjsgZm9udC1z aXplOiAxNHB4OyI+DQo8L2Rpdj4NCjxkaXYgc3R5bGU9ImZvbnQtZmFtaWx5OiBBcmlhbCwgc2Fu cy1zZXJpZjsgZm9udC1zaXplOiAxNHB4OyI+PGJyPjwvZGl2PjxkaXYgY2xhc3M9InByb3Rvbm1h aWxfcXVvdGUiPg0KICAgICAgICBPbiBNb25kYXksIEZlYnJ1YXJ5IDE5dGgsIDIwMjQgYXQgNTox OCBQTSwgV2FybmVyIExvc2ggJmx0O2ltcEBic2RpbXAuY29tJmd0OyB3cm90ZTo8YnI+DQogICAg ICAgIDxibG9ja3F1b3RlIGNsYXNzPSJwcm90b25tYWlsX3F1b3RlIiB0eXBlPSJjaXRlIj4NCiAg ICAgICAgICAgIDxkaXYgZGlyPSJsdHIiPjxkaXYgZGlyPSJhdXRvIj48ZGl2Pjxicj48YnI+PGRp diBjbGFzcz0iZ21haWxfcXVvdGUiPjxkaXYgY2xhc3M9ImdtYWlsX2F0dHIiIGRpcj0ibHRyIj5P biBNb24sIEZlYiAxOSwgMjAyNCwgNDoyOeKAr0FNIGNnbG9naWMgJmx0OzxhIHRhcmdldD0iX2Js YW5rIiBocmVmPSJtYWlsdG86Y2dsb2dpY0Bwcm90b25tYWlsLmNvbSIgcmVsPSJub3JlZmVycmVy IG5vZm9sbG93IG5vb3BlbmVyIj5jZ2xvZ2ljQHByb3Rvbm1haWwuY29tPC9hPiZndDsgd3JvdGU6 PGJyPjwvZGl2PjxibG9ja3F1b3RlIHN0eWxlPSJtYXJnaW46MCAwIDAgLjhleDtib3JkZXItbGVm dDoxcHggI2NjYyBzb2xpZDtwYWRkaW5nLWxlZnQ6MWV4IiBjbGFzcz0iZ21haWxfcXVvdGUiPk9u IE1vbmRheSwgRmVicnVhcnkgMTl0aCwgMjAyNCBhdCAxOjAzIFBNLCBBbmRyaXkgR2Fwb24gJmx0 O2F2Z0BGcmVlQlNELm9yZyZndDsgd3JvdGU6PGJyPg0KPGJyPg0KJmd0OyBPbiAxOS8wMi8yMDI0 IDEyOjQ3LCBjZ2xvZ2ljIHdyb3RlOjxicj4NCiZndDsgPGJyPg0KJmd0OyAmZ3Q7IEhlbGxvIEFu ZHJpeSw8YnI+DQomZ3Q7ICZndDsgPGJyPg0KJmd0OyAmZ3Q7IEkgdXNlIFpGUyB3aXRoIGF1dG90 cmltIGVuYWJsZWQgb24gU2Ftc3VuZyA4NjAgUFJPIGNvbm5lY3RlZCB0byBJbnRlbCBBSENJIFNB VEEgY29udHJvbGxlciBmb3IgOSB5ZWFycyB3aXRob3V0IGFueSBpc3N1ZS48YnI+DQomZ3Q7IDxi cj4NCiZndDsgPGJyPg0KJmd0OyBJIHRoaW5rIHRoYXQgaXQgd2FzIHJlbGVhc2VkIGluIDIwMTg/ PGJyPg0KPGJyPg0KWW91IGFyZSByaWdodCwgaXQncyA5IHllYXJzIG9sZCBjb21wdXRlciwgU1NE IHdhcyBhZGRlZCBsYXRlci48YnI+DQo8YnI+DQomZ3Q7IDxicj4NCiZndDsgJmd0OyBDYW4gSSBk aXNhYmxlIHRoaXMgcXVpcmsgbG9jYWxseSBvciBoYXZlIEkgcmV2ZXJ0IHRoZSBwYXRjaCB0byBj b250aW51ZSB1c2UgTkNRIFRSSU0gd2l0aCB0aGlzIFNTRD88YnI+DQomZ3Q7IDxicj4NCiZndDsg PGJyPg0KJmd0OyBJIGRvbid0IHRoaW5rIHRoYXQgdGhlcmUgaXMgYSB3YXkgdG8gZGlzYWJsZSB0 aGUgcXVpcmssIHNvIHlvdSdsbCBoYXZlIHRvIHJldmVydC48YnI+DQomZ3Q7IE5vdGUgdGhhdCBB VEEgVFJJTSBpcyBzdGlsbCBlbmFibGVkLCBpdCdzIG9ubHkgTkNRIFRSSU0gdGhhdCBnb3QgZGlz YWJsZWQuPGJyPg0KPGJyPg0KRnJvbSBteSB1bmRlcnN0YW5kaW5nIEFUQSBUUklNIGlzIG5vbi1x dWV1ZWQgVFJJTSBhcyBvcHBvc2VkIHRvIE5DUSBUUklNLjxicj4NCldpdGggb25seSBBVEEgVFJJ TSBlbmFibGVkLCBkcml2ZSB3aWxsIGhhdmUgaW5jcmVhc2VkIGxhdGVuY3kgd2hlbiBsYXJnZSBh bW91bnQgb2YgZmlsZXMgZGVsZXRlZC48YnI+DQo8YnI+DQpIb3dldmVyIEknbSBub3Qgc3VyZSBo b3cgWkZTIGhhbmRsZXMgVFJJTXMsIG1heWJlIGl0IGdyb3VwcyBzZXZlcmFsIFRSSU1zIGFuZCB0 aGVuIHNlbmRzIHdoZW4gZHJpdmUgaXMgaWRsZS48YnI+DQpBbm90aGVyIHF1ZXN0aW9uIGlzIGhv dyB0aGlzIGFmZmVjdHMgVFJJTSBlbmFibGVkIHN3YXAgcGFydGl0aW9uLjxicj4NCjxicj4NCklu IGdlbmVyYWwsIGlmIEknbSBjb3JyZWN0IGhlcmUsIGRpc2FibGluZyBOQ1EgVFJJTSBzaG91bGQg bm90IGJlIGFuIGlzc3VlIGZvciBkZXNrdG9wIHVzYWdlLCBleGNlcHQgZm9yIGxhcmdlIGdpdCBy ZXBvc2l0b3J5IHVwZGF0ZXMsIGV0Yy48YnI+PC9ibG9ja3F1b3RlPjwvZGl2PjwvZGl2PjxkaXYg ZGlyPSJhdXRvIj48YnI+PC9kaXY+SW4gZ2VuZXJhbCwgaXQgd29uJ3QgbWF0dGVyIGEgdG9uLiBV bmxlc3MgeW91IGFyZSBzZWVpbmcgc3RhbGxzIGJlY2F1c2Ugb2YgcmVhZC93cml0ZSBJL08gd2Fp dGluZyBiZWhpbmQgdHJpbXMgdGhhdCBoYXZlIHRvIGdvIHRvIHRoZSBkcml2ZSBvbmUgYXQgYSB0 aW1lLCB0aGUgZWZmZWN0cyBhcmUgaW4gdGhlIG5vaXNlLiBJZiB5b3UgYXJlIHNlZWluZyB0aGF0 LCB0aG91Z2gsIHRoZSBlZmZlY3RzIGNhbiBiZSBxdWl0ZSBoZWxwZnVsIGluIHRlcm1zIG9mIGxh dGVuY3kuLi4gYXNzdW1pbmcgdGhlIGRyaXZlIGlzIGNvb3BlcmF0aXZlLiBUaGUgYmVuZWZpdHMg b2YgaXQgdmFyeSBhIGxvdCBmcm9tIGRyaXZlIHRvIGRyaXZlIGFzIHdlbGwuIFNvbWUgZWFybHkg ZHJpdmVzIHN0aWxsIHNlcmlhbGl6ZSB0aGUgdHJpbXMsIHNvIHRoZSBsYXRlbmN5IGJlbmVmaXQg aXMgbm90IHNvIGdyZWF0LiBTb21lIGVudGVycHJpc2UgZHJpdmVzIGRvIHRyaW1zIGluc3RhbnRs eSBhbmQga2VlcCBzb21lIGludGVybmFsIHN0YXRlIHRoYXQgaXMgaGVscGVkIGEgbG90IGJ5IHRo ZW0uIEJ1dCBpZiBOQ1EgdHJpbXMgYXJlIHVuc3RhYmxlLCB3ZSBsaWtlbHkgc2hvdWxkIGVyciBv biB0aGUgc2lkZSBvZiBkaXNhYmxpbmcuPGJyPjwvZGl2PjxkaXYgZGlyPSJhdXRvIj48YnI+PC9k aXY+PGRpdj5UaGUgZXJyb3JzIHRoYXQgQW5kcml5IHdhcyBzZWVpbmcgdHlwaWNhbGx5IGFyZSBj YWJsZSBvciBjb250cm9sbGVyIGlzc3Vlcy4gSW4gaGlzIGNhc2UsIGl0IHdhcyBhIGNvbnRyb2xs ZXIgaXNzdWUgKGFwcGFyZW50bHksIGFuZCBzdXJwcmlzaW5nbHksIHBhaXJlZCB3aXRoIGEgc3Bl Y2lmaWMgdHlwZSBvZiBkcml2ZSkuIExpbnV4IGhhcyBhIHNwZWNpZmljIHdvcmthcm91bmQgZm9y IHRoZSBwYWlyLCB3aGljaCBpcyB1bnVzdWFsLiBCdXQgdGhlcmUncyB0d28gaXNzdWVzIGF0IHBs YXkuPGJyPjwvZGl2PjxkaXY+PGJyPjwvZGl2PjxkaXY+VGhlIGZpcnN0IGlzc3VlIGlzIHRoYXQg dGhlc2UgZHJpdmVzIHNob3VsZCBoYXZlIE5DUSBUcmltIHR1cm5lZCBvZmYsIGFjY29yZGluZyB0 byBMaW51eCdzIGNvbW1pdCBsb2cuIFRoaXMgbWF5IGJlIGZpcm13YXJlIHJldmlzaW9uIGJhc2Vk IG9yIG1heSBqdXN0IGJlIHNvbWUgcGVvcGxlIGFyZSBsdWNraWVyIHdpdGggbmV3ZXIgZmlybXdh cmUgKGl0J3MgaGFyZCB0byBzYXkgZnJvbSB0aGUgbWl4ZWQgcmVwb3J0cywgYnV0IHRoZXkgcmVh ZCBtb3JlIGxpa2UgbHVjayB0aGFuIHZlcnNpb24gZm9yIHRoZSBzYW1wbGluZyBJIGRpZCkuIFNv IEFuZHJpeSdzIGNoYW5nZSBpcyBnb29kLiBUaGUgc2Vjb25kIGlzc3VlLCBhbmQgb25lIEkgd2Fz IGNvbmZ1c2VkIG9uIGVhcmxpZXIsIGlzIHRoYXQgTGludXggZ29lcyBhIHN0ZXAgZnVydGhlciBh bmQgZGlzYWJsZXMgTkNRIGVudGlyZWx5IGZvciB0aGVzZSBvbGQgY29udHJvbGxlcnMgZm9yIDg2 MCBhbmQgODcwIGRyaXZlcy4gVGhpcyBpc24ndCB0b28gc3VycHJpc2luZy4gV2UgaGF2ZSBhIHdv cmthcm91bmQgZm9yIFBNUCBmb3IgdGhlc2UgY29udHJvbGxlcnMgYWxyZWFkeS4uLi4gT25lIGNh biBkaXNhYmxlIE5DUSBlbnRpcmVseSBieSBzZXR0aW5nIHRoZSB0YWdzIHRvIDAuLi4gR2l2ZW4g dGhlIHNwZWNpZmljaXR5IG9mIHRoZSBwcm9ibGVtLCBhbmQgdGhlIGFnZSBvZiB0aGUgY29udHJv bGxlcnMsIEknbSBpbmNsaW5lZCB0byBub3QgaW1wbGVtZW50IHRoZSBMaW51eCB3b3JrYXJvdW5k IGZvciB0aGlzIHNwZWNpZmljIHBhaXIuPGJyPjwvZGl2PjxkaXY+PGJyPjwvZGl2PjxkaXY+PGRp dj5XYXJuZXI8YnI+PC9kaXY+PGRpdiBkaXI9ImF1dG8iPjxicj48L2Rpdj48ZGl2IGRpcj0iYXV0 byI+PGRpdiBkaXI9ImF1dG8iPjxkaXYgY2xhc3M9ImdtYWlsX3F1b3RlIj48YmxvY2txdW90ZSBz dHlsZT0ibWFyZ2luOjAgMCAwIC44ZXg7Ym9yZGVyLWxlZnQ6MXB4ICNjY2Mgc29saWQ7cGFkZGlu Zy1sZWZ0OjFleCIgY2xhc3M9ImdtYWlsX3F1b3RlIj4NCiZndDsgPGJyPg0KJmd0OyAmZ3Q7IE9u IE1vbmRheSwgRmVicnVhcnkgMTl0aCwgMjAyNCBhdCAxMjowOSBQTSwgQW5kcml5IEdhcG9uIGF2 Z0BGcmVlQlNELm9yZyB3cm90ZTo8YnI+DQomZ3Q7ICZndDsgPGJyPg0KJmd0OyAmZ3Q7ICZndDsg VGhlIGJyYW5jaCBtYWluIGhhcyBiZWVuIHVwZGF0ZWQgYnkgYXZnOjxicj4NCiZndDsgJmd0OyAm Z3Q7IDxicj4NCiZndDsgJmd0OyAmZ3Q7IFVSTDogPGEgdGFyZ2V0PSJfYmxhbmsiIHJlbD0ibm9y ZWZlcnJlciBub2ZvbGxvdyBub29wZW5lciIgaHJlZj0iaHR0cHM6Ly9jZ2l0LkZyZWVCU0Qub3Jn L3NyYy9jb21taXQvP2lkPWMwMWFmNDFjM2M4ZmRkNTcwNzY0ZmY5YjZiZmJhZDZhYzljYTE2NjQi Pmh0dHBzOi8vY2dpdC5GcmVlQlNELm9yZy9zcmMvY29tbWl0Lz9pZD1jMDFhZjQxYzNjOGZkZDU3 MDc2NGZmOWI2YmZiYWQ2YWM5Y2ExNjY0PC9hPjxicj4NCiZndDsgJmd0OyAmZ3Q7IDxicj4NCiZn dDsgJmd0OyAmZ3Q7IGNvbW1pdCBjMDFhZjQxYzNjOGZkZDU3MDc2NGZmOWI2YmZiYWQ2YWM5Y2Ex NjY0PGJyPg0KJmd0OyAmZ3Q7ICZndDsgQXV0aG9yOiBBbmRyaXkgR2Fwb24gYXZnQEZyZWVCU0Qu b3JnPGJyPg0KJmd0OyAmZ3Q7ICZndDsgPGJyPg0KJmd0OyAmZ3Q7ICZndDsgQXV0aG9yRGF0ZTog MjAyNC0wMi0xOSAxMDowODoxMiArMDAwMDxicj4NCiZndDsgJmd0OyAmZ3Q7IENvbW1pdDogQW5k cml5IEdhcG9uIGF2Z0BGcmVlQlNELm9yZzxicj4NCiZndDsgJmd0OyAmZ3Q7IDxicj4NCiZndDsg Jmd0OyAmZ3Q7IENvbW1pdERhdGU6IDIwMjQtMDItMTkgMTA6MDg6MTIgKzAwMDA8YnI+DQomZ3Q7 ICZndDsgJmd0OyA8YnI+DQomZ3Q7ICZndDsgJmd0OyBhdGFfZGE6IGFkZCBxdWlyayB0byBkaXNh YmxlIE5DUSBUUklNIGZvciBTYW1zdW5nIDg2MC84NzAgU1NEczxicj4NCiZndDsgJmd0OyAmZ3Q7 IDxicj4NCiZndDsgJmd0OyAmZ3Q7IE5DUSBUUklNIGZvciBTYW1zdW5nIDg2MC84NzAgU1NEcyBy ZXN1bHRzIGluIGRhdGEgY29ycnVwdGlvbiBvbiBzeXN0ZW1zPGJyPg0KJmd0OyAmZ3Q7ICZndDsg d2l0aCBzb21lIFNBVEEgY29udHJvbGxlcnMuPGJyPg0KJmd0OyAmZ3Q7ICZndDsgPGJyPg0KJmd0 OyAmZ3Q7ICZndDsgVGhpcyBjYW4gYmUgZWFzaWx5IHJlcHJvZHVjZWQgdXNpbmcgWkZTIHdoaWNo IHVzZXMgVFJJTSBhbmQgaXMgYWJsZSB0bzxicj4NCiZndDsgJmd0OyAmZ3Q7IGRldGVjdCBibG9j ayBjb250ZW50IGNoYW5nZXMuPGJyPg0KJmd0OyAmZ3Q7ICZndDsgPGJyPg0KJmd0OyAmZ3Q7ICZn dDsgTGludXggYnVnIHJlcG9ydCBmb3IgdGhpcyBpc3N1ZTo8YnI+DQomZ3Q7ICZndDsgJmd0OyA8 YSB0YXJnZXQ9Il9ibGFuayIgcmVsPSJub3JlZmVycmVyIG5vZm9sbG93IG5vb3BlbmVyIiBocmVm PSJodHRwczovL2J1Z3ppbGxhLmtlcm5lbC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMTY5MyI+aHR0 cHM6Ly9idWd6aWxsYS5rZXJuZWwub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDE2OTM8L2E+PGJyPg0K Jmd0OyAmZ3Q7ICZndDsgPGJyPg0KJmd0OyAmZ3Q7ICZndDsgU2luY2UgYXQgcHJlc2VudCB3ZSBj YW4gbm90IGxpbWl0IGEgcXVpcmsgYmFzZWQgb24gdGhlIGNvbnRvcmxsZXIgLyBTSU0sPGJyPg0K Jmd0OyAmZ3Q7ICZndDsgYXBwbHkgdGhlIHF1aXJrIGluIGFsbCBjYXNlcy48YnI+DQomZ3Q7ICZn dDsgJmd0OyA8YnI+DQomZ3Q7ICZndDsgJmd0OyBSZXZpZXdlZCBieTogaW1wPGJyPg0KJmd0OyAm Z3Q7ICZndDsgTUZDIGFmdGVyOiAyIHdlZWtzPGJyPg0KJmd0OyAmZ3Q7ICZndDsgRGlmZmVyZW50 aWFsIFJldmlzaW9uOiA8YSB0YXJnZXQ9Il9ibGFuayIgcmVsPSJub3JlZmVycmVyIG5vZm9sbG93 IG5vb3BlbmVyIiBocmVmPSJodHRwczovL3Jldmlld3MuZnJlZWJzZC5vcmcvRDQzOTYxIj5odHRw czovL3Jldmlld3MuZnJlZWJzZC5vcmcvRDQzOTYxPC9hPjxicj4NCiZndDsgJmd0OyAmZ3Q7IC0t LTxicj4NCiZndDsgJmd0OyAmZ3Q7IHN5cy9jYW0vYXRhL2F0YV9kYS5jIHwgMTYgKysrKysrKysr KysrKysrKzxicj4NCiZndDsgJmd0OyAmZ3Q7IDEgZmlsZSBjaGFuZ2VkLCAxNiBpbnNlcnRpb25z KCspPGJyPg0KJmd0OyAmZ3Q7ICZndDsgPGJyPg0KJmd0OyAmZ3Q7ICZndDsgZGlmZiAtLWdpdCBh L3N5cy9jYW0vYXRhL2F0YV9kYS5jIGIvc3lzL2NhbS9hdGEvYXRhX2RhLmM8YnI+DQomZ3Q7ICZn dDsgJmd0OyBpbmRleCBmNWQzYWVjYTkzMjkuLmQ0YTU5MTk0MzMwNyAxMDA2NDQ8YnI+DQomZ3Q7 ICZndDsgJmd0OyAtLS0gYS9zeXMvY2FtL2F0YS9hdGFfZGEuYzxicj4NCiZndDsgJmd0OyAmZ3Q7 ICsrKyBiL3N5cy9jYW0vYXRhL2F0YV9kYS5jPGJyPg0KJmd0OyAmZ3Q7ICZndDsgQEAgLTcyNyw2 ICs3MjcsMjIgQEAgc3RhdGljIHN0cnVjdCBhZGFfcXVpcmtfZW50cnkgYWRhX3F1aXJrX3RhYmxl W10gPTxicj4NCiZndDsgJmd0OyAmZ3Q7IHsgVF9ESVJFQ1QsIFNJUF9NRURJQV9GSVhFRCwgIiIs ICJTYW1zdW5nIFNTRCA4NTAiLCAiIiB9LDxicj4NCiZndDsgJmd0OyAmZ3Q7IC9xdWlya3MvQURB X1FfNEsgfCBBREFfUV9OQ1FfVFJJTV9CUk9LRU48YnI+DQomZ3Q7ICZndDsgJmd0OyB9LDxicj4N CiZndDsgJmd0OyAmZ3Q7ICsgezxicj4NCiZndDsgJmd0OyAmZ3Q7ICsgLzxicj4NCiZndDsgJmd0 OyAmZ3Q7ICsgKiBTYW1zdW5nIDg2MCBTU0RzPGJyPg0KJmd0OyAmZ3Q7ICZndDsgKyAqIDRrIG9w dGltaXNlZCwgTkNRIFRSSU0gYnJva2VuIChub3JtYWwgVFJJTSBmaW5lKTxicj4NCiZndDsgJmd0 OyAmZ3Q7ICsgLzxicj4NCiZndDsgJmd0OyAmZ3Q7ICsgeyBUX0RJUkVDVCwgU0lQX01FRElBX0ZJ WEVELCAiIiwgIlNhbXN1bmcgU1NEIDg2MCoiLCAiIiB9LDxicj4NCiZndDsgJmd0OyAmZ3Q7ICsg L3F1aXJrcy9BREFfUV80SyB8IEFEQV9RX05DUV9UUklNX0JST0tFTjxicj4NCiZndDsgJmd0OyAm Z3Q7ICsgfSw8YnI+DQomZ3Q7ICZndDsgJmd0OyArIHs8YnI+DQomZ3Q7ICZndDsgJmd0OyArIC88 YnI+DQomZ3Q7ICZndDsgJmd0OyArICogU2Ftc3VuZyA4NzAgU1NEczxicj4NCiZndDsgJmd0OyAm Z3Q7ICsgKiA0ayBvcHRpbWlzZWQsIE5DUSBUUklNIGJyb2tlbiAobm9ybWFsIFRSSU0gZmluZSk8 YnI+DQomZ3Q7ICZndDsgJmd0OyArIC88YnI+DQomZ3Q7ICZndDsgJmd0OyArIHsgVF9ESVJFQ1Qs IFNJUF9NRURJQV9GSVhFRCwgIiIsICJTYW1zdW5nIFNTRCA4NzAqIiwgIiIgfSw8YnI+DQomZ3Q7 ICZndDsgJmd0OyArIC9xdWlya3MvQURBX1FfNEsgfCBBREFfUV9OQ1FfVFJJTV9CUk9LRU48YnI+ DQomZ3Q7ICZndDsgJmd0OyArIH0sPGJyPg0KJmd0OyAmZ3Q7ICZndDsgezxicj4NCiZndDsgJmd0 OyAmZ3Q7IC88YnI+DQomZ3Q7ICZndDsgJmd0OyAqIFNhbXN1bmcgU004NjMgU2VyaWVzIFNTRHMg KE1aN0tNKik8YnI+DQomZ3Q7IDxicj4NCiZndDsgPGJyPg0KJmd0OyAtLTxicj4NCiZndDsgQW5k cml5IEdhcG9uPGJyPg0KPC9ibG9ja3F1b3RlPjwvZGl2PjwvZGl2PjwvZGl2Pg0KPC9kaXY+PC9k aXY+DQoNCiAgICAgICAgPC9ibG9ja3F1b3RlPjxicj4NCiAgICA8L2Rpdj4= --b1_mkkyEVwy7Drn1aJ6XvL9VSap6ONAxAQ7RuVaO0HPR9Y-- From nobody Mon Feb 19 16:40:02 2024 X-Original-To: dev-commits-src-main@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 4TdpDQ0JV1z5C8f7; Mon, 19 Feb 2024 16:40:06 +0000 (UTC) (envelope-from avg@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TdpDP6t0fz4Y29; Mon, 19 Feb 2024 16:40:05 +0000 (UTC) (envelope-from avg@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708360806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding:autocrypt:autocrypt; bh=1Cd9c8QPUFolDt8bBq/pC/nTjHuCDTXp+o5blNU7/rk=; b=U+jBF0VxomLcI75uG7/045AQwSJWsmBmFo2rN4k9wG4GN+y9ufENX5q2KoApCrEOHeaYpW xPR2l5iCZC0B15fyHTdgM7yEh2mZL3AcivHgmv8UcxqLCY9tlRrETGUc4iZkGlXwUAdPeU nR9mHCNcjESimstdhZgwIsf3tIaQtwIEwRcjqP8z9qu+dUxbofqBayOri7WeWMMD088whD vkAbe8fDGgA4L9PehwHLwH1JCtmtRwKy68Ej3PYZZqg4BACT3u4vOeHiAhlLBw0V5fhu4j SzxI/vivjd7b/hCSP+k/y5IZ11HtXbK6+aiHKT8ZDW7bV+2khUvCNwVJ+xBneA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708360806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding:autocrypt:autocrypt; bh=1Cd9c8QPUFolDt8bBq/pC/nTjHuCDTXp+o5blNU7/rk=; b=smdbHr0+sloJw/bxbnY1szZQrILQPYajVh7aX/DDm0HMjNUW0Ya44Gl4SJrExjpkBGIuhc QtGb6D4R0tDru29KtBGUPUKoWAt+Wge6CbGwffJo0a1DALeXAqlSvKeKTYLzygBTUsAlIy b+VuJRwOqnS4Np4V2m26CeTU9Rjre2hwAukuYNsDyDFkRz9nbB4nqzM8zpHdeV/klVy8A6 VGroe31GE30i3UAMSsVRq6LWnoxntlO1HDKRTRQCzvolcccuSgzZsLi88UNR37j2LC/FK7 EaJ51qTrxpBS28Wl6meUGJBwHlULtTRYxy0TCnpis5j073DLKjhbFzhKsBOuDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708360806; a=rsa-sha256; cv=none; b=cM6vpHkUgZEb6T13s4HUZ9DXXVQ68lWIwtY4y6WqdNAfxuAuF3Psicft63MX3RGiHcPaVB IX38RiJF0LF4MaV6Y4+IGM/eDAkPiNSczLr9K0I1AMbFtECrk7BRW9hNCnOWs+j5sz7v2R N8YjyYiIkrcmtikEmgVe+H/sQikNz2VCuTEav23rsioJkVCol7S/nyTAjVTv8049IlLA6J fB7JRDYw02q/xQb3/4ohAgXZr0dYGC1OE3zw19cDgvJrRitDnFmZ6EAJC8jDfZKKbEGqcR 2Eey67WE0NxfZKhHCkynoZGutAkWiR+3BH6e3zQUS4tSvq5cS+WO0WE+lGDJbA== Received: from [192.168.0.88] (unknown [93.188.39.137]) (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) (Authenticated sender: avg/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TdpDP0tq3z13Kw; Mon, 19 Feb 2024 16:40:04 +0000 (UTC) (envelope-from avg@freebsd.org) Message-ID: <6a73f7bf-dbe9-416b-a6d0-dded14285574@freebsd.org> Date: Mon, 19 Feb 2024 18:40:02 +0200 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird From: Andriy Gapon Subject: Re: git: c01af41c3c8f - main - ata_da: add quirk to disable NCQ TRIM for Samsung 860/870 SSDs Content-Language: en-US To: cglogic , Warner Losh Cc: src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Autocrypt: addr=avg@freebsd.org; keydata= xjMEX1iFDhYJKwYBBAHaRw8BAQdAiu8JG/oLFkVkOAJqJc7Dx5KI/Q6C3SBI20EQm+DXnAvN HkFuZHJpeSBHYXBvbiA8YXZnQEZyZWVCU0Qub3JnPsKWBBMWCAA+FiEEyCHHZM09l0OE3Ir/ 1A1+Gq8+L1EFAl9YhQ4CGwMFCQeEzgAFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQ1A1+ Gq8+L1Fc0wD/ZjmhHfbCJywZU3aOxXIPjcz73FYEGMvqMCCLAWyLbSABALFL+1ZNrjV3BGjq 889cOYFuboA/Yn3eWezS+tfqYBsGzjgEX1iFDhIKKwYBBAGXVQEFAQEHQL6B20Xi600TrkpG P9fWjl7JtHNxqrHKhX6Kg7kgb4ILAwEIB8J+BBgWCAAmFiEEyCHHZM09l0OE3Ir/1A1+Gq8+ L1EFAl9YhQ4CGwwFCQeEzgAACgkQ1A1+Gq8+L1F3cgEAktp4h+IJUJxL1vn6zMOt//znni/J TanKfQuA8wGXcGkBAKpZJhqMkg+pKk7MGvJhgJ6nCpTZ+rMK6vZVZLUWc3QF Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 19/02/2024 18:06, cglogic wrote: > Hello Warner, > > Thank you for detailed explanation. Looks like it has no sense for me to worry > about disabling NCQ TRIM on that old PC. > > However it would be great to have possibility to apply such hardware bug > workarounds for affected controller/drive pairs only. > Or, at least, have possibility to disable such quirks on per drive basis via > sysctl. I didn't find such a possibility. Yeah, we do not have a way to control ata_da (and scsi_da) quirks via configuration. It would be nice to have it, indeed. Also, perhaps what ADA_Q_NCQ_TRIM_BROKEN could do is prefer a different delete method by default. That way, NCQ_DSM_TRIM option would not disappear completely and it would be possible to set with kern.cam.ada.N.delete_method sysctl. > On Monday, February 19th, 2024 at 5:18 PM, Warner Losh wrote: >> >> >> On Mon, Feb 19, 2024, 4:29 AM cglogic > > wrote: >> >> On Monday, February 19th, 2024 at 1:03 PM, Andriy Gapon >> wrote: >> >> > On 19/02/2024 12:47, cglogic wrote: >> > >> > > Hello Andriy, >> > > >> > > I use ZFS with autotrim enabled on Samsung 860 PRO connected to Intel >> AHCI SATA controller for 9 years without any issue. >> > >> > >> > I think that it was released in 2018? >> >> You are right, it's 9 years old computer, SSD was added later. >> >> > >> > > Can I disable this quirk locally or have I revert the patch to >> continue use NCQ TRIM with this SSD? >> > >> > >> > I don't think that there is a way to disable the quirk, so you'll have >> to revert. >> > Note that ATA TRIM is still enabled, it's only NCQ TRIM that got disabled. >> >> From my understanding ATA TRIM is non-queued TRIM as opposed to NCQ TRIM. >> With only ATA TRIM enabled, drive will have increased latency when large >> amount of files deleted. >> >> However I'm not sure how ZFS handles TRIMs, maybe it groups several TRIMs >> and then sends when drive is idle. >> Another question is how this affects TRIM enabled swap partition. >> >> In general, if I'm correct here, disabling NCQ TRIM should not be an issue >> for desktop usage, except for large git repository updates, etc. >> >> >> In general, it won't matter a ton. Unless you are seeing stalls because of >> read/write I/O waiting behind trims that have to go to the drive one at a >> time, the effects are in the noise. If you are seeing that, though, the >> effects can be quite helpful in terms of latency... assuming the drive is >> cooperative. The benefits of it vary a lot from drive to drive as well. Some >> early drives still serialize the trims, so the latency benefit is not so >> great. Some enterprise drives do trims instantly and keep some internal state >> that is helped a lot by them. But if NCQ trims are unstable, we likely should >> err on the side of disabling. >> >> The errors that Andriy was seeing typically are cable or controller issues. In >> his case, it was a controller issue (apparently, and surprisingly, paired with >> a specific type of drive). Linux has a specific workaround for the pair, which >> is unusual. But there's two issues at play. >> >> The first issue is that these drives should have NCQ Trim turned off, >> according to Linux's commit log. This may be firmware revision based or may >> just be some people are luckier with newer firmware (it's hard to say from the >> mixed reports, but they read more like luck than version for the sampling I >> did). So Andriy's change is good. The second issue, and one I was confused on >> earlier, is that Linux goes a step further and disables NCQ entirely for these >> old controllers for 860 and 870 drives. This isn't too surprising. We have a >> workaround for PMP for these controllers already.... One can disable NCQ >> entirely by setting the tags to 0... Given the specificity of the problem, and >> the age of the controllers, I'm inclined to not implement the Linux workaround >> for this specific pair. -- Andriy Gapon From nobody Mon Feb 19 16:42:12 2024 X-Original-To: dev-commits-src-main@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 4TdpGs2Dl2z5C8Yj; Mon, 19 Feb 2024 16:42:13 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TdpGs1Lc3z4YSk; Mon, 19 Feb 2024 16:42:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708360933; 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=oEsysHNBXcbJajlufUFuWN835qolhbvFeRT3gA1mL4c=; b=MIYErKN1Ez/9ozUjzlaxMsPp5q7EHY6ASFWLMi4hbweXshvNHeZFgjZ9oYKufchDFQRXC9 aHKrKRroH8mm49TaG2/tgk6eT65sqVZhwRknN0C85hU1kVdxKCLx5SLbfFXEvn8iBN6OJR Z+58dJl5dfFlT9tjXYM+ngV/qgxLFzBDsiJlFBUcT9GPqTWFIVZkMwi6sLwOAVHbDHe/D2 TCNV3Np52GKQwCLN7Pe7HKhv8zEVf6jjAMhUHImZ1TeTsBJ75D36hLPzppr1p6Wlazo8yG mcDqGcdzzI0zTeTk8/WVPH3r7SO1NQd+TfXay4HIzAQNgJJucdr5TCuSjoP92g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708360933; 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=oEsysHNBXcbJajlufUFuWN835qolhbvFeRT3gA1mL4c=; b=Gu4coI8NAcIZi6eZMJd15g8GIyIYEtnQOElHN/rpMTjT90CJqDNPHufI6ViZEvHDYQp5nR vXg2W5EqV024dM0lQsrqmPCPsGQikrRHa4eSevFLGMDI/Z6nAWCKaW1+NZknjhL9XKgmXY zQGOwAuRS89VNmwYoewRmg/Mjut7QD5e5D1vbMiBDFeoclbVUUW0eSVqsAws/ywyj6aL+f S4a927QsBgvq7tXQB/AISi89t5Be/NS/OWfGq22b89Ljj3OFuguWNYjjadLGUTW0rMMeJD qfnYkRrrz2iAhHdl8vhXBhxbt6y/wQOs+8V756IYWudqf4X1iO6eVcVE6F6Urg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708360933; a=rsa-sha256; cv=none; b=ZYLpYvfXu6v7jXrCwT1lBbgviT9+6fCssWRkwDutZAeJoVKyeE4ZJve5e+of8hMBCXfgir d5G+METWXlFhevv9DGam7gVGjAgkYOQaPeS4EZr/fZ2pxVfmsmii3W1P87CCuHXUOVm55K yRV0XA0R6CC7V7TSvm6PRGXRW5JrwABPVX9d65+03Bqr1QfsYd+YtbV565CBakqFj+b2uR n8DRlD4zDVqQBbIWvIZviQxmD+QPoPNKi06+DNTroccP1X96kPOpCGghM9t3Jaz6S8VeDV tmx8ucWv6KW6+8BUE+tYYtVVdYb3ZCa6UQYg6b7pmo2YlBFEzliiCzwSoLOHAQ== 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 4TdpGs0QgZzjGX; Mon, 19 Feb 2024 16:42:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41JGgCme093159; Mon, 19 Feb 2024 16:42:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JGgCta093156; Mon, 19 Feb 2024 16:42:12 GMT (envelope-from git) Date: Mon, 19 Feb 2024 16:42:12 GMT Message-Id: <202402191642.41JGgCta093156@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 6a3c02bc5289 - main - sched: sched_switch(): Factorize sleepqueue flags List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a3c02bc52892eb09c3b766562b8ddb452c393a9 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=6a3c02bc52892eb09c3b766562b8ddb452c393a9 commit 6a3c02bc52892eb09c3b766562b8ddb452c393a9 Author: Olivier Certner AuthorDate: 2024-01-16 09:42:11 +0000 Commit: Olivier Certner CommitDate: 2024-02-19 16:37:19 +0000 sched: sched_switch(): Factorize sleepqueue flags Avoid duplicating common flags for the preempted and non-preempted cases, making it clear that they are the same without resorting to formatting. No functional change. Approved by: markj (mentor) MFC after: 3 days Sponsored by: The FreeBSD Foundation --- sys/kern/sched_4bsd.c | 5 ++--- sys/kern/sched_ule.c | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/kern/sched_4bsd.c b/sys/kern/sched_4bsd.c index efcd9b7cb250..f0fffeb08e2d 100644 --- a/sys/kern/sched_4bsd.c +++ b/sys/kern/sched_4bsd.c @@ -1041,9 +1041,8 @@ sched_switch(struct thread *td, int flags) } else { if (TD_IS_RUNNING(td)) { /* Put us back on the run queue. */ - sched_add(td, preempted ? - SRQ_HOLDTD|SRQ_OURSELF|SRQ_YIELDING|SRQ_PREEMPTED : - SRQ_HOLDTD|SRQ_OURSELF|SRQ_YIELDING); + sched_add(td, SRQ_HOLDTD | SRQ_OURSELF | SRQ_YIELDING | + (preempted ? SRQ_PREEMPTED : 0)); } } diff --git a/sys/kern/sched_ule.c b/sys/kern/sched_ule.c index ebd7139fa612..c0d085fcf906 100644 --- a/sys/kern/sched_ule.c +++ b/sys/kern/sched_ule.c @@ -2227,9 +2227,8 @@ sched_switch(struct thread *td, int flags) TD_SET_CAN_RUN(td); } else if (TD_IS_RUNNING(td)) { MPASS(mtx == TDQ_LOCKPTR(tdq)); - srqflag = preempted ? - SRQ_OURSELF|SRQ_YIELDING|SRQ_PREEMPTED : - SRQ_OURSELF|SRQ_YIELDING; + srqflag = SRQ_OURSELF | SRQ_YIELDING | + (preempted ? SRQ_PREEMPTED : 0); #ifdef SMP if (THREAD_CAN_MIGRATE(td) && (!THREAD_CAN_SCHED(td, ts->ts_cpu) || pickcpu)) From nobody Mon Feb 19 16:42:14 2024 X-Original-To: dev-commits-src-main@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 4TdpGt304gz5C8bk; Mon, 19 Feb 2024 16:42: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TdpGt2LYLz4Yhx; Mon, 19 Feb 2024 16:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708360934; 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=ib8/HTtv8VBUDspPkF4AcKo+qnKrPkE+jMtxYMemg68=; b=THPYF6JUdOq/NZZHDdqDiuttQ4pvEnZJmC7QU/fjJ2M7zi6eJ9llK4/XpVCe8LmjLFl3JD rd9NCtDyy5wjxnMapkODsCAUGI4WSXg+0MSfLCvRHsdMOrCTkqBZgfJSDKeLYSHBDL/tqI 9Oai/+VBbfyWbcLr4X/RbinA53sRk8pmMeu6L0Q1VmxBGDpKtu1AaMP1DubUu+1pbRW8ig rpOJFop9FfmV3PWSjERGvlRpO9YdMfr/xBwATSDIBpUQ4GUte8T3pqGEf+j/LTI3U2OXg0 yNuiF98KQFrrHx+lTDKXRM/EcVTqxhrX4Vaf1utwLhaDSjXEaTkoEYKtyag5Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708360934; 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=ib8/HTtv8VBUDspPkF4AcKo+qnKrPkE+jMtxYMemg68=; b=g0Z7g9LJWayEmhSWhvfaQY2EAKUsJQ+yPx86qQ3mF0E8UFB24W+4vBkpihTBRG8ANqKYo7 N4FDH5ZVBl2PbowlBJ8ZFfNlNIBxCxW0TKOr2II7JtA3Z4bwGhtDMHw/x9qZewK6cGUlAd u0udaovh0bkoniRTyG1ZQc9nHyTzmJxBzILRf0xxyRttGbYrQdZoKXzj2c8rooeO8U6wnj 5+GkTyQlWxEBbIUWb2aIEjDbQEDgl/+Wm3MYlH0gtu4U8VyE+bPrjRdIZT7MYvnZhA0w/S VH/I+6+I2jzyXm/Z14ZO+244QfjrMsZ3iR34UWf9VbxAacWhDc7kHlHTehptkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708360934; a=rsa-sha256; cv=none; b=s9cHuDjzkKumoYGwyurFGucPvY4o94qqe2w5kdYK3LrSsxq5u6FsW+YFEXRya0yLfBeru1 RGy4V6oIGkHS/jtm2Zt7tpvu4M10s8Su/Z9u+ss+/C1ToYsttoNUq/XYEkfJzU6t8OPw0i di7myzQ2OGqfrT6sq7piWlkEp/2m3UIqjrk0QgUm8zQxigwJjeFq1zexx+RuNs89EwI/R0 pmL3mIhM6UaAaxa0Ka1z4/GqCJEtn50uy9Dn+JDu4cAmbXEb8RX3+vy3UqCYDzdOPQ7ZJM 0F/Ka801ALP09YjyHNBBfz81FI5oB8MJjdByJb8uDQPMWmt+Y0RYCIKwa6HH/Q== 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 4TdpGt1PdczjD5; Mon, 19 Feb 2024 16:42:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41JGgEGT093204; Mon, 19 Feb 2024 16:42:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JGgE4u093201; Mon, 19 Feb 2024 16:42:14 GMT (envelope-from git) Date: Mon, 19 Feb 2024 16:42:14 GMT Message-Id: <202402191642.41JGgE4u093201@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: bcaa0b4c2bab - main - umtxvar.h: Add missing include List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bcaa0b4c2bab2866d5ee11c9eb8900a70bdb21e1 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=bcaa0b4c2bab2866d5ee11c9eb8900a70bdb21e1 commit bcaa0b4c2bab2866d5ee11c9eb8900a70bdb21e1 Author: Olivier Certner AuthorDate: 2024-02-08 20:11:17 +0000 Commit: Olivier Certner CommitDate: 2024-02-19 16:41:34 +0000 umtxvar.h: Add missing include Necessary to have the definition of 'struct timespec'. No functional change. Approved by: markj (mentor) MFC after: 3 days Sponsored by: The FreeBSD Foundation --- sys/sys/umtxvar.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/sys/umtxvar.h b/sys/sys/umtxvar.h index 216c7a3e2cd1..647ee2a4650c 100644 --- a/sys/sys/umtxvar.h +++ b/sys/sys/umtxvar.h @@ -32,6 +32,8 @@ #ifdef _KERNEL +#include + /* * The umtx_key structure is used by both the Linux futex code and the * umtx implementation to map userland addresses to unique keys. From nobody Mon Feb 19 16:51:27 2024 X-Original-To: dev-commits-src-main@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 4TdpTW5Gxpz5C9tK; Mon, 19 Feb 2024 16:51:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TdpTW4qWmz4rhF; Mon, 19 Feb 2024 16:51:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708361487; 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=Dx9j0Zygs+0wrbH2xjiuNNwR80raQ4s1NOvb5Q+iqZ8=; b=eV+UGlfJeBZK1dW7jaJqAYSHsZuOrJvtx1UVw2TMjJPNcmTSd03yRYytAantb1hK2vxVP3 NQpUtfPXSOMj7fHwArTT9NW1pzVfmypvgJt/vD6+f3g/qcbvBxeQ0a5zkfyK2zaEwkpNyI ZJrAzvzRrYTYN/H2rzfLvQDl+ZQho85rT5kpCR8rFvxUofLeTjw6J0kUZ6TLy/7+VPEopU sflqLiGhWe/7j45OgH3ItFo1el8dKMioGPGQqXBosX+tXnA71chIoGKvNbbHE6An3yGooD eSIHyx8EO5XidMrm+AsAgydOxy5YMevRpxhO89OEKy+3Iq1VxrPDzH13GPWKNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708361487; 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=Dx9j0Zygs+0wrbH2xjiuNNwR80raQ4s1NOvb5Q+iqZ8=; b=gZeGJY8ZvwMUInbsZeZR9BDpm4erMTlIj2f5DwXL69N88v/8UMUKYKbXq35B7fbeAjXy2F y50uo/AeAqwS5YEwNq5VNgLBcnoUDvI0NN3yVEmZWnx/mkP6THGdvsBF2QvXDBgak0aMdv Tm7tIAwps33phPSRgH7Mv25xnOOne1ePlQwmZ0dqRUBbGJs4hCwD6VuhdKB5IzhVcre2nC bs0L//EvQIBshcbHzqf9ipGc/Dgm64pkxoq90t1sLA6mZHjTE4SWWPzzM0h/ehebfk5Ryj evrt/iaB6bIWW4XJUmVqHiFBlkYfuyOwihkZQmiNWBliCOH5z0opBa4tdeagVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708361487; a=rsa-sha256; cv=none; b=whsFTNbB9MBDudHJuWmFf4Xx/Jgn+OB5u8YBcmQLC0ra7MO248Uap7vpUiPGP6fLpNLK0Z aPnOR1lnSLYzTWTEyhA9eqspKBRYuQsHocyrgTShfDa9jxWObE9m5NC7nPaSeuu5TxY5Ei TOacX9yDdtgzxiERwAW3sfe5lPDG3yTTy4XbqT53Og6nA6uIyTEQVCJaqs5RNW5pFaNRrI tlB+pzsvELBffo/Ft/dKT3wlBehHfYwK/I8kl6Di6VCe81OufYOt2YoD3ynV1+iDvkXUJs /t8/hRBhEBkIHKdDmUAS0ImGMEYMx+j/SBSPTaN9pjKfeu80WACSRF0QzoAnEg== 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 4TdpTW3vSGzjQX; Mon, 19 Feb 2024 16:51:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41JGpRq8010134; Mon, 19 Feb 2024 16:51:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JGpRb1010131; Mon, 19 Feb 2024 16:51:27 GMT (envelope-from git) Date: Mon, 19 Feb 2024 16:51:27 GMT Message-Id: <202402191651.41JGpRb1010131@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ef75877fc2d9 - main - ls: Fix -v and associated test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ef75877fc2d93199aab2b509089136c433af1f20 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ef75877fc2d93199aab2b509089136c433af1f20 commit ef75877fc2d93199aab2b509089136c433af1f20 Author: Warner Losh AuthorDate: 2024-02-19 16:48:05 +0000 Commit: Warner Losh CommitDate: 2024-02-19 16:50:04 +0000 ls: Fix -v and associated test The cleanup of d854370fa86b7 had a cut and paste error (so f_verssort was set to 1 and then to 0 rather thame f_timesort being set to 0). Fixes: d854370fa86b7 Sponsored by: Netflix --- bin/ls/ls.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/ls/ls.c b/bin/ls/ls.c index 7ebcc5383863..b5e3578f27bb 100644 --- a/bin/ls/ls.c +++ b/bin/ls/ls.c @@ -327,7 +327,7 @@ main(int argc, char *argv[]) case 'v': f_verssort = 1; f_sizesort = 0; - f_verssort = 0; + f_timesort = 0; break; /* Other flags. Please keep alphabetic. */ case ',': @@ -566,6 +566,7 @@ main(int argc, char *argv[]) blocksize /= 512; } } + /* Select a sort function. */ if (f_reversesort) { if (f_sizesort) From nobody Mon Feb 19 17:00:33 2024 X-Original-To: dev-commits-src-main@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 4Tdph74Rs4z5CC3F for ; Mon, 19 Feb 2024 17:00:39 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) (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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tdph71cjKz4tpC for ; Mon, 19 Feb 2024 17:00:39 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lj1-x22b.google.com with SMTP id 38308e7fff4ca-2d228a132acso30808661fa.0 for ; Mon, 19 Feb 2024 09:00:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1708362036; x=1708966836; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=0ek4PeJSFSbxIvl0QPEXJipULW56fvFuuS/M82ihHlw=; b=d7W6C4TQ6Y0ZeEogGuWwiLrdJDu3OMmfXyRBcidqmzTtbJwlzvPJ6V2jNNxq/bAvsU /01buCbominULUESfmkqFLHpYYlOXu4uWBHE1fCbgKQMKo3mvyNucc4WAHwaE+anHQJA 9BlDgCHotDSZT5H1/zNKLyRQ5bgxUqCzob2WlwO8dYt7FVYS6CQ0fuwzgfsy9W5+KbJ0 JyInbzU5bwjZ/GFwtHdWCAUbjE36wOXTWiRwjcj6qhwIIPMPSdd+y0RSqZuOwal8krUM R0ubx9WOUboCh0VRRBV6NqShCjf3AtRqx28di+xqE7FI4yXDMctj+HE31f+Jmlepgv5Q LArw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708362036; x=1708966836; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=0ek4PeJSFSbxIvl0QPEXJipULW56fvFuuS/M82ihHlw=; b=EpZ7u2aky4Si8rC0pspaGY5HuYw01r8manYTE50Lb3OI+EAnLm6YyqcTqCfYlnrFQ/ FX/c327NO02Ew4DwEZ//2Kqd/S/lSkiCqWtSRIu0vOuLd4mWKcnCQZb9VaDP87RssXXE gxUXux6kipgskiXcnXbAxa5q121vDe2XOWhrhFxSKt+0MAcyz7hwDO3W9w9PR4ZFGnuN xvLCfl5LIOnKyojNJQ7CMr2VGMaPjUntvzO8bgHU6oIgVsuzghWLLoOBPAtLWIjsm81P faYDOkwPqcy8AlKnkLPMB2qucOeYC8CyKw8uOSvPoyBCIuzR+dBXLV7ts9+UYYILFMVt iLiA== X-Forwarded-Encrypted: i=1; AJvYcCUYC5PtHTtt7mgA84dhG+eHwXSsBa0p13asjhx598makVg3tmDZt9WR97R3isFcicYzN9jyFet1Xke73fIRQSblshQkZRd41S/4Wji4hjVgzA== X-Gm-Message-State: AOJu0Yw4YHb6hyVlY3DMoHX/iA98/TpCBS1EvLLCek1H0lH1rcrErdrb HV8sZcefqxfeFHM2/kTCf1E8wpwudPl7J40WCMCt75ms+bQHGkAVdlkgYfHpkN8o+V5JGoysT8L fB7IlhOYM2fRr+zVwHUUuG8aUWwiepbTza8recg== X-Google-Smtp-Source: AGHT+IFVGKK4guak3Y8xtSI6+4NDKEcb0uGrJFqdwW3thhk4FT5JT7w21g3c6QPwy87eWRj0voi2P5X3vZIN7G2V4pw= X-Received: by 2002:a2e:bc24:0:b0:2d2:427c:9ac5 with SMTP id b36-20020a2ebc24000000b002d2427c9ac5mr1563533ljf.37.1708362035995; Mon, 19 Feb 2024 09:00:35 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <6a73f7bf-dbe9-416b-a6d0-dded14285574@freebsd.org> In-Reply-To: <6a73f7bf-dbe9-416b-a6d0-dded14285574@freebsd.org> From: Warner Losh Date: Mon, 19 Feb 2024 10:00:33 -0700 Message-ID: Subject: Re: git: c01af41c3c8f - main - ata_da: add quirk to disable NCQ TRIM for Samsung 860/870 SSDs To: Andriy Gapon Cc: cglogic , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="0000000000004db5760611bf087c" X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Tdph71cjKz4tpC X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] --0000000000004db5760611bf087c Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Feb 19, 2024 at 9:40=E2=80=AFAM Andriy Gapon wrot= e: > On 19/02/2024 18:06, cglogic wrote: > > Hello Warner, > > > > Thank you for detailed explanation. Looks like it has no sense for me t= o > worry > > about disabling NCQ TRIM on that old PC. > > > > However it would be great to have possibility to apply such hardware bu= g > > workarounds for affected controller/drive pairs only. > > Or, at least, have possibility to disable such quirks on per drive basi= s > via > > sysctl. I didn't find such a possibility. > > Yeah, we do not have a way to control ata_da (and scsi_da) quirks via > configuration. It would be nice to have it, indeed. > > Also, perhaps what ADA_Q_NCQ_TRIM_BROKEN could do is prefer a different > delete > method by default. That way, NCQ_DSM_TRIM option would not disappear > completely > and it would be possible to set with kern.cam.ada.N.delete_method sysctl. > Yea. In this case, though, the method is known to be bad. This badness might not be apparent until data is corrupted. Things seem to work. This is very dangerous to allow, even with a I know what I'm doing flag. We could do it, but I'm very uneasy given the data corruption that causes us to disable it in the first place... Given what I read https://bugzilla.kernel.org/show_bug.cgi?id=3D203475 we want NCQ Trim disabled entirely for these drives. Sometimes they work, until they don't, then people report similar errors to what Andriy reported. Warner > > On Monday, February 19th, 2024 at 5:18 PM, Warner Losh > wrote: > >> > >> > >> On Mon, Feb 19, 2024, 4:29=E2=80=AFAM cglogic >> > wrote: > >> > >> On Monday, February 19th, 2024 at 1:03 PM, Andriy Gapon > > >> wrote: > >> > >> > On 19/02/2024 12:47, cglogic wrote: > >> > > >> > > Hello Andriy, > >> > > > >> > > I use ZFS with autotrim enabled on Samsung 860 PRO connected t= o > Intel > >> AHCI SATA controller for 9 years without any issue. > >> > > >> > > >> > I think that it was released in 2018? > >> > >> You are right, it's 9 years old computer, SSD was added later. > >> > >> > > >> > > Can I disable this quirk locally or have I revert the patch to > >> continue use NCQ TRIM with this SSD? > >> > > >> > > >> > I don't think that there is a way to disable the quirk, so you'l= l > have > >> to revert. > >> > Note that ATA TRIM is still enabled, it's only NCQ TRIM that got > disabled. > >> > >> From my understanding ATA TRIM is non-queued TRIM as opposed to NC= Q > TRIM. > >> With only ATA TRIM enabled, drive will have increased latency when > large > >> amount of files deleted. > >> > >> However I'm not sure how ZFS handles TRIMs, maybe it groups severa= l > TRIMs > >> and then sends when drive is idle. > >> Another question is how this affects TRIM enabled swap partition. > >> > >> In general, if I'm correct here, disabling NCQ TRIM should not be > an issue > >> for desktop usage, except for large git repository updates, etc. > >> > >> > >> In general, it won't matter a ton. Unless you are seeing stalls becaus= e > of > >> read/write I/O waiting behind trims that have to go to the drive one a= t > a > >> time, the effects are in the noise. If you are seeing that, though, th= e > >> effects can be quite helpful in terms of latency... assuming the drive > is > >> cooperative. The benefits of it vary a lot from drive to drive as well= . > Some > >> early drives still serialize the trims, so the latency benefit is not > so > >> great. Some enterprise drives do trims instantly and keep some interna= l > state > >> that is helped a lot by them. But if NCQ trims are unstable, we likely > should > >> err on the side of disabling. > >> > >> The errors that Andriy was seeing typically are cable or controller > issues. In > >> his case, it was a controller issue (apparently, and surprisingly, > paired with > >> a specific type of drive). Linux has a specific workaround for the > pair, which > >> is unusual. But there's two issues at play. > >> > >> The first issue is that these drives should have NCQ Trim turned off, > >> according to Linux's commit log. This may be firmware revision based o= r > may > >> just be some people are luckier with newer firmware (it's hard to say > from the > >> mixed reports, but they read more like luck than version for the > sampling I > >> did). So Andriy's change is good. The second issue, and one I was > confused on > >> earlier, is that Linux goes a step further and disables NCQ entirely > for these > >> old controllers for 860 and 870 drives. This isn't too surprising. We > have a > >> workaround for PMP for these controllers already.... One can disable > NCQ > >> entirely by setting the tags to 0... Given the specificity of the > problem, and > >> the age of the controllers, I'm inclined to not implement the Linux > workaround > >> for this specific pair. > > > -- > Andriy Gapon > > --0000000000004db5760611bf087c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Mon, Feb 19, 2024 at 9:40=E2=80=AF= AM Andriy Gapon <avg@freebsd.org&= gt; wrote:
On 19= /02/2024 18:06, cglogic wrote:
> Hello Warner,
>
> Thank you for detailed explanation. Looks like it has no sense for me = to worry
> about disabling NCQ TRIM on that old PC.
>
> However it would be great to have possibility to apply such hardware b= ug
> workarounds for affected controller/drive pairs only.
> Or, at least, have possibility to disable such quirks on per drive bas= is via
> sysctl. I didn't find such a possibility.

Yeah, we do not have a way to control ata_da (and scsi_da)=C2=A0 quirks via=
configuration.=C2=A0 It would be nice to have it, indeed.

Also, perhaps what ADA_Q_NCQ_TRIM_BROKEN could do is prefer a different del= ete
method by default.=C2=A0 That way, NCQ_DSM_TRIM option would not disappear = completely
and it would be possible to set with kern.cam.ada.N.delete_method sysctl.

Yea. In this case, though, the method is= known to be bad. This badness might not be apparent
until data i= s corrupted. Things seem to work. This is very dangerous to allow, even wit= h a
I know what I'm doing flag. We could do it, but I'm v= ery uneasy given the data corruption
that causes us to disable it= in the first place...

disabl= ed entirely for these drives. Sometimes they work, until they don't, th= en people report
similar errors to what Andriy reported.

Warner
=C2=A0
> On Monday, February 19th, 2024 at 5:18 PM, Warner Losh <imp@bsdimp.com> wrote:
>>
>>
>> On Mon, Feb 19, 2024, 4:29=E2=80=AFAM cglogic <cglogic@protonmail.com
>> <mailto:cglogic@protonmail.com>> wrote:
>>
>>=C2=A0 =C2=A0 =C2=A0On Monday, February 19th, 2024 at 1:03 PM, Andr= iy Gapon <avg@FreeBSD.org>
>>=C2=A0 =C2=A0 =C2=A0wrote:
>>
>>=C2=A0 =C2=A0 =C2=A0> On 19/02/2024 12:47, cglogic wrote:
>>=C2=A0 =C2=A0 =C2=A0>
>>=C2=A0 =C2=A0 =C2=A0> > Hello Andriy,
>>=C2=A0 =C2=A0 =C2=A0> >
>>=C2=A0 =C2=A0 =C2=A0> > I use ZFS with autotrim enabled on Sa= msung 860 PRO connected to Intel
>>=C2=A0 =C2=A0 =C2=A0AHCI SATA controller for 9 years without any is= sue.
>>=C2=A0 =C2=A0 =C2=A0>
>>=C2=A0 =C2=A0 =C2=A0>
>>=C2=A0 =C2=A0 =C2=A0> I think that it was released in 2018?
>>
>>=C2=A0 =C2=A0 =C2=A0You are right, it's 9 years old computer, S= SD was added later.
>>
>>=C2=A0 =C2=A0 =C2=A0>
>>=C2=A0 =C2=A0 =C2=A0> > Can I disable this quirk locally or h= ave I revert the patch to
>>=C2=A0 =C2=A0 =C2=A0continue use NCQ TRIM with this SSD?
>>=C2=A0 =C2=A0 =C2=A0>
>>=C2=A0 =C2=A0 =C2=A0>
>>=C2=A0 =C2=A0 =C2=A0> I don't think that there is a way to d= isable the quirk, so you'll have
>>=C2=A0 =C2=A0 =C2=A0to revert.
>>=C2=A0 =C2=A0 =C2=A0> Note that ATA TRIM is still enabled, it= 9;s only NCQ TRIM that got disabled.
>>
>>=C2=A0 =C2=A0 =C2=A0From my understanding ATA TRIM is non-queued TR= IM as opposed to NCQ TRIM.
>>=C2=A0 =C2=A0 =C2=A0With only ATA TRIM enabled, drive will have inc= reased latency when large
>>=C2=A0 =C2=A0 =C2=A0amount of files deleted.
>>
>>=C2=A0 =C2=A0 =C2=A0However I'm not sure how ZFS handles TRIMs,= maybe it groups several TRIMs
>>=C2=A0 =C2=A0 =C2=A0and then sends when drive is idle.
>>=C2=A0 =C2=A0 =C2=A0Another question is how this affects TRIM enabl= ed swap partition.
>>
>>=C2=A0 =C2=A0 =C2=A0In general, if I'm correct here, disabling = NCQ TRIM should not be an issue
>>=C2=A0 =C2=A0 =C2=A0for desktop usage, except for large git reposit= ory updates, etc.
>>
>>
>> In general, it won't matter a ton. Unless you are seeing stall= s because of
>> read/write I/O waiting behind trims that have to go to the drive o= ne at a
>> time, the effects are in the noise. If you are seeing that, though= , the
>> effects can be quite helpful in terms of latency... assuming the d= rive is
>> cooperative. The benefits of it vary a lot from drive to drive as = well. Some
>> early drives still serialize the trims, so the latency benefit is = not so
>> great. Some enterprise drives do trims instantly and keep some int= ernal state
>> that is helped a lot by them. But if NCQ trims are unstable, we li= kely should
>> err on the side of disabling.
>>
>> The errors that Andriy was seeing typically are cable or controlle= r issues. In
>> his case, it was a controller issue (apparently, and surprisingly,= paired with
>> a specific type of drive). Linux has a specific workaround for the= pair, which
>> is unusual. But there's two issues at play.
>>
>> The first issue is that these drives should have NCQ Trim turned o= ff,
>> according to Linux's commit log. This may be firmware revision= based or may
>> just be some people are luckier with newer firmware (it's hard= to say from the
>> mixed reports, but they read more like luck than version for the s= ampling I
>> did). So Andriy's change is good. The second issue, and one I = was confused on
>> earlier, is that Linux goes a step further and disables NCQ entire= ly for these
>> old controllers for 860 and 870 drives. This isn't too surpris= ing. We have a
>> workaround for PMP for these controllers already.... One can disab= le NCQ
>> entirely by setting the tags to 0... Given the specificity of the = problem, and
>> the age of the controllers, I'm inclined to not implement the = Linux workaround
>> for this specific pair.


--
Andriy Gapon

--0000000000004db5760611bf087c-- From nobody Mon Feb 19 22:44:35 2024 X-Original-To: dev-commits-src-main@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 4TdyK01yTMz59dxW; Mon, 19 Feb 2024 22:44: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TdyK00nKnz4Y9T; Mon, 19 Feb 2024 22:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708382676; 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=Gbet1e9vffYsMXAukC4xeW0vecj4voAYSihpVb+cIXo=; b=cXTAQ7bYsB5uHjtomzVoRa/DupxlgRhyrWPlgQRzAfeiJM9hwqPoxtC4/04/GJJgJXL+Yj GRvvaVOSZYJKhIO1HCL9vAJyI62TOXEm+R1Pt5t+5ay8pHmFJU2h/FIba/QSrHFBQLt7Dz M4unY3+l9carLqUtABnHBB+wPef8kB4dV5Cn88P0S0DxGxWs1nfIdbfdEMZr4zwZ2GsCqg FriJP11fpcEX/IuaeqOUflcEdnCCKEI49hh96GGtBQNM5swsAWJ9TLFUx+QJmzycWiG+l/ QmW+BkZ2jHnWtxNRsgvMDErbY33v54CtQA4zt70pmRUdbBceCcwWje2lccIjCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708382676; 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=Gbet1e9vffYsMXAukC4xeW0vecj4voAYSihpVb+cIXo=; b=xpA38eb8hlyvQwqMlRfwbhw91GQG9YD2/hJzAOE54auFy1/WDc8lnea9J9mlobuILkZl6H yLbHbUmFs2EwLAWeWgEO90PPS0mGebqZIeMdrsX6zu6Vtc6Jrsr9pgDjcly4t9sA6s+AHp 4+qoSKWfiTwFjj2xyNk0JEiP7TIH9fOpPbuHnnfytX+1ZcxEdwq1JvFg7HO43EjCfEoW4+ yvrNfifRCTM+8OlyG5zmGiEsV+hqR6EKG2DZkurqeHqqPAre1dk8w3QgZHnveZzVIiS7YY 5XGAL8enYSTpXM15n6lQwgts8TqlMh786AyUVgZ+Bbs5sqCTYD62QXZt3s+4AA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708382676; a=rsa-sha256; cv=none; b=Fi96bSzFtMTJ+MDBMxXhwY1hk5i3VhZU7lDQW+NxPoH1tdJ11Bwe7EaeT6EL2ouJ+78yIJ wOLMuaYSs8/j1avmvs9IJbaQwciiJBhcdOBDacjzgC5Kahi04kuiBazGZtDq5z7z4RtDkq zJO+VTVteTpkO5vfyxqlSvfwyOnt+XiDFWS+HloYC1DbDAtNiB+JOW4eQY7JRFsZYms1im gK4hL/xk3EEUULKq1hSojo5ZDCN7N6w4mIS3lae9WJr09DixJUD7HTPcGFlA/rOurkBmpb T0kj1Ml89mMGMOK1P8O1Yl7W71AjP5Crj3QX23HLaEj9bzlEjSpJ0pmH/BPPxg== 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 4TdyJz6rb8ztCD; Mon, 19 Feb 2024 22:44:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41JMiZoj002752; Mon, 19 Feb 2024 22:44:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JMiZc2002749; Mon, 19 Feb 2024 22:44:35 GMT (envelope-from git) Date: Mon, 19 Feb 2024 22:44:35 GMT Message-Id: <202402192244.41JMiZc2002749@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 99ea67573164 - main - lib{c,sys}: move auxargs more firmly into libsys List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 99ea67573164637d633e8051eb0a5d52f1f9488e Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=99ea67573164637d633e8051eb0a5d52f1f9488e commit 99ea67573164637d633e8051eb0a5d52f1f9488e Author: Brooks Davis AuthorDate: 2024-02-19 22:44:08 +0000 Commit: Brooks Davis CommitDate: 2024-02-19 22:44:08 +0000 lib{c,sys}: move auxargs more firmly into libsys Continue to filter the public interface (elf_aux_info()), but entierly relocate the private interfaces (_elf_aux_info(), __init_elf_aux_vector(), and __elf_aux_vector) to libsys. This ensures that rtld updates the correct (only) copy of __elf_aux_vector. After 968a18975adc9c2a619bb52aa2f009de99fc9e24 updates were confused and __getosreldate was failing, causing the system to fall back to compat compat12 syscalls in some cases. Return to explicitly linking libc to libsys and link libthr with libc and libsys (in that order). Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D43910 --- lib/libc/Makefile | 1 + lib/libc/tests/ssp/Makefile | 1 + lib/libsys/Makefile | 3 +++ lib/libsys/Makefile.sys | 10 ++++++++-- lib/libsys/Symbol.map | 5 +++++ lib/libsys/Symbol.sys.map | 2 -- lib/libsys/libc_stubs.c | 11 +++++++++++ lib/libthr/Makefile | 2 ++ share/mk/bsd.libnames.mk | 5 ++++- share/mk/src.libnames.mk | 6 +++++- 10 files changed, 40 insertions(+), 6 deletions(-) diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 54748abfeff1..41cf0f6de72a 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -62,6 +62,7 @@ CFLAGS+= -ftls-model=initial-exec # LDFLAGS+= -nodefaultlibs LIBADD+= compiler_rt +LIBADD+= sys LDFLAGS+=-Wl,--auxiliary,libsys.so.7 diff --git a/lib/libc/tests/ssp/Makefile b/lib/libc/tests/ssp/Makefile index c6f850ec1a33..22f48d7dfe54 100644 --- a/lib/libc/tests/ssp/Makefile +++ b/lib/libc/tests/ssp/Makefile @@ -10,6 +10,7 @@ CFLAGS.h_raw+= -fstack-protector-all -Wstack-protector # override the sanitizer runtime libraries to be the ones installed on the # target system. CFLAGS.h_raw+= -fsanitize=bounds +LIBADD+=sys .elif ${COMPILER_TYPE} == "gcc" CFLAGS.h_raw+= --param ssp-buffer-size=1 LDADD+= -lssp diff --git a/lib/libsys/Makefile b/lib/libsys/Makefile index 897e033267a4..598962185dcf 100644 --- a/lib/libsys/Makefile +++ b/lib/libsys/Makefile @@ -57,6 +57,9 @@ MDASM= MIASM= NOASM= +SYM_MAPS+= ${LIBSYS_SRCTOP}/Symbol.map +SRCS+= auxv.c + .include "${LIBSYS_SRCTOP}/Makefile.sys" SYM_MAPS+= ${LIBSYS_SRCTOP}/Symbol.thr.map diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys index b45aa3cf1aaf..cb9ca1749ba8 100644 --- a/lib/libsys/Makefile.sys +++ b/lib/libsys/Makefile.sys @@ -47,8 +47,6 @@ SRCS+= recv.c recvmmsg.c send.c sendmmsg.c NOASM+= sched_getcpu.o PSEUDO+= _sched_getcpu.o -SRCS+= auxv.c - SRCS+= brk.c SRCS+= closefrom.c SRCS+= pipe.c @@ -58,6 +56,14 @@ SRCS+= POSIX2x_Fork.c SRCS+= compat-stub.c +.if ${LIB} == "c" +# Trapping stubs in dynamic libc to be filtered by libsys. +SOBJS+= libc_stubs.pico + +# Link the full implementation of ELF auxargs for static libc. +STATICOBJS+= auxv.o +.endif + INTERPOSED = \ accept \ accept4 \ diff --git a/lib/libsys/Symbol.map b/lib/libsys/Symbol.map new file mode 100644 index 000000000000..4f72ea204039 --- /dev/null +++ b/lib/libsys/Symbol.map @@ -0,0 +1,5 @@ +FBSDprivate_1.0 { + __elf_aux_vector; + __init_elf_aux_vector; + _elf_aux_info; +}; diff --git a/lib/libsys/Symbol.sys.map b/lib/libsys/Symbol.sys.map index 73a1cf297ca0..d59ac8674669 100644 --- a/lib/libsys/Symbol.sys.map +++ b/lib/libsys/Symbol.sys.map @@ -433,12 +433,10 @@ FBSD_1.8 { FBSDprivate_1.0 { /* Add entries in sort(1) order */ - __elf_aux_vector; __libc_sigwait; __libsys_interposing_slot; __set_error_selector; __sigwait; - _elf_aux_info; gssd_syscall; nlm_syscall; rpctls_syscall; diff --git a/lib/libsys/libc_stubs.c b/lib/libsys/libc_stubs.c new file mode 100644 index 000000000000..41d69a9355c3 --- /dev/null +++ b/lib/libsys/libc_stubs.c @@ -0,0 +1,11 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 SRI International + */ + +#define STUB_FUNC(f) \ + void (f)(void); \ + void (f)(void) { __builtin_trap(); } + +STUB_FUNC(elf_aux_info); diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile index 932650885dea..325a320d55ec 100644 --- a/lib/libthr/Makefile +++ b/lib/libthr/Makefile @@ -7,6 +7,8 @@ PACKAGE= clibs SHLIBDIR?= /lib +LIBADD= c sys + .include MK_SSP= no diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 414ae3164066..4177a1ef0e4e 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -174,7 +174,7 @@ LIBZFSBOOTENV?= ${LIBDESTDIR}${LIBDIR_BASE}/libzfsbootenv.a LIBZPOOL?= ${LIBDESTDIR}${LIBDIR_BASE}/libzpool.a LIBZUTIL?= ${LIBDESTDIR}${LIBDIR_BASE}/libzutil.a -# enforce the 2 -lpthread and -lc to always be the last in that exact order +# enforce -lpthread, -lc, and -lsys to always be the last in that exact order .if defined(LDADD) .if ${LDADD:M-lpthread} LDADD:= ${LDADD:N-lpthread} -lpthread @@ -182,6 +182,9 @@ LDADD:= ${LDADD:N-lpthread} -lpthread .if ${LDADD:M-lc} LDADD:= ${LDADD:N-lc} -lc .endif +.if ${LDADD:M-lsys} +LDADD:= ${LDADD:N-lsys} -lsys +.endif .endif # Only do this for src builds. diff --git a/share/mk/src.libnames.mk b/share/mk/src.libnames.mk index 658dd1c3d699..0fd349d0d00f 100644 --- a/share/mk/src.libnames.mk +++ b/share/mk/src.libnames.mk @@ -394,7 +394,7 @@ _DP_xo= util _DP_ztest= geom m nvpair umem zpool pthread avl zfs_core spl zutil zfs uutil icp # The libc dependencies are not strictly needed but are defined to make the # assert happy. -_DP_c= compiler_rt +_DP_c= compiler_rt sys # Use libssp_nonshared only on i386 and power*. Other archs emit direct calls # to __stack_chk_fail, not __stack_chk_fail_local provided by libssp_nonshared. .if ${MK_SSP} != "no" && \ @@ -410,6 +410,10 @@ _DP_sys= compiler_rt (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH:Mpower*} != "") _DP_sys+= ssp_nonshared .endif +.if !defined(BOOTSTRAPPING) +_DP_thr= c sys +_DP_pthread= ${_DP_thr} +.endif _DP_tacplus= md pam _DP_ncursesw= tinfow _DP_formw= ncursesw From nobody Mon Feb 19 22:44:37 2024 X-Original-To: dev-commits-src-main@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 4TdyK1330Fz59fVG; Mon, 19 Feb 2024 22:44: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TdyK12XwDz4Xr7; Mon, 19 Feb 2024 22:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708382677; 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=ysz7rLz8DZtCU8doYiaYxkJLQxXJ6CIOCiAPItv6T78=; b=I3/8/QCSFiF0u+1RvYgDnMowJuq5X5M6DOS5Lk7ys1YUwWc4tU2CsZ9sZ40DmoTrluSolX 88rvrze2/ejOQaEyrGPb/0ASAJHUoYkFz1Znpn3IHgJxPxXa2WzmttzCqBDUQ0+PCfCIpm 7aMSWuZmwRdMzKTwW35rVn3d6xkWiVQpOgF3hhdbjbsuovAEO3B7OHmq5mbs0WGqO16k1/ 1jfWu08qFc907hqspD9+PSwTsZ/6HI0UKLJOvD4by43p9t6xFrOw0x8pRmiUAYos6Mi0/K W7QS2AqhUdrPnODRt3qneBS6tDmKZMT/8/Zjslh7zJfLs3lr0EYhMF29v9ytLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708382677; 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=ysz7rLz8DZtCU8doYiaYxkJLQxXJ6CIOCiAPItv6T78=; b=O7ScZo+luGgV9O367nqeIGbiE89/GZ+ht7jcB3JGWC6SPx63ZadfKmQ6aRPbqYbCBi+uqh hvit33HOwCZPddS41RIM2PPt43kpTcF5+nyaQ/UNAxXuIKhlFirADQdJCiGMfhVZT0nWwT ZxDQ0yUjjNAzUjlZr4xGFryqxG+NZ7GBXrUJVJq3sHTjD70BEnd/ZdB9Rxz9lGQbPodYK3 9i4PLwN+t3hkOosKKaO9GL95dpm+4ZqsA84tqNRuBq8oUCZb+e2ThX7dYDWjg1iZMnpkNv zePu6jDrVv4Qf0Cs3SS75V6BncQCRnZ+lHs2PjpnHbA5crYtHbLUeNVeHhNCfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708382677; a=rsa-sha256; cv=none; b=e3fBqljyqZk2IkgIlDb9/LrLTwZ84kbvnryGq/HE1m/QCBNYYZYqLKvrbfvfwHPeu7mlKG DTEqEpmN39VV/2hdayVmbmdBHNghAtK50GMoDoDZ+qzw4fd4v4y394xRRaUTiMT598Kmjk ww191+jwsXPd95wIZ4xYRLxFWgWPvRzSFocmSut8wLlg29DDAlQfwkaZ3F6Cu3tjvSbzSS o+mBwy8H52xd+pNKwoSd3LB+p3IUpjeymNpyUxJeruuBYXUnjFOml/YQhAjRAQ0AX1+Ca2 nRc21W64Hv35DcuKRI39rKG6aE4WlKaCK0B5hdmXWFP20STK6q3KVq7ZTfg5NQ== 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 4TdyK10Tksztgs; Mon, 19 Feb 2024 22:44:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41JMibcI002797; Mon, 19 Feb 2024 22:44:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JMibiw002794; Mon, 19 Feb 2024 22:44:37 GMT (envelope-from git) Date: Mon, 19 Feb 2024 22:44:37 GMT Message-Id: <202402192244.41JMibiw002794@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: eb90239d0886 - main - lib{c,thr}: add DT_RUNPATH for gcc -m32 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb90239d08863bcff3cf82a556ad9d89776cdf3f Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=eb90239d08863bcff3cf82a556ad9d89776cdf3f commit eb90239d08863bcff3cf82a556ad9d89776cdf3f Author: Brooks Davis AuthorDate: 2024-02-19 22:44:08 +0000 Commit: Brooks Davis CommitDate: 2024-02-19 22:44:08 +0000 lib{c,thr}: add DT_RUNPATH for gcc -m32 To allow gcc -m32 to work, link libc and libthr with --rpath-/usr/lib32. When called with -m32, gcc is currently unable to communicate to the bfd linker that it should look in /usr/lib32 to resolve needed (as opposed to explicitly linked) libraries so we need to provide a hint. See also: https://sourceware.org/bugzilla/show_bug.cgi?id=31395 Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D43910 --- lib/libc/Makefile | 5 +++++ lib/libthr/Makefile | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/lib/libc/Makefile b/lib/libc/Makefile index 41cf0f6de72a..aa6a737002c4 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -63,6 +63,11 @@ CFLAGS+= -ftls-model=initial-exec LDFLAGS+= -nodefaultlibs LIBADD+= compiler_rt LIBADD+= sys +.if defined(COMPAT_libcompat) +# XXX: work around gcc -m32 + bfd ld path issue for DT_NEEDED symbols. +# https://sourceware.org/bugzilla/show_bug.cgi?id=31395 +LDFLAGS+= -Wl,--rpath=/usr/lib${COMPAT_libcompat} +.endif LDFLAGS+=-Wl,--auxiliary,libsys.so.7 diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile index 325a320d55ec..46b547e8da85 100644 --- a/lib/libthr/Makefile +++ b/lib/libthr/Makefile @@ -8,6 +8,11 @@ PACKAGE= clibs SHLIBDIR?= /lib LIBADD= c sys +.if defined(COMPAT_libcompat) +# XXX: work around gcc -m32 + bfd ld path issue for DT_NEEDED symbols. +# https://sourceware.org/bugzilla/show_bug.cgi?id=31395 +LDFLAGS+= -Wl,--rpath=/usr/lib${COMPAT_libcompat} +.endif .include MK_SSP= no From nobody Mon Feb 19 23:01:17 2024 X-Original-To: dev-commits-src-main@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 4TdyhF6BlXz59gfr; Mon, 19 Feb 2024 23:01: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TdyhF5k67z4cwj; Mon, 19 Feb 2024 23:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708383677; 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=eFIJpFFFsfRQ4L5gWvEXyXKul2CVt6fehry7xOJUD2c=; b=nD2uEwpXvmzYlxujrxbXhHddCihFno4JLH9X6rnmI8ISNXPuvw7WKRNcdRvX2ZsngFw7C/ JPtxxBnnReikE9K7MjqgYUXI29kZXvugBFGtxT9DD8ZN92Yy2tDhTbTyl6UVtQy6IVsKL4 jnYMMeLKJ2v8t4X2a0eEnsLUSmrg+aWBq+9N1xbtM8RFXvOSWWzmXYe1WBktGaBDPWRyTd XR3Ghe63V5X7+c9zSD8dzxVRLeME4k7DMFsRbe2mR1ip7us6jGfVr/LitwiMSYv8T9ESmz NIz4j5UtHR7kA92tYiUce7UXSDnmHzFjpRpIPK3gAAET1bnyEDPnNoiTqcn75w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708383677; 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=eFIJpFFFsfRQ4L5gWvEXyXKul2CVt6fehry7xOJUD2c=; b=qXBC39zILtAErRaosefxLHlNTzo0Tb3w5FFneoc7kbk9oNxfEDmjf5FI2jKwcdO/KiToHS T1oLbVU1+YqGTH09LoVlrI68F5JHyA+8I4MOfJKkjfne50BPHwqhKN7ScG9YYU2T7sTdeg aibAmWOKc4lbSsUG/N+w0Iyg0viO4TqrEumTwpYbp48zX81AaIWW3bFEA0J2GI0X5VmDam Se1KZyajLNOwcTxRvQCePNoL5prZZmUrTiALCpdqkul08c7G4Pwlx1qCgVC6R4k29G701B KgceafmeIlkPVg00eJArmlsc8l/wvdRA7iwMXhO6zsuD2zpWBU+DYjqpcD//Tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708383677; a=rsa-sha256; cv=none; b=N8zkRUtZGeAYcvpUyqZyToYLTzAjhsBM6la4VydmICa/VhpO/jNjSC9mcdcZ/rpZGTRRm9 NeiuHAFPy4i3AZDtQiGE3vf7+ZXp3DToiKCIpP18zzDojrNCWn27amMEJiQ1fD5Chzf8t3 G0HtXVaO1SU482dQk2FTC9EkkkY6UsBgFICF769prK3Ig/aBTKiFYn7GeE5zR00K+WNP3T iokgssY+gD1plsHFg/w9RaL94wOrTp/ivqD7zKeHQ1vf5mH+aqjexVoop10VNtrav0sA/2 ExjkfCyszL6NxuGWfESE7mrQOtjhNUMnIPP9IJ6tzTusqp4YQ/DtK0NCP5h7mg== 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 4TdyhF4pZgztrR; Mon, 19 Feb 2024 23:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41JN1HIu033120; Mon, 19 Feb 2024 23:01:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JN1HZO033117; Mon, 19 Feb 2024 23:01:17 GMT (envelope-from git) Date: Mon, 19 Feb 2024 23:01:17 GMT Message-Id: <202402192301.41JN1HZO033117@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: aea57ebcb1b0 - main - zlib: use more memory for a small deflate speedup. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aea57ebcb1b053370ea1f0e29cdc666291bc5d5e Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=aea57ebcb1b053370ea1f0e29cdc666291bc5d5e commit aea57ebcb1b053370ea1f0e29cdc666291bc5d5e Author: Xin LI AuthorDate: 2024-02-19 23:01:04 +0000 Commit: Xin LI CommitDate: 2024-02-19 23:01:04 +0000 zlib: use more memory for a small deflate speedup. The LIT_MEM option uses slightly more memory (for base gzip(1), about 16kiB; according to the author, about 6% for default deflate settings) for a small speedup. The performance gain is more noticeable for input data with higher entropy and less significant for data that is highly compressible, such as source code and logs. MFC after: 1 month --- sys/contrib/zlib/deflate.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/contrib/zlib/deflate.h b/sys/contrib/zlib/deflate.h index 300c6ada62b8..df76fc6fc5d1 100644 --- a/sys/contrib/zlib/deflate.h +++ b/sys/contrib/zlib/deflate.h @@ -25,7 +25,7 @@ /* define LIT_MEM to slightly increase the speed of deflate (order 1% to 2%) at the cost of a larger memory footprint */ -/* #define LIT_MEM */ +#define LIT_MEM /* =========================================================================== * Internal compression state. From nobody Tue Feb 20 00:17:38 2024 X-Original-To: dev-commits-src-main@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 4Tf0NL6HWvz59pXk; Tue, 20 Feb 2024 00:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tf0NL5nNjz4kVd; Tue, 20 Feb 2024 00:17:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708388258; 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=HTmOC4Xk2H5b4v1lPcZiujSTXRfvSQxSdJb/+r0CxhQ=; b=b/3FFRuwfPiGVUGlWbtusw98PeP1BOsQRrAyRrQB8IBsGmTOnBRADqnjSmPFaHO05ukgbl l+kM0B6M3PMZ0XccIzqXpRkEPsj/cmUkl/J6UF9wzNvdtfzjeyFAm+oEKz5twFKjsqwr31 HSxyIiYHfbqn8dzyBwYZDkOon+vKNv3KJd3Gd8C/YyvTqQ6yGO1MGz43MG1RjJ53w8Grz+ p1xjSCJ2iAFLx8mpN9+4oewOQvuwOC59sokZUXenWzpahF//z1vOPw59x3I4v0liiffD5v w1wewfHBc3Zvl24GFeVNezVmjfm6y/XcG7o1ZEc/3HpXf8Psvzco6JGg165Zlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708388258; 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=HTmOC4Xk2H5b4v1lPcZiujSTXRfvSQxSdJb/+r0CxhQ=; b=w0a0CY+Y17UZL0ppHofoTnIvtcl2gqqopK/2FF0lscIPevv0MaaUJ+Q7gvr7dsgP7a4aLO 4XVb6xJ0r/27hc/4DQOGz886SeEAoJwaNw3qRGhWx3TfMT+kZV9JxTcVZYp+6T7+LxFZnQ svUxWU5SOdOBYCwuFEZyHC5wtsTTbxNca74zQt+OLXPglLeApiWNmmWCIVp4sm3KdOL2S5 MRG6bsgo78ryKT5Bmcaq8bFVcSUSzWQNLEzPmON7hC8nxcbaJzR8c9Lrl7x6Zo+rod+JcP Amn6Xs5Xl6q/vUJvHuEgxPwn/JZHDvy8QzeKiGS/jmeE4DGTlHTdWqy6SzA1Xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708388258; a=rsa-sha256; cv=none; b=bSK3s2fpRXU7tuEVzOoou5aEIXz7Z0wYKo42KJj/Kls702xDahjYsa2nkYOAUhCtIHBWm4 h0wLGFAElUiLojsfpnxn5vTzTUlNl37opVTAMZTRAd00iCG0/5CcBV93GEvDHzdATzs3Si jN+EErGLF1trI4VbVZlOTTg6eVN6dutknymIWLIcDGCy/QBJ+y4wG/RFsqnC/5VlIh5lWu //TuV9qLE221lORq4HaRkIcvGLRJV2qzZSTCuinVKKr4RBhkxCOvu5OcbtB4mQpjQp/idG /SiciopLlT0JmmyNSZmtM6oWRCEplyia0e80k5PhpaaPD3dOFwxaRpDZLKtaOg== 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 4Tf0NL4Ldhzwcm; Tue, 20 Feb 2024 00:17:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41K0HcYX055313; Tue, 20 Feb 2024 00:17:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41K0Hc0H055310; Tue, 20 Feb 2024 00:17:38 GMT (envelope-from git) Date: Tue, 20 Feb 2024 00:17:38 GMT Message-Id: <202402200017.41K0Hc0H055310@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: b241767f8ef3 - main - Eliminate unnecessary UFS1 integrity checks. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b241767f8ef38f9ca7c109fe2fccd11ccbfaa4f0 Auto-Submitted: auto-generated The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=b241767f8ef38f9ca7c109fe2fccd11ccbfaa4f0 commit b241767f8ef38f9ca7c109fe2fccd11ccbfaa4f0 Author: Kirk McKusick AuthorDate: 2024-02-20 00:16:07 +0000 Commit: Kirk McKusick CommitDate: 2024-02-20 00:17:05 +0000 Eliminate unnecessary UFS1 integrity checks. The UFS1 integrity checks added in FreeBSD 14 were too aggressive for UFS1 filesystems created in FreeBSD 4 and 9 systems. This patch removes those tests which can be done safely since they are not relevant to the current implementation of UFS1. This is a follow-on report to bug report 264450 (comments 21-28). Reported by: slb@sonnet.com Tested by: slb@sonnet.com PR: 264450 MFC after: 1 week --- sbin/fsck_ffs/fsutil.c | 2 -- sys/ufs/ffs/ffs_subr.c | 4 ---- 2 files changed, 6 deletions(-) diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index aa536fb5dd4e..2acf825b159f 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -1017,7 +1017,6 @@ check_cgmagic(int cg, struct bufarea *cgbp) CHK(cgp->cg_ndblk, >, sblock.fs_fpg, "%jd"); if (sblock.fs_magic == FS_UFS1_MAGIC) { CHK(cgp->cg_old_niblk, !=, sblock.fs_ipg, "%jd"); - CHK(cgp->cg_old_ncyl, >, sblock.fs_old_cpg, "%jd"); } else if (sblock.fs_magic == FS_UFS2_MAGIC) { CHK(cgp->cg_niblk, !=, sblock.fs_ipg, "%jd"); CHK(cgp->cg_initediblk, >, sblock.fs_ipg, "%jd"); @@ -1034,7 +1033,6 @@ check_cgmagic(int cg, struct bufarea *cgbp) } else if (sblock.fs_magic == FS_UFS1_MAGIC) { CHK(cgp->cg_niblk, !=, 0, "%jd"); CHK(cgp->cg_initediblk, !=, 0, "%jd"); - CHK(cgp->cg_old_ncyl, !=, sblock.fs_old_cpg, "%jd"); CHK(cgp->cg_old_niblk, !=, sblock.fs_ipg, "%jd"); CHK(cgp->cg_old_btotoff, !=, start, "%jd"); CHK(cgp->cg_old_boff, !=, cgp->cg_old_btotoff + diff --git a/sys/ufs/ffs/ffs_subr.c b/sys/ufs/ffs/ffs_subr.c index 20addf66a65b..bcb4d25c8ad9 100644 --- a/sys/ufs/ffs/ffs_subr.c +++ b/sys/ufs/ffs/ffs_subr.c @@ -395,7 +395,6 @@ validate_sblock(struct fs *fs, int flags) } else if (fs->fs_magic == FS_UFS1_MAGIC) { FCHK(fs->fs_sblockloc, <, 0, %jd); FCHK(fs->fs_sblockloc, >, SBLOCK_UFS1, %jd); - FCHK(fs->fs_old_ncyl, !=, fs->fs_ncg, %jd); } FCHK(fs->fs_frag, <, 1, %jd); FCHK(fs->fs_frag, >, MAXFRAG, %jd); @@ -472,16 +471,13 @@ validate_sblock(struct fs *fs, int flags) WCHK(fs->fs_old_rotdelay, !=, 0, %jd); WCHK(fs->fs_old_rps, !=, 60, %jd); WCHK(fs->fs_old_nspf, !=, fs->fs_fsize / sectorsize, %jd); - FCHK(fs->fs_old_cpg, !=, 1, %jd); WCHK(fs->fs_old_interleave, !=, 1, %jd); WCHK(fs->fs_old_trackskew, !=, 0, %jd); WCHK(fs->fs_old_cpc, !=, 0, %jd); WCHK(fs->fs_old_postblformat, !=, 1, %jd); FCHK(fs->fs_old_nrpos, !=, 1, %jd); - WCHK(fs->fs_old_spc, !=, fs->fs_fpg * fs->fs_old_nspf, %jd); WCHK(fs->fs_old_nsect, !=, fs->fs_old_spc, %jd); WCHK(fs->fs_old_npsect, !=, fs->fs_old_spc, %jd); - FCHK(fs->fs_old_ncyl, !=, fs->fs_ncg, %jd); } else { /* Bad magic number, so assume not a superblock */ return (ENOENT); From nobody Tue Feb 20 03:54:24 2024 X-Original-To: dev-commits-src-main@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 4Tf5BS2pXWz5BC1l; Tue, 20 Feb 2024 03:54: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tf5BS2F6Kz4CZt; Tue, 20 Feb 2024 03:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708401264; 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=NDwa7YAw9Y3anvVJGffsgZviiGq3XVvIuweELDSrvqc=; b=D5f7+3E6iX/J6WrehWgi3oWo82QHQ6RtqzcMA/f7EaTE5FRigszJM7pEZ9DH/Dhs9WpRpI VVhl3bU67iVltRp6SepupE/gw1w0zPBjAt4yQzeRECWuTfJk6O0alovLe2KcYv3AqBdzjW iFBwywpycHtjrQisLETRG6i4IBe67f/hfDtCP67HlmPEKV5s31PEwAPqxTmMbLbli8O/Oo q2soTnn4PBqInJG53Sc25g49I+IbRYvtyHYWCOL862eOVWppUNsbpU6z9qXy8ss/CBDUVy hm/9IBK0y0MdoK/szcOGntqsQ6H01T/pN0RYcgpF7fcTpXusiw4yZs0ruOKGxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708401264; 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=NDwa7YAw9Y3anvVJGffsgZviiGq3XVvIuweELDSrvqc=; b=G3GXmr/bktNOWgGCiFMH9fhuuRLNP+DlcWs4AvMd34hcQq71K84NECuHh/C9ptSo0/u7p5 b25lkg3b2fs9b0+2Q7b1hu6XNIcGNVYfCE9svPkNTQA9K57GD3fa0ZJYOa4+pyCQDH8OyX yeyCZWPjWCW3dHdX2L1Ldu6FZGHE0LMFreSlcui8wVsthd2SWOWqMzTaZcEFK/7cHKFsB5 PBURTSM2cGwCPAnKE3VYi4yKs/v3pLwoPa/ZnyPmOTB0vkZAZbvp1WZgPk6VzuToFyTEVt e/JMoJVjCeR/DsuGpZh3Ia8lBg+5hve99u6ldWjWJSvaWF5kiYXH+eZ21cEcVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708401264; a=rsa-sha256; cv=none; b=qiLD3F9faPaenPj1rEdBRW0vjxb9SdDvSU5rtNAoOWCh3tZLwFDBRYTkPv67kRCn53fenN Frxw0zo9sVNqmklnreTMM/5/9wjGu5fR8S8/yp5YvA8B9Ch+Yr/nqCMfZx1JUQrC3QWXzB JZMYIGWWLhG6PuZdl7fUpf+bcsePkil6yWJ/7TH3tk4G9Z4Y+1Qm6O0adRlprUqA1gCLdK 36LZ7j4E3cmtpYxcB0CQL3V45qEETXw34QBVJvyGHVDo6iv2DfWt93zi2/vq2vgcN+/1Fz cP9pY5aNW3L8kIJ9AIms1rCgc03m6Ir/l11+PUcHTgb5k0maSKwe8JygJm6OLQ== 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 4Tf5BS1HnFz12tj; Tue, 20 Feb 2024 03:54:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41K3sOJM025587; Tue, 20 Feb 2024 03:54:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41K3sO13025584; Tue, 20 Feb 2024 03:54:24 GMT (envelope-from git) Date: Tue, 20 Feb 2024 03:54:24 GMT Message-Id: <202402200354.41K3sO13025584@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 3aefe6759669 - main - nextboot: fix typo that merged two args into one List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3aefe6759669bbadeb1a24a8956bf222ce279c68 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=3aefe6759669bbadeb1a24a8956bf222ce279c68 commit 3aefe6759669bbadeb1a24a8956bf222ce279c68 Author: Gleb Smirnoff AuthorDate: 2024-02-20 03:51:22 +0000 Commit: Gleb Smirnoff CommitDate: 2024-02-20 03:51:22 +0000 nextboot: fix typo that merged two args into one Fixes: fd6d47375a78fbf0737012b7cc11180291781e8b --- sbin/reboot/reboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index d215255487a7..7ea4d50eaf74 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -79,7 +79,7 @@ zfsbootcfg(const char *pool, bool force) "-n", "freebsd:nvstore", "-k", - "nextboot_enable" + "nextboot_enable", "-v", "YES", NULL From nobody Tue Feb 20 03:54:25 2024 X-Original-To: dev-commits-src-main@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 4Tf5BT3xZvz5BC4R; Tue, 20 Feb 2024 03:54:25 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tf5BT2nWzz4CQq; Tue, 20 Feb 2024 03:54:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708401265; 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=iAppBMpE6uD9AGRzi9VyX03AG6OsFCUtTH77yhlmaC8=; b=KPSquVBpqBj0aWuiazh+ls9w+VFV3EfKSl6UwCgcsv5msIT0rm0HgOWBSRFPr5+5+BlYSa hMZltgxRglU/V8/kN2ReuMIcOClOU4mdynaSq2fgEqPg+hr7sxqCCAua2S4pRz2znJa1Um VcSJ+vhXbL4w9KO1KCLK2cpG7q3A8LawPSDQ9gxRFICxJyqdeZ52Avgm+Xsk6EYqyq+2LI BRbniv0T9KMNYKx3wMxCp3sPgiRUpsbskJJVQcJwUP4lX1lylFZ4ufMnS0yupZl1ySFn9y 2t45AFEQu4UkcGeG4s+h4w8wwz+PyZnOT6dEYZ8sghKpCMZvaPVp6AyC4h6XUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708401265; 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=iAppBMpE6uD9AGRzi9VyX03AG6OsFCUtTH77yhlmaC8=; b=DyaPdeYK46eYXOlDRRiFdbZUWcQGVnggHnN/PeVyokFAkkWuawtbJcw1BkLBp+W0brFc7v NQtE14OTDwXgoysp1NctGoJZVfNL6d1KzG8XnAi0QeujMsfy22K5EnHiQDqoLpX/A8dkai 7RLp33IOHTL6ZAUv0r8Koj+i/g4fS6crQ9RR/ubRCN+Ie7YELr/q4XQUUVAhmSdrkYiqXO mNlXZbGDQN6GBXew+Pd+P52cU44CB5FQ1XwG8sUKzv0U/ublNTgYg3F7tVrtG+tteF3uFm KHU/Ba81n0C59MaRBw4qw9bVhJ3h4MBicJoQhdA1/71PxaFze5WoAIT19uq0TA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708401265; a=rsa-sha256; cv=none; b=pIGMYfpRLyVS+M0MzPxNb8eLpBHpy0+RbFc7wn5llUuTQU7ApPScT8VVOq5qSigzwg2gn/ Hez18d1jvvb8fF49p797x3X4A0VFjrwqcfTBYszGUmpcf1kxLiJwFfyFhnjpLigdEQkrja KcsNa2dWvMxO6NcrNc1yaX3EVm8BogKmW/kAJQGa5rED4PDFqgm8FbJcPijp7s4Ls/IH/K pMg+h8qU1YK1xSIi1a4S7P30UIeJGqZw17M2KSSZqpZdeiLM83HMiXscwB+PZEKbK2Wmxp Smdk3XHb9F42Qc3rxO9vSbqrvG8400acHRxpD+feOTVrhhYTTVVO2P966RZO5g== 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 4Tf5BT1sQJz139V; Tue, 20 Feb 2024 03:54:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41K3sPbo025632; Tue, 20 Feb 2024 03:54:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41K3sPeT025629; Tue, 20 Feb 2024 03:54:25 GMT (envelope-from git) Date: Tue, 20 Feb 2024 03:54:25 GMT Message-Id: <202402200354.41K3sPeT025629@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 0c3ade2cf13d - main - nextboot: fix nextboot -k on ZFS List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c3ade2cf13df1ed5cd9db4081137ec90fcd19d0 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=0c3ade2cf13df1ed5cd9db4081137ec90fcd19d0 commit 0c3ade2cf13df1ed5cd9db4081137ec90fcd19d0 Author: Gleb Smirnoff AuthorDate: 2024-02-20 03:51:22 +0000 Commit: Gleb Smirnoff CommitDate: 2024-02-20 03:51:22 +0000 nextboot: fix nextboot -k on ZFS zfsbootcfg(1) expects pool name to operate on, not currently mounted filesystem name. Fixes: fd6d47375a78fbf0737012b7cc11180291781e8b --- sbin/reboot/reboot.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index 7ea4d50eaf74..ac3927cc2432 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -130,6 +130,11 @@ write_nextboot(const char *fn, const char *env, bool force) } if (zfs) { + char *slash; + + if ((slash = strchr(sfs.f_mntfromname, '/')) == NULL) + E("Can't find ZFS pool name in %s", sfs.f_mntfromname); + *slash = '\0'; zfsbootcfg(sfs.f_mntfromname, force); } From nobody Tue Feb 20 08:29:23 2024 X-Original-To: dev-commits-src-main@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 4TfCHl6L22z5BdZZ; Tue, 20 Feb 2024 08:29:23 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfCHl5qmnz4Zm7; Tue, 20 Feb 2024 08:29:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708417763; 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=TXnfwHVGkciYtsvINkn10Yhvcv7uZjRxyOTZCu9oBa4=; b=S0JIPic3WnXKUfX9BNvIniC4+ADl+Q/HOhTKNr6HdwD/qcynoWa3yTn3zJAmxWvbz3/3cs SGiHoZHLtDX22VXNsFTK/NyIS97df1BzE5k6CtPaURJRQQxhpDdWcymY5AThlPcvGaQTd+ IJD/uN4UtGyRnLPkPLc2sdRQ1IgDpWvPdvARrqdJiOZBObwe2vYI5VDQYFBQmuc6eQxGzc BhaUEOL+RuUs23TA3C1r4N71zGHaZOLq0pvv18OAnwluA2ikE4isBs0fJx8voLtrsyYlGI eomd/N7vp6A3k13bRWD/XW+SLmJh46ncpYfyXz7xVRymxIPs11IVuqhkjHRELg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708417763; 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=TXnfwHVGkciYtsvINkn10Yhvcv7uZjRxyOTZCu9oBa4=; b=jIFwIm2dVYKlhjPSJOX+m0ReADdy9zoRr11Su/H/Hs7uxHUgYefCtgpDug9CiMfnevj6Sg Kcs9920qoMWKzQXxmxlAdMARbJktvIYi+CMAf5TdCaqBDNyLFHvDiVhqmVrp7PS+RuSIKJ gl7aGdLTFSv0cdz2sd78i8mSxxpb07sKyJCoB4q4YJLUDARoX46dEkgj1p4XmUqbaKl3UD S1CBctarf4CaUK/fHJ6k4tAX1ZAZvdaqTp5T+WYVORZ4sEml22MhL4itBrY4RLExkhQISp YI717hSIn6Lo1JwYegQuoDr1qKxV+40dh6v9y9Fy4KXL+I1GmXwguCFjWBiYXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708417763; a=rsa-sha256; cv=none; b=MFE3sYfhzIQcqSve2ovLCEaxK9LKeHxn4FCUlxAJG/ThxF21JDlPcwFMjclXvW739PRNhc w9FlUXruRD+1CXhxunXtUp9wUP8dIuU7+jn3kOY1a4YiF+c3z0Pl1ujEB5o3bqvkwSh3wf agI6nlQo5nX7xGULFXq7qB5Veg8S7dm2F7ctFyqw0ymEfT8jhBmrp02L0dUCA1wkkDH6dd cL4vxakgB2KQnDKOXD3ADEYLg/BVrsHPVLOQjdIGy2eTB42ca+IUIqrAubKzZpr6Ic1zsg DEf8vwVhS9pszdL8H/jgxQaOs1TvQR0TuzrNuRQFz6FVZe65itZmFZnbib8+iA== 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 4TfCHl4tXzz19kt; Tue, 20 Feb 2024 08:29:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41K8TN50081576; Tue, 20 Feb 2024 08:29:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41K8TNOU081573; Tue, 20 Feb 2024 08:29:23 GMT (envelope-from git) Date: Tue, 20 Feb 2024 08:29:23 GMT Message-Id: <202402200829.41K8TNOU081573@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Joseph Koshy Subject: git: 81dc3a4d3bb9 - main - tools/net80211/wlanwatch: Remove obsolete code. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jkoshy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81dc3a4d3bb9fd0847530a3530f860e08a9b3ad3 Auto-Submitted: auto-generated The branch main has been updated by jkoshy: URL: https://cgit.FreeBSD.org/src/commit/?id=81dc3a4d3bb9fd0847530a3530f860e08a9b3ad3 commit 81dc3a4d3bb9fd0847530a3530f860e08a9b3ad3 Author: Joseph Koshy AuthorDate: 2024-02-19 16:46:45 +0000 Commit: Joseph Koshy CommitDate: 2024-02-20 08:27:30 +0000 tools/net80211/wlanwatch: Remove obsolete code. The symbol NI_WITHSCOPEID has not been defined by since May 2005 (since SVN r146690). --- tools/tools/net80211/wlanwatch/wlanwatch.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/tools/net80211/wlanwatch/wlanwatch.c b/tools/tools/net80211/wlanwatch/wlanwatch.c index def94454cfab..6e3bfd798c2d 100644 --- a/tools/tools/net80211/wlanwatch/wlanwatch.c +++ b/tools/tools/net80211/wlanwatch/wlanwatch.c @@ -193,9 +193,6 @@ routename(struct sockaddr *sa) { struct sockaddr_in6 sin6; /* use static var for safety */ int niflags = 0; -#ifdef NI_WITHSCOPEID - niflags = NI_WITHSCOPEID; -#endif memset(&sin6, 0, sizeof(sin6)); memcpy(&sin6, sa, sa->sa_len); From nobody Tue Feb 20 12:16:31 2024 X-Original-To: dev-commits-src-main@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 4TfJKq5kQ6z5BxgC; Tue, 20 Feb 2024 12:16:31 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfJKq5Dbnz4scy; Tue, 20 Feb 2024 12:16:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708431391; 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=3ps7ACNqmbPf9fWh2qYQa0caM6b/MRdZJtyXkDIDsjg=; b=O+y4Q6fNz3WCAWFMPXwq1uHHemvfLHHzwU1xp9l9Pu7v9CvV6kP9urm/zjYvyQHLZruZ/l ifXXVhiKuYZbQ+1TJ4oRrM/8NPI6dupUOQV89hzmFr2aP8tlLlz7notRvggNdtAOEpLXPR iyCQmB9fa83bejKyQ71bktVEF0juc3kkaOzWlFrvFgQhAp5lc5KL3mLWvCTPl5vFkfUIaj LghBtjL5LOfO1GTfGB1IbXOBwkPR6VM0DabyrefsbkbvdsWI34ZaMVOFvJcSykgZ7PqhzF LSWUer66wrsSpJijUynTN5bSmMwm7hm/LLeOZCzr/TLPLJ3ycOeHu5tZet6xtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708431391; 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=3ps7ACNqmbPf9fWh2qYQa0caM6b/MRdZJtyXkDIDsjg=; b=MpG+Ia+ViM47Jz838xZhVCTX4fBjM0WziD5PRCv7UVUdmTnwh0h9fw4i7NmrqMiYohjZXA 4wNCCN5uIrPeT92vPmIX88NNfKZTe5e4Sd95IA/h4tqQFAdhPAg8H7wc0eC/gFgZWgtJXE 9LAsdfJTnJELvCOFnHBF5hwcfRMopbJwIEdgRks7iWaK4nKIrrGXC6Do3o3VqgAYQJ0yHm 2TSC4RCiKrbZZJZg0cykQgOI+YU+Q3T8aLybJOGErT5dF0bIVegUZmeX9J1MDNh0TqSmqZ Lr5xCQiLWH+sTe1JW1sKAlV2ikJ+SauhyPZ4SRTxN67CwEv9JEnIqMAOuj6j3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708431391; a=rsa-sha256; cv=none; b=imxHJqhHkRVJaRiHP8roKimOGfYlAwBTZDA38yeeD/Ohi+A+RjxRVjSgd+Rdj7NSwzbD7O wVjIQaCIiPNQNHLQkzD13Yngi9AN5+5TFju3pcoRtfiLT6oQHQ7ju6J1SRYSLP2TBPakJT Z+E2whD/vNjSvsbTV4J/JfBLkrLXizGf9lrqt7+iHFgtW4GOGh1iyYeyfNo1lW1IY8hC4b PqOkx9EPoU5v8eQt8xN63xAmjtWsat2lpdoFfxNYW0Pk4iTlAuA+ZLIui1XbavFHt2Uux1 lvvHVJz/kCUIAaRA+RWmEZtSI/bFA6QTI3gw2tUzUaRGNgVeitoZ2n4wv/QMxg== 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 4TfJKq4K8gzJ9m; Tue, 20 Feb 2024 12:16:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41KCGVlc068262; Tue, 20 Feb 2024 12:16:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41KCGVXN068260; Tue, 20 Feb 2024 12:16:31 GMT (envelope-from git) Date: Tue, 20 Feb 2024 12:16:31 GMT Message-Id: <202402201216.41KCGVXN068260@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Stefan =?utf-8?Q?E=C3=9Fer?= Subject: git: 445d3d227e68 - main - msdosfs: fix potential inode collision on FAT12 and FAT16 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 445d3d227e68f85157d0301d1706aa488e8423da Auto-Submitted: auto-generated The branch main has been updated by se: URL: https://cgit.FreeBSD.org/src/commit/?id=445d3d227e68f85157d0301d1706aa488e8423da commit 445d3d227e68f85157d0301d1706aa488e8423da Author: Stefan Eßer AuthorDate: 2024-02-20 12:02:24 +0000 Commit: Stefan Eßer CommitDate: 2024-02-20 12:02:24 +0000 msdosfs: fix potential inode collision on FAT12 and FAT16 FAT file systems do not use inodes, instead all file meta-information is stored in directory entries. FAT12 and FAT16 use a fixed size area for root directories, with typically 512 entries of 32 bytes each (for a total of 16 KB) on hard disk formats. The file system data is stored in clusters of typically 512 to 4096 bytes, depending on the size of the file system. The current code uses the offset of a DOS 8.3 style directory entry as a pseudo-inode, which leads to inode values of 0 to 16368 for typical root directories with 512 entries. Sub-directories use 2 cluster length plus the byte offset of the directory entry in the data area for the pseudo-inode, which may be as low as 1024 in case of 512 byte clusters. A sub-directory in cluster 2 and with 512 byte clusters will therefore lead to a re-use of inode 1024 when there are at least 32 DOS 8.3 style filenames in the root directory (or 11 14-character Windows long file names, each of which takes up 3 directory entries). FAT32 file systems are not affected by this issue and FAT12/FAT16 file systems with larger cluster sizes are unlikely to have as many directory entries in the root directory as are required to cause the collision. This commit leads to inode numbers that are guaranteed to not collide for all valid FAT12 and FAT16 file system parameters. It does also provide a small speed-up due to more efficient use of the vnode cache. Approved by: mckusick MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D43978 --- sys/fs/msdosfs/denode.h | 8 +++++++- sys/fs/msdosfs/msdosfs_denode.c | 19 ++++++++++++++++--- sys/fs/msdosfs/msdosfs_lookup.c | 2 +- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/sys/fs/msdosfs/denode.h b/sys/fs/msdosfs/denode.h index ad52a736592c..0d31b0583fa6 100644 --- a/sys/fs/msdosfs/denode.h +++ b/sys/fs/msdosfs/denode.h @@ -162,7 +162,7 @@ struct denode { u_long de_FileSize; /* size of file in bytes */ struct fatcache de_fc[FC_SIZE]; /* FAT cache */ u_quad_t de_modrev; /* Revision level for lease. */ - uint64_t de_inode; /* Inode number (really byte offset of direntry) */ + uint64_t de_inode; /* Inode number (really index of DOS style direntry) */ }; /* @@ -217,6 +217,12 @@ struct denode { #define VTODE(vp) ((struct denode *)(vp)->v_data) #define DETOV(de) ((de)->de_vnode) +#define DETOI(pmp, cn, off) \ + ((cn) == MSDOSFSROOT \ + ? (((uint64_t)(off) >> 5)) \ + : (((((uint64_t)pmp->pm_bpcluster * ((cn) - 2) + (off))) >> 5) \ + + pmp->pm_RootDirEnts)) + #define DETIMES(dep, acc, mod, cre) do { \ if ((dep)->de_flag & DE_UPDATE) { \ (dep)->de_flag |= DE_MODIFIED; \ diff --git a/sys/fs/msdosfs/msdosfs_denode.c b/sys/fs/msdosfs/msdosfs_denode.c index 612b318ce6e8..7f275d387a25 100644 --- a/sys/fs/msdosfs/msdosfs_denode.c +++ b/sys/fs/msdosfs/msdosfs_denode.c @@ -133,10 +133,13 @@ deget(struct msdosfsmount *pmp, u_long dirclust, u_long diroffset, * entry that represented the file happens to be reused while the * deleted file is still open. */ - inode = (uint64_t)pmp->pm_bpcluster * dirclust + diroffset; + inode = DETOI(pmp, dirclust, diroffset); error = vfs_hash_get(mntp, inode, lkflags, curthread, &nvp, de_vncmpf, &inode); +#ifdef MSDOSFS_DEBUG + printf("vfs_hash_get(inode %lu) error %d\n", inode, error); +#endif if (error) return (error); if (nvp != NULL) { @@ -191,6 +194,9 @@ badoff: } error = vfs_hash_insert(nvp, inode, lkflags, curthread, &xvp, de_vncmpf, &inode); +#ifdef MSDOSFS_DEBUG + printf("vfs_hash_insert(inode %lu) error %d\n", inode, error); +#endif if (error) { *depp = NULL; return (error); @@ -589,8 +595,11 @@ reinsert(struct denode *dep) return; #endif vp = DETOV(dep); - dep->de_inode = (uint64_t)dep->de_pmp->pm_bpcluster * dep->de_dirclust + - dep->de_diroffset; + dep->de_inode = DETOI(dep->de_pmp, dep->de_dirclust, dep->de_diroffset); +#ifdef MSDOSFS_DEBUG + printf("vfs_hash_rehash(inode %lu, refcnt %lu, vp %p)\n", + dep->de_inode, dep->de_refcnt, vp); +#endif vfs_hash_rehash(vp, dep->de_inode); } @@ -608,6 +617,10 @@ msdosfs_reclaim(struct vop_reclaim_args *ap) /* * Remove the denode from its hash chain. */ +#ifdef MSDOSFS_DEBUG + printf("vfs_hash_remove(inode %lu, refcnt %lu, vp %p)\n", + dep->de_inode, dep->de_refcnt, vp); +#endif vfs_hash_remove(vp); /* * Purge old data structures associated with the denode. diff --git a/sys/fs/msdosfs/msdosfs_lookup.c b/sys/fs/msdosfs/msdosfs_lookup.c index eb4cbaa21ab7..2a90339d0878 100644 --- a/sys/fs/msdosfs/msdosfs_lookup.c +++ b/sys/fs/msdosfs/msdosfs_lookup.c @@ -586,7 +586,7 @@ foundroot: } if (FAT32(pmp) && scn == MSDOSFSROOT) scn = pmp->pm_rootdirblk; - inode1 = scn * pmp->pm_bpcluster + blkoff; + inode1 = DETOI(pmp, scn, blkoff); if (VTODE(*vpp)->de_inode != inode1) { vput(*vpp); goto restart; From nobody Tue Feb 20 16:49:54 2024 X-Original-To: dev-commits-src-main@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 4TfQPG3F4xz53yPs; Tue, 20 Feb 2024 16:49:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfQPG2kX1z4B7K; Tue, 20 Feb 2024 16:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708447794; 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=xVBQj//ip0vFvcl3c9oMtQoSO3KaxIsukH5u9jOlrt4=; b=kaDmHW0jxcHL3yrxthN2buUM3sqGB+T7BWh7kLcb8ChhCPRGs+vDhch2Y6Fh8qBpfplRlw cLb+4+uhy8Jz/mHNn+ODhWSBJqjDaBlK7q0UCC10Qiw57FnwwzyR49Qe87ElcxK36Kb8nT OkLtubFaeNGo/gyn/GmbF991is72qwAw5syXqIa5mU9JedTemRoaN4XNjof1SMTcLztoKP vwVnFwsbkXfTDYL8HVI1tRH+oFhYlhdmiX+M19m3c1qttZJzmprW/VIQX3hq9YIf8Erih/ 70uIgcqtNb7n94BhdykunqUY3RiO4MJ5UeTsKSs9ycdQcoiuabIsbGNYH4DNpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708447794; 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=xVBQj//ip0vFvcl3c9oMtQoSO3KaxIsukH5u9jOlrt4=; b=TQPpnB/5RMUWHqOGJVZbwFxxy1K0DGFiRGdNwoIp3oqKA9riuYhcQkW8G3lB1kWZ8kMlOb ldBG5G+39MmHtcyfh1jofQtebXQlmhGKuI7j36jg9w1nrYjK5Cvj5VozHee/IrO+Ul9Uv1 A10JC9x98mmd8V4RQ/XQv0skiAMszNVyG2yLJSoHm7TLEAGZV/9hp7a+lTte9b1yr3zMrG 0qDPxFt/CgvOo5i5TprUmmlBoeyQtJzzxxvyB08YK8IdF/HPrEcj4z722iGv9qyCMMtRvV bkvpts8qQ2MtcTB82q+Ww+XhiaNjvX2EL4xUuK0lHZBjfUuqJCvXfaNugwcEYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708447794; a=rsa-sha256; cv=none; b=PcC7a1C9NmezXbiuiBbgjSKzF7gLklxClzA+4I3JjilhuhzJXEmzw/JSrdGJoie7yZ1GXy 2Bm0WIYLA6Bj6omQc4OpjXH1bTC6Le5DBUvhwZWZWQG+0+mZquOttp0JouimTK8BonD90Z wP8VmY/326P5vRp/zT2ZfT44Hnr0QsMgMjndXzqsfrSKNWfvA7jknkZ8KX50Bjzw4N2GZl vGZALAjLlgqVUXd8ZmGlx/LeN2UhFUBllostCXq0cClIbL5b6I2eDaOeQDi1KgRw2ihC/f VHMuElD1H8Q5qIhjIy8vBwjRJEegCtrm3gmIWCOmJOYsb8GsTxJDaat8jLd9aQ== 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 4TfQPG1mrGzR1f; Tue, 20 Feb 2024 16:49:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41KGns6Z023479; Tue, 20 Feb 2024 16:49:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41KGnsRo023476; Tue, 20 Feb 2024 16:49:54 GMT (envelope-from git) Date: Tue, 20 Feb 2024 16:49:54 GMT Message-Id: <202402201649.41KGnsRo023476@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 9dd5023e955d - main - iwm.4: add iwlwifi cross-reference List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 9dd5023e955dac6bf1d4372d1b611a85f8b6f508 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9dd5023e955dac6bf1d4372d1b611a85f8b6f508 commit 9dd5023e955dac6bf1d4372d1b611a85f8b6f508 Author: Ed Maste AuthorDate: 2024-02-20 16:43:00 +0000 Commit: Ed Maste CommitDate: 2024-02-20 16:47:51 +0000 iwm.4: add iwlwifi cross-reference iwlwifi(4) supports a superset of the devices supported by iwm(4). The latter may be retired in the future (if there is no reason to prefer it for the set of devices supported by both). Sponsored by: The FreeBSD Foundation --- share/man/man4/iwm.4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/man/man4/iwm.4 b/share/man/man4/iwm.4 index f0ad81b4f696..b810f7016e54 100644 --- a/share/man/man4/iwm.4 +++ b/share/man/man4/iwm.4 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd February 4, 2023 +.Dd February 20, 2024 .Dt IWM 4 .Os .Sh NAME @@ -167,6 +167,7 @@ failed. This should not happen. .El .Sh SEE ALSO +.Xr iwlwifi 4 , .Xr iwmfw 4 , .Xr pci 4 , .Xr wlan 4 , From nobody Tue Feb 20 18:33:22 2024 X-Original-To: dev-commits-src-main@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 4TfShg13Jxz55Nl9; Tue, 20 Feb 2024 18:33:23 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfShf3fWZz4QxY; Tue, 20 Feb 2024 18:33:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708454002; 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=C/AAOUZfzgsotptUlEf75zQEnAkQuU0KS5xs0RXnpzU=; b=iVTrxaT6Wm21vgwBn2XZv2xKKbUmdY5lnuBKM8JwMVOPDqlyybEccwavfMNJPiO7j7XAus INf2PmBt9B2vY3+D86ps3nUOezAYHIRP67BnfLE0hAZuASXGJ7qDqR7/cTTRVWoTsUT7DQ Gl472S9exI3J00E31x22WYwL2YsI0oZPUo5FDdmnyBRdugzWG1Xq8VCGOjoOBpT7SgqFxE sosKFJD9rknOgbjMooDPdBXhXydqvVhKpW19p78eoKOKo3aeLWr66icIC4lp+UtVrMQbt7 SQUsdZJfCsUccFInDDYq/JcGn1GAp1bifulXwFvphotnP0d2zBQuQGDtoI1EoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708454002; 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=C/AAOUZfzgsotptUlEf75zQEnAkQuU0KS5xs0RXnpzU=; b=ixVKtGkljMaqms3TNG1klLPoyWxlASrL08tQNHTi9OC+lqwEr9lTPqJqVbf2EM5Q3kQL3Y ZkE6TbcQ9zJA6UPsavo3ehO7oFrEk3TBKHh6xwGY4FMAsbddXta9kgPxMPfxgbHZlBh+px ACEpgOncQo7estkuLNOB37h5INUK1SL/f8A0+ByCMn62etdzZwUP1D9w8OxkKmck8lvdtt eRy5ujvl5jQJDWW18HoSEcOBOoz7yzAPYsAwfQwSyS/iXJtLz2hzeDa86LLoo4u1skETu3 RgSL3za3XQyZ55J7yfH4H3XPmBNMl15RkG7vr8T9HBXFODSTABKvV1dVOEag3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708454002; a=rsa-sha256; cv=none; b=FAx+HuCK7WyJ2M7/qTH8EFAiBR85h3ux4S5eD+U0vtA9I8jhAr6d2GCQAYOSR11Bq8Nw+g UUMr/3ND2ieAq80pNAOWqDy8HQgHh/EwUjnV+52Q6onqJ9c040bf/4XtbV01np4vH3myIX FDSWeTEr0uMBP7KXsouFYyoGMJa62GnB7CDuvm8D8WdwSkPf5Cjz+jntWIgPrQCquOxCWw ttABD9BxFRQHNjgZILwNld/XLFMO1cIZFwcIlemw6HiBkZfKHcp0ibnkqjbHd4Zmy30ve2 6+tGmqU6sGyI3sVzh5ORTzSJVKPNjgCAl8C4AkZqUu8T2voBHnN417Fih0M5VQ== 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 4TfShf2lGGzV3H; Tue, 20 Feb 2024 18:33:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41KIXMd1008723; Tue, 20 Feb 2024 18:33:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41KIXMoA008720; Tue, 20 Feb 2024 18:33:22 GMT (envelope-from git) Date: Tue, 20 Feb 2024 18:33:22 GMT Message-Id: <202402201833.41KIXMoA008720@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 6a3e87e1306d - main - arp: fix arp -s/-S List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a3e87e1306d5058d63f7552a25ed6376422f658 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=6a3e87e1306d5058d63f7552a25ed6376422f658 commit 6a3e87e1306d5058d63f7552a25ed6376422f658 Author: Gleb Smirnoff AuthorDate: 2024-02-20 18:31:05 +0000 Commit: Gleb Smirnoff CommitDate: 2024-02-20 18:31:05 +0000 arp: fix arp -s/-S When setting a permanent ARP entry, the route(4) would use rtm->rtm_rmx.rmx_expire == 0 as a flag for installing a static entry, but netlink(4) is looking for explicit NTF_STICKY flag in the request. The arp(8) utility was adopted to use netlink(4) by default, but it has lots of route-era guts internally. Specifically there is global variable 'opts' that shares configuration for both protocols, and it is still initialized with route(4) specific RTF_xxx flags. In set_nl() these flags are translated to netlink(4) parameters. However, RTF_STATIC is a flag that is never set by default, so attempt to use it as a proxy flag manifesting -s/-S results in losing it. Use zero opts.expire_time as a manifest of -s/-S operation. This is a minimal fix. A better one would be to fully get rid of route(4) legacy. The change also corrects the logic to set NUD_PERMANENT flag for consistency. This flag is ignored by our kernel (now). Reviewed by: melifaro, tuexen, emaste PR: 277063 Fixes: 6ad73dbf65048b0950a1ba6ff25607f6708c8954 Differential Revision: https://reviews.freebsd.org/D43983 --- usr.sbin/arp/arp_netlink.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/usr.sbin/arp/arp_netlink.c b/usr.sbin/arp/arp_netlink.c index d78f380af04b..8644f3722aed 100644 --- a/usr.sbin/arp/arp_netlink.c +++ b/usr.sbin/arp/arp_netlink.c @@ -390,9 +390,6 @@ set_nl(uint32_t ifindex, struct sockaddr_in *dst, struct sockaddr_dl *sdl, char return (0); } - if (opts.expire_time != 0) - opts.flags &= ~RTF_STATIC; - snl_init_writer(&ss, &nw); struct nlmsghdr *hdr = snl_create_msg_request(&nw, RTM_NEWNEIGH); hdr->nlmsg_flags |= NLM_F_CREATE | NLM_F_REPLACE; @@ -402,11 +399,12 @@ set_nl(uint32_t ifindex, struct sockaddr_in *dst, struct sockaddr_dl *sdl, char ndmsg->ndm_family = AF_INET; ndmsg->ndm_ifindex = ifindex; - ndmsg->ndm_state = (opts.flags & RTF_STATIC) ? NUD_PERMANENT : NUD_NONE; + ndmsg->ndm_state = (opts.expire_time == 0) ? \ + NUD_PERMANENT : NUD_NONE; if (opts.flags & RTF_ANNOUNCE) nl_flags |= NTF_PROXY; - if (opts.flags & RTF_STATIC) + if (opts.expire_time == 0) nl_flags |= NTF_STICKY; ndmsg->ndm_flags = nl_flags; } From nobody Tue Feb 20 18:33:24 2024 X-Original-To: dev-commits-src-main@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 4TfShh6r7Cz55NNc; Tue, 20 Feb 2024 18:33: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfShh5MPYz4QbS; Tue, 20 Feb 2024 18:33:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708454004; 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=KZkptD7moyXiSnNU2Ox9xPmSMuWKM2VmQRqf/UhtdZg=; b=npLPk+PCu4kYY1g4A8Iv7LJPZceK87W9C4RgqlNObe/GYXTPmmn+XW3Gm987qDBdCDWmkB GD5UbOG8Y6gNiE3CTqfyEWq/pKnfEWnQerdjEE3BudOK5wc77xipFjyuj4cmKWBKnOASFj 5PweOP9RxNyVFZ3i9+P4Iw2BaKN2zQ8jgBDK+wC/yT80GFckiV7Go6HlPlODZi1m8xXrCb rdU4HRmFQHg0JsXMd/MdLEHooc/sssvxxzcLStl/JlgKRMzkAV8kKsmX7Ei6v3tM21PAS2 Y4BlAcz9EeD2rf4QDkA21FTdXdVUWNjSadldcsWph26uGn/WN2D7tZLa5ox+2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708454004; 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=KZkptD7moyXiSnNU2Ox9xPmSMuWKM2VmQRqf/UhtdZg=; b=wPSUKqZ83uK1FlksHR2hymc9qiBH7WKTxXTTuZulWxV0AuCxLfa3rfak1o+No16VO1jZj8 yVpfO9+nhhkPcQrJ18E1uYdI+JU0lExouTFOD65gOcJdYQUBmweH/3SCl5L8m6AjxgJTz0 Ja7COI8Bhn5UKn2PmsV0TvLTb4dysqqaMUy0c4cBDz3qffimpvStOIEqERb7jAmP1nh7Od wJGvMsAjBgdCSDQ+/+py9v+W8RxCxWEz2GJMixFAsI9UZCWfWiySYPd00rONCk4QIiMtFK 5wTdl2zp8EKXv12FgAZPAT3auKpke1vpIcgUiVbRIM6z981VENyrADjUEHJfXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708454004; a=rsa-sha256; cv=none; b=AO4ZXjXLh8lExwem3Elob7qHL9hRZuhzk+Jwdk/Aksd5+SbVMJalj/YZkb3Ez7N/6wsP+z HUlgaYXUKJ5f0FOIM2vogApNa6aNKTRUi6jKDDCatSotGhP4mwmADGwW1YzB2N2kW7mKWI nSth7mOW5sZyLxwpAfhzym+jgc1qu9V61nhr6OG+o2IY9INbpKdHd/avnPx4m3h5NzlfsS ad20sQ2XFEDDM9IWNnXo8JkzpGo3p1oogXceyzQwKRRszXwAmsA5j5/4QN+ddjUL2v8SCC dvtlMCan0jXnGQ377ieKygqpe0N2Km3RcjFzCHH3n78TwBsqqP8uzA14AeQPgg== 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 4TfShh4L7XzVWH; Tue, 20 Feb 2024 18:33:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41KIXOnY008822; Tue, 20 Feb 2024 18:33:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41KIXOLh008819; Tue, 20 Feb 2024 18:33:24 GMT (envelope-from git) Date: Tue, 20 Feb 2024 18:33:24 GMT Message-Id: <202402201833.41KIXOLh008819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 1968d71647ba - main - tests/arp: test arp -s/-S work List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1968d71647ba0189c1102e54959b7074160ad437 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=1968d71647ba0189c1102e54959b7074160ad437 commit 1968d71647ba0189c1102e54959b7074160ad437 Author: Gleb Smirnoff AuthorDate: 2024-02-20 18:32:03 +0000 Commit: Gleb Smirnoff CommitDate: 2024-02-20 18:32:03 +0000 tests/arp: test arp -s/-S work Install permanent entry, try to modify it, check that net.link.ether.inet.log_arp_permanent_modify works. --- tests/sys/netinet/arp.sh | 62 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/tests/sys/netinet/arp.sh b/tests/sys/netinet/arp.sh index f13ba467a2d9..34946d42f250 100755 --- a/tests/sys/netinet/arp.sh +++ b/tests/sys/netinet/arp.sh @@ -169,6 +169,67 @@ arp_lookup_host_cleanup() { } +atf_test_case "static" "cleanup" +static_head() { + atf_set descr 'Test arp -s/-S works' + atf_set require.user root +} + +static_body() { + + vnet_init + + jname="v4t-arp_static_host" + + epair0=$(vnet_mkepair) + + vnet_mkjail ${jname}a ${epair0}a + vnet_mkjail ${jname}b ${epair0}b + + ipa=198.51.100.1 + ipb=198.51.100.2 + max_age=$(sysctl -n net.link.ether.inet.max_age) + + atf_check ifconfig -j ${jname}a ${epair0}a inet ${ipa}/24 + eth="$(ifconfig -j ${jname}b ${epair0}b | + sed -nE "s/^\tether ([0-9a-f:]*)$/\1/p")" + + # Expected outputs + permanent=\ +"? (${ipb}) at 00:00:00:00:00:00 on ${epair0}a permanent [ethernet]\n" + temporary=\ +"? (${ipb}) at ${eth} on ${epair0}a expires in ${max_age} seconds [ethernet]\n" + deleted=\ +"${ipb} (${ipb}) deleted\n" + + # first check -s + atf_check jexec ${jname}a arp -s ${ipb} 0:0:0:0:0:0 + # the jail B ifconfig will send gratuitous ARP that will trigger A + atf_check ifconfig -j ${jname}b ${epair0}b inet ${ipb}/24 + atf_check -o "inline:${permanent}" jexec ${jname}a arp -n ${ipb} + if [ $(sysctl -n net.link.ether.inet.log_arp_permanent_modify) -ne 0 ]; + then + msg=$(dmesg | tail -n 1) + atf_check_equal "${msg}" \ +"arp: ${eth} attempts to modify permanent entry for ${ipb} on ${epair0}a" + fi + + # then check -S + atf_check -o "inline:${deleted}" jexec ${jname}a arp -nd ${ipb} + atf_check -o ignore jexec ${jname}b ping -c1 ${ipa} + atf_check -o "inline:${temporary}" jexec ${jname}a arp -n ${ipb} + # Note: this doesn't fail, tracked all the way down to FreeBSD 8 + # atf_check -s not-exit:0 jexec ${jname}a arp -s ${ipb} 0:0:0:0:0:0 + atf_check -o "inline:${deleted}" \ + jexec ${jname}a arp -S ${ipb} 0:0:0:0:0:0 + atf_check -o "inline:${permanent}" jexec ${jname}a arp -n ${ipb} +} + +static_cleanup() { + vnet_cleanup +} + + atf_init_test_cases() { @@ -176,6 +237,7 @@ atf_init_test_cases() atf_add_test_case "arp_del_success" atf_add_test_case "pending_delete_if" atf_add_test_case "arp_lookup_host" + atf_add_test_case "static" } # end From nobody Tue Feb 20 20:25:00 2024 X-Original-To: dev-commits-src-main@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 4TfW9b48rdz59Xw9 for ; Tue, 20 Feb 2024 20:25:07 +0000 (UTC) (envelope-from brianna.walker@attendeemetricsexpodata.com) Received: from IND01-MAX-obe.outbound.protection.outlook.com (mail-maxind01on2103.outbound.protection.outlook.com [40.107.222.103]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "DigiCert Cloud Services CA-1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfW9Z36qQz4h8Y for ; Tue, 20 Feb 2024 20:25:06 +0000 (UTC) (envelope-from brianna.walker@attendeemetricsexpodata.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of brianna.walker@attendeemetricsexpodata.com designates 40.107.222.103 as permitted sender) smtp.mailfrom=brianna.walker@attendeemetricsexpodata.com; dmarc=none; arc=pass ("microsoft.com:s=arcselector9901:i=1") ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k4h1gvWIyIi91ii2L8WGjr9Jc4l8xHyRP0JIlc0OzMrks4tIkNvfpm2928Qh2EofuPveCnWpVu1rN5IiObSZs+xqrl2vkPSY4SizzUoTP/P7LDp4O6GhtgxXP6XnhrAJ56yClv3PRWSkPGg71zrbLSn7He2CLHpwKvPbm8bAUl8JT/A3q3jXBfzAEsjKRyxo3V/JiKczScU0yLaWMdAo/kjipKnmec2Wj1nK8rexMNjbdHJQaGefKOvnGGYMGNulwyGwtNjKDGebXIPqocw6AY1Be72WB0JAJbdWTwrtItN3yIipLX16gs2vYRxsvZ3YPfzfHmZGV9NxUv2mtBXCKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=b1b2XeuQQUBdebtSYCLVQy1/+xmUghserIKLKp03AjY=; b=aHiD7OVRRAidp76cEBdWgUq2s6xvTplgULB/D0gbsGOnNp2VUMAf+ApJkVX/weoi470l46S+VIUqi8w9zmfdtnKXAqI/1gdLEdnkXb55PXkd/xc0/MrJ07IsD2HjJggmQGjL2F2emhbAn22mXRDDKhphoTFD9LhjIQ3mYLUQKPn5yaVSUCExUlpNasIyqGv+k1EFzoc5e+5ecFdGzYmfRLfTvY4OemOJmBnw/ZzuOG6NpAF69G9iL/x5jh4aHa78/IJFlaQRe9yEWF0iMiVh+jH9bmJOUbt+IhI0EjmP0Qqi1P/WYKlf53HOb/bL2kKgu9eZmVjaRXTnVqL1/y/uqw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=attendeemetricsexpodata.com; dmarc=pass action=none header.from=attendeemetricsexpodata.com; dkim=pass header.d=attendeemetricsexpodata.com; arc=none Received: from PN3P287MB2457.INDP287.PROD.OUTLOOK.COM (2603:1096:c01:1e0::7) by PN2P287MB0626.INDP287.PROD.OUTLOOK.COM (2603:1096:c01:159::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.20; Tue, 20 Feb 2024 20:25:01 +0000 Received: from PN3P287MB2457.INDP287.PROD.OUTLOOK.COM ([fe80::2db2:e38a:cf13:2d59]) by PN3P287MB2457.INDP287.PROD.OUTLOOK.COM ([fe80::2db2:e38a:cf13:2d59%4]) with mapi id 15.20.7316.018; Tue, 20 Feb 2024 20:25:00 +0000 From: Brianna Walker To: =?iso-8859-1?Q?Food_Ingredients=A0China_2024?= Subject: =?iso-8859-1?Q?Freebsd_-_Food_Ingredients=A0China_2024?= Thread-Topic: =?iso-8859-1?Q?Freebsd_-_Food_Ingredients=A0China_2024?= Thread-Index: AdpkOt5MwoLpZTrDSBaBIj7PSND/PA== Disposition-Notification-To: Brianna Walker Return-Receipt-To: Date: Tue, 20 Feb 2024 20:25:00 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PN3P287MB2457:EE_|PN2P287MB0626:EE_ x-ms-office365-filtering-correlation-id: a4e3410d-06a7-4c9e-28eb-08dc325203a6 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: u0vgbgYMgQmE95U0PqnhJKmHZBSUM4bWF9PPRjheBJnVu/nLBChJJEjUH4DOtRObHfNt4MValeGkWeNFpy3SpCrfc+P+yb/ys6yuQaCGgX/Gk0hNFPYZ+SXkQpuitdJ1tv4WO9jE2tSdssBRD6UTt4COuIs+6TjqaYFdk43HH/9OCA173aMbSi40rnUl7QexD/lUA7OxPJ2S1XAhmGeyW+gh8znowsMtcSJNlEyNofUP4VuMZljuCHfAAESFRWRyKKPZcgkmUEsPQY11TE7P1kIIg/hZvqIxlKzPqAObWSFj4mqTjjhz0Pn6qjtVUsWWlbGHdbPUp0dZNCga2U2HeY9tDcH+AGJzb01OxzKaOuPVRWWbKyZUZ49i8lyFbU+h8LJ/GjQZYLzzOMhLgUlSaF6W38FRxopzP7ZyzodiC5rdf9pC85NgYdLgHW39Ceb0oeTby2YhFOkqrLB73i1/MA88k1d+yqkE59zK7c9/ztHsP3i2eINNjsuzwHAHnh1gD/6iIsKxFF53VvqYmQSJvel2UWeaZhJuuh17KGjT0ao4IKgc2wAJCbyXIKKIej5J7N1PPpCKtfVvOS77PsHKAcSWhW1lbNK7OkJAkMCLraXbYx/2VYC11ta5VQDIUZTe x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PN3P287MB2457.INDP287.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230031)(38070700009);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?GR8cMoSk9mX8Jxh+eK0MYbBVlVCz7pFmuZOrEMbwKSDenN5/JskTTzOLMZ?= =?iso-8859-1?Q?auhA+W7kl+TBOEv3A0Cd/mTiiw0EcGM994SZeONhbtqvFkqRmbmAOhC6ui?= =?iso-8859-1?Q?3eKI3oojQpIHuiXDHgIhzen/TmQ7hM5ai02sVDqGQf0K+WrOA0GnsceByJ?= =?iso-8859-1?Q?8oilGg8SQNYd/x0GuFmlTc6iM12UwcAbLx0gL3ikrfZSr75KEu4RNmw8Ub?= =?iso-8859-1?Q?x59GxyPq21kbs7YGWutA9EBnJ19PMwqIFihSXrpo1ECe/LAa35H6GKc/mo?= =?iso-8859-1?Q?Ng0Xk6rIOgQh/ZwLRHwAex4vQOwOvHkWL53xtGxvjlWoKmA6UlrPzfMVO+?= =?iso-8859-1?Q?oaDBXDQU1efDcFuFF8fB4r49MzIZbG4piA+7XbyrDsA/EKNJBSuSNAmDFP?= =?iso-8859-1?Q?uD49yhBNDwvyQgDszil1fiG4dOCxIAPsRTc54u+y4jwhJKcXerbBB8Dx8J?= =?iso-8859-1?Q?ORKYV8IPqsyywmakP3SqfFkz5ZAaRWm4uk5cZdt4xY+BHxEmYWPzC7/0+Q?= =?iso-8859-1?Q?hJj0bpbaCu91W/ZvvIIoUrQelDR7rp94lMnrBTl6UIL/1jam3j60KktDfO?= =?iso-8859-1?Q?NlzNJkGUNwlw4GJJqOftGNHXia6/7djrSINdmVTmF7shXkE1CiYso4Zl9U?= =?iso-8859-1?Q?OplzBwtGWhCXMLyg2B2KHHBIVEYiVZ7T5kfhxEaABVDP49k/ZzwusTEtZL?= =?iso-8859-1?Q?VB5eV8u3+yEBnAtHt8/090LA0FwdkVdOSduivM2eu+nmjwdi8FALwjg1MY?= =?iso-8859-1?Q?1ItwmYXH2NK9bfc3cUsbu1RoIZZmMg2ZTYyfUvGTCQVD5cZiA/a4YsETLw?= =?iso-8859-1?Q?IptXVlYCSymEUl2E1CFmPgKzWyuVPnXnE1L4QvInhYMrPFFvYPdyhbhuSY?= =?iso-8859-1?Q?CfVnfXeFcLSHDKwI+kUVOk2OqUQuKW20cqqrw6yvuEyfP1/p1uWgxIAysX?= =?iso-8859-1?Q?zWLq8EKsqS2wS0G8lM4zzzcl6RX4mBCIv4C0QucN5XGpQR7c9qE7rj/ddE?= =?iso-8859-1?Q?3zos2y3nIwio4rpEmDGahzc4jV7pK2jBVQWSgLVGwRtSPv/lHQ15bxAii2?= =?iso-8859-1?Q?mInqfMgxs92K4tG1mogfIVMzxeF3OyDUDedM8ZzYaCmguvW3cSVA7820Wg?= =?iso-8859-1?Q?yRT5UYfkAKeN9W8rkPmhBj2VCZM+LjDhWa8DbE+sIn4M5ehHXPmkzb49C3?= =?iso-8859-1?Q?7nQSKe9ZVJgiGR/ALvFn+JL8dmJou3/vvlvkeOvrX3TtCRLM7LERIjd2X5?= =?iso-8859-1?Q?zUvxSYNG5b1r8R6CYnK+vflHdNpWSpabw2ahXDLDuYCK30A8luXqOGBD48?= =?iso-8859-1?Q?o0usLNWIt22ramAP6NAjo3ycqjgLlYCVM9Z+V1Ag75/CRbY4YYY19lHrVy?= =?iso-8859-1?Q?ZdGEGBf8ZGvu0VOMnF7V6AzX1W0qtpaosW82vGnyWGlaEdPdRBjkS1APVL?= =?iso-8859-1?Q?WxsQr7RiyDftW1i9hQob1xNfFUTnLZnpd8NPRuDFrTjdWVCaW7Kiwa4BE2?= =?iso-8859-1?Q?L6x04gpVEkRu4YjCVZSRe9//F1fzhxHlzKit/8LHFJH1vWo5XkwVQ1DcKp?= =?iso-8859-1?Q?08Pnh5dK4hj1liEoB+8RhboOKk2bK3amKdNh1GBsyW4WlkYd8vWfoqqE78?= =?iso-8859-1?Q?VKEbqVSiMfRDb5S5UId989MEZuatSzZhjbW3sMRzprFjqt0J6o74dWWA?= =?iso-8859-1?Q?=3D=3D?= Content-Type: multipart/alternative; boundary="_000_PN3P287MB2457F372B6CCF8F044F661C48F502PN3P287MB2457INDP_" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 X-OriginatorOrg: attendeemetricsexpodata.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PN3P287MB2457.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: a4e3410d-06a7-4c9e-28eb-08dc325203a6 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Feb 2024 20:25:00.9259 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 231f15d6-4417-4763-8db3-2ce4f3fac4a6 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: i55Povo5l6ZWYbsn2EYjA5hqZBu8DmR1/H4jP+kMnT7Vult4x3ROhxdAXwvuUpqI7Ey7VPCdXTTMwcBPzxiXUY1llIqHAf+qwaFkiv+YbkeFZbJ9djfVY+57OQSybG1AVqnvszYcJmMxN4P5by9Axg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PN2P287MB0626 X-Rspamd-Queue-Id: 4TfW9Z36qQz4h8Y X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.28 / 15.00]; ARC_ALLOW(-1.00)[microsoft.com:s=arcselector9901:i=1]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.98)[-0.981]; R_SPF_ALLOW(-0.20)[+ip4:40.107.0.0/16]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; RWL_MAILSPIKE_POSSIBLE(0.00)[40.107.222.103:from]; ASN(0.00)[asn:8075, ipnet:40.104.0.0/14, country:US]; MISSING_XM_UA(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FROM_HAS_DN(0.00)[]; R_DKIM_NA(0.00)[]; DMARC_NA(0.00)[attendeemetricsexpodata.com]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_LAST(0.00)[]; TO_DN_ALL(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[40.107.222.103:from] --_000_PN3P287MB2457F372B6CCF8F044F661C48F502PN3P287MB2457INDP_ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Hi, Hope you are doing well. Food Ingredients China 2024 Email list is available for purchase. Kindly let me know if you are interested. So, that will get back to you wit= h the Counts, Cost and details. I await your response. Tons of thanks, Brianna Walker - Demand Generation --_000_PN3P287MB2457F372B6CCF8F044F661C48F502PN3P287MB2457INDP_ Content-Type: text/html; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable

Hi,

 

Hope you are doing well.=

 

Food Ingredients China 2024 Email lis= t is available for purchase.

 

Kindly let me know if you are interested. = So, that will get back to you with the Counts, Cost and details.

 

I await your response.

 

Tons of thanks,

Brianna Walker - Demand Generation

 

--_000_PN3P287MB2457F372B6CCF8F044F661C48F502PN3P287MB2457INDP_-- From nobody Tue Feb 20 22:05:03 2024 X-Original-To: dev-commits-src-main@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 4TfYNw3B7rz59k6v; Tue, 20 Feb 2024 22:05: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfYNw1KLdz4sJg; Tue, 20 Feb 2024 22:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708466704; 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=B0QIs4Dl97ZTBrjbDCheGSNq5BrjeHg8AxGDWGrcWnU=; b=b+b+CA1c24+bJ25+FUhb2SizmVEaZf2Pw8czyOJ8gsrGfeVrYy3XWuf0LoLnNMFfcx3bTR jg6jnVHwRHKvKwmkPQ2L4WtoB8QmNjHL1507ZnFL23lreRVmhl9ecPJYUfJRv4d4D+YoiX ZRpzKvu0T7dEDZ1FvgMx4fRCwj9CT+NKL1TZAsjQDjaIeBnV2Dv9pI4QzxbnTmVEJ7R3Ks tc41vvhmZnaBkooVW+uj0oTInWLVKueV/g0wQK7h9GTnSBLjHG/bBiTqwdgdJV95sRGxDe GYmazdblcdzjeBSiBzJR2R7MYDNNauXC+6n95jlh4S7V8wJIRcDR0DjnLPeCqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708466704; 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=B0QIs4Dl97ZTBrjbDCheGSNq5BrjeHg8AxGDWGrcWnU=; b=pMFBS8GjGlv3/UBoHVb2GuK3hOWJ/Rh4V2MQ9ZjyMGLKKDmcFIoyMRUacBX6IrE81NODqm cTZ8eXl++l3JkiHbh4XDXJW2SJKpmGwuvcEGk89vta1cNnG20nELXPJFez1DV3iQd+vmxN jwFVfjFcB4BT6yi3db/hqTHcMJdNzc43jbHijG2bnrOg8YliLOn0Cr33/nf52shFERvm2y zIF2lblf9f5nIWeF+QpnFdVbI7gEJcF/R4l2s6ur0qwh3JcQ0y3yabjpefHuo5kupo4Qv/ jg3FwmUaqs0W5fLlYNvk+vlKQS3kbic7Y5WDDuig4OgF0KI97VvVEifzks9jgA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708466704; a=rsa-sha256; cv=none; b=V/5MKK6/eNZ98y7f6Zndxtzn8yR/MR06FJMeSt12IhYJRZwk9byMLfx87LT8wxCS9eaBdI 9gQG8FdJTgiQmCIyvLKI0K/qAKMibINB/qnVcdJscWd1rb068BnPMIkSYRKzDvSnQoBh1C bgZHaHHaoQ+m/8r0XfP9a0uMvxGLpSVP+83D3AaVGbERQV2S8P7tT1YU2E3VQXsKO7slQ3 Xs7nonDjDT5KvbF9B0pkvKUYnBDlUauwVHeVC3MR6na0O4G7AmL+fTH5hDna3h1RCJoKwQ QFIvDf0RzhKL9te6FCxL8KBy1PWRGD4TYZks3q85Z/Dp72NYGeY0cqZCq7PJLA== 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 4TfYNw0JJVzcR1; Tue, 20 Feb 2024 22:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41KM53Hg063680; Tue, 20 Feb 2024 22:05:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41KM53If063677; Tue, 20 Feb 2024 22:05:03 GMT (envelope-from git) Date: Tue, 20 Feb 2024 22:05:03 GMT Message-Id: <202402202205.41KM53If063677@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: e7308a60a5b7 - main - md5: Add test case for GNU input modes. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e7308a60a5b77a1e4aff6e27eddef40fedabb98c Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e7308a60a5b77a1e4aff6e27eddef40fedabb98c commit e7308a60a5b77a1e4aff6e27eddef40fedabb98c Author: Dag-Erling Smørgrav AuthorDate: 2024-02-20 22:04:32 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-02-20 22:04:32 +0000 md5: Add test case for GNU input modes. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude, markj Differential Revision: https://reviews.freebsd.org/D43988 --- sbin/md5/tests/md5_test.sh | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/sbin/md5/tests/md5_test.sh b/sbin/md5/tests/md5_test.sh index 5b018b18c220..34bdf43f13ea 100644 --- a/sbin/md5/tests/md5_test.sh +++ b/sbin/md5/tests/md5_test.sh @@ -369,6 +369,28 @@ gnu_cflag_body() } +atf_test_case gnu_cflag_mode +gnu_cflag_mode_head() +{ + atf_set descr "Verify handling of input modes in GNU check mode" + atf_set require.progs "sha1sum" +} +gnu_cflag_mode_body() +{ + printf "The Magic Words are 01010011 01001111\r\n" >input + # The first line is malformed per GNU coreutils but matches + # what we produce when mode == mode_bsd && output_mode == + # output_reverse (i.e. `sha1 -r`) so we want to support it. + cat >digests < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 4db7ca244705 - main - md5: Fix Perl mode long options. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4db7ca24470576948e33f48033cfa5be2749950e Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=4db7ca24470576948e33f48033cfa5be2749950e commit 4db7ca24470576948e33f48033cfa5be2749950e Author: Dag-Erling Smørgrav AuthorDate: 2024-02-20 22:04:36 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-02-20 22:04:36 +0000 md5: Fix Perl mode long options. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: imp, allanjude, markj Differential Revision: https://reviews.freebsd.org/D43989 --- sbin/md5/md5.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c index b6405635a5a1..158769812819 100644 --- a/sbin/md5/md5.c +++ b/sbin/md5/md5.c @@ -263,7 +263,8 @@ static const char *gnu_shortopts = "bctwz"; static const struct option perl_longopts[] = { { "algorithm", required_argument, 0, opt_algorithm }, - { "check", required_argument, 0, opt_check }, + { "binary", no_argument, 0, opt_binary }, + { "check", no_argument, 0, opt_check }, { "help", no_argument, 0, opt_help }, { "ignore-missing", no_argument, 0, opt_ignore_missing }, { "quiet", no_argument, 0, opt_quiet }, From nobody Tue Feb 20 22:05:06 2024 X-Original-To: dev-commits-src-main@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 4TfYNy5mMjz59k9R; Tue, 20 Feb 2024 22:05: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfYNy3G8Zz4sS8; Tue, 20 Feb 2024 22:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708466706; 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=V4ZP6t2yu0ClzakuL/lfBZvHhs6OZ1OUmQ8iy1pVYpk=; b=NfVxBLsZcXGH46ekz82Di/e9+4kCj5vHj36dDqxm+Pd0/qanip4peBFFh5PGXqvmE1SXeu vl4UKkUI/SzRywIeZCS/qr3FGtDAqwWFt84sO1ZzLB56bIzS2HLGPPxffugqR2eB8GPP55 mdu+iOhDv23inHSCQmA7vykLfz1yOLO612+kyWa/WpV45+rgsGDFnF+FqmoCw0kIbgQQVE /umGCq5vYej72esF0CmMknfVQevPbvepafbi9fg2xFIgRjHdLnPKA5xhPxi/DIPROQYCXH TM10Mmc/2XVKDfiw+h8bobPeYrwKTze7r3Mzqfwuxzfc75rJMvd5aPv28VC5DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708466706; 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=V4ZP6t2yu0ClzakuL/lfBZvHhs6OZ1OUmQ8iy1pVYpk=; b=rXdrB+l9aysyz4270ym/ASnPY0vW1V0CBBOzcuH0L3uruvsoa+RGkMZsjF72nhsxMWU+PV bRiTn2Oof5I6q9O61Olc2bgRC1cgKxqZkCpl/YekMpdRnXua20up0odAB9+83C6e7zAW6g ftSNi7szFM9IeJCHqZB7DuoQntiNXbVfcKvoPyLwIKdBjQESGcYM6lSZqSyQ/s/ZONEt+0 AdA7GG8yh8WrhvE7Hj/i7/UoW5VRNhTogAmCknlYtxFonUVuLi+2jRRIezr3+TNZJILjZ2 bobU5KtOsfVb0rK3LPvVRmbu5pn6e+6fTFZuOJ78L9dkXVOerrZmVh1NB9sj6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708466706; a=rsa-sha256; cv=none; b=RyTPS2aRFIox5pFYNAR6TlidVNPoch+pCL4GWtjZzNi/gPaWS4VjQGSzpdlgewzJsPIsDk ouHrA0c5Wn5SyjM4VAHiQg+Tyy0WNLMOPwmZU47vS0VuUKkBfcFF6QespeQccxgQ5muxkR 6Lbgq91sneS7aBzJIUfKlz1PUSYCzEpjwF98vzxk+W1wOCfZoHgurTWWy5CP0D5zXoSErU UrqfR326UQAmAti5NaLkFQRyWZ51wJCeIBAsUQNjxF4jOerJFGmybvcL7eOlAUj5T3oxsh MERs3tWaKwUZWVBbBlIxUbUnCMJdC2896MfZDEin8WJIgRi0bTXSPgH7+9TAEg== 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 4TfYNy1m7Vzc3j; Tue, 20 Feb 2024 22:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41KM565Z063780; Tue, 20 Feb 2024 22:05:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41KM56hn063777; Tue, 20 Feb 2024 22:05:06 GMT (envelope-from git) Date: Tue, 20 Feb 2024 22:05:06 GMT Message-Id: <202402202205.41KM56hn063777@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: c05533d97ac1 - main - md5: Fix GNU check mode. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c05533d97ac178f8e811407860d47d3c0ae61eed Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c05533d97ac178f8e811407860d47d3c0ae61eed commit c05533d97ac178f8e811407860d47d3c0ae61eed Author: Dag-Erling Smørgrav AuthorDate: 2024-02-20 22:04:40 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-02-20 22:04:40 +0000 md5: Fix GNU check mode. Fixes: 9b20849bc5f1b500f2de7aeca77f0e6556069bbb MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: imp, allanjude, markj Differential Revision: https://reviews.freebsd.org/D43990 --- sbin/md5/md5.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c index 158769812819..74b61f9bc1ad 100644 --- a/sbin/md5/md5.c +++ b/sbin/md5/md5.c @@ -287,9 +287,10 @@ MD5_Update(MD5_CTX *c, const unsigned char *data, size_t len) } struct chksumrec { - char *filename; - char *chksum; - struct chksumrec *next; + char *filename; + enum input_mode input_mode; + char *chksum; + struct chksumrec *next; }; static struct chksumrec *head = NULL; @@ -362,16 +363,18 @@ gnu_check(const char *checksumsfile) if (rec == NULL) errx(1, "malloc failed"); - if (*filename == '*' || - *filename == ' ' || - *filename == 'U' || - *filename == '^') { - if (lstat(filename, &st) != 0) - filename++; + if ((*filename == '*' || *filename == ' ' || + *filename == 'U' || *filename == '^') && + lstat(filename, &st) != 0 && + lstat(filename + 1, &st) == 0) { + rec->filename = strdup(filename + 1); + rec->input_mode = (enum input_mode)*filename; + } else { + rec->filename = strdup(filename); + rec->input_mode = input_mode; } rec->chksum = strdup(hashstr); - rec->filename = strdup(filename); if (rec->chksum == NULL || rec->filename == NULL) errx(1, "malloc failed"); rec->next = NULL; @@ -612,6 +615,13 @@ main(int argc, char *argv[]) const char *filename = *argv; const char *filemode = "rb"; + if (cflag && mode != mode_bsd) { + input_mode = rec->input_mode; + checkAgainst = rec->chksum; + rec = rec->next; + } + if (input_mode == input_text) + filemode = "r"; if (strcmp(filename, "-") == 0) { f = stdin; } else { @@ -626,14 +636,8 @@ main(int argc, char *argv[]) warn("%s", filename); failed = true; } - if (cflag && mode != mode_bsd) - rec = rec->next; continue; } - if (cflag && mode != mode_bsd) { - checkAgainst = rec->chksum; - rec = rec->next; - } p = MDInput(&Algorithm[digest], f, buf, false); if (f != stdin) (void)fclose(f); From nobody Tue Feb 20 22:05:07 2024 X-Original-To: dev-commits-src-main@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 4TfYNz5fhTz59jt7; Tue, 20 Feb 2024 22:05: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfYNz3rmKz4sGQ; Tue, 20 Feb 2024 22:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708466707; 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=z+nHPYgfb07xNB86hwsgbY35JZFX9upOOaHuapO0+kg=; b=RRqcqFCSGub8hhvLkoMCcTNMn8Ta7E9qs6kLPdQxkDfbvFt5+OUgHE/jJcDcVYp9QMLygW Z7X/shkjCmla1f3/98Ete57M/QAZfQBXeQ1kq5TnmShiC+OY/E4srH6LJDmxB57N/6LpSM 1hav8ALVMGhd6ylpY9UXQpstNXnnCQYBns1Rf3yuTKnjEmy3HBu2OhY+othgycT9QWkv3D GSGSvQ3KDSK6ZudgWfLi71pxhyq46OwZsV30SHS44TWW4+DT2Gg2EXfk5aqNxWP47im5Sh 3P3Z96Jyk1caiRGwsMcqirVzAxkMHr9lKGxdBeMWM+cPxuKqMw4FBZ7XJwS4BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708466707; 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=z+nHPYgfb07xNB86hwsgbY35JZFX9upOOaHuapO0+kg=; b=TJ4fr1pIojUr2VsNAY4rZCwhDCQT47fMsotuYcCeSdMu6VXXXz/v51Cd771v/ai2G48apq 3p+vPnPRUJLF9Q+1YWg/UveoI7y9ttKaffMHtCok633mbc4VZTWzE+eKlnZs30RcLPtulC FwqlAb4Anz215+8QzjyQzyraplhBWMOMa/q0M6fTVLkis8k6tp8idEJSJydvLoI6wnFmPE 7ZA/bgcy3X8pBqqWCEXfW03TESC7Z7UACpI2mJGv8X73DbYHc7/BzVpycPwmLfh/wJilTE WPw6dst0V8sJllZ2qdWCuxRyEw+M4XuhtTpq/+eJcOLaqq527J6KCIZcN9gHMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708466707; a=rsa-sha256; cv=none; b=ukFujlaijofmnbQKBXHB7Y9MqPJFgyQM18o05qA+nwPSPbJJ4FPyG5lMeU+1rg9xu9ooMV kBbWOqbJ6PXOhrv3qYwMcw4sHx3ba3/N91aFVeaRAz6bwQqYhSWLikCdrMb//Lj9QVTFzJ rCK3J7utUURrk9QCq33mWMCoEJwUlfa6Lco9QPDVAfJMFzYRO9wXLE3nEzZB/C/17b0lai 6XQ3Ql+T5vfMcFHdSm2MPjxttom2ZxxrS8Qzt0K/dj/Omk5eJslPLH0lrHcBeycnkpo6SP 60JaP4AUQzqQwobfq62nDzOUIBjfFiX8Zj4dLFL7cFGFYAtCYftPRNZ8McaaJA== 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 4TfYNz2N9pzc5J; Tue, 20 Feb 2024 22:05:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41KM57kj063825; Tue, 20 Feb 2024 22:05:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41KM57Rh063822; Tue, 20 Feb 2024 22:05:07 GMT (envelope-from git) Date: Tue, 20 Feb 2024 22:05:07 GMT Message-Id: <202402202205.41KM57Rh063822@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 702f133fa181 - main - md5: Untabify declarations. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 702f133fa18185a7e10e66316e8f158be935b696 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=702f133fa18185a7e10e66316e8f158be935b696 commit 702f133fa18185a7e10e66316e8f158be935b696 Author: Dag-Erling Smørgrav AuthorDate: 2024-02-20 22:04:45 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-02-20 22:04:45 +0000 md5: Untabify declarations. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: imp, allanjude, markj Differential Revision: https://reviews.freebsd.org/D43991 --- sbin/md5/md5.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c index 74b61f9bc1ad..70fc7cb7eef1 100644 --- a/sbin/md5/md5.c +++ b/sbin/md5/md5.c @@ -303,17 +303,17 @@ static unsigned int numrecs; static void gnu_check(const char *checksumsfile) { - FILE *inp; - char *linebuf = NULL; - size_t linecap; - ssize_t linelen; - int lineno; - char *filename; - char *hashstr; - struct chksumrec *rec; - const char *digestname; - size_t digestnamelen; - size_t hashstrlen; + FILE *inp; + char *linebuf = NULL; + size_t linecap; + ssize_t linelen; + int lineno; + char *filename; + char *hashstr; + struct chksumrec *rec; + const char *digestname; + size_t digestnamelen; + size_t hashstrlen; struct stat st; if (strcmp(checksumsfile, "-") == 0) @@ -399,17 +399,17 @@ int main(int argc, char *argv[]) { #ifdef HAVE_CAPSICUM - cap_rights_t rights; - fileargs_t *fa = NULL; + cap_rights_t rights; + fileargs_t *fa = NULL; #endif const struct option *longopts; const char *shortopts; - FILE *f; - int i, opt; - char *p, *string = NULL; - char buf[HEX_DIGEST_LENGTH]; - size_t len; - struct chksumrec *rec; + FILE *f; + int i, opt; + char *p, *string = NULL; + char buf[HEX_DIGEST_LENGTH]; + size_t len; + struct chksumrec *rec; if ((progname = strrchr(argv[0], '/')) == NULL) progname = argv[0]; From nobody Tue Feb 20 22:31:21 2024 X-Original-To: dev-commits-src-main@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 4TfYzF2M3hz59nB0; Tue, 20 Feb 2024 22:31:21 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfYzF1wCgz416F; Tue, 20 Feb 2024 22:31:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708468281; 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=TVrbr3sAavGhPgxmEUtoGw2kD+KjTrT5zjdPHMppvRs=; b=LfBDrqsmxKYVv3h3sv/LPEPod22746WgpoGYYi7juqNTaciA6Iz4MhyewN1shFNtiRV5E6 tabeKfy38ogwwSmEZuBEEw7xlbPpnCr2XbCew908u4YOt/5Vkm6D5poPxn0uM3JEgtPpfT TFT3lIkmPJzhl+vKaw5m12avNJBVganWh6vIQia7nHriQcLZLqnFgfi/x4qYjsfIOTHfnH ec4hVn0BPAlFwGeF+T5NbUawhz3uf5L3uPVl/Cv8Qq6NzLY0Wr5KO/iMoF8kvVSG+AsIdC NPjfmTH3Vc7eS/hwO8npPO1gbpiwgPHAg85zuiBl8xDLYT4YEIrlQrMGB7sTQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708468281; 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=TVrbr3sAavGhPgxmEUtoGw2kD+KjTrT5zjdPHMppvRs=; b=bUPL48SsGYHvlxI5YXKKmg01mUm/ewMtf9kiqQd3QNhwJc2E+TGZntbhoSAD5A1vvgr1/r OU5xoPBatxzLsrfzz1SF1NRNkJpDkA48CxhmQ0a37ebiTF/6/4Da3bv1e2nr/2me0CKFBT wQf9JgRduHB8K6+CdjMexTLjHJ40BHqbqdmCg0XqkjE5HxLcxMufWDreMaR6B/QfvBWcZi DmYyQXs34oc1lgv4lLYaKSwP+6Vat7faoA7kdLriZHkxHoXZYlTZpcqPKqgKe5TcGB1O+y MCmNTGkvMeEDKlS8KqIUEAPAxjNSItu5qt0yN6qhgmgv/XnoUDYRULFeOKxtwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708468281; a=rsa-sha256; cv=none; b=qXq1ujdvk7RvIvuuOmKppIamGP4b0gbs+VWDeKI8F1zzgK6T5jCiisychfPFM3UOBh2I98 xaVyBND9k3mfM+xl2X+6t/7+7fIwxrj0dG6UCz9cVTYtI0iSHaIYNpmR/wNnooHnelG+nx qGUTyOx4itij3x2ofagrexkFRI6MUlFjZOQhdkNUkmSSwJasCp7aDQ8xCZfeMcxXH1/BMy Exx+mZ8qhsdzcDwXtujXSyyMknFSHtFyE7El1bRas9FkV2eNbLajolbvFmYHeYdtAY4l2x p0RRQz99HzXwq7kIqrzqninB/Cr5zd6R183fhBK25zr91ciqdaRhthA35IOxuQ== 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 4TfYzF0yt5zc6m; Tue, 20 Feb 2024 22:31:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41KMVLvx011274; Tue, 20 Feb 2024 22:31:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41KMVL3w011271; Tue, 20 Feb 2024 22:31:21 GMT (envelope-from git) Date: Tue, 20 Feb 2024 22:31:21 GMT Message-Id: <202402202231.41KMVL3w011271@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: fa6a02f50e65 - main - tests/fdgrowtable: open more files in the threaded case List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa6a02f50e65c47540f51b3177f5080bc6af168e Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=fa6a02f50e65c47540f51b3177f5080bc6af168e commit fa6a02f50e65c47540f51b3177f5080bc6af168e Author: Gleb Smirnoff AuthorDate: 2024-02-20 22:31:06 +0000 Commit: Gleb Smirnoff CommitDate: 2024-02-20 22:31:06 +0000 tests/fdgrowtable: open more files in the threaded case This should fix the test failing on some machines/conditions/runs. This won't fix failures in standalone run, but should fix kyua(1) runs. Currently with standalone run it will usually fail because the 40-sized allocation is skipped (see details below). This matches what forking test does: open 128 files in the parent and 128 in the child. There should actually be no difference where and when the files are open, but let's mimic the forking test, and open more files in the spawned thread. Also opening from two different contexts adds a bit more entropy to the test. What the test does it checks that fdgrowtable() has been called at least three tmes for the test process, and the old tables are still on the free list as long as other execution contexts exist. Under kyua(1) control the first call grows the table from 20 to 40, but the original table of 20 is an embedded one, thus is not put on the free list. Passing 40 open files the table grows to 128 and first old table lands on the free list. Passing 128 open file the table grows to 256 and a second old table lands on the free list. After that the test would pass. The threaded test was one open file off before this fix sometimes. --- tests/sys/kern/fdgrowtable_test.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/sys/kern/fdgrowtable_test.c b/tests/sys/kern/fdgrowtable_test.c index 75c3d6701c0c..6ea42bd076ad 100644 --- a/tests/sys/kern/fdgrowtable_test.c +++ b/tests/sys/kern/fdgrowtable_test.c @@ -151,6 +151,7 @@ ATF_TC_BODY(free_oldtables, tc) static _Noreturn void * exec_thread(void *args) { + openfiles(128); for (;;) sleep(1); } From nobody Tue Feb 20 22:31:22 2024 X-Original-To: dev-commits-src-main@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 4TfYzG5C0jz59mpQ; Tue, 20 Feb 2024 22:31:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfYzG2t8sz41LZ; Tue, 20 Feb 2024 22:31:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708468282; 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=p+J5lGyWRrT8EsFZukqpZxgydOR5UL8RR4ireMXKm90=; b=FFdDSMZyln0ge5BEIYo0mtn2KFc8FB0KJwI06481hBvFQ7rSz6NjZxJ/ZgEfwcZ35X1th3 2tJRNnPfwRbcZh53AD9psfzNabSPe9J6wKSMqPeaNQnH3sCh4FSrib2GRxi4OjRo5TjX0c XgOtGfGRqLXn/WfvG1TQGEyBUMDzwQCq+1uHMf0F5NW4t5nLsm0tOzhlSPWCBMqHTE3VIo mrmApXntvApj6NPExwdUxFF1OtWS3trtO4ZxKyaxBl49jBit1/Pav3ejUMYMLCmyVP33og 9ZslDPN0jY/9UighD5nnTc/jtZu2Sl6ONH6rkIEexmU3CEAe6QuT/DZu7bZ3Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708468282; 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=p+J5lGyWRrT8EsFZukqpZxgydOR5UL8RR4ireMXKm90=; b=ufEaIP02f66OmGG3qsX85BxopP10Hl2j3brXi2HNlsWB1hWtYSs8Kjm946owQgkOmiiLS8 Vsc6ISkxz1j+Z1XbFN+hwX25XWAeskwsnxVqL9YpERnWhOh0e4S5nEDAj1eV1XfIbFfdIH ezsHXV+v/fBI3ES/e/jPXPIC8ZRuuhJc3jvbYfjrag9vM0ZiSDG+VQeHYkaBKx3tYTSi9h KwzHZX0wGC00LWvGuupW2Nvnirg7+8FLpFj0TTxGXyYfQW0Jm6SVIwNvkvCP5XSa2EDz0h mdtSthJUVZKGGxjaBUdfOk7p2Gqs+ceRiVE1d/nPO5AaJK76Ovgk7ikg/pK2FQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708468282; a=rsa-sha256; cv=none; b=PiRfRkFWmMbIHRG5dhqABUrG7Dfe/9CtUENsXPCurYn7F6UfdXlln2TN6BL22oOnW1WQnd jSnDZXWQptnciF22he7E76BwP1Oha/zGMppmxGwQpAl640x7zNSF6fSKz2/nmNlgw3lM/0 wtvVqZSe4IRDq9Bh97GmA1xL2HuYw4lYaZ5uEpg55PiG38LC8qhDYb5qePJimBKS3hO2Jw 0rOyL0G21EzX8u5XmogMcr/flHvvBJ/a2zYPLTsIkqOLlc1BRuAMGsp0WDRJEy7seTnfiZ UjZi3zdXU+TcJH1o+ur14fUMC8GzGx+jq0HDUvcvR++Tm0TcIUkSdE5/NkmjFA== 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 4TfYzG1xxczcss; Tue, 20 Feb 2024 22:31:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41KMVMrS011316; Tue, 20 Feb 2024 22:31:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41KMVMED011313; Tue, 20 Feb 2024 22:31:22 GMT (envelope-from git) Date: Tue, 20 Feb 2024 22:31:22 GMT Message-Id: <202402202231.41KMVMED011313@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 3ac001620e28 - main - tests/fdgrowtable: remove always true check List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ac001620e286a7a1125ca171adbe76960a68180 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=3ac001620e286a7a1125ca171adbe76960a68180 commit 3ac001620e286a7a1125ca171adbe76960a68180 Author: Gleb Smirnoff AuthorDate: 2024-02-20 22:31:06 +0000 Commit: Gleb Smirnoff CommitDate: 2024-02-20 22:31:06 +0000 tests/fdgrowtable: remove always true check We are always the parent in this code path. --- tests/sys/kern/fdgrowtable_test.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/sys/kern/fdgrowtable_test.c b/tests/sys/kern/fdgrowtable_test.c index 6ea42bd076ad..2eea274a64ee 100644 --- a/tests/sys/kern/fdgrowtable_test.c +++ b/tests/sys/kern/fdgrowtable_test.c @@ -242,14 +242,12 @@ ATF_TC_BODY(oldtables_shared_via_process, tc) * otherwise we'll lose a reference count * to the file descriptor table */ - if (child != 0) { - kp = read_kinfo(kd); + kp = read_kinfo(kd); - ATF_CHECK(filedesc_refcnt(kd,kp) > 1); - ATF_CHECK(old_tables(kd,kp) > 1); + ATF_CHECK(filedesc_refcnt(kd,kp) > 1); + ATF_CHECK(old_tables(kd,kp) > 1); - kill(child, SIGCONT); - } + kill(child, SIGCONT); /* child should have exited */ wpid = waitpid(child, &status, 0); From nobody Tue Feb 20 22:38:37 2024 X-Original-To: dev-commits-src-main@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 4TfZ7d6TTpz59nZx; Tue, 20 Feb 2024 22:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfZ7d4HNFz4291; Tue, 20 Feb 2024 22:38:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708468717; 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=s74N349SA5G+d+reNJzPmpYq/0bRxtMcKJG0NY3rtME=; b=K/ryM/eNcicP072cnifMB6igqwG6bupoR0C0aPM0/d8oW5rRFOLMfEy58HzLA2fg0Xqmmq pq7mymbIAxJhgcHfd0BYDAA1J+O8H3vyw44wuVCL5aT3vOssYCyiMHLflkcoRguHJg1yqY RvyuI+10LyjZGVwVPaO1B3AaZNG65w/ZlJBnfGKUkTe0i2hmAuDGjDo4LHhiUX3pKiusDU f8fV051hgF7SnPyHdMVnR22dV76Tqd9lH2et4RFJBDS9hlgR3YbugK9ZRjlgJEl2aM7C3M qGYFP6LyY1BjsEEFre9cx9E6C36pYyLG138Ej3eyYi3NfhJOZQ4AdiGOX32LYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708468717; 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=s74N349SA5G+d+reNJzPmpYq/0bRxtMcKJG0NY3rtME=; b=SGbcOZqRn+XeihwgzGGWsSdr/6rFGrpPydo18FTXvM3QB3tcxZ3Dex8KkdYrOQK29+/DPD 4C7MNkAmlC8OR8KcmvsomK/siS6nnQbKMUDrrrY7jHEdElIQdz96GLM/GU2HqpsQdOKtYm csY6FoHyINnAhuJSRvtRN2HyPQ5ZKb4IQhgYTSyhOo6GhbKuD1HznEWeicPpLFnGiPE/oR ES84DoXkIn1zrAB+w2T4abcSvdzeKAaybqJpNNpuCugOq9n8s3Dn4/R/PCtevogOSrx0Nr MrEC7Alr0EpQOdIyGAb3tLoKzOXLVKKqK5dXJEkKXiVvWcrT4HCPR+Pm31kAog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708468717; a=rsa-sha256; cv=none; b=YdUUzk9KUt6b7NMarFz921hRk8MYfD6yRM2DQEEo+c0yH8LNxkez2+LwAPtFZWq39h3BYS unMe/b2h8whfhITpKW8vAJi9E4F3Xv87BeZ7BxvUrTBJ5f7F7Yieng4sM/PaVSaJP9vkjy 86i8BdQD0qHEKFP+xj07cHIbkXWfI+hI5z+G37ka2oCkauOVYf5xHmXHOJAUk4O50VZG++ 6g7d6xfLI5/kZt+6iKOsMo1Oigk3S2Eh7Kcl+dDPz3Pn5NpYXb1SIeY9uVqdieqFBbaLzo LWty1qJnEVsIo1wX57OtzuqaOJmKii2u5tRDrQIAYBtERFlTUcIAzr1vhTP3Rw== 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 4TfZ7d3N2rzdPR; Tue, 20 Feb 2024 22:38:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41KMcbJ2015192; Tue, 20 Feb 2024 22:38:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41KMcbqb015189; Tue, 20 Feb 2024 22:38:37 GMT (envelope-from git) Date: Tue, 20 Feb 2024 22:38:37 GMT Message-Id: <202402202238.41KMcbqb015189@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: e53b83a849e3 - main - tests/sigsys: initialize parameter passed to sysctlbyname() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e53b83a849e3a34772d0a0ed26eb0cb4aeeec71d Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=e53b83a849e3a34772d0a0ed26eb0cb4aeeec71d commit e53b83a849e3a34772d0a0ed26eb0cb4aeeec71d Author: Gleb Smirnoff AuthorDate: 2024-02-20 22:37:45 +0000 Commit: Gleb Smirnoff CommitDate: 2024-02-20 22:37:45 +0000 tests/sigsys: initialize parameter passed to sysctlbyname() --- tests/sys/kern/sigsys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/kern/sigsys.c b/tests/sys/kern/sigsys.c index 8554a646ebc6..8b9a4e8516e7 100644 --- a/tests/sys/kern/sigsys.c +++ b/tests/sys/kern/sigsys.c @@ -63,7 +63,7 @@ sigsys_test(int knob) static void sysctlset(const char *name, int val) { - size_t oldlen; + size_t oldlen = sizeof(int); int oldval; char buf[80]; From nobody Wed Feb 21 00:29:22 2024 X-Original-To: dev-commits-src-main@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 4TfcbQ4dyXz59yf7; Wed, 21 Feb 2024 00:29:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfcbQ48SGz4CfH; Wed, 21 Feb 2024 00:29:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708475362; 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=+s05ZKgOXOFxNvh29Tug3KlNjDtaWXG3/tsvNQHA6WQ=; b=u4RSLi+zMCICRJHZksZMw9Dk7GxMNqp93hGpxwSu/5SU7LUaCWOPxRduEzZdNrU63k8XDQ ALq3z+BzPOVaLxHsCnMtSTyeY4Aj1T4DFPGNWQcBAftQC6Un9AhEJG45p1UEmDb9l4WOTr htXNoLN0tZ7dKEyxUQfZspQgI6J5jLKbetE8DSGXRhsem6QAxC7RgNigJE7TTPesBKfgSY SAtNPwildQC9xZbu/AxSS9RQT6qxuelcIR/TmrU4//EcHFfVlx+EIGg62xTLqXNgs16ie+ t+2xcCZI1voKT7PooLyvSlMhFDz0ftSGHWGZcBDbcvIaw1gzWk/tsMlXRpo3Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708475362; 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=+s05ZKgOXOFxNvh29Tug3KlNjDtaWXG3/tsvNQHA6WQ=; b=ORCIlHoc2FbU5GXYNpSFvRTD8+1QBvjSmZXJ5wOJR5Vupc+uFjh3SNzMGzIanThcxt9lAn sPMqWb8bs5a2OeuS0velxRUWwJSxzhFLFiTDOVZAeMUFbgz4vQjEHluWU3o/RNiJM3ck27 XVvpqg5MbZMMaX2Q3IOoMulGSUq0r7Fukld5hty0p3M1psw8yJvtP+e7Qh/+kE5RUvGceW WByIDMW2xGLWcA0MYzU+RMQEfs6bZGGEwiFYGwoQX9Az19ulGJq4yeLV3G5zMDwCL60v3+ k7cq1rtsk6v7BcD1HCX2JPOsU/I+icgx1QBt1mAjbeIXQo319DwvJJ5wMc/Yjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708475362; a=rsa-sha256; cv=none; b=DFUdcTC5qvlxEmjIcj2z+iM2HWLWIwGdw9RJoMlyzM5llGzo+h/pkC8kQznHJxye2u4BhA Gx4vzNuTh8x+vLElKPbwOuUjcJuAJfMSfdPvxoY1YcPu1A6ZnqXh0G+9mloQGWzBwXVqxN vME3RB0oM/x0c8r58MIZsSPe5tZMwdKaTO72D8EgcBFbhODVQbtQEY3o6HJbM18XNBPJa+ sgJiZm8MBO4PLkZgCDh/Vhy0ta7j9UdIRT1VOeVbuQ0wnmjTUWCnsV8CKcX4+z2N8ggaGS HeXdPu/JNrMSERJSKmnUxVgwBuIqOimCb2NfCyn3UMJbXKVPrKbzyj01oLUj+A== 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 4TfcbQ3CqTzh7B; Wed, 21 Feb 2024 00:29:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41L0TMHs000138; Wed, 21 Feb 2024 00:29:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41L0TMC1000135; Wed, 21 Feb 2024 00:29:22 GMT (envelope-from git) Date: Wed, 21 Feb 2024 00:29:22 GMT Message-Id: <202402210029.41L0TMC1000135@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 180df764c4ee - main - rtld: remove pointless "extern" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 180df764c4ee570850deb4a910a11780ec3316df Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=180df764c4ee570850deb4a910a11780ec3316df commit 180df764c4ee570850deb4a910a11780ec3316df Author: Konstantin Belousov AuthorDate: 2024-02-20 14:25:48 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-21 00:26:10 +0000 rtld: remove pointless "extern" Reviewed by: brooks, imp Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D43985 --- libexec/rtld-elf/rtld-libc/rtld_libc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rtld-elf/rtld-libc/rtld_libc.c b/libexec/rtld-elf/rtld-libc/rtld_libc.c index c4feab5e184d..a5371de394e9 100644 --- a/libexec/rtld-elf/rtld-libc/rtld_libc.c +++ b/libexec/rtld-elf/rtld-libc/rtld_libc.c @@ -105,7 +105,7 @@ getpagesize(void) return (page_size); } -extern int __sys___sysctl(const int *name, u_int namelen, void *oldp, +int __sys___sysctl(const int *name, u_int namelen, void *oldp, size_t *oldlenp, const void *newp, size_t newlen); int From nobody Wed Feb 21 00:29:23 2024 X-Original-To: dev-commits-src-main@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 4TfcbR6VvRz59ycG; Wed, 21 Feb 2024 00:29:23 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfcbR5NRWz4CbT; Wed, 21 Feb 2024 00:29:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708475363; 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=e0Do4rZDTCtHGLQ+fHSaZZ+t1ZO1qsGj2SfPkCNKDYE=; b=t8g9GSd1a6b/axqX9dZXR9odq+EK2bntXZcgzxwq67igJOEzcEoxG7VYiOoh8ZZZJVR8Fq w5E5n5RIYACnwXeW565wFRAMcsYhxrmQnIVSIVaZq54Gj1zLhjvh6zoYuq2PD1noRmh7yf t5WalWTulpeW7ObDV5o2+VH7h9CTcMUSv1TRc4OmLx5ApKiERX0r9vtiByJWS0jA4GNQUR IIo5ScIZZB8sCwMnUSqey+5b9tEgl0qtXG0Ri+O/tYAZQ9EklIGS1ufwH++yCNxOz08ChU inWPy9RVI0ZMzdH0lZc7Tm4pj6Ic1L2d7wG37graHR5u8tNOCcNcXghWU1oJ5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708475363; 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=e0Do4rZDTCtHGLQ+fHSaZZ+t1ZO1qsGj2SfPkCNKDYE=; b=YyshyZAdOZoje/pjNnu2h38c3RMYsKk0UwpPfwf1+1+eLaSTS61mY7jtJwF9FDI+2gySuY 0OYcehdmWOHHp8GJ9TwaPzlMIw5BVqvrG9KV7Qz+hW6+wPFChK1cGIdd06qSJRQ4mL+M5U 4dOe3RxNTLwMgrUcYjA58KKXItn57maJjR33wwkhA4rxEv4B6Pm2Vf2BIXqgE1ZOmY8Std acxLeuSBew+Hhdpe+xAR2nV8RmLarMrbrV8E8PY0yz141xUC+OXdJinuxcqnj320VZfAGl tB4ZzAr/C5KFXzmcOtjcuJimvLaHic61So37KWz5d9j8+SDiJA21MxOvZgHE2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708475363; a=rsa-sha256; cv=none; b=ouwy9q79JeQQzQmnJHDLRLR2GHjapWuRJB1+M0+leXDtAIJuZ4Lt4yBI1RQ+1SXrgOkZkc Dy3OBXuJSYtlSd30eLxEXyXvoPBKdG1iQV3zgLDcDnrvYV/Wsf9T4fQ0H15DLXzVoqyZ5R SanRmcIzlSAobig8g14xEpPZJSAES7j68xHdyzhZ9mS7GJm3vOYLN2yd2lNYxY0926vG7S u4Dvcbu1B+829VhDymINkUzLggLHXw4L+VNKF2AIpPFTjwtfXTpIYgjMXu8kGIH6bV76vg KeMIIicGXItw5fMXLfBHHPbt19rWCKTksJnx3zA2HTINAqR2+OhWSQHLWSWJQg== 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 4TfcbR4T30zh8n; Wed, 21 Feb 2024 00:29:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41L0TN3s000186; Wed, 21 Feb 2024 00:29:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41L0TNsB000183; Wed, 21 Feb 2024 00:29:23 GMT (envelope-from git) Date: Wed, 21 Feb 2024 00:29:23 GMT Message-Id: <202402210029.41L0TNsB000183@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: af9758deff9a - main - libsys: internalize memcpy, memset, and strlcpy List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: af9758deff9abb118ce189cbab0a830b02fc63db Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=af9758deff9abb118ce189cbab0a830b02fc63db commit af9758deff9abb118ce189cbab0a830b02fc63db Author: Konstantin Belousov AuthorDate: 2024-02-20 14:28:37 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-21 00:26:11 +0000 libsys: internalize memcpy, memset, and strlcpy Reviewed by: brooks, imp Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D43985 --- lib/libsys/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/libsys/Makefile b/lib/libsys/Makefile index 598962185dcf..668c263c506f 100644 --- a/lib/libsys/Makefile +++ b/lib/libsys/Makefile @@ -26,6 +26,9 @@ CFLAGS+=-I${LIBSYS_SRCTOP}/include -I${LIBC_SRCTOP}/include CFLAGS+=-I${LIBSYS_SRCTOP}/${LIBC_ARCH} CFLAGS+=-I${LIBC_SRCTOP}/${LIBC_ARCH} +.PATH: ${LIBC_SRCTOP}/string +SRCS+= memcpy.c memset.c strlcpy.c + CLEANFILES+=tags INSTALL_PIC_ARCHIVE= #XXX? BUILD_NOSSP_PIC_ARCHIVE= From nobody Wed Feb 21 00:29:24 2024 X-Original-To: dev-commits-src-main@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 4TfcbT1Vfbz59yfD; Wed, 21 Feb 2024 00:29:25 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfcbS6RBdz4CfT; Wed, 21 Feb 2024 00:29:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708475364; 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=yoBXrt7gGvugbJ0XmQmS9+Bv5FRbbn2M5J84zkPvRf0=; b=jV9fjNAA8QZsqUT/Zul3I/WCFIphI7eCAC9QXraExt6yJIm5tQV2MsIc5Se6qlkZVpP6KA ZP1PaDi9qMb7jQQjBtq3QGwIRFB/B8FXU6+aOoMui+QhjbHgnGatnmHyV4QjAhUdE3S2eD oPMB+kpcCvqRNsXZ/vFxzqtU37a0W+psWN9mi8F6vZ1gi3Ml2fcRw5hjmd4Zw5n/dVEd8o JCvmWMNGkodc1sovNpKHcqlxL6eYVrZuKpTguri2zWc+G1X1hcUxxOvn8X4+2VFVHI0mkg gkIZHouz05MhYaxRFmPXz5d+ynpXx1jAhm5XWW7LOmVy1bBwYWyokUtlrUjuVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708475364; 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=yoBXrt7gGvugbJ0XmQmS9+Bv5FRbbn2M5J84zkPvRf0=; b=ZKkbrrIixxbnBvX5HvJN3zBtsNda8BeF/Obe0WsBSHXq6Wdt3nXsEOcqiKZD3F+gdRh4+I lkao7uxbQixLgHUE7hiiRyem7ZJBwaWwlP6LvxvDjGyy/nIrn1Qpxg+Bz2eO9bzRnvRfQ7 n4LjgQJNrj1qkdnIxUMy9bIexdocfTBxXxdeJBftEVBqbnRMDPYbL2zlJ1q0HDcbdE7OlA hGwj0YKG/ygh+HcpnA6yWHZDUZkrpUcKzX3m9+7++ceZhxwbvCQNG9s1nIsIvGfAfDlgAr xxNwkw+1Tjf4k0VRRv3cX/1zWEVB6unvhkPqTav65BACP9zcLebLrnt4oaZ78w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708475364; a=rsa-sha256; cv=none; b=s6kH3xYZA2+xuWScH0ewW4ONj1Aj1Q/o+w0lnra3y+Ku4QFFoSBWMYX4eMzLrF9hYYVqd1 6Eyc46d6FrlXYkbUq05smhZQuy1I5MbjPcd6VWNNRMMA2h7q36ZTA39F1WY7lV0M2M+q2E G5UxFMqVvC/XuNAsclW7tks3i6WLXHjlVcJuUuDP8gQy6Oe/OaVkK9BxdMdJkp+Vr4eD4f DpBdXyaka1ZLNHJ3mzPmHyDgWI+bx6WYlciBiliH05U4CoGQcj1wWODbpdd9wYhxvvnCij hgfh31n+zwG9wlIFvg8XV8qlE/Dm8hdl2p9+yVyLHy5eEpV4ufNdUnmRgc1MIg== 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 4TfcbS5VcpzgqB; Wed, 21 Feb 2024 00:29:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41L0TOLe000234; Wed, 21 Feb 2024 00:29:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41L0TOH5000231; Wed, 21 Feb 2024 00:29:24 GMT (envelope-from git) Date: Wed, 21 Feb 2024 00:29:24 GMT Message-Id: <202402210029.41L0TOH5000231@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 8271d9b99a3b - main - libsys: remove usage of pthread_once and _once_stub List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 8271d9b99a3b98c662ee9a6257a144284b7e1728 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8271d9b99a3b98c662ee9a6257a144284b7e1728 commit 8271d9b99a3b98c662ee9a6257a144284b7e1728 Author: Konstantin Belousov AuthorDate: 2024-02-20 14:45:29 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-21 00:26:11 +0000 libsys: remove usage of pthread_once and _once_stub that existed in auxv.c, use simple bool gate instead. This leaves a small window if two threads try to call _elf_aux_info(3) simultaneously. The situation is safe because auxv parsing is really idempotent. The parsed data is the same, and we store atomic types (int/long/ptr) so double-init does not matter. Reviewed by: brooks, imp Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D43985 --- lib/libc/gen/Makefile.inc | 1 + lib/{libsys => libc/gen}/_once_stub.c | 0 lib/libsys/Makefile.sys | 1 - lib/libsys/auxv.c | 20 ++++++++++++++++++-- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 8d30e06cfed9..ce7a34d0e58e 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -9,6 +9,7 @@ CONFSPACKAGE= runtime SRCS+= \ __pthread_mutex_init_calloc_cb_stub.c \ __xuname.c \ + _once_stub.c \ _pthread_stubs.c \ _rand48.c \ _spinlock_stub.c \ diff --git a/lib/libsys/_once_stub.c b/lib/libc/gen/_once_stub.c similarity index 100% rename from lib/libsys/_once_stub.c rename to lib/libc/gen/_once_stub.c diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys index cb9ca1749ba8..e33a11bacb57 100644 --- a/lib/libsys/Makefile.sys +++ b/lib/libsys/Makefile.sys @@ -33,7 +33,6 @@ PSEUDO+= _clock_gettime.o _gettimeofday.o SRCS+= \ __error.c \ __getosreldate.c \ - _once_stub.c \ getpagesize.c \ getpagesizes.c \ interposing_table.c diff --git a/lib/libsys/auxv.c b/lib/libsys/auxv.c index b0b3a8ed708b..88f49ef53be1 100644 --- a/lib/libsys/auxv.c +++ b/lib/libsys/auxv.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include "un-namespace.h" @@ -40,6 +41,8 @@ extern int _DYNAMIC; #pragma weak _DYNAMIC void *__elf_aux_vector; + +#ifndef PIC static pthread_once_t aux_vector_once = PTHREAD_ONCE_INIT; static void @@ -61,8 +64,9 @@ __init_elf_aux_vector(void) return; _once(&aux_vector_once, init_aux_vector_once); } +#endif -static pthread_once_t aux_once = PTHREAD_ONCE_INIT; +static bool aux_once = false; static int pagesize, osreldate, canary_len, ncpus, pagesizes_len, bsdflags; static int hwcap_present, hwcap2_present; static char *canary, *pagesizes, *execpath; @@ -77,11 +81,19 @@ static void _init_aux_powerpc_fixup(void); int _powerpc_elf_aux_info(int, void *, int); #endif +/* + * This function might be called and actual body executed more than + * once in multithreading environment. Due to this, it is and must + * continue to be idempotent. All stores are atomic (no store + * tearing), because we only assign to int/long/ptr. + */ static void init_aux(void) { Elf_Auxinfo *aux; + if (aux_once) + return; for (aux = __elf_aux_vector; aux->a_type != AT_NULL; aux++) { switch (aux->a_type) { case AT_BSDFLAGS: @@ -166,6 +178,8 @@ init_aux(void) if (!powerpc_new_auxv_format) _init_aux_powerpc_fixup(); #endif + + aux_once = true; } #ifdef __powerpc__ @@ -256,10 +270,12 @@ _elf_aux_info(int aux, void *buf, int buflen) { int res; +#ifndef PIC __init_elf_aux_vector(); +#endif if (__elf_aux_vector == NULL) return (ENOSYS); - _once(&aux_once, init_aux); + init_aux(); /* idempotent */ if (buflen < 0) return (EINVAL); From nobody Wed Feb 21 00:29:25 2024 X-Original-To: dev-commits-src-main@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 4TfcbV25tFz59yqZ; Wed, 21 Feb 2024 00:29: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfcbV0Jbkz4Cbw; Wed, 21 Feb 2024 00:29:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708475366; 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=OCwKNYzBRW0R+/6Zoa04YKaBkDmQPjM/SU4qbqFbZw4=; b=gh1ISooRYT6YyOVp6HlkrAZ8dt5TSVpZbtl1Lx1cpsspwly3cglRYpVpQT9+FHrdYt3unP lMYcpMUnSNz7yApVZm/qn4oU8DHa9Z6pPDc6mZhRxoEq0r96XikgB5wiZuh3St6jCNx6OW gvkTXIiWuOdly1Do4YcEDH7Q3pgxajfPie0f2NGbe5+h4fsVbB4KxhsPVFLjx6mRE6j8VK pNdDBQg5ISX4EaQH+HKdoKnTx4aAI7jy+qcMRX8EwZEJluzO6EjeR/gVn+YbP5MTh3V1lH tPscp8X4LGTbASFJWsqaz7/8KayU9l3/qj9jZS3d6JYtKn3kkw9KjzdvzJCNfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708475366; 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=OCwKNYzBRW0R+/6Zoa04YKaBkDmQPjM/SU4qbqFbZw4=; b=KuYigkb6IKHkrzTBvahTOqUmJyLaRevdbMAn4ukdwaYfsoomCACAZ4j77dRr9ehzmogGRY L6l8vJTJczLCyBr8ocZ0xlJncc4BFJ8R4Nd/0Z8wuFkFwQILfgHTONid1FrTL6V1srpwTh t89UxXdXvHSN6Kf7e/EbWE6C3RWrlldFZGWYvJ8F4OegGOwtE/d13KFnEzm6AU+nZagnRJ NYP7IqXyJBNfBM4GvAuIKIH89JWbXscOFPZpnFxATn+smyK7h/35S5GDNjnEVUyV7zBvaY 74301+EpUThNf1Rjw4ZHjk5k4cOUlVsXDK6+ASS8t36Tpdrxq0VuEiKyrHZ6xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708475366; a=rsa-sha256; cv=none; b=gbmC9cbJf8DIGtXpl0NMR8d0oPmCqT2ywajl9Z04KPtuKBo3umO1CtLP45oe07Gti1Dlf1 CMICT3Z2jrZe5WBRR1Dm+JmhUCD44TC2Y1uiq8SWdMCUBNX3QJKiAI/urWC17ficrOM6ve QMHroe3huYB+qlslNafqEl2wbFXnCWjALRCcE+xhp0E7/UQ/rME+krydyIJMqMSyPa/sz2 hZ8FBVRMDhcoJ+I/iM3PuJ2VXa9scxJQDihu8FA1z1B6Md1EgyVU+f0TWz5tDRG9SA6T6D gfumd0Cywe+GdKnS46NheYWO6ikoHf1/IGYHx+arKGB3ofjIqEAlJa02Q7v8Xw== 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 4TfcbT6Vl0zgvX; Wed, 21 Feb 2024 00:29:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41L0TPwv000276; Wed, 21 Feb 2024 00:29:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41L0TPFO000273; Wed, 21 Feb 2024 00:29:25 GMT (envelope-from git) Date: Wed, 21 Feb 2024 00:29:25 GMT Message-Id: <202402210029.41L0TPFO000273@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: fe920a4f2f80 - main - libsys: move errno to libsys List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: fe920a4f2f80fda4a24c3991de0d593e06ae7f6f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fe920a4f2f80fda4a24c3991de0d593e06ae7f6f commit fe920a4f2f80fda4a24c3991de0d593e06ae7f6f Author: Konstantin Belousov AuthorDate: 2024-02-20 15:13:09 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-21 00:26:11 +0000 libsys: move errno to libsys Before, the 'errno' itself was defined in libc and was referenced by libsys, causing undesired dependency. Reviewed by: brooks, imp Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D43985 --- lib/libc/gen/Makefile.inc | 1 - lib/libc/gen/Symbol.map | 1 - lib/libc/gen/errno.c | 29 ----------------------------- lib/libsys/Symbol.sys.map | 1 + lib/libsys/__error.c | 2 +- 5 files changed, 2 insertions(+), 32 deletions(-) diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index ce7a34d0e58e..648ddc76e056 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -47,7 +47,6 @@ SRCS+= \ erand48.c \ err.c \ errlst.c \ - errno.c \ eventfd.c \ exec.c \ exect.c \ diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index 0821563e0c9f..7b002941ea4e 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -99,7 +99,6 @@ FBSD_1.0 { vwarnx; sys_errlist; sys_nerr; - errno; exect; execl; execle; diff --git a/lib/libc/gen/errno.c b/lib/libc/gen/errno.c deleted file mode 100644 index d35a481dff3f..000000000000 --- a/lib/libc/gen/errno.c +++ /dev/null @@ -1,29 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2002 Peter Wemm - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -int errno; diff --git a/lib/libsys/Symbol.sys.map b/lib/libsys/Symbol.sys.map index d59ac8674669..4b9373ffa773 100644 --- a/lib/libsys/Symbol.sys.map +++ b/lib/libsys/Symbol.sys.map @@ -76,6 +76,7 @@ FBSD_1.0 { extattr_set_file; extattr_set_link; extattrctl; + errno; fchdir; fchflags; fchmod; diff --git a/lib/libsys/__error.c b/lib/libsys/__error.c index 7f2bf5713b1d..1132bdba9c65 100644 --- a/lib/libsys/__error.c +++ b/lib/libsys/__error.c @@ -31,7 +31,7 @@ #include "libc_private.h" -extern int errno; +int errno; static int * __error_unthreaded(void) From nobody Wed Feb 21 00:29:26 2024 X-Original-To: dev-commits-src-main@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 4TfcbW2M8Tz59ycR; Wed, 21 Feb 2024 00:29:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfcbW11dDz4Clm; Wed, 21 Feb 2024 00:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708475367; 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=4PQD4iPxfcGugAC6MJ1U1n8upt459PqiLWknVR6fnss=; b=ke+1rQLTxprNAsT196wsJQZulxPfTr4xzwSh9rNH0+NhG50DRqdObu/MdZfv/yP9iBTHJ1 nP/8DEUvLc96+cNLPOe2NBj/BhbQHp5Dqk/bLJb/W2byQc21pqusqh1asdTPCJ8OCfLrWh AzK4bDcXd6fJZh0wurtV0U7DY09leVvGrwuX85GnhYBghRxKhqEI+luoL6RDcnvs5YxA7i gKBc0PJcXYPktsyOcIC/3+Uptz0U4kebcJj8Th8zNeYa2F1JjXpL4pLsJzdZcsC55ZWttA Bgg67SiMRWmuisWNlrCiYUIv26Qh/3upuNZEoqhi19YnWU4nem9F9Mvu7yON6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708475367; 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=4PQD4iPxfcGugAC6MJ1U1n8upt459PqiLWknVR6fnss=; b=skNGMccA0PXkhLMsKi+ITD7pFEg/JX6bFZf39oKEOSUn9KEN0UD/tfAnDkHcJwvSkr4Pdp nz97NbErl9twbSii0EM8ag21JwM+0k3H/4b8IeGXdQw54azbVdN1G6hXAtHuamSj9XUrJ9 aFioPRgairLZXdFl4WizrasKW3rNzDXhns3itiZF+qpJiuGP0RqV75WsVtEucPDkLdbUFO URWum/hZRyCSWW+FzgkHPlFURh26r/TBiOZX/Fn1KYG6qV4czkwmDfSsLSDhYYd/DpT6SY Ray9WxNp+95sJPT+2ZHdB24sbsy8n0dYBR52jvcGsaNlb67yq6HWT+u+o1DpLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708475367; a=rsa-sha256; cv=none; b=VPSlZBW3Pd30jYvzlUNM81Sk54IyFNs4RWeIZ3mQWxER3/TB2m8da9ke0Gd1ZTRzj8M5WO UnmAbhL487nXUw9YUiPIMt/G4zSrBY8rswphfo/r8waucY/wPywdVTA0DYiIqLcvvP+b5o 2r0qzRHVbsXg+AYrQrRXZuLvGtqSQaanXsDYzxGDHYKWdkxl/hUA6pOL5lKEjuzAOhO+iK m9sz7qyT8ww7QqjMBnidZottuWElTlxrO5jtefUiA0FjbLABoRqNJCcT3TVeCzlqg1ME0w ZqbRC4gy+2E/8Qc549ZtyuisPzIE2X+6XFtsNwbpQzAvqDyfckQ0L/eDBLvZLw== 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 4TfcbW06lTzh7C; Wed, 21 Feb 2024 00:29:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41L0TQ0q000320; Wed, 21 Feb 2024 00:29:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41L0TQgU000317; Wed, 21 Feb 2024 00:29:26 GMT (envelope-from git) Date: Wed, 21 Feb 2024 00:29:26 GMT Message-Id: <202402210029.41L0TQgU000317@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 3668e1fa0a50 - main - libsys: disable ssp List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 3668e1fa0a50562f58508565bdde0bdb83e0b475 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3668e1fa0a50562f58508565bdde0bdb83e0b475 commit 3668e1fa0a50562f58508565bdde0bdb83e0b475 Author: Konstantin Belousov AuthorDate: 2024-02-20 15:13:26 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-21 00:26:11 +0000 libsys: disable ssp Reviewed by: brooks, imp Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D43985 --- lib/libsys/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libsys/Makefile b/lib/libsys/Makefile index 668c263c506f..5e8c39deb463 100644 --- a/lib/libsys/Makefile +++ b/lib/libsys/Makefile @@ -21,6 +21,7 @@ LIBC_ARCH=${MACHINE_CPUARCH} LIB=sys SHLIB_MAJOR= 7 WARNS?= 2 +MK_SSP= no CFLAGS+=-I${LIBSYS_SRCTOP}/include -I${LIBC_SRCTOP}/include CFLAGS+=-I${LIBSYS_SRCTOP}/${LIBC_ARCH} From nobody Wed Feb 21 00:51:04 2024 X-Original-To: dev-commits-src-main@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 4Tfd4k1fGqz5B1pY for ; Wed, 21 Feb 2024 00:51:18 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tfd4j6zXsz4Gsl for ; Wed, 21 Feb 2024 00:51:17 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-40fb3b5893eso35472485e9.0 for ; Tue, 20 Feb 2024 16:51:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708476676; x=1709081476; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Py4Ty/VpEhx4nXvdO28WlCgbeiag7O2vbM3x+QGc7ig=; b=v3hFpXrrVYn+Xwh4ijKNd7XbSfayGgvQABiaYj5e7fXBz3v1hPZToGZSAvkwZsEK69 fAR73bi01lGwSBLvnc76YMCWhEQGVin6tvsu5umDNL9IUGzvL+PRVyYaXHqHAxwyOaJd OGpy1BDxUgnLVp915diuWO0whofO/Y8d/svRY+64RjzkweA166u6l246xpxxKnzN7Ijr RfbfnCaF1KxUKcB3ehmNTQL9PcN4zMBS+pfETvgcRxK6q5eQl0dPOyouR1c3az/UMCqe XMZ0+XUDzfxMLFOpM8zTQSVX6mcAB3TKyX8nJGrelhTqSR9BU4Xkwkar/Wau3wrDDLHd IeYQ== X-Forwarded-Encrypted: i=1; AJvYcCXIjNTq1Ymk5jIlRRtKf4b+vBH0N0tlBHHlYg7ce0y7OdVe52daiWTTlxr90v0tp2C8cy16hGJ8qmufOs6MBFPPMX9xpQ6HAhonqHGot4hHeg== X-Gm-Message-State: AOJu0Yw3c2QTbIVryfYPgE0MHT0gsV9HsdsWZFEzZ3g7jG+FGLunjNLc R/wG83TzL74jFnxCcxmWIo6r7DQH86N1uyLOmiU5UgwI20DMkTJl6bRopf49+5E= X-Google-Smtp-Source: AGHT+IEyv6WUEujAyhIcyWUoGGxuuwwXKrXObywKVyLqcgbpkHYLaAERKK9fECV40IUsA8CG7nqnVw== X-Received: by 2002:a05:6000:3:b0:33d:1cc1:bb08 with SMTP id h3-20020a056000000300b0033d1cc1bb08mr9447690wrx.22.1708476675827; Tue, 20 Feb 2024 16:51:15 -0800 (PST) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id r6-20020adff706000000b0033cf7eb4a85sm14992783wrp.65.2024.02.20.16.51.15 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Feb 2024 16:51:15 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: 8271d9b99a3b - main - libsys: remove usage of pthread_once and _once_stub From: Jessica Clarke In-Reply-To: <202402210029.41L0TOH5000231@gitrepo.freebsd.org> Date: Wed, 21 Feb 2024 00:51:04 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <964A29A2-4C51-4037-8EBE-320008D48AE0@freebsd.org> References: <202402210029.41L0TOH5000231@gitrepo.freebsd.org> To: Konstantin Belousov X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Tfd4j6zXsz4Gsl X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On 21 Feb 2024, at 00:29, Konstantin Belousov wrote: >=20 > The branch main has been updated by kib: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D8271d9b99a3b98c662ee9a6257a14428= 4b7e1728 >=20 > commit 8271d9b99a3b98c662ee9a6257a144284b7e1728 > Author: Konstantin Belousov > AuthorDate: 2024-02-20 14:45:29 +0000 > Commit: Konstantin Belousov > CommitDate: 2024-02-21 00:26:11 +0000 >=20 > libsys: remove usage of pthread_once and _once_stub >=20 > that existed in auxv.c, use simple bool gate instead. This leaves a > small window if two threads try to call _elf_aux_info(3) = simultaneously. > The situation is safe because auxv parsing is really idempotent. = The > parsed data is the same, and we store atomic types (int/long/ptr) = so > double-init does not matter. You still need to load acquire and store release aux_once though, otherwise you can see aux_once as true yet read the pre-initialised data. In practice that=E2=80=99s surely very hard to hit, but the code = as written is now wrong. Also, idempotence should probably be made unnecessary by using 0/1/2 state for uninitialised/initialising/ initialised, as it=E2=80=99s still technically UB from a C AM = perspective due to not being data race free if two threads initialise at the same time. Better to just do the correct thing rather than risk things going wrong. Jess > Reviewed by: brooks, imp > Sponsored by: The FreeBSD Foundation > Differential revision: https://reviews.freebsd.org/D43985 > --- > lib/libc/gen/Makefile.inc | 1 + > lib/{libsys =3D> libc/gen}/_once_stub.c | 0 > lib/libsys/Makefile.sys | 1 - > lib/libsys/auxv.c | 20 ++++++++++++++++++-- > 4 files changed, 19 insertions(+), 3 deletions(-) >=20 > diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc > index 8d30e06cfed9..ce7a34d0e58e 100644 > --- a/lib/libc/gen/Makefile.inc > +++ b/lib/libc/gen/Makefile.inc > @@ -9,6 +9,7 @@ CONFSPACKAGE=3D runtime > SRCS+=3D \ > __pthread_mutex_init_calloc_cb_stub.c \ > __xuname.c \ > + _once_stub.c \ > _pthread_stubs.c \ > _rand48.c \ > _spinlock_stub.c \ > diff --git a/lib/libsys/_once_stub.c b/lib/libc/gen/_once_stub.c > similarity index 100% > rename from lib/libsys/_once_stub.c > rename to lib/libc/gen/_once_stub.c > diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys > index cb9ca1749ba8..e33a11bacb57 100644 > --- a/lib/libsys/Makefile.sys > +++ b/lib/libsys/Makefile.sys > @@ -33,7 +33,6 @@ PSEUDO+=3D _clock_gettime.o _gettimeofday.o > SRCS+=3D \ > __error.c \ > __getosreldate.c \ > - _once_stub.c \ > getpagesize.c \ > getpagesizes.c \ > interposing_table.c > diff --git a/lib/libsys/auxv.c b/lib/libsys/auxv.c > index b0b3a8ed708b..88f49ef53be1 100644 > --- a/lib/libsys/auxv.c > +++ b/lib/libsys/auxv.c > @@ -31,6 +31,7 @@ > #include > #include > #include > +#include > #include > #include > #include "un-namespace.h" > @@ -40,6 +41,8 @@ extern int _DYNAMIC; > #pragma weak _DYNAMIC >=20 > void *__elf_aux_vector; > + > +#ifndef PIC > static pthread_once_t aux_vector_once =3D PTHREAD_ONCE_INIT; >=20 > static void > @@ -61,8 +64,9 @@ __init_elf_aux_vector(void) > return; > _once(&aux_vector_once, init_aux_vector_once); > } > +#endif >=20 > -static pthread_once_t aux_once =3D PTHREAD_ONCE_INIT; > +static bool aux_once =3D false; > static int pagesize, osreldate, canary_len, ncpus, pagesizes_len, = bsdflags; > static int hwcap_present, hwcap2_present; > static char *canary, *pagesizes, *execpath; > @@ -77,11 +81,19 @@ static void _init_aux_powerpc_fixup(void); > int _powerpc_elf_aux_info(int, void *, int); > #endif >=20 > +/* > + * This function might be called and actual body executed more than > + * once in multithreading environment. Due to this, it is and must > + * continue to be idempotent. All stores are atomic (no store > + * tearing), because we only assign to int/long/ptr. > + */ > static void > init_aux(void) > { > Elf_Auxinfo *aux; >=20 > + if (aux_once) > + return; > for (aux =3D __elf_aux_vector; aux->a_type !=3D AT_NULL; aux++) { > switch (aux->a_type) { > case AT_BSDFLAGS: > @@ -166,6 +178,8 @@ init_aux(void) > if (!powerpc_new_auxv_format) > _init_aux_powerpc_fixup(); > #endif > + > + aux_once =3D true; > } >=20 > #ifdef __powerpc__ > @@ -256,10 +270,12 @@ _elf_aux_info(int aux, void *buf, int buflen) > { > int res; >=20 > +#ifndef PIC > __init_elf_aux_vector(); > +#endif > if (__elf_aux_vector =3D=3D NULL) > return (ENOSYS); > - _once(&aux_once, init_aux); > + init_aux(); /* idempotent */ >=20 > if (buflen < 0) > return (EINVAL); From nobody Wed Feb 21 00:52:40 2024 X-Original-To: dev-commits-src-main@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 4Tfd6J6sT2z5B1vZ; Wed, 21 Feb 2024 00:52: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tfd6J6ZZJz4HDp; Wed, 21 Feb 2024 00:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708476760; 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=RDS/XdzhVIMaU1czgLA1+zlUP+SACDcq2uDl0NqMLd4=; b=P9NGzSdIh3gRSjBk0YMqGUjrQFBRYVCNHb5hA/aXRkETHi7I8j5Gb5m87aMjQzUsssL1hq N2GNpAxUHrujtAnJzdnNTQp3HfB0O+2Z9xlJJQTsBGvLq+j4ZBOEX7V/4oXfOPYElWQkUl 7F3EE6rRQVsf74e7tyHcGJBJMjXsEPb2sVHKV6YqMCv1WnS3s+cYwgMSaYx5l9YN0WGRwS Fp11L+Lfz9x9FuPACuyNK7MEwa8F2WaV9EvS3DLgrfLl1Aluvbsu4I5jKDE7RGwJnqbQsv T96KrlLCwGmJ/8wFHj1pR8pTHvqju0Z6l2+NyXKUusM/+US8uY5iUDIJGfu/8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708476760; 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=RDS/XdzhVIMaU1czgLA1+zlUP+SACDcq2uDl0NqMLd4=; b=Kn9rFOpEPJHqSwKoCGrcso6zQHeiXewgn8Sc/zwb4iAmSCnOV+v3a+DHP5BSBYIGoq8LTn WUyfQwYYKRFur4vrzcS189CyTMuv8Y4hg0bSxjFMbQTnJc9dtPpcB8QpjcctJHIs8ame0P q/Blu5Yak08ZWZ+65+aZUKFppQrUG16jo4MpgOe4vfQqEcQBStiEgGx3pADsYlZrtpmz1r xP7RdvQLbOCyU/wdVA9b6xcVblO4MCHsD92kpAtAhmZ8rh0Yy8z/OyBM0EDdjbQOTzeUiG wj7aTzyjm25YPjO2xKtlkSaXYfXW/iUxBL9+EvbHbKuXmynxsHKmwhIl1Emp8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708476760; a=rsa-sha256; cv=none; b=JnfCSHjw+9FeZo61We/xcPIW5WuvWtuTKoXsN5Jy+6edx8DoGy4cmsOLUgZpZHHsSa/hWc 1RAR6PZeaKUjj6yrQ0RC6ekPaKIWmfLIhdl4qm/0LqhP97Jq4Nhtp8lAyxjAdOq0wmvKwt JiAP7o4mU0wLlm1ObzKLgcB00vEHrnWScKnvJ58bCI4Yl6T0XqOrRBRClLCxPsVKCfkIX/ UxSM7fmZPDCeKKiDYk8Do8d1bny7nvw4rJESwfEm8hseK1XgufNVORaXf2aqQWR1/V91Yj OQXVEzdTJ/BtUTM2J7TCthMIvgRT+eJoSMxluqk1EBPIhScdBAFBbNToHhJrUQ== 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 4Tfd6J5Jv9zhZ0; Wed, 21 Feb 2024 00:52:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41L0qeGw049518; Wed, 21 Feb 2024 00:52:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41L0qepV049515; Wed, 21 Feb 2024 00:52:40 GMT (envelope-from git) Date: Wed, 21 Feb 2024 00:52:40 GMT Message-Id: <202402210052.41L0qepV049515@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: f81cdf24ba54 - main - bhyve: Add support for XML register definitions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: f81cdf24ba5436367377f7c8e8f51f6df2a75ca7 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f81cdf24ba5436367377f7c8e8f51f6df2a75ca7 commit f81cdf24ba5436367377f7c8e8f51f6df2a75ca7 Author: Mark Johnston AuthorDate: 2024-02-21 00:21:29 +0000 Commit: Mark Johnston CommitDate: 2024-02-21 00:51:34 +0000 bhyve: Add support for XML register definitions This is useful for exposing additional registers to debuggers. For instance, control registers are now available on amd64 when using gdb to debug a guest. The stub indicates support by including the string "qXfer:features:read+" in its feature list. The debugger queries for target descriptions by sending the query "qXfer:features:read:" followed by a file path. The XML definitions are copied from QEMU and installed to /usr/share/bhyve/gdb. Note that we currently don't handle the SIMD registers at all, since that's of somewhat limited utility (for me at least) and since that requires new ioctls to fetch the register values. Reviewed by: jhb MFC after: 2 weeks Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D43666 --- etc/mtree/BSD.usr.dist | 2 + usr.sbin/bhyve/Makefile | 1 + usr.sbin/bhyve/gdb.c | 106 ++++++++++++++++++++++++++- usr.sbin/bhyve/gdb/Makefile | 21 ++++++ usr.sbin/bhyve/gdb/amd64.xml | 165 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 294 insertions(+), 1 deletion(-) diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index a7738aaf6f78..0d43b657530b 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -184,6 +184,8 @@ atf tags=package=tests .. bhyve + gdb + .. kbdlayout .. .. diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index b6cad38a6c39..c9d571daebbc 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -75,6 +75,7 @@ CFLAGS+= -DBHYVE_GDB .ifdef GDB_LOG CFLAGS+=-DGDB_LOG .endif +SUBDIR+= gdb .endif CFLAGS+=-I${.CURDIR} \ diff --git a/usr.sbin/bhyve/gdb.c b/usr.sbin/bhyve/gdb.c index 84e725f9085e..fbd62413e2c2 100644 --- a/usr.sbin/bhyve/gdb.c +++ b/usr.sbin/bhyve/gdb.c @@ -34,6 +34,8 @@ #include #include #include +#include + #include #include #include @@ -63,6 +65,8 @@ #include "mem.h" #include "mevent.h" +#define _PATH_GDB_XML "/usr/share/bhyve/gdb" + /* * GDB_SIGNAL_* numbers are part of the GDB remote protocol. Most stops * use SIGTRAP. @@ -85,6 +89,7 @@ static cpuset_t vcpus_active, vcpus_suspended, vcpus_waiting; static pthread_mutex_t gdb_lock; static pthread_cond_t idle_vcpus; static bool first_stop, report_next_stop, swbreak_enabled; +static int xml_dfd = -1; /* * An I/O buffer contains 'capacity' bytes of room at 'data'. For a @@ -169,8 +174,25 @@ static const struct gdb_reg { { .id = VM_REG_GUEST_ES, .size = 4 }, { .id = VM_REG_GUEST_FS, .size = 4 }, { .id = VM_REG_GUEST_GS, .size = 4 }, + /* + * Registers past this point are not included in a reply to a 'g' query, + * to provide compatibility with debuggers that do not fetch a target + * description. The debugger can query them individually with 'p' if it + * knows about them. + */ +#define GDB_REG_FIRST_EXT VM_REG_GUEST_FS_BASE + { .id = VM_REG_GUEST_FS_BASE, .size = 8 }, + { .id = VM_REG_GUEST_GS_BASE, .size = 8 }, + { .id = VM_REG_GUEST_KGS_BASE, .size = 8 }, + { .id = VM_REG_GUEST_CR0, .size = 8 }, + { .id = VM_REG_GUEST_CR2, .size = 8 }, + { .id = VM_REG_GUEST_CR3, .size = 8 }, + { .id = VM_REG_GUEST_CR4, .size = 8 }, + { .id = VM_REG_GUEST_TPR, .size = 8 }, + { .id = VM_REG_GUEST_EFER, .size = 8 }, }; +#define GDB_LOG #ifdef GDB_LOG #include #include @@ -1029,9 +1051,13 @@ gdb_read_regs(void) send_error(errno); return; } + start_packet(); - for (size_t i = 0; i < nitems(gdb_regset); i++) + for (size_t i = 0; i < nitems(gdb_regset); i++) { + if (gdb_regset[i].id == GDB_REG_FIRST_EXT) + break; append_unsigned_native(regvals[i], gdb_regset[i].size); + } finish_packet(); } @@ -1519,6 +1545,7 @@ check_features(const uint8_t *data, size_t len) /* This is an arbitrary limit. */ append_string("PacketSize=4096"); append_string(";swbreak+"); + append_string(";qXfer:features:read+"); finish_packet(); } @@ -1590,6 +1617,71 @@ gdb_query(const uint8_t *data, size_t len) start_packet(); append_asciihex(buf); finish_packet(); + } else if (command_equals(data, len, "qXfer:features:read:")) { + struct stat sb; + const char *xml; + const uint8_t *pathend; + char buf[64], path[PATH_MAX]; + size_t xmllen; + unsigned int doff, dlen; + int fd; + + data += strlen("qXfer:features:read:"); + len -= strlen("qXfer:features:read:"); + + pathend = memchr(data, ':', len); + if (pathend == NULL || + (size_t)(pathend - data) >= sizeof(path) - 1) { + send_error(EINVAL); + return; + } + memcpy(path, data, pathend - data); + path[pathend - data] = '\0'; + data += (pathend - data) + 1; + len -= (pathend - data) + 1; + + if (len > sizeof(buf) - 1) { + send_error(EINVAL); + return; + } + memcpy(buf, data, len); + buf[len] = '\0'; + if (sscanf(buf, "%x,%x", &doff, &dlen) != 2) { + send_error(EINVAL); + return; + } + + fd = openat(xml_dfd, path, O_RDONLY | O_RESOLVE_BENEATH); + if (fd < 0) { + send_error(errno); + return; + } + if (fstat(fd, &sb) < 0) { + send_error(errno); + close(fd); + return; + } + xml = mmap(NULL, sb.st_size, PROT_READ, MAP_SHARED, fd, 0); + if (xml == MAP_FAILED) { + send_error(errno); + close(fd); + return; + } + close(fd); + xmllen = sb.st_size; + + start_packet(); + if (doff >= xmllen) { + append_char('l'); + } else if (doff + dlen >= xmllen) { + append_char('l'); + append_packet_data(xml + doff, xmllen - doff); + } else { + append_char('m'); + append_packet_data(xml + doff, dlen); + } + finish_packet(); + (void)munmap(__DECONST(void *, xml), xmllen); } else send_empty_response(); } @@ -1917,6 +2009,9 @@ limit_gdb_socket(int s) void init_gdb(struct vmctx *_ctx) { +#ifndef WITHOUT_CAPSICUM + cap_rights_t rights; +#endif int error, flags, optval, s; struct addrinfo hints; struct addrinfo *gdbaddr; @@ -1997,4 +2092,13 @@ init_gdb(struct vmctx *_ctx) gdb_active = true; freeaddrinfo(gdbaddr); free(sport); + + xml_dfd = open(_PATH_GDB_XML, O_DIRECTORY); + if (xml_dfd == -1) + err(1, "Failed to open gdb xml directory"); +#ifndef WITHOUT_CAPSICUM + cap_rights_init(&rights, CAP_FSTAT, CAP_LOOKUP, CAP_MMAP_R, CAP_PREAD); + if (caph_rights_limit(xml_dfd, &rights) == -1) + err(1, "cap_rights_init"); +#endif } diff --git a/usr.sbin/bhyve/gdb/Makefile b/usr.sbin/bhyve/gdb/Makefile new file mode 100644 index 000000000000..a444b0cc4c69 --- /dev/null +++ b/usr.sbin/bhyve/gdb/Makefile @@ -0,0 +1,21 @@ +PACKAGE= bhyve +FILESDIR= ${SHAREDIR}/bhyve/gdb + +FILES+= target.xml + +.if ${MACHINE_ARCH} == "amd64" +XMLARCH= i386:x86-64 +FILES+= amd64.xml +.endif + +target.xml: .PHONY + @echo "" > ${.TARGET} + @echo "" >> ${.TARGET} + @echo "" >> ${.TARGET} + @echo " ${XMLARCH}" >> ${.TARGET} +.for file in ${FILES:Ntarget.xml} + @echo " " >> ${.TARGET} +.endfor + @echo "" >> ${.TARGET} + +.include diff --git a/usr.sbin/bhyve/gdb/amd64.xml b/usr.sbin/bhyve/gdb/amd64.xml new file mode 100644 index 000000000000..15bd270120d8 --- /dev/null +++ b/usr.sbin/bhyve/gdb/amd64.xml @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From nobody Wed Feb 21 03:19:14 2024 X-Original-To: dev-commits-src-main@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 4TfhMR1HNFz5BGMF; Wed, 21 Feb 2024 03:19:15 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfhMR0h5gz4Sv7; Wed, 21 Feb 2024 03:19:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708485555; 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=aRAL1WSiBa6h7Do8iAKzaH+91Ep96RyZrSFi/+ETgIE=; b=MtNICdYGgs0ZJdZREPO55GBc4vkeX+YSjf2NY1hcv6G/zjRqCh0ymw44fw2lPj4w0wcSlM 6zrxbKAjPPKTXdqpHqHfRDiEjqbyBiUNrURui78lkIjwjmlo9VHY0XxjxhrPr/BNlM1ehm zi0CtoV/YT8UW8pHKZUsBeWc6aveo/EhEqMEHB/1DpThPYm+0wHLqa+KUT57UqfOcwGOTg 9GhgTBWpkJvidKcqhV2TRhUOQddeNdde1jXQZ4NKhWqTA9oo4YjFOy2696u9AlRF8/BvXs uYI38qz2KrmUUo0ndWrpggXww8EWVPYbMzkqRpNtxKOfx5M+/WLaHsAD/e/hDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708485555; 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=aRAL1WSiBa6h7Do8iAKzaH+91Ep96RyZrSFi/+ETgIE=; b=Cs9GY0kGweT+nzSmwQcatqVe4lkxTRAF3D+op6SozjtngBxtzH0BLBP8oPUSu037xdJ/ZQ rxYFJZVKmBHq8m13EdfbXKed6kgIPdgjcaZHv0rcxi5UH+2Mg652F1XrXrcV3Pwb+G52jH Obm2PmVx0oT69zWJjQAcXIGBwGlDocG/0sqp/oGTZV2ovv+yQ64BrnjIxq8k/Q9+fgw7cs 5mlkcyD+eS9Il1/AcWuztIQT5bqLB92VE0J5TZIozJ8GXnoIkYe6QNgUvE0fy1StJz/Oi7 N8pM3OJefE/UsaXOp8GRJvnWse2ahjylXrIlrN5EUlh2VROku4wvh+OtQSr3vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708485555; a=rsa-sha256; cv=none; b=QWTJJcpW3wYAi0wVIOEsuSLAcIvIgwSaONgZdxrGr+iFWvY2zmFF8MigvySBQwGyAG64ZG 2deGysojNt2Z9Alt/f/MrTSh9kiUdTAdtmOmEMc8tERJb0y0SLG92MOo7bw+Z48YNLVOC+ +hbgPFD9oXRmXzpjaBRUNkcnPOz5F+Ij5aNXo3veE2h3MDyAKv0hbsqFF91P7j1vs7VVJU A73fW6SxFYUGwNYFm6tqcziHlneebWFLJH7x4cfMH5wB7EFti6bGbRtlcxuylQRd3jkjO4 KTXlCdSnC5VYE17Des6pVd0TI/ooOmh+jK/b4m4dbbM/lIGX23iYzQKgRSmsMw== 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 4TfhMQ6rV2zlsr; Wed, 21 Feb 2024 03:19:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41L3JEnc087263; Wed, 21 Feb 2024 03:19:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41L3JE6L087260; Wed, 21 Feb 2024 03:19:14 GMT (envelope-from git) Date: Wed, 21 Feb 2024 03:19:14 GMT Message-Id: <202402210319.41L3JE6L087260@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: cd6e526e268e - main - loader/libofw: Fix disk size truncation List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd6e526e268e4fdf1c9a65b9d792e67343f52307 Auto-Submitted: auto-generated The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=cd6e526e268e4fdf1c9a65b9d792e67343f52307 commit cd6e526e268e4fdf1c9a65b9d792e67343f52307 Author: Justin Hibbits AuthorDate: 2024-02-20 22:08:54 +0000 Commit: Justin Hibbits CommitDate: 2024-02-21 03:17:26 +0000 loader/libofw: Fix disk size truncation At present OF_ioctl first multiplies, then casts to 64-bit, meaning at the asm level it truncates the result to 32-bit, then zero-extends it to 64-bit to return. Cast `n` to 64-bit before multiplying, so that the correct result is returned. --- stand/libofw/ofw_disk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/libofw/ofw_disk.c b/stand/libofw/ofw_disk.c index e9002ca23fe9..d30454b70b74 100644 --- a/stand/libofw/ofw_disk.c +++ b/stand/libofw/ofw_disk.c @@ -174,7 +174,7 @@ ofwd_ioctl(struct open_file *f, u_long cmd, void *data) case DIOCGMEDIASIZE: block_size = OF_block_size(dev->d_handle); n = OF_blocks(dev->d_handle); - *(uint64_t *)data = (uint64_t)(n * block_size); + *(uint64_t *)data = ((uint64_t)n * block_size); break; default: return (ENOTTY); From nobody Wed Feb 21 03:38:27 2024 X-Original-To: dev-commits-src-main@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 4Tfhnb3Z0yz5BJ0G; Wed, 21 Feb 2024 03:38:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tfhnb33zFz4VmY; Wed, 21 Feb 2024 03:38:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708486707; 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=so7yZtQFa70Y38fdP3DbKp9vDvahR8XrkBWVJfgo7fI=; b=O+lgewr+eMDf64Oyc7EHchzUQGDkjzremqhQoh8oDkzVY9eO+kMGsxdYrA5DwY8weUT6O+ ro1UpUDwxrO090q82PiYDyLaO9zncHYCkJuVGsSnhOFT5ywswcbt4/k0jHvvMNet3Az81R UH8N+AnJZFwxHCpv43pvtr31fdTdKxnRc3LM+0rumtbO8u1c/JNpbsgrbxAQQlUoIgT0rI LFXZe2oHGytdwIC5e5aAAfBFGWG4qMJ62M6ldHc9pBzNCFOOZq9PG3bH4HlzXVYgRX4P6C Pda2odY+FJVjQ9s8icRoX+iePs86QOGNLVDjxwLAyq0MQV4BEZVf6KCmJb2o2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708486707; 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=so7yZtQFa70Y38fdP3DbKp9vDvahR8XrkBWVJfgo7fI=; b=TDveV6l7c9utBqybwGM2cc8sCg6xMZN4Ur7Vpsw+StbnnOtvWlCH/ccbgHTeOLeAGAM6+W eocn2NYo3jQf23SilasMd6m3F5yshcYdLF5DmFDKeQju1LmZdDh4AkMnB5Xjye5t7GzZf6 tBKKata2n3Z7x7OaAEGZpkvVTnNo/Iw2q2GMafw32yfYBASU4JUbS1XVd8zId4pqlAVFLy RYQ6YlgT0FEF+6cEGKKFbwADxFK6mhENLdCdmIK2Vtj5QAheo5hBOYozQy6hctQMKn/26y aUGgu5bhUslkphDhmnMSwh9l2YSbNciO1PqcGDyZj+6dUTZusj6IBFnZ0RZ3sA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708486707; a=rsa-sha256; cv=none; b=LmEIubk1faiFkkIxlnMpKRabwemo3dqjucD10BSARMdwZ+ndKkHwkNbXMFBxpR2U+CQicv ezTB5SQxFVEX8CLcGRfST9gLWAQn2sjEuqC35qdupH16JOL/gx17vJLMCKlrpRHyHZzkp8 Z+kjIbARozkN+Jc+IoNorGLM60ZfGWQP/Bjr/gRzfA3ebZwmBu0lGlA4xdhwGDTql28s2r 7dfMXt7AV4xkm9E4v1TDSP28UzqzvfrwdUrjP+VyxiQbLEqDdhJ5sNkJBY6mKuZPTIxJHK 7UBwHO8d660Enui0EY19oWVbD6peNbuyKO+DRUhM/LMqNZUCFyE6F2ET9LOdvA== 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 4Tfhnb26yjzmrp; Wed, 21 Feb 2024 03:38:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41L3cRQj021093; Wed, 21 Feb 2024 03:38:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41L3cRAZ021090; Wed, 21 Feb 2024 03:38:27 GMT (envelope-from git) Date: Wed, 21 Feb 2024 03:38:27 GMT Message-Id: <202402210338.41L3cRAZ021090@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 1edb7116f450 - main - bearssl: Make shared library link List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 1edb7116f450c1a1793f2fd25f6bdc16735ef888 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1edb7116f450c1a1793f2fd25f6bdc16735ef888 commit 1edb7116f450c1a1793f2fd25f6bdc16735ef888 Author: Warner Losh AuthorDate: 2024-02-21 03:31:41 +0000 Commit: Warner Losh CommitDate: 2024-02-21 03:31:41 +0000 bearssl: Make shared library link Creating a lua shared library module linking against libbearssl.so won't load w/o these functions. Sponsored by: Netflix Reviewed by: sjg Differential Revision: https://reviews.freebsd.org/D43982 --- lib/libbearssl/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/libbearssl/Makefile b/lib/libbearssl/Makefile index d307dd138a94..1fa57f372596 100644 --- a/lib/libbearssl/Makefile +++ b/lib/libbearssl/Makefile @@ -45,6 +45,7 @@ SRCS+= \ hash/ghash_pwr8.c \ hash/md5.c \ hash/md5sha1.c \ + hash/mgf1.c # this one does not compile for amd64 @@ -149,6 +150,11 @@ SRCS+= \ x509/x509_knownkey.c \ x509/x509_minimal_full.c \ +SRCS+= \ + rand/hmac_drbg.c \ + mac/hmac.c \ + mac/hmac_ct.c \ + INCS= \ inc/bearssl.h \ inc/bearssl_aead.h \ @@ -169,9 +175,6 @@ INCS:= ${INCS:S,^,${BEARSSL}/,} .if ${MK_BEARSSL_SSL:Uno} == "yes" SRCS+= \ - mac/hmac.c \ - mac/hmac_ct.c \ - rand/hmac_drbg.c \ ssl/prf.c \ ssl/prf_md5sha1.c \ ssl/prf_sha256.c \ From nobody Wed Feb 21 03:38:28 2024 X-Original-To: dev-commits-src-main@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 4Tfhnc4x6vz5BJ7D; Wed, 21 Feb 2024 03:38:28 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tfhnc46kBz4WDk; Wed, 21 Feb 2024 03:38:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708486708; 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=QOxvzMCA2pWhdVXA82CsUvOG5kIabyT5W+6Vkdxxh3w=; b=a1QFZMt88Z7sy1uT1hOQvVq6YnglxCVf4o3maSQKQuKZhESOk0FxBAhGHoeEpqohMWcuU3 ADTfkLS5fOl2gRpHhPcE8huZ9DkoWPBqO+PF8rKJ/xKdsHhh37NFIYWewX9MWTFz+y7JVk qVdZNBtmlcxcI6tolkE/P7EQ5yTh9/9ANargc7hC73mZPyvs9a2UwvfD4uaV/Fd0PzY9kP OzgFdSiLbWC5LKVOH1KS8lKKz6E2Uh7WDJ97avJBAPtXu3x2vncRUOjE+E2Jvozv+axaQu q+kDD9BnC+T1zc3eEuBbHuUBSv3Fo8z5kPPRxAjARAwDK4Xoed8j8biW4BvE+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708486708; 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=QOxvzMCA2pWhdVXA82CsUvOG5kIabyT5W+6Vkdxxh3w=; b=EmHkmUA/EB0uuwJUvpXBcx5obxTc5P5aSKRZn/w+gew6MeGackiP+y1lJDUXcRkINHVCxT o5UKnLUQQ5iUoLn+SGNTfHIMcH1glmEJwzmaZhA/zyIvrHBwMUu/IwLZbz44ZUiHdH2q+S kbViiKAzGsokjX8CHTx1Wf3XhNQNSRHrrXpWOgOL+VY74jY8IVayhVRT6e5u+qlEQal0KH 8RK955vazyby0aos7YCKgZNl1cumzLtWxgdJrYbLT6fno0C3+LQJMT93U5OkG+uOwlEopV o1ivFfiAXm/qc4AtV2WVOuTsFJFyU5eDUDBoCYXqjvpJv1C9oambPr/7Sbzvkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708486708; a=rsa-sha256; cv=none; b=NSR87rJjUGqgsC+Mx8xNUUCypYrVWvI1zTkzEC1+i6o79/zswV+QkZDmZmQ4K/qSWq/K4B u28nRRYjbEeiGMHCfVSLOtMvr2P7C6TUSpWtPpaSRDTWIwF+T90CEzY8tG6c2oCsS3JNMd 0IWpA8M0rUHx0QAwHB1jXCW2J+Tib0m/FS2+x2NN3kbc13aLefWFFe7JeOBQrDxntxg3cu 9yw8ORDc7yg1StKoM5bxuM6Ew1cp8PeFwIOWjVEOoZGjZEmUtae9XiC16k7FvY8VUs1vAb lq/LizjZI3NY4JKzgkVtnE6cstaS/ebMJI3T8KKMjpVxwtPKg0nDh/fa+4BTpA== 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 4Tfhnc3BP3zmrq; Wed, 21 Feb 2024 03:38:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41L3cSZ0021159; Wed, 21 Feb 2024 03:38:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41L3cSwL021156; Wed, 21 Feb 2024 03:38:28 GMT (envelope-from git) Date: Wed, 21 Feb 2024 03:38:28 GMT Message-Id: <202402210338.41L3cSwL021156@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 9a5aaa97cbae - main - loader: For the mini-stdio we have for lua, #define them to something else List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 9a5aaa97cbae024f90bb626f78c3dbde28653c58 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9a5aaa97cbae024f90bb626f78c3dbde28653c58 commit 9a5aaa97cbae024f90bb626f78c3dbde28653c58 Author: Warner Losh AuthorDate: 2024-02-21 03:31:50 +0000 Commit: Warner Losh CommitDate: 2024-02-21 03:31:50 +0000 loader: For the mini-stdio we have for lua, #define them to something else To make it easier to port lua and some of the lua modules, we have a series of routines to implement the stdio routines, even though we don't normally implement them in the boot loader. Add a comment to this effect. Also, some tools, like sanitizers and static analysis tools, make unwarranted assumptions about these, so #define them to a different name so they stop. Sponsored by: Netflix --- stand/liblua/lstd.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/stand/liblua/lstd.h b/stand/liblua/lstd.h index 05a8b8843d9c..ce3aef4bc5fc 100644 --- a/stand/liblua/lstd.h +++ b/stand/liblua/lstd.h @@ -34,6 +34,15 @@ #include #include +/* + * Mini stdio FILE and DIR routines. These are the minimal routines needed by + * the lfs module and lua's base code. We define them minimally here so we don't + * have to modify lua on every import. Further, since they aren't completely + * standard, we #define them to other names so they don't conflict with other + * tooling that makes assumptions about these routines that might not be, in + * fact, correct. + */ + typedef struct FILE { int fd; @@ -46,6 +55,18 @@ typedef struct DIR int fd; } DIR; +#define fopen lua_loader_fopen +#define freopen lua_loader_freopen +#define fread lua_loader_fread +#define fwrite lua_loader_fwrite +#define fclose lua_loader_fclose +#define ferror lua_loader_ferror +#define feof lua_loader_feof +#define getc lua_loader_getc +#define opendir lua_loader_opendir +#define fdopendir lua_loader_fdopendir +#define closedir lua_loader_closedir + FILE *fopen(const char *filename, const char *mode); FILE *freopen( const char *filename, const char *mode, FILE *stream); size_t fread(void *ptr, size_t size, size_t count, FILE *stream); From nobody Wed Feb 21 03:38:29 2024 X-Original-To: dev-commits-src-main@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 4Tfhnd6S1Mz5BJ56; Wed, 21 Feb 2024 03:38:29 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tfhnd4kNsz4WFc; Wed, 21 Feb 2024 03:38:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708486709; 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=GnvPsNB1b0K3GVdOAfISGJq2yO6fCnbzYbaRfAdJLIE=; b=RVuFj6i3pkfjjNcoq0YWV/TFhmuMc3dWcU0vO/5ysVPncnMCQ4jq3Dj1FKJq4EhUie9r7Z nSecdiqNtFy3WFvdWM3mkrEiumy+ZFVCR0gOWLJiXD/+nKUyEfLBzfMtgJp3LOc2zF52/C 9ArLqeGRYh3VeI9AcEZ2EdwGOXS5GcY4o7gGGUEWTsuM8YCvxBW0KrgOIfOV12EmELqzv1 3eyr+fg+f8rBOLzpbhWlTTIqph8s4eB5MkM670uWcahkAOFGTPjRlB0ADFtMeF9MIbGfAk iTMowvoaybFFmCfUI3h8D19sqzEfV3NCaN/HBGg68ZYtaEPYuPHgRJlT5Lfw9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708486709; 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=GnvPsNB1b0K3GVdOAfISGJq2yO6fCnbzYbaRfAdJLIE=; b=Xz65JNu3QtPp0SYy/Oqnf8rIw1VndJDLyOLUPRA88fD2Spw3An6k+VhqiOLS8o/kehHvK7 vqikBIl49hQXlrlajDIQGdZmgu0jTsPnWnsi2nHzhMy+oJTJN8v8eU2eRcprU9sbzJ0ms6 lYghcBPEvVaD3FOAQxRG9xdMyjdjBB337xmnRsPbAUq1dk/fA6LNC+mvWnaV/mA2njGdJL P6Fd/AJsDcHZAGh8x/aV4FghKk5sAN5JPuihOmS4SMxD3o+MRJk2aVZbxAft20x+qNlmpF T3ydCCQox//YSlp52FOqV9Rs20BwgAvOE2VjIZsBFfQdrHzJvjaM3Vx5fSMtjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708486709; a=rsa-sha256; cv=none; b=dX4kd6YpkNaRtTnVIk9fxjBnFu9Luig7AG1mI1vpyEKIC0yz3SVu/B+RKwGpPJex369i2b QyDMFZIzgz06zA67JC6EdmvdEABBekFoJftQntxGiiSroGBqJ1lRIxzMWfNpy7Ui6VY5eC PLLMCJnYoLW85DLTXtI5Z/4ch+l5wcIfzdqX1C10Ak17OP5KCtz2ewJlY4Kya0VMFPtQmb 1GjNLlCRxv0agB5nvje1cq1Iv6i28BFuril+BOXO6iBwM8oqWRxy6q8C3w9drMUyN7NcRD Sr3JOUchfh/xjRrtdyGuZN4ZioxIzp2JDilTnT9j3sFk1GDRdjUiZnBHzeQ8lg== 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 4Tfhnd3p7nzmh3; Wed, 21 Feb 2024 03:38:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41L3cT6Q021204; Wed, 21 Feb 2024 03:38:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41L3cTKj021201; Wed, 21 Feb 2024 03:38:29 GMT (envelope-from git) Date: Wed, 21 Feb 2024 03:38:29 GMT Message-Id: <202402210338.41L3cTKj021201@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 65ee8f90b790 - main - kboot: Fix zfs bootonce protocol List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 65ee8f90b7906a5895c87bfe05f85ce3d3bf84c7 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=65ee8f90b7906a5895c87bfe05f85ce3d3bf84c7 commit 65ee8f90b7906a5895c87bfe05f85ce3d3bf84c7 Author: Warner Losh AuthorDate: 2024-02-21 03:26:08 +0000 Commit: Warner Losh CommitDate: 2024-02-21 03:36:00 +0000 kboot: Fix zfs bootonce protocol This wasn't updated when the other copies were updated. Make it identical to efi code. We should likely refactor this (with userboot), but they are all not quite identical. Sponsored by: Netflix --- stand/kboot/kboot/hostdisk.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/stand/kboot/kboot/hostdisk.c b/stand/kboot/kboot/hostdisk.c index 552ae68daced..423151983523 100644 --- a/stand/kboot/kboot/hostdisk.c +++ b/stand/kboot/kboot/hostdisk.c @@ -567,40 +567,35 @@ hostdisk_zfs_probe(void) /* This likely shoud move to libsa/zfs/zfs.c and be used by at least EFI booting */ static bool -probe_zfs_currdev(uint64_t pool_guid, uint64_t root_guid, bool setcurrdev) +probe_zfs_currdev(uint64_t pool_guid) { char *devname; struct zfs_devdesc currdev; - bool bootable; + char buf[VDEV_PAD_SIZE]; currdev.dd.d_dev = &zfs_dev; currdev.dd.d_unit = 0; currdev.pool_guid = pool_guid; - currdev.root_guid = root_guid; + currdev.root_guid = 0; devname = devformat(&currdev.dd); - if (setcurrdev) - set_currdev(devname); - - bootable = sanity_check_currdev(); - if (bootable) { - char buf[VDEV_PAD_SIZE]; - - if (zfs_get_bootonce(&currdev, OS_BOOTONCE, buf, sizeof(buf)) == 0) { - printf("zfs bootonce: %s\n", buf); - if (setcurrdev) - set_currdev(buf); - setenv("zfs-bootonce", buf, 1); - } - (void)zfs_attach_nvstore(&currdev); - init_zfs_boot_options(devname); + printf("Setting currdev to %s\n", devname); + set_currdev(devname); + init_zfs_boot_options(devname); + + if (zfs_get_bootonce(&currdev, OS_BOOTONCE, buf, sizeof(buf)) == 0) { + printf("zfs bootonce: %s\n", buf); + set_currdev(buf); + setenv("zfs-bootonce", buf, 1); } - return (bootable); + (void)zfs_attach_nvstore(&currdev); + + return (sanity_check_currdev()); } static bool hostdisk_zfs_try_default(hdinfo_t *hd) { - return (probe_zfs_currdev(hd->hd_zfs_uuid, 0, true)); + return (probe_zfs_currdev(hd->hd_zfs_uuid)); } bool From nobody Wed Feb 21 03:40:33 2024 X-Original-To: dev-commits-src-main@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 4Tfhr15h17z5BJC2; Wed, 21 Feb 2024 03:40:33 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tfhr14qdyz4X6J; Wed, 21 Feb 2024 03:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708486833; 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=x537dC3OR51QgzW0D/1mbaM1hIc7/V00Acl+k+L0/Uw=; b=waVHRjKWeEugebyt6UL5raGj/uk3omaUbupbaQVXib+i8XF9Lhu+jAtxYgCI7uVXA7zAiu gdyq/PRsbpg+mkvbRdl4ef8CkIEYPULLetTBBb1/v+07XdDwlZ/ogJEd0TH/8SeYDL2iMJ WqFjAwq3pQKSrG2z+9QN2SWGoqiwXvJQqQCCu2hm/DjGd3BFYfJfxTEjigXQz2dO0DC9fc kjSrm6BZPy8RtZ//53yoHdyYjlcHCGoZcdlz6LzrIaTvokmCoJYcu3YjvpUfOstAAJQOcB wDIilDlarLoyz54iVE+i2G5jkZQqlWuSxE5HxwhGVxVpFEcKKeu2H1JOL8vt6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708486833; 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=x537dC3OR51QgzW0D/1mbaM1hIc7/V00Acl+k+L0/Uw=; b=bkVMusENVH/XRWhobl/w0PvOkZWf8B5J/wl+196kGeuj474P4t48749C3gEHbXrNyTbAcy ZvV4livgHQ90ne+Pmt9KkzJU46p5ca/tv1DXX994ZQ+NmqSi3oEMmFLSRcv/sCpWt8VTMx 48Tx2+PkTEJTj8WynHzvcCV0KfciYXB+oc09eO4LN+4ZZ2slZ03Lav8h2lM6wnb7dwjjVR WfM/RKE/VH2rCQ/KNUHWUfuHhIRiOJ+mYVBJj292NKgmtrOhU1JxhaRyaPi+zA2G4CKq6s qMFUWX0KV9/htl5kk1bMVYLhnC6f49xq0DCN0T7KYkqJ73d2WCPaoHsvKdHmHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708486833; a=rsa-sha256; cv=none; b=yKKR8a+zAONLfkpK8WH1VFnUr3R7x6clyBKv5PKMTcUVyOQLUMF03pCRSYrxgeXgzKSHR6 4YIa3EFIRtNTJY/PKKOVBU+LvPBGGLYGe8xRjtRdfZzeFShhXH3wdy11p+qn2oH473lvAW NqZS8bg1bFQJe8vTARPtD4hzQYUmjdZ0ngngR2zfW5r1vPlo2NBH2tW8DcxjtySO4DcodW WknB+rG3auIRP5CDkKVhNcDtryWMKygD9auA+zJExG2hYf+qhgImmNS3xMPfqlCHvMZzNq 5pg8lCYBC6FJAIWv/IT0m3WqpWAGWUJJe1IxfnIIIirTqkri4UC4OEH2AZqPVA== 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 4Tfhr13wsPzmfG; Wed, 21 Feb 2024 03:40:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41L3eXGV030137; Wed, 21 Feb 2024 03:40:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41L3eXON030134; Wed, 21 Feb 2024 03:40:33 GMT (envelope-from git) Date: Wed, 21 Feb 2024 03:40:33 GMT Message-Id: <202402210340.41L3eXON030134@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: eccde5f496ce - main - sys/kern: Remove a few sys/cdefs.h around some elf things List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: eccde5f496ce9ced2d0ffcc13beeb4a8812bcfc3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=eccde5f496ce9ced2d0ffcc13beeb4a8812bcfc3 commit eccde5f496ce9ced2d0ffcc13beeb4a8812bcfc3 Author: Warner Losh AuthorDate: 2024-02-21 03:40:19 +0000 Commit: Warner Losh CommitDate: 2024-02-21 03:40:19 +0000 sys/kern: Remove a few sys/cdefs.h around some elf things These sys/cdefs.h are no longer needed. Remove them in advance of other work in this area. Sponsored by: Netflix --- sys/kern/imgact_elf32.c | 1 - sys/kern/imgact_elf64.c | 1 - sys/kern/init_main.c | 1 - sys/kern/link_elf.c | 1 - sys/kern/link_elf_obj.c | 1 - 5 files changed, 5 deletions(-) diff --git a/sys/kern/imgact_elf32.c b/sys/kern/imgact_elf32.c index f74b0d31c9d4..b3e8edb28b3f 100644 --- a/sys/kern/imgact_elf32.c +++ b/sys/kern/imgact_elf32.c @@ -26,6 +26,5 @@ * SUCH DAMAGE. */ -#include #define __ELF_WORD_SIZE 32 #include diff --git a/sys/kern/imgact_elf64.c b/sys/kern/imgact_elf64.c index bd198bae4fe6..b903755779ae 100644 --- a/sys/kern/imgact_elf64.c +++ b/sys/kern/imgact_elf64.c @@ -26,6 +26,5 @@ * SUCH DAMAGE. */ -#include #define __ELF_WORD_SIZE 64 #include diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 96980b869f91..3df4b1edf4a2 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -41,7 +41,6 @@ * SUCH DAMAGE. */ -#include #include "opt_ddb.h" #include "opt_kdb.h" #include "opt_init_path.h" diff --git a/sys/kern/link_elf.c b/sys/kern/link_elf.c index eb7ce3828deb..4c7af262addb 100644 --- a/sys/kern/link_elf.c +++ b/sys/kern/link_elf.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include "opt_ddb.h" #include "opt_gdb.h" diff --git a/sys/kern/link_elf_obj.c b/sys/kern/link_elf_obj.c index 0b2befc02c1a..1001cb53ba49 100644 --- a/sys/kern/link_elf_obj.c +++ b/sys/kern/link_elf_obj.c @@ -27,7 +27,6 @@ * SUCH DAMAGE. */ -#include #include "opt_ddb.h" #include From nobody Wed Feb 21 05:14:14 2024 X-Original-To: dev-commits-src-main@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 4Tfkw62bYqz5BSCZ; Wed, 21 Feb 2024 05:14: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tfkw61zk5z4gx6; Wed, 21 Feb 2024 05:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708492454; 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=9ENfMk3pJiSFSuXJW6NSjPcJaRbZMbTVaL4SS6Sdn/U=; b=BnKvSYHO15RbqUkmoq5hUnDFuFsoEbgW4c5jmXEfywXBpyKouWcK8StgplsGzVafpYgZI9 EoQOukUVbU5GkppAXqXVgL3a/PUF+usahGtK++v3CmPQdd3DTMxvJJsQToeOnD3kU9nVfV yjooZysTZhxAJI+4uY9+eyXNMtR9E/uuOFkMBRYmQPJlNogrft3fj0pj4/GqT5QMaSXrYR CRF0uFuUkRGtt4RJdFWdpPNBUbEuvE5XG6fbRCCtuLbYEdgaml+zoaTVoq9fTJFYp62baO o6JAUnt2TgeIdPyaP2ZOMUETxwjfVqAW391OdGTBbtVu5wGA4AivmJHJGjwiYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708492454; 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=9ENfMk3pJiSFSuXJW6NSjPcJaRbZMbTVaL4SS6Sdn/U=; b=DujQ8NAvxQNT5//RVXqH79r29m9aE33QpPXMc54NgFA8BGMTLh2sHI4MC9UTMi/SETUmb5 OLJu8LEbLEt1bdDrOAnjYjvtT6dTcrzyR2LEykqEnVN6RWJJHprB7snLmCyfsS4EkQu/A2 V71hROf+4kNZAqjs73/mge0O2XfJAL+p2lldKELDW6FJqXINOnTvAJz3hD2yFUl/yDtpXd M/c6qnu9FVgFq2VMAXoOTv1o8D+g0oZ++e6sH1ve8RWot5jcHqF7fMLG2mxdslUovGhsgn yr/NW7psYgi4cadn+UX5qj729ndT7jH5HyyqjII1KUdr/ry/tUvrC/UghCV/SQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708492454; a=rsa-sha256; cv=none; b=pGjUAaHJuk3ncuTa8Yc56DmB4uMpb2BJOwT/07DEpJ2J8MBkhfHhTyCenq3b75jcdj0qy4 hpOTvpyKjjqfNEnW+ES9iK7nhWObWJ7/yeamPpAn8bK81pm8+MoJLoS+otvHK4rDREaKjZ KbOT+vP5rzxsZUzpkVHCpo3oRa5gyQibi3IbrLrZSjHnHVguEEXvEfRp5s32KVhg059v/G go43F29k9bqPTrRjINIJbzKLCidyOxv7eEwgyWAEgTvyQH5O55+PRwW2jD/QBZcUO8eBYm CodFDs6iAIhhd7lEpF8yPTEfhXj8Z2Ncic35v5yMkvx1ud/2QSsrWknaek6Nkg== 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 4Tfkw611Lczq8c; Wed, 21 Feb 2024 05:14:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41L5EEPT089127; Wed, 21 Feb 2024 05:14:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41L5EEP1089124; Wed, 21 Feb 2024 05:14:14 GMT (envelope-from git) Date: Wed, 21 Feb 2024 05:14:14 GMT Message-Id: <202402210514.41L5EEP1089124@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric Joyner Subject: git: 768329961dc0 - main - ice_ddp: Update package to 1.3.36.0 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 768329961dc0c041f7647f1c4549944a2ca168aa Auto-Submitted: auto-generated The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=768329961dc0c041f7647f1c4549944a2ca168aa commit 768329961dc0c041f7647f1c4549944a2ca168aa Author: Eric Joyner AuthorDate: 2024-02-13 06:39:21 +0000 Commit: Eric Joyner CommitDate: 2024-02-21 05:13:18 +0000 ice_ddp: Update package to 1.3.36.0 This is intended to be used with the upcoming ice 1.39.13-k driver update, but is still backwards compatible with previous versions of the driver. Signed-off-by: Eric Joyner MFC after: 3 days Sponsored by: Intel Corporation --- sys/conf/files.amd64 | 6 +++--- sys/conf/files.arm64 | 6 +++--- sys/conf/files.powerpc | 6 +++--- .../dev/ice/{ice-1.3.35.0.pkg => ice-1.3.36.0.pkg} | Bin 692776 -> 692776 bytes sys/modules/ice_ddp/Makefile | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index cb5ed560a82e..09478599efc5 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -196,7 +196,7 @@ dev/ice/irdma_di_if.m optional ice pci \ dev/ice/ice_ddp_common.c optional ice pci \ compile-with "${NORMAL_C} -I$S/dev/ice" ice_ddp.c optional ice_ddp \ - compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032300 -mice_ddp -c${.TARGET}" \ + compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032400 -mice_ddp -c${.TARGET}" \ no-ctfconvert no-implicit-rule before-depend local \ clean "ice_ddp.c" ice_ddp.fwo optional ice_ddp \ @@ -205,8 +205,8 @@ ice_ddp.fwo optional ice_ddp \ no-implicit-rule \ clean "ice_ddp.fwo" ice_ddp.fw optional ice_ddp \ - dependency "$S/contrib/dev/ice/ice-1.3.35.0.pkg" \ - compile-with "${CP} $S/contrib/dev/ice/ice-1.3.35.0.pkg ice_ddp.fw" \ + dependency "$S/contrib/dev/ice/ice-1.3.36.0.pkg" \ + compile-with "${CP} $S/contrib/dev/ice/ice-1.3.36.0.pkg ice_ddp.fw" \ no-obj no-implicit-rule \ clean "ice_ddp.fw" dev/ioat/ioat.c optional ioat pci diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index dcdd429c14c4..625684a91534 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -327,7 +327,7 @@ dev/ice/irdma_di_if.m optional ice pci \ dev/ice/ice_ddp_common.c optional ice pci \ compile-with "${NORMAL_C} -I$S/dev/ice" ice_ddp.c optional ice_ddp \ - compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032300 -mice_ddp -c${.TARGET}" \ + compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032400 -mice_ddp -c${.TARGET}" \ no-ctfconvert no-implicit-rule before-depend local \ clean "ice_ddp.c" ice_ddp.fwo optional ice_ddp \ @@ -336,8 +336,8 @@ ice_ddp.fwo optional ice_ddp \ no-implicit-rule \ clean "ice_ddp.fwo" ice_ddp.fw optional ice_ddp \ - dependency "$S/contrib/dev/ice/ice-1.3.35.0.pkg" \ - compile-with "${CP} $S/contrib/dev/ice/ice-1.3.35.0.pkg ice_ddp.fw" \ + dependency "$S/contrib/dev/ice/ice-1.3.36.0.pkg" \ + compile-with "${CP} $S/contrib/dev/ice/ice-1.3.36.0.pkg ice_ddp.fw" \ no-obj no-implicit-rule \ clean "ice_ddp.fw" diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc index 0293efd28fbe..1a0388884ee8 100644 --- a/sys/conf/files.powerpc +++ b/sys/conf/files.powerpc @@ -95,7 +95,7 @@ dev/ice/irdma_di_if.m optional ice pci powerpc64 | ice pci powerpc64le \ dev/ice/ice_ddp_common.c optional ice pci powerpc64 | ice pci powerpc64le \ compile-with "${NORMAL_C} -I$S/dev/ice" ice_ddp.c optional ice_ddp powerpc64 | ice pci powerpc64le \ - compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032300 -mice_ddp -c${.TARGET}" \ + compile-with "${AWK} -f $S/tools/fw_stub.awk ice_ddp.fw:ice_ddp:0x01032400 -mice_ddp -c${.TARGET}" \ no-ctfconvert no-implicit-rule before-depend local \ clean "ice_ddp.c" ice_ddp.fwo optional ice_ddp powerpc64 | ice pci powerpc64le \ @@ -104,8 +104,8 @@ ice_ddp.fwo optional ice_ddp powerpc64 | ice pci powerpc64le \ no-implicit-rule \ clean "ice_ddp.fwo" ice_ddp.fw optional ice_ddp powerpc64 | ice pci powerpc64le \ - dependency "$S/contrib/dev/ice/ice-1.3.35.0.pkg" \ - compile-with "${CP} $S/contrib/dev/ice/ice-1.3.35.0.pkg ice_ddp.fw" \ + dependency "$S/contrib/dev/ice/ice-1.3.36.0.pkg" \ + compile-with "${CP} $S/contrib/dev/ice/ice-1.3.36.0.pkg ice_ddp.fw" \ no-obj no-implicit-rule \ clean "ice_ddp.fw" dev/ixl/if_ixl.c optional ixl pci powerpc64 \ diff --git a/sys/contrib/dev/ice/ice-1.3.35.0.pkg b/sys/contrib/dev/ice/ice-1.3.36.0.pkg similarity index 98% rename from sys/contrib/dev/ice/ice-1.3.35.0.pkg rename to sys/contrib/dev/ice/ice-1.3.36.0.pkg index fc3e8ebc640f..ce5dbf41f557 100644 Binary files a/sys/contrib/dev/ice/ice-1.3.35.0.pkg and b/sys/contrib/dev/ice/ice-1.3.36.0.pkg differ diff --git a/sys/modules/ice_ddp/Makefile b/sys/modules/ice_ddp/Makefile index ad85bc2a9935..7329f0897325 100644 --- a/sys/modules/ice_ddp/Makefile +++ b/sys/modules/ice_ddp/Makefile @@ -1,5 +1,5 @@ KMOD= ice_ddp -FIRMWS= ${SRCTOP}/sys/contrib/dev/ice/ice-1.3.35.0.pkg:ice_ddp:0x01032300 +FIRMWS= ${SRCTOP}/sys/contrib/dev/ice/ice-1.3.36.0.pkg:ice_ddp:0x01032400 .include From nobody Wed Feb 21 05:59:35 2024 X-Original-To: dev-commits-src-main@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 4TflwR5Mchz5BX55; Wed, 21 Feb 2024 05:59:35 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TflwR4QlRz4lbd; Wed, 21 Feb 2024 05:59:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708495175; 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=jQDndErn7DhgfP40+R/24r/OM5xXzDXLlqI+ytND2n4=; b=CG4Gr3OAN9fO6X0KkrUw6KfM562bn0g7+uPId24XB+Yzvy7GUvKqNCLEa2R2+CnkUWg/Qw oups4amjB5v1NcZQb+wpeQPR7nnOm91PFxOUe286J0LGvdra8gQsLNyC4fN4m42aLxHTw3 jXQQzqZwqrfg1sZfrlbLUYkSJSWpGGjQKeD7C5sHZ34uEalkaBT/i0fgOExUPQeMDVmP3Z tMj1+jNts6MnV4YkNq3smv9wy1TuPs4ixyUn89gz+zMTXE3Sb8jV58XXt5PjQf4sMV9tHS YWDgciRSBQuaj/cC2/DamJJY7FNeGSOiQhqJLUhNcmCilMCw77G+oxtc2xmjjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708495175; 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=jQDndErn7DhgfP40+R/24r/OM5xXzDXLlqI+ytND2n4=; b=HR2CZhM2EPu2O40mWBnACnIxBTdCU38BjQmCMGdJGh1HxrUOEHFiq5CwAUp/cSGe8WyM4l Y0YbLWgut9o/ABKupwIOizsYkedKrAmJUD1F7rYo2pKYoFV563lIDaW1zJ010G5b7RLwlK hjQFHfJZB5JUawXuA13994rC/FlzBLgXq1LkfnItPo8f1zqA2MEnnIUlt9MBZPjL/POfFH II/nFQokfPnVargeelrSmo/b8IaOFT3YGUL6JqEMxbYGyBIwu9zuisLafA+WC0k0Omu4Kb 8PyKaewe4FrqBFATacAVG7/isGmBh/A4p1kyiXu+WVWOisDT6v3mf6O4/xFXog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708495175; a=rsa-sha256; cv=none; b=qc7skr/d/DLE8qysIX97cV8ifUhzb71HCpRT5zfx9w+Syca38N7WnDW6fUKt6Lrkb+zEBQ Vyvd5bleePl80kTSFETiMhSRaZDghOWf/WNQ76q8oQ+bIONWp/QIypRsdUc7xwJtMbj/x3 14aWGLrpFbIMcwbUAuoQWHZH99LdUTRrY69agjZ+Sj6Y5eGMRdRVl7r/cugHBSpajtvhLt BHmtNjoYXTgSojlghBlUWee0nQBL1mvHxOU1tahURktDBjPZJ5mllyI+wjVArVv8ixMalR Y1pdsvVBZDnLG+lYyAY2K93DGL6LV5lsXV8/F+LbzirBGWkaqGx+mVUOluypXQ== 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 4TflwR3Nv4zr7b; Wed, 21 Feb 2024 05:59:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41L5xZIZ056434; Wed, 21 Feb 2024 05:59:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41L5xZjY056431; Wed, 21 Feb 2024 05:59:35 GMT (envelope-from git) Date: Wed, 21 Feb 2024 05:59:35 GMT Message-Id: <202402210559.41L5xZjY056431@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: 4cea0cbcc9d3 - main - rc.d/mountlate: discard output from nextboot List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4cea0cbcc9d3a6583e5325ca081c09c8a9423172 Auto-Submitted: auto-generated The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=4cea0cbcc9d3a6583e5325ca081c09c8a9423172 commit 4cea0cbcc9d3a6583e5325ca081c09c8a9423172 Author: Robert Wing AuthorDate: 2024-02-21 05:50:43 +0000 Commit: Robert Wing CommitDate: 2024-02-21 05:50:43 +0000 rc.d/mountlate: discard output from nextboot silent the warning seen at boot: Mounting late filesystems:. nextboot: unlink /boot/nextboot.conf: No such file or directory Sun Feb 18 23:31:52 AKST 2024 FreeBSD/amd64 (main) (ttyv0) login: Differential Revision: https://reviews.freebsd.org/D43979 --- libexec/rc/rc.d/mountlate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/mountlate b/libexec/rc/rc.d/mountlate index 133192ac183c..4547e8ec6876 100755 --- a/libexec/rc/rc.d/mountlate +++ b/libexec/rc/rc.d/mountlate @@ -39,7 +39,7 @@ mountlate_start() # If we booted a special kernel remove the record # so we will boot the default kernel next time. if [ -x /sbin/nextboot ]; then - /sbin/nextboot -D + /sbin/nextboot -D > /dev/null 2>&1 fi } From nobody Wed Feb 21 06:00:54 2024 X-Original-To: dev-commits-src-main@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 4Tfly164nHz5BX2x for ; Wed, 21 Feb 2024 06:00:57 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) (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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tfly14HK1z4m5V for ; Wed, 21 Feb 2024 06:00:57 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-563c2b2bddbso8884505a12.1 for ; Tue, 20 Feb 2024 22:00:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1708495255; x=1709100055; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=MfYiAUmorY/wAfAy0z704Yzcvnw6NqLchlOvhQi/gGw=; b=rlEv4pBM7EDqUUSXylIvMEoLxQk3uMY4fdgWKZ163EKk7moIpJEmBNLbKfSfKvM+yY PGg8/QWIyXqqEA4bgmf0T6n1QvqDbBwPrbpWLukg0fj1PR2qE1fS1KUHPoVIfoPJEmm4 /r/LWVM0R/LRFd8QsdKG3/dfXfscTIIY/t1J5zfk2SO0/I1fx/k9Xmr9zMhK8X7/OlcV +oei6CFnhrsrjDefZmP8G9oj0MbK0vtonS50G+mjbegVGqU/2FeuWnxZITGgxZGTwa7J mNX1poXlPSY/Dp8O7C9VsvN6wezLV0Aeisy55de9C01JhzxvH7lt+79zFFoCA5WhwP3n +2cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708495255; x=1709100055; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=MfYiAUmorY/wAfAy0z704Yzcvnw6NqLchlOvhQi/gGw=; b=AniD0mA9guxd0bR7IOq0zCtDEj7eRkEDEecBlGxQ9jQ/Xpvw8ZN1z9PjnQMZJSd7kq Lq0hwUM090fh61Roh4ln05c5KaN/MCN8JhnkVhgf2BpqUOnFYOZOxPnwht0D8pmee/V2 QoV+75XYC4EbdewsG1ebW1sZ16X+7WfG+p2zkh4A+/oz2VlSNU4FJjsDazxViUeDMcRm FdCYwLFwMXhxuJD4BNzGkhXmJJ+VXxlVnNGVH2XGLukn0T0N0QL6QO07sp0B3w6zI3bi jBO9Tp9MZolu9p0HHvRofO52yUb9KPeBCrl2xPqd5kDoauZe3DTNr4Lplp5EyofvEHGF tQsg== X-Forwarded-Encrypted: i=1; AJvYcCXqngBFKH/2YIEgOu3OQNyZB5sgphTV7t4GOPbfmE3JQGeoyD0J+JUJHJhzx7gUTEvYtzAfAJ/doF0/kV2sG+7V6MFgEoUmHZhodqCvlX/1Vg== X-Gm-Message-State: AOJu0Ywtnku1WdbtArgcI3NDewZMiWobs5eO5qRHHTNHsMrKhjGS3HxL k6+mfQvj+kWkmTdEyDKFkWucxVVkgnLozx3xKQze0qTEtkb4gKjhn0v9TeRWWRW3J/dRDm3XMDM 6z0Ql1dJAV/q4Ezu8JJOp+BYgzk3ulFEOVdwP2w== X-Google-Smtp-Source: AGHT+IHf6jcyJDVHRYDJ6sWDkeXE0rQAWh7kKMiaX9NWNmCZSkGQKJp7vlfuRuCrqerHuLUrwPq1oE/jhvnR9UCqe0o= X-Received: by 2002:aa7:d0d5:0:b0:564:a1e2:edd2 with SMTP id u21-20020aa7d0d5000000b00564a1e2edd2mr4056157edo.9.1708495254696; Tue, 20 Feb 2024 22:00:54 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202402210559.41L5xZjY056431@gitrepo.freebsd.org> In-Reply-To: <202402210559.41L5xZjY056431@gitrepo.freebsd.org> From: Warner Losh Date: Tue, 20 Feb 2024 23:00:54 -0700 Message-ID: Subject: Re: git: 4cea0cbcc9d3 - main - rc.d/mountlate: discard output from nextboot To: Robert Wing Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000c1c35f0611de0ce7" X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Tfly14HK1z4m5V X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] --000000000000c1c35f0611de0ce7 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable This change is wrong, please revert. I'll make nextboot silent again. Warner On Tue, Feb 20, 2024 at 10:59=E2=80=AFPM Robert Wing wrot= e: > The branch main has been updated by rew: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D4cea0cbcc9d3a6583e5325ca081c09c= 8a9423172 > > commit 4cea0cbcc9d3a6583e5325ca081c09c8a9423172 > Author: Robert Wing > AuthorDate: 2024-02-21 05:50:43 +0000 > Commit: Robert Wing > CommitDate: 2024-02-21 05:50:43 +0000 > > rc.d/mountlate: discard output from nextboot > > silent the warning seen at boot: > > Mounting late filesystems:. > nextboot: unlink /boot/nextboot.conf: No such file or directory > > Sun Feb 18 23:31:52 AKST 2024 > > FreeBSD/amd64 (main) (ttyv0) > > login: > > Differential Revision: https://reviews.freebsd.org/D43979 > --- > libexec/rc/rc.d/mountlate | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libexec/rc/rc.d/mountlate b/libexec/rc/rc.d/mountlate > index 133192ac183c..4547e8ec6876 100755 > --- a/libexec/rc/rc.d/mountlate > +++ b/libexec/rc/rc.d/mountlate > @@ -39,7 +39,7 @@ mountlate_start() > # If we booted a special kernel remove the record > # so we will boot the default kernel next time. > if [ -x /sbin/nextboot ]; then > - /sbin/nextboot -D > + /sbin/nextboot -D > /dev/null 2>&1 > fi > } > > --000000000000c1c35f0611de0ce7 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
This change is wrong, please revert.

I'll make nextboot silent again.

Warn= er

On Tue, Feb 20, 2024 at 10:59=E2=80=AFPM Robert Wing <rew@freebsd.org> wrote:
The branch main has been update= d by rew:

URL: https://cgit.= FreeBSD.org/src/commit/?id=3D4cea0cbcc9d3a6583e5325ca081c09c8a9423172
commit 4cea0cbcc9d3a6583e5325ca081c09c8a9423172
Author:=C2=A0 =C2=A0 =C2=A0Robert Wing <rew@FreeBSD.org>
AuthorDate: 2024-02-21 05:50:43 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Robert Wing <rew@FreeBSD.org>
CommitDate: 2024-02-21 05:50:43 +0000

=C2=A0 =C2=A0 rc.d/mountlate: discard output from nextboot

=C2=A0 =C2=A0 silent the warning seen at boot:

=C2=A0 =C2=A0 =C2=A0 =C2=A0 Mounting late filesystems:.
=C2=A0 =C2=A0 =C2=A0 =C2=A0 nextboot: unlink /boot/nextboot.conf: No such f= ile or directory

=C2=A0 =C2=A0 =C2=A0 =C2=A0 Sun Feb 18 23:31:52 AKST 2024

=C2=A0 =C2=A0 =C2=A0 =C2=A0 FreeBSD/amd64 (main) (ttyv0)

=C2=A0 =C2=A0 =C2=A0 =C2=A0 login:

=C2=A0 =C2=A0 Differential Revision:=C2=A0 https://reviews.freebsd= .org/D43979
---
=C2=A0libexec/rc/rc.d/mountlate | 2 +-
=C2=A01 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libexec/rc/rc.d/mountlate b/libexec/rc/rc.d/mountlate
index 133192ac183c..4547e8ec6876 100755
--- a/libexec/rc/rc.d/mountlate
+++ b/libexec/rc/rc.d/mountlate
@@ -39,7 +39,7 @@ mountlate_start()
=C2=A0 =C2=A0 =C2=A0 =C2=A0 # If we booted a special kernel remove the reco= rd
=C2=A0 =C2=A0 =C2=A0 =C2=A0 # so we will boot the default kernel next time.=
=C2=A0 =C2=A0 =C2=A0 =C2=A0 if [ -x /sbin/nextboot ]; then
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/sbin/nextboot -D +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0/sbin/nextboot -D &= gt; /dev/null 2>&1
=C2=A0 =C2=A0 =C2=A0 =C2=A0 fi
=C2=A0}

--000000000000c1c35f0611de0ce7-- From nobody Wed Feb 21 06:03:21 2024 X-Original-To: dev-commits-src-main@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 4Tfm0n6zBbz5BXZC; Wed, 21 Feb 2024 06:03:21 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tfm0n6CKCz4mnH; Wed, 21 Feb 2024 06:03:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708495401; 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=irxbaEztPSzbXhiLmcEt74pxQ1SEPP75lVZzN9QLEWI=; b=RBSAf31zwKgfIAh1yqzYluP6edv66OmNCDG1JQkBtREk6p8oMkd7MHrxbSErVbRoHjEXMf stDapAEpWeIA/KhCniVawBR1poTrtcLyn4nD3qNyGGNJBPHHR3qThC8Rizid6dpPLRv85K Kc0oquCSURcmjvIeN7IVgluu3GMlWZ/jGaQjXt1yxomZ2x0mG99b9WWudnP5YqnVGGBXuz 4JtX+4zkK+6DFF/LvJRXeWtZTCYUWc+MiCIYGbxEAZsTnvgS4LoZE0EB5JVSv7X8alomsm 1NVmIsE3+F0PNkUyygQ9++xy7G9Ka8DinVOgwhgRSHV1CQfULXpXZn/z36hF7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708495401; 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=irxbaEztPSzbXhiLmcEt74pxQ1SEPP75lVZzN9QLEWI=; b=UHq1o3TA1t+QcYf3A4c3JV79JXhvSYb3DPOp9BF5FLyW0QCLCzcZIviuX9FZnD6xaH4x85 Ry2lU56urQpJZSFheZv+RAWOZIQg0Qd49bax9hEgBqJuqOXm8l6LKPpqhnJkFwAS/itbHT 969UeZkVrSl5X69WrQLVErJOFzvvGe1Pks4jkrjCIZei9lhoSDa+bE7JQzkh+qZlVK4VD2 FdC2QMwA9BiROGVywPRXZTztKieNGdgjfBu8FvEozzyDt4Z/RaX2v9lnCAqrHmxf3O4dgT cWh+RYyLvQyWU99YQEfxV3Q+Tlk2pg0MrhLN1jbpfNJjmCr0A0XEqP+bGqFZYw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708495401; a=rsa-sha256; cv=none; b=OlCsIKq4P3hA7JYhQgQ43TXZr4B0wS83rJhIIahimgil2L3XWEfwdztmXcLXTHciHX2z1O IW3/50URbUoAKeEH7DYV/jxYjgXjPp397acwTwHHcRKv7vLtSrz9hJWZ2gq+8r3rCGxz6p 8SVX+L6XximdyewX6eLnGGlpaUN0/NO5J2ctxSeM7MiUIFF+5vbvtvqV3BNWZIQgTBGJEq J2k0bRO+4oaKcRS2EkcaSzhp38HpykJVzZbtyK20bOZDa6CXDVYFXTA0gfvjA5XzhxQZV/ sHNINsb3+Ss0YfWU2vmP0Ok86dNm+8Hw7EQqjeG6iQ6nDsbNjii61GundaEqUg== 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 4Tfm0n5F5bzr80; Wed, 21 Feb 2024 06:03:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41L63LfE073819; Wed, 21 Feb 2024 06:03:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41L63Leb073816; Wed, 21 Feb 2024 06:03:21 GMT (envelope-from git) Date: Wed, 21 Feb 2024 06:03:21 GMT Message-Id: <202402210603.41L63Leb073816@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Robert Wing Subject: git: c7d5cc6f5e64 - main - Revert "rc.d/mountlate: discard output from nextboot" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7d5cc6f5e64961a054ad4fb0544102f8b0257fd Auto-Submitted: auto-generated The branch main has been updated by rew: URL: https://cgit.FreeBSD.org/src/commit/?id=c7d5cc6f5e64961a054ad4fb0544102f8b0257fd commit c7d5cc6f5e64961a054ad4fb0544102f8b0257fd Author: Robert Wing AuthorDate: 2024-02-21 06:04:15 +0000 Commit: Robert Wing CommitDate: 2024-02-21 06:04:15 +0000 Revert "rc.d/mountlate: discard output from nextboot" This reverts commit 4cea0cbcc9d3a6583e5325ca081c09c8a9423172. Requested by: imp --- libexec/rc/rc.d/mountlate | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/mountlate b/libexec/rc/rc.d/mountlate index 4547e8ec6876..133192ac183c 100755 --- a/libexec/rc/rc.d/mountlate +++ b/libexec/rc/rc.d/mountlate @@ -39,7 +39,7 @@ mountlate_start() # If we booted a special kernel remove the record # so we will boot the default kernel next time. if [ -x /sbin/nextboot ]; then - /sbin/nextboot -D > /dev/null 2>&1 + /sbin/nextboot -D fi } From nobody Wed Feb 21 06:04:50 2024 X-Original-To: dev-commits-src-main@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 4Tfm2W35mxz5BXZK; Wed, 21 Feb 2024 06:04:51 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tfm2V70Lfz4nPv; Wed, 21 Feb 2024 06:04:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708495491; 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=SPzeNx+IMduEcE87qnMib71Poh9PBj43mQDoZYdDuEM=; b=kykbQdbd1ZvISGT6lsZCnoGsf/dCcnlusR8cBfQg6pCbrKl/6loxdHstEXq+oAb4DTGcm5 9h1+oWVH9a+v2NRMjNAR/fj3SxAt6wxgR1/aiSVruxFvOwgLJ/9zoqaKrRnAUO3qiMtRE7 xlGzAsmexcdZFTj4s3cm4Sm4E56frBWAwTPuk3bToHd6nBAsAIiHku0sDAKZLTGjM9BoG0 MAh1Fo5ZUdyRJb3vNmMHrWoUT18j+KN8j98ovx+Ua5ScacH03A8eNdCB9IudmTOcj2gCeU KuVMJBOIaXS714lDtpoWCJQHbgOQhIjZCpJ+TLQQGC3bbu+TpGbLaONXoS4L/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708495491; 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=SPzeNx+IMduEcE87qnMib71Poh9PBj43mQDoZYdDuEM=; b=N33+ssbRt9BvyyAOb/gRpRjxdi2Ed+4x7kx3h/oT002KMdZUNHK+lhoC6xvE80KO5+QaM2 lV9tt315LacK+kVwRljMgtgy0jYcX5jW/KKEgE4U8GVWAqRggp6iOPGm10MbQSnsTnRMb+ X6ji/OJmH4ezmWeWQaSZMmXCA6xzH9a/Ck0xa+73tHdiShR4oWexlw653Yv2LXWnSSpAhK lDw4/u2XjAtzroSFJw9SgKOTeU0lF5PHZu2pqcJY1A+eka7FkrhhNHTlbyD93hAnrldgyH UBBAGd1NMFtNEcrmovCe28nhIK4/fWwT2Vd9PcpGvXxpL+/9WbwaqTbBXkONWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708495491; a=rsa-sha256; cv=none; b=VB2PSskmnlJ4gu89rVS+GiZXTvNT3EapLG1GLe59GldqA3tfKCX/5A+diJpLa+ZOoJefKj S4hJJUM/H/WENnju0KOhGLlUgMSNIhhEjtN8h768f9eDMXtdIEOcOxupfntSW++6Hxmk1o yrHTtKNOfOetb4w/dQsZ1vqgHTvRg/HS1XNymQ9gpuvtGmEuE1E5bD7uFX+9IG6fC3SPjN ahEaYYN1KFqJIKuvaEnVESze+ZlAX8pBvU2Y+aiWnEBQjK/2Shz03dd1OnDVnb7q4sRoyv 8MRk7A5qQBpC6XMsPxaV1Y8VW2aJWjiSVh107+IZ8on0iHr0YG9NW5+KaB/H6g== 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 4Tfm2V64Gqzr82; Wed, 21 Feb 2024 06:04:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41L64oI7074165; Wed, 21 Feb 2024 06:04:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41L64oJ2074162; Wed, 21 Feb 2024 06:04:50 GMT (envelope-from git) Date: Wed, 21 Feb 2024 06:04:50 GMT Message-Id: <202402210604.41L64oJ2074162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 07cba2ddcb19 - main - reboot: Emulate nextboot -D better List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 07cba2ddcb196c6e595df26a49ec0d54b1f2efe1 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=07cba2ddcb196c6e595df26a49ec0d54b1f2efe1 commit 07cba2ddcb196c6e595df26a49ec0d54b1f2efe1 Author: Warner Losh AuthorDate: 2024-02-21 06:03:15 +0000 Commit: Warner Losh CommitDate: 2024-02-21 06:04:56 +0000 reboot: Emulate nextboot -D better It used to produce no output when the file couldn't be removed. Emulate that better by unlinking and ignoring errors. It's used at the end of reboot always, even when the file isn't going to be there. Sponsored by: Netflix Fixes: 2c479548119a --- sbin/reboot/reboot.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index ac3927cc2432..e245c78d83bc 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -288,8 +288,7 @@ main(int argc, char *argv[]) errx(1, "-r and -k cannot be used together, there is no next kernel"); if (Dflag) { - if (unlink(PATH_NEXTBOOT) != 0) - err(1, "unlink %s", PATH_NEXTBOOT); + (void)unlink(PATH_NEXTBOOT); /* Say nothing if it's not there */ exit(0); } From nobody Wed Feb 21 10:55:33 2024 X-Original-To: dev-commits-src-main@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 4TftTx5yHhz5ByKV; Wed, 21 Feb 2024 10:55:33 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TftTx5CRqz4H6k; Wed, 21 Feb 2024 10:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708512933; 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=qnbkoiCdja2izpYfJtKybD082+gIod5jEN5uf7g/tYM=; b=O7bnjnMQQe3o6R1Fq6AH6Ds9qE0rzozBvieb8whJJQnPGkdikuuUcbbFAEVz5ahmD2eESM uYr68JsxAm5z7CCNf0GMqGlrDgyX6GMgk3ZOJeQTJaP6wB3omiV0G0CcII+BEeD5SAdwGC iuq0juaO8awrZnGBMNeLP01KY8y2uRcu0CwR3dqCu7to6z6KH6xYQU/dmL4mD2fHy7KKUH /bMQvpC7Fla1gEV1BWB2ubToI3A+ZDiDim4WVBCEPfZld9jVo+PEyOVZZgrhlrDkzNZX94 6PvfKmSYZxpoqNvOfzrI+OfNMLZeO7EQ9Gwi5n1F09fuCoUjhGmiLImHQ+WcAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708512933; 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=qnbkoiCdja2izpYfJtKybD082+gIod5jEN5uf7g/tYM=; b=o1m90LFeWnsl6Sbw/DC+TmCFM6dGwP6WBdYMG9/7MtV/QmXIUCdPej3YfzASap8bpCLLOG 6+IuzDrC55eoQf/GJBlsr8EsYMEuQCJkhMCf4qJZJKefy+wpVyHiSA3vOQLnyKB2jqQdEb UjzC6r/c9BiEeXhKcl5JLoCB1DagQOG8Rg4TMZkcicfYgn/Z3HasWpPAG/rVFy9Sl6Asik SbNtGEnDEihzD8m3vLI/Y+RQ8Y2VYwwiG09NByyBrK94cgAHLHXV33rDLXhfZpJzUB1xRK 9m2JAsSPFC9cVAg33KYwmttRFmqy3DnT2bIiUd7wnNPZsQq2XUkhnExAVgzcNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708512933; a=rsa-sha256; cv=none; b=OvP40iZC23Ghq0eknYjU087/VjQfEogQ/SZ/M78GVHVhSn5O1PS4Ha/IjR9W8f4CHt5tMN /o2BtQnsh3hcyB7HR8rjQS5qroh/241A756vvIsFY4DzDmdarVzUvOHULET2kjmylzSbXt xoHywb+PcwKngBcZu/4LlBtCGb3rsL6XFrhQEJCE+/bf2endx3RMWnIgVBdN5m7WAO0ZZq kSz+DepFE2mFngSLIIZdguCpuwHhXaWnrFJvZ+lgRHPM2OSfi4EOMIpDhY/ueaFR0oyvAD Dc3FaLcliBrB9pigMl43eCcg4u00WpR+yk62U9cqJ87/2n5V9gBJ9MOPzrxARw== 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 4TftTx4H2hz10Qq; Wed, 21 Feb 2024 10:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LAtXHr061543; Wed, 21 Feb 2024 10:55:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LAtXVq061540; Wed, 21 Feb 2024 10:55:33 GMT (envelope-from git) Date: Wed, 21 Feb 2024 10:55:33 GMT Message-Id: <202402211055.41LAtXVq061540@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: ffea732c5192 - main - ls.1: Mention CLICOLOR environment variable List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ffea732c5192070a6877409428b0a2cc1728aa16 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=ffea732c5192070a6877409428b0a2cc1728aa16 commit ffea732c5192070a6877409428b0a2cc1728aa16 Author: Gordon Bergling AuthorDate: 2024-02-21 10:54:58 +0000 Commit: Gordon Bergling CommitDate: 2024-02-21 10:54:58 +0000 ls.1: Mention CLICOLOR environment variable Mention CLICOLOR environment variable in the manual page. PR: 276556 Submitted by: bsdcode at disroot dot org Reviewed by: imp MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D43970 --- bin/ls/ls.1 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/ls/ls.1 b/bin/ls/ls.1 index d3daf6e12019..9d4c55b9b17d 100644 --- a/bin/ls/ls.1 +++ b/bin/ls/ls.1 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 12, 2024 +.Dd February 21, 2024 .Dt LS 1 .Os .Sh NAME @@ -244,9 +244,11 @@ but only if .Dv stdout is a tty and either the .Fl G -flag is specified or the +flag is specified or one of the environment variables .Ev COLORTERM -environment variable is set and not empty. +or +.Ev CLICOLOR +is set and not empty. .Pp .Cm never will disable color regardless of environment variables. From nobody Wed Feb 21 11:27:49 2024 X-Original-To: dev-commits-src-main@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 4TfvCB1ZJNz5C1Wc; Wed, 21 Feb 2024 11:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfvCB13Szz4MdF; Wed, 21 Feb 2024 11:27:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708514870; 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=wATlgJ2I9v856BhHiLzlXsVSu6es/pPUpDCLZ9KS8Os=; b=wOn0tsvjYBaM+hg/XsUAYpd/GwZV9sjY3EJtLKWJXSWQeXgTlJJQkFwIXltsE2rn4BH4Ot XMNZDDdgdKmdd5OxN/MeizKO+vnfXkpgXW+zuF+KZBHFku1HELCD9Qtqn2ALQ83Cd7C5g8 KSOl0EmI67wzgbO7rtjo/lYCvlUGJSzPBTAvojA/dALCM/fm7O+wsDfmHJwBN62M5Kt5eQ tEWuGk8dhTPPnMpOghIJOs1MkrxWh2ahAdaeBqUs6d/drJMLxGzJtnxAHLMcsO2bemxFPf bG0PXCus/dx+Z3daVDJdGJelZFRdrxBJFnEH9eZsayIqwHROHbt5hqQFT9d1Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708514870; 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=wATlgJ2I9v856BhHiLzlXsVSu6es/pPUpDCLZ9KS8Os=; b=nflLe7+nChNsx5jiyE0Tf7IOwBwSsI6yL6iNKZ0FyNwjgs0XfELFz5brOfX1oVPIIUs0sn /lFrJJ+3ukEg1onj+Im17/V7hCu2K52cm0Sq/d70YS81UJQ7Q8H3eqj4HMDZhbfyeGcmMC Cim66LQyCjgIC4utflcaqyltodje9wahAoCDz898UuDoQ1R8CqymCGRmFrMSDPA1kL78g6 LxStsb2XsgGXPAoMLrvcFmYcksoGKKrlWOKE63o6H+1GfSGBpCH1UMbDZkhKLvYW+fTWRd YApwx77Qov4G3qhvTLhfogdzzXxl3DBfnMcihHEzpRSfZ6mnO9fJFG+CC07rVA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708514870; a=rsa-sha256; cv=none; b=ndZ5Xq7XYy1rGQxfgYh5U9VVGgsOlZMYVXYbnn7a6j3M9GAHAx9mYN/SfK4yseaYxho73E v6U+dcgDA5IMhigLBBkKfYqdw40fU0T0uzDbu4KEfchD4+Dn1Anu1ewapY/wfK7oHEH6tu Cd48nRzszJGUuy9PHHRtrk5pMw0oZJSjAElOwwq2HlBfubidWnynJPjnxRqDsV4owGUCsQ OQhC7JFVFFwD8M06/jvXRPt7MFHdGCkUCJgeICRTvlnAk0sRLAN6Bh02ulzdEnnFPKwVDn LLsL/ILT9jzcj/pMri+F5BJqiYMGhfGWAhAUNmsAwWJptqvhI3xXfpJKaLkR0g== 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 4TfvCB00twz11RD; Wed, 21 Feb 2024 11:27:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LBRnlt013269; Wed, 21 Feb 2024 11:27:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LBRnM2013266; Wed, 21 Feb 2024 11:27:49 GMT (envelope-from git) Date: Wed, 21 Feb 2024 11:27:49 GMT Message-Id: <202402211127.41LBRnM2013266@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 5e7941b6c979 - main - arm64: Add CurrentEL register definitions List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e7941b6c979a55dc67baf316db6932c09b14022 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=5e7941b6c979a55dc67baf316db6932c09b14022 commit 5e7941b6c979a55dc67baf316db6932c09b14022 Author: Andrew Turner AuthorDate: 2024-02-19 14:57:34 +0000 Commit: Andrew Turner CommitDate: 2024-02-21 11:00:19 +0000 arm64: Add CurrentEL register definitions Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43971 --- sys/arm64/include/armreg.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index c43ec1f5b97c..0ff42de90f46 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -190,6 +190,14 @@ #define CTR_ILINE_VAL(reg) ((reg) & CTR_ILINE_MASK) #define CTR_ILINE_SIZE(reg) (4 << (CTR_ILINE_VAL(reg) >> CTR_ILINE_SHIFT)) +/* CurrentEL - Current Exception Level */ +#define CURRENTEL_EL_SHIFT 2 +#define CURRENTEL_EL_MASK (0x3 << CURRENTEL_EL_SHIFT) +#define CURRENTEL_EL_EL0 (0x0 << CURRENTEL_EL_SHIFT) +#define CURRENTEL_EL_EL1 (0x1 << CURRENTEL_EL_SHIFT) +#define CURRENTEL_EL_EL2 (0x2 << CURRENTEL_EL_SHIFT) +#define CURRENTEL_EL_EL3 (0x3 << CURRENTEL_EL_SHIFT) + /* DAIFSet/DAIFClear */ #define DAIF_D (1 << 3) #define DAIF_A (1 << 2) From nobody Wed Feb 21 11:27:51 2024 X-Original-To: dev-commits-src-main@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 4TfvCC3Z1bz5C1Wd; Wed, 21 Feb 2024 11:27:51 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfvCC1dF7z4MgB; Wed, 21 Feb 2024 11:27:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708514871; 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=me3rCigNej2nlXSP0EW+jFoCFetscY8ROwPEUClSshA=; b=IUurXCCqLrIEmIbFuAOujpGP+BpjAHf+CBaFRXa1IAvAMl0XpkIzRglWGX4oPKo/du+cRv ITcEGB6VrMaTeDDLP5X6oRxxw7YxCb558zCfjLrrdsxuAqrcLS/xXRLE3X2D+x3PSpJoPd pdp+rza09s81qnwn9LFX9My48oGtTW/Kt5Bbos/SSya6fY6blf70e1Vj9JB79f74OBod0K KlnF1N/P2oI751pRrlw6Qae0P8Az7gKjG9BF1kpZuw/v8u/NuMrUOvm1hERTQYLYM3o4h2 P3rTXHS4PEsY3Ci0g2WJzTFwcwlrQgeu7rlmlwVxbFQdVRwbt6HCBGfJmIR4qg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708514871; 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=me3rCigNej2nlXSP0EW+jFoCFetscY8ROwPEUClSshA=; b=Ccjtj3yeh6IWGC876TEooalXEaeLcayBzI6bHIzdjflucLVJt6tU5+vM/d9NLpefcxw/v1 HAgMmG7b1Pll2+Z1oVCmSscuuLM5efKJuHNqxxlOMtrmNVeaF2R+to0huf1BpUzHzc5JRs 1/lePsGWAomROzkV3tX9gqeONQhXv6rUVQxxUEwmwNRaODYXaYxMcYXi4G4Ro1im0FW7SJ 8V0vd1ZPIoiUuJ9W/osYMtQDxFNrZ2x5xBIeBr0ulC+9wZOsUYuTOtgO5/Wp9iAT6LrwRM ezXvMNY73+29b1VMAz+LsnkV7k57sHz+zcV7Ivc5thp5+J9sGtpVvFIB8knBIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708514871; a=rsa-sha256; cv=none; b=C2PHGM3rEJ2F1mw4b1KUABRxSQ7y2dmD9VrlkrzIexLF3w4C7+f9F81CZbThmXp5DgNIyh /9dU37xPFdd4c84pJ1+pCaHvntXRRh3/3NFszOx/mVHYky7BjcGpJ2iczE79XfEPGYPR+1 tdNB7iw70WF3E175a1wnEZjU8zzOuFtZh6dX2ULxXasAqQ+qNMXT4tsy5zFbNs7kRkV+Hb HN0IfGm/1vXUQq2qWGBY5VXjq1FM49DwvveppCFGgGLn0Y4VqPTQjaUXd8cLa1VNcyInNT 2rHSRoJ9EtvUwnnHw+lB/mZV41aqDOWwMXDRwRf7E6pdHuqyyULgGFXJQ+4eMg== 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 4TfvCC0jLqz11GK; Wed, 21 Feb 2024 11:27:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LBRpIR013314; Wed, 21 Feb 2024 11:27:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LBRpgi013311; Wed, 21 Feb 2024 11:27:51 GMT (envelope-from git) Date: Wed, 21 Feb 2024 11:27:51 GMT Message-Id: <202402211127.41LBRpgi013311@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 37563d39efd1 - main - arm64: Use the new CurrentEL macros List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 37563d39efd115c7e6ccddb5f2dc1e0d089b2b8b Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=37563d39efd115c7e6ccddb5f2dc1e0d089b2b8b commit 37563d39efd115c7e6ccddb5f2dc1e0d089b2b8b Author: Andrew Turner AuthorDate: 2024-02-15 16:13:09 +0000 Commit: Andrew Turner CommitDate: 2024-02-21 11:23:58 +0000 arm64: Use the new CurrentEL macros Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43972 --- sys/arm64/arm64/locore.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/locore.S b/sys/arm64/arm64/locore.S index b246ed3f2a41..638c4a542891 100644 --- a/sys/arm64/arm64/locore.S +++ b/sys/arm64/arm64/locore.S @@ -267,8 +267,8 @@ END(mpentry) */ LENTRY(drop_to_el1) mrs x23, CurrentEL - lsr x23, x23, #2 - cmp x23, #0x2 + and x23, x23, #(CURRENTEL_EL_MASK) + cmp x23, #(CURRENTEL_EL_EL2) b.eq 1f ret 1: From nobody Wed Feb 21 11:27:52 2024 X-Original-To: dev-commits-src-main@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 4TfvCD5cp6z5C1Wh; Wed, 21 Feb 2024 11:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TfvCD2jWKz4N41; Wed, 21 Feb 2024 11:27:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708514872; 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=yVjdrBsG0rmAwmGuTF4GDAPW92dzP7rsiHJHo2/80r0=; b=UE0BWxnTomsk7/pRc3A63jZhDwxWdYN4U+jev+Ir0h7rJHeDGdjyDl46jtx3e80KtSPjke c6SECZcz1JhG4OnCdczYQwZGTPsmXCYyjv1/Vwwng5OrPuI6fxsQcZgat9Xj/GBBe7mEY1 XNfShI5x436OsX63KYFnRVMDZrWHb4fjLez7LvQhA5CcOCOQZsasS/2hX2X8R+3Z9dZCXm L5Sd9q+hfRgvEXZXMvMx+oe0hSHFiwlwNad7SEbjPHTPM92fX2ZhVz5ZzqOuzUpcEuJweU 51EFqV758W1sDcTrqurT48GokLUvjR4AgBgcrPtf03aW/aWBfd9tsEbhC6nnRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708514872; 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=yVjdrBsG0rmAwmGuTF4GDAPW92dzP7rsiHJHo2/80r0=; b=ibG7nLxct3+NC6tDgko6CQahcoH9y9na12CJZspOxyW1NAGmDVuAHJW4444kaI5WgvrDap lNUSEP8Zz5hGRKotHXo0wJn5jKBrpcvOkKYAcpWnp2IyKT6dLP6gCk/K8LWJXOh8FXYvyH EaKIwCvcCJQq1Xco5tQ/KtdO0xFfuHIziXeDsj3DI2v9/wsU4S0JikMH3Z79l1e2LfDRWh eP2aG43e392R3aBXd7ZpQBnElJPmNfoY5iZlAOSsBtMYo7bnPNiTWL/Uhx21Vl8T+dp80C 7zrQo4+mbDmWrHCoc6KD9Xc2pQcQjUUPulBDGs7A8DtLFk3gyiFqXZTYWBPeOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708514872; a=rsa-sha256; cv=none; b=Jm+gzaGU7gYJ2PHT6ZLE/rZGNnkG0iAunkbttH3fPo37HSC/xLEDgJp/qZ5xzDvtvGBIEM 8Wpiy+2dsJWbrJVLMBs4LU/yp2LA4l/qAR8meB/rLQTcJW2yD+jOq2J3DhKtpRXw3+TxaV xQkEKg9BcCXa2XJNciX6LNy35LfHLAfx0x/vqQAXyO1zl16fdph2riqXrbJtX6rGcG97dm K82vmsC4qZNebCvOieDDRvc3LZ9xe9k6wP4rZBaapn/F4MxJ1lSZRWN6ZgpkO7h+NyVqys pa8kDHFPIUOmRaZ1URzJK8JonuWNEPB7HPRiRvjrrtqG3dgRqD8WrSRy/HtxtA== 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 4TfvCD1nW4z10bS; Wed, 21 Feb 2024 11:27:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LBRqPE013374; Wed, 21 Feb 2024 11:27:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LBRq4E013371; Wed, 21 Feb 2024 11:27:52 GMT (envelope-from git) Date: Wed, 21 Feb 2024 11:27:52 GMT Message-Id: <202402211127.41LBRq4E013371@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 353b6a5bcb5a - main - arm64: Add in_vhe() to find if the kernel is in VHE List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 353b6a5bcb5ae6943903b38ebcc0922b059ff8b8 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=353b6a5bcb5ae6943903b38ebcc0922b059ff8b8 commit 353b6a5bcb5ae6943903b38ebcc0922b059ff8b8 Author: Andrew Turner AuthorDate: 2024-01-11 17:01:52 +0000 Commit: Andrew Turner CommitDate: 2024-02-21 11:26:29 +0000 arm64: Add in_vhe() to find if the kernel is in VHE Add a function to support devices that may need to know if the kernel has enabled the Armv8.1 Virtulization Host Extensions (FEAT_VHE). Some devices, e.g. the generic timer, will need to know, e.g. use a different interrupt. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43973 --- sys/arm64/arm64/machdep.c | 8 ++++++++ sys/arm64/include/machdep.h | 1 + 2 files changed, 9 insertions(+) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 9ce1c40b674c..c7f451543687 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -215,6 +215,14 @@ has_hyp(void) return (boot_el == 2 && (hcr_el2 & HCR_E2H) == 0); } +bool +in_vhe(void) +{ + /* If we are currently in EL2 then must be in VHE */ + return ((READ_SPECIALREG(CurrentEL) & CURRENTEL_EL_MASK) == + CURRENTEL_EL_EL2); +} + static void cpu_startup(void *dummy) { diff --git a/sys/arm64/include/machdep.h b/sys/arm64/include/machdep.h index 80cb28bcfbeb..2f2960ae39f2 100644 --- a/sys/arm64/include/machdep.h +++ b/sys/arm64/include/machdep.h @@ -48,6 +48,7 @@ extern enum arm64_bus arm64_bus_method; void dbg_init(void); bool has_hyp(void); +bool in_vhe(void); void initarm(struct arm64_bootparams *); vm_offset_t parse_boot_param(struct arm64_bootparams *abp); #ifdef FDT From nobody Wed Feb 21 12:40:25 2024 X-Original-To: dev-commits-src-main@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 4Tfwpx3L4Dz5C6qp; Wed, 21 Feb 2024 12:40:25 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tfwpx2pJfz4Tjj; Wed, 21 Feb 2024 12:40:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708519225; 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=es/q6NxXtQgxSICSk0+C8FBhXQ41/adxez8yfDEdGHQ=; b=WmwsGlgcAXOMBLxsglfnI+vay9SWgDmVwoXI3e8x5obQP4fgAIBnJFYCKlotet1FZ/BB4m 7laPj4htSKyEElBPXaxA0l5NUCt0uZMJ4kC0sf01JLLQc2NnrL4kDgezJ+aDjU6eEPVNJ8 dhZvDdgdZ6Dn/LB4GeCe8/wBUL5hGdB6T/jcjC8wEiGLUkAQ4tCvtd5iu9flWCEkT0okiz 1/yWoGBV3WM0Yv7Gr261C+ulyGUXvIOCELFuaa+QfKGU3toChG+xOb1EQV1k9H+9k/fg6A fKea75aGmfCBhEkx+tE7Bj9ivn/J/x51kSK4BPAURyqwAyfa/S0Mx9IRV3z+OQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708519225; 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=es/q6NxXtQgxSICSk0+C8FBhXQ41/adxez8yfDEdGHQ=; b=fDYRHWd6IVYWhiQumaKcJtRyj12e+PL2Qhz+stAz4fSaPFDZUZfOnMxhg0yJfmRojeRcS4 KdkXTjjCX9b7NTT43ObGJLNrTINAwbrTSYl76D4JShgZHutx1GMTKGUFnrF42Y0YlPiz+v XdWK/0uETVsuk4zRmw4ilz9dlLt7NmA8IXJye0zxJ4J1FTaQhQ/9pXT/cR//+h++JAUg4F Nc/7iMRZGfBcJEU+LMy458fkB36O4c4KtRt/vicVVKB5jNKHMVxeX0NjAD47NlPumLcSu9 7nqA4pih/Rk5ShcKSDK0zH7UobzZD7CKITri/uwVRa//ptQ4y1ONZXjp8s/RJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708519225; a=rsa-sha256; cv=none; b=VuvEq7q8kUBBz5rt7EV56vu2oY710TvkMsRvFZY9ltshF/MXIShe5+2HoPt3OLWFov1MEr p3diABtA/XzIBvFw+WH6BxdBd1PkbIIpHH9F9ptJtKuxwFblms+3fJz56soQdppnOiL7IU r+v4zWNDdlju4GOjnlnQysVp8IyGzoy1bZo8zFnSnmsBb4voBHNe4jmimOB/oIWQZPCfgf 11yI4XzOxr99t8DclFPdFrnUf3R6LN8o89RbLJsEoNrpZexkTA4xI9xYTVAlTPN8YbTuX1 z8KqwLxM0YzH/dYCk0WoEvDawi49xusF4rUgRt7GO2uI9zkxkUB3G5QbYgGL5Q== 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 4Tfwpx1slfz12WR; Wed, 21 Feb 2024 12:40:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LCePxk040034; Wed, 21 Feb 2024 12:40:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LCePmx040031; Wed, 21 Feb 2024 12:40:25 GMT (envelope-from git) Date: Wed, 21 Feb 2024 12:40:25 GMT Message-Id: <202402211240.41LCePmx040031@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 58df49801d9d - main - arm64: Fix the has_hyp check List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58df49801d9d58e61cc2adc8fd1e6848b64d2453 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=58df49801d9d58e61cc2adc8fd1e6848b64d2453 commit 58df49801d9d58e61cc2adc8fd1e6848b64d2453 Author: Andrew Turner AuthorDate: 2024-02-21 12:38:49 +0000 Commit: Andrew Turner CommitDate: 2024-02-21 12:38:49 +0000 arm64: Fix the has_hyp check boot_el is now the CurrentEL.EL field value. Use the new macros to implement the has_hyp() check. Sponsored by: Arm Ltd --- sys/arm64/arm64/machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index c7f451543687..2716182ca442 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -212,7 +212,7 @@ has_hyp(void) * XXX The E2H check is wrong, but it's close enough for now. Needs to * be re-evaluated once we're running regularly in EL2. */ - return (boot_el == 2 && (hcr_el2 & HCR_E2H) == 0); + return (boot_el == CURRENTEL_EL_EL2 && (hcr_el2 & HCR_E2H) == 0); } bool From nobody Wed Feb 21 14:17:52 2024 X-Original-To: dev-commits-src-main@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 4Tfyzh1g53z5CGDc; Wed, 21 Feb 2024 14:18:08 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4Tfyzg0rg1z4kLP; Wed, 21 Feb 2024 14:18:06 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 41LEHqx1053572; Wed, 21 Feb 2024 16:17:55 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 41LEHqx1053572 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 41LEHqxj053571; Wed, 21 Feb 2024 16:17:52 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 21 Feb 2024 16:17:52 +0200 From: Konstantin Belousov To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 8271d9b99a3b - main - libsys: remove usage of pthread_once and _once_stub Message-ID: References: <202402210029.41L0TOH5000231@gitrepo.freebsd.org> <964A29A2-4C51-4037-8EBE-320008D48AE0@freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <964A29A2-4C51-4037-8EBE-320008D48AE0@freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Tfyzg0rg1z4kLP X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] On Wed, Feb 21, 2024 at 12:51:04AM +0000, Jessica Clarke wrote: > On 21 Feb 2024, at 00:29, Konstantin Belousov wrote: > > > > The branch main has been updated by kib: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=8271d9b99a3b98c662ee9a6257a144284b7e1728 > > > > commit 8271d9b99a3b98c662ee9a6257a144284b7e1728 > > Author: Konstantin Belousov > > AuthorDate: 2024-02-20 14:45:29 +0000 > > Commit: Konstantin Belousov > > CommitDate: 2024-02-21 00:26:11 +0000 > > > > libsys: remove usage of pthread_once and _once_stub > > > > that existed in auxv.c, use simple bool gate instead. This leaves a > > small window if two threads try to call _elf_aux_info(3) simultaneously. > > The situation is safe because auxv parsing is really idempotent. The > > parsed data is the same, and we store atomic types (int/long/ptr) so > > double-init does not matter. > > You still need to load acquire and store release aux_once though, > otherwise you can see aux_once as true yet read the pre-initialised > data. In practice that’s surely very hard to hit, but the code as > written is now wrong. Also, idempotence should probably be made > unnecessary by using 0/1/2 state for uninitialised/initialising/ > initialised, as it’s still technically UB from a C AM perspective due > to not being data race free if two threads initialise at the same time. > Better to just do the correct thing rather than risk things going wrong. There is too much to handle 'in process' state for loosing thread, I need the whole libthr machinery. I added the fences, thanks for noting. WRT being UB from pure C, we already have much more assumptions about atomicity. From nobody Wed Feb 21 14:19:01 2024 X-Original-To: dev-commits-src-main@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 4Tfz0j4YgNz5CGPd; Wed, 21 Feb 2024 14:19: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tfz0j3sJtz4krg; Wed, 21 Feb 2024 14:19:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708525141; 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=S2CuHsh/b2dgCS1+/wyvY88r+hvJggCKFILtiF247qU=; b=uSDr1/gvTuBYmMOK8ZLu4dz6HykoG6wGIxzcbswkOMKtV7q6cuOKTwwFSo4Xc0uRHAJeDa ha+BYsgxAu8Kg3pGmgve2dbt3/gvF0HIz1jfYzIJSyVs2ohSn/4luYKuzBRcLoaZx5c/z3 rsizGtEz1viMZoNdAyDT2C/TgMqs3nwPGNxEE+zje8CEvaWcEY8tuyZKQeWNGWH4jVzuhZ 6SIiOsKWp2cBkQKQYJbDDS+0X758VbgK/UOwAlDTe9B181N4tbYzIW9nrR+L8DpBS4WKhH PEq1ziFpYsBLjFD2EVoS8OnJ5UrVufPmr3YVzR1MKsg4mkFOzp6k0dKaf416Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708525141; 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=S2CuHsh/b2dgCS1+/wyvY88r+hvJggCKFILtiF247qU=; b=tfWu4AaOVjL4dlSTvmZQBEkJDgUSP9q4ovjt7ZjHfNEeLp1VJrNxY3VveMlPtYdPC7Cgtf dphNnuzRzSqUBI5j4fiVg0UyP3WbxRX9/oBWReETsNAYaPQkOkxToYZqJ32olOUvQ5i3X9 lttVQG7gwiWDywsStKtgnptfUUuULTCA3WvqVGLh0WLrB5qRulfM5wuV3daq6z+nQkCHJj A/uQe6Z8agcIc3DQlmcso5VC+HW9Lz64b3jd3g2ri+X1WrGx8QlA2gDIKmNhyBIO0+wQ7l mIuBeUUxHovcHbCuFMvJgYMKaLRPvuRaPwCco/RzGBtU/Pgu4mA6X6bf3UESrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708525141; a=rsa-sha256; cv=none; b=AKRZ6qY6cyxEHt/7pzZqsCiSy427+yuEpiBVXYxptFJv6kZiKyZU0nXJ7W5ggbve3d08mB ojZ3ONvC3ywaLM6Ue/+He4nwYb7gqFl3Bjroowq4shgg7OXvPbdXJWqgcXjgxEgqq7gf4r L4rydg42YV3VFA7rBSdyWFIHj09RJ3rSPNbFZxUe1SALCKTgYb5hhUn5NTEeIp7+6Watmh l0DRmehG+BQVf25jME+t7dpp5eOmm/gJf4wiwMBA6m7LR+CdxobxQH6VDaUkIKugUZUujH jgykxnJVBnjOcgq6Nyj94rqyzzmXeoP0midWZlwY0WkAcV9MX9QiQHulUYlPvg== 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 4Tfz0j2yQZz15dM; Wed, 21 Feb 2024 14:19:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LEJ1xN000740; Wed, 21 Feb 2024 14:19:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LEJ19I000737; Wed, 21 Feb 2024 14:19:01 GMT (envelope-from git) Date: Wed, 21 Feb 2024 14:19:01 GMT Message-Id: <202402211419.41LEJ19I000737@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 2f4cbf459d4a - main - libsys auxv.c: add fences needed to ensure that flag works List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 2f4cbf459d4af41977be30eab2f6f7d7e9f9b5b5 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2f4cbf459d4af41977be30eab2f6f7d7e9f9b5b5 commit 2f4cbf459d4af41977be30eab2f6f7d7e9f9b5b5 Author: Konstantin Belousov AuthorDate: 2024-02-21 14:12:12 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-21 14:18:10 +0000 libsys auxv.c: add fences needed to ensure that flag works Noted by: jrtc27 Sponsored by: The FreeBSD Foundation --- lib/libsys/auxv.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libsys/auxv.c b/lib/libsys/auxv.c index 88f49ef53be1..1a4fd352950e 100644 --- a/lib/libsys/auxv.c +++ b/lib/libsys/auxv.c @@ -36,6 +36,7 @@ #include #include "un-namespace.h" #include "libc_private.h" +#include extern int _DYNAMIC; #pragma weak _DYNAMIC @@ -66,7 +67,7 @@ __init_elf_aux_vector(void) } #endif -static bool aux_once = false; +static int aux_once; static int pagesize, osreldate, canary_len, ncpus, pagesizes_len, bsdflags; static int hwcap_present, hwcap2_present; static char *canary, *pagesizes, *execpath; @@ -92,7 +93,7 @@ init_aux(void) { Elf_Auxinfo *aux; - if (aux_once) + if (atomic_load_acq_int(&aux_once)) return; for (aux = __elf_aux_vector; aux->a_type != AT_NULL; aux++) { switch (aux->a_type) { @@ -179,7 +180,7 @@ init_aux(void) _init_aux_powerpc_fixup(); #endif - aux_once = true; + atomic_store_rel_int(&aux_once, 1); } #ifdef __powerpc__ From nobody Wed Feb 21 15:51:37 2024 X-Original-To: dev-commits-src-main@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 4Tg13Z4Vx7z59pw5; Wed, 21 Feb 2024 15:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tg13Y6m0Tz4HpQ; Wed, 21 Feb 2024 15:51:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708530697; 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=xL1w+AqE2wY00K6xOXzduJvQ9xm+EJz70bO3bSogjiY=; b=lF8xI1mxW6lQ9J4Sa2UVRzdVs2qgjodvk+MHW430V/nrnvZtAOfA5MG+t0B1e9cCD6Dkev QgSIURN6M8M1JjVtnlYoSNsREHO0PEUEokbL4hFF5Ou9gKnpQO8Dsxb3hCUQRM7QYBVWqL eMxwJRXRAbHh0h6UyKweHJ+bMr+IN06Ay5Po1pKeSNk6YHWi4IuriRt1ErjziQp28ZKZF0 nkutPIseSvYc4DpbPUh7bDPipWDHghi+BwUYY9FNrco8xcGvHlbf639wjYdkCmHqvTE56U dIlW3BTXf8tBPk82rklOtWTI1BF3Rm9RW5SP+hi13FhcOOip2ICiNzYf/ty1uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708530697; 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=xL1w+AqE2wY00K6xOXzduJvQ9xm+EJz70bO3bSogjiY=; b=dnCtgY1QUBcCK9HuDsEb9KGgYb8qlAijRfx/Q83Os3Ccr6pdVMUIMNLYdkVH0MVRccegse +bg0+yDwQ5DyNeZPda5T/tUehyNs8lLPonCHqW4GFLlWzwG7J2Qj3rFDUtTFol6PuoyPh6 rCqeJRwsIQP9W3ACjUpfzqQz0Zc9Nsk+mk90m4bBOZoc18Bxm/zt+fw73/opTTN9ddp+93 Ifcnh5kh2viYpctgBsYb9JI82dzeK5R2pw+VCxnvSetBGNfFhC446p3G6wIU6je+K+t/DS S1+zQVyG2ho7p1VpuTnDVpl+981gcyjlBnvOvXb/+bHZoRPmexiHBxQquzwbsw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708530697; a=rsa-sha256; cv=none; b=Kiv+/IRlYgiH37rEYfb8kmu4LprHemqXc4A46aeI7RQSPAS0qL5cwjHGXNx9HobJZs24XC uM3yIqwP/hHP1GPjkBgbO6gXN6hXpimqc+1JbBi92EWKwRXeCP+GqHs3uvZSjZdcGvjVQ3 MYz5tQRdTWfLzCUuc1FROlS0G0oPPjdmEOvXKT7fGr5yf/lDpTYBC9L2dFLTtkfeyR7SYh IXULZQu2RdGxWM4DhYsYjlYmI5kuPEvKFXLAaYOqdEBeI9zIkbAQUFiodmxbt8U5ETc+tY 7PL5ma9xNYaimPqfwdUNCpVAD2kv+4glIhggSkTv6kOBIXBXycVPgL1eRmXnlw== 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 4Tg13Y5sNvz18Cl; Wed, 21 Feb 2024 15:51:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LFpbNk023898; Wed, 21 Feb 2024 15:51:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LFpbHF023895; Wed, 21 Feb 2024 15:51:37 GMT (envelope-from git) Date: Wed, 21 Feb 2024 15:51:37 GMT Message-Id: <202402211551.41LFpbHF023895@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 32568e5f2435 - main - loader: Retire CTASSERT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 32568e5f2435a2539b0c4177a6fefe7a9e0a0c89 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=32568e5f2435a2539b0c4177a6fefe7a9e0a0c89 commit 32568e5f2435a2539b0c4177a6fefe7a9e0a0c89 Author: Warner Losh AuthorDate: 2024-02-21 15:48:32 +0000 Commit: Warner Losh CommitDate: 2024-02-21 15:51:34 +0000 loader: Retire CTASSERT The project is moving away from CTASSERT in favor of _Static_assert. Cleanup the few instances in the loader proactively. Sponsored by: Netflix Reviewed by: manu, tsoome Differential Revision: https://reviews.freebsd.org/D44006 --- stand/common/bootstrap.h | 4 ---- stand/efi/loader/arch/amd64/multiboot2.c | 2 +- stand/i386/libi386/multiboot.c | 2 +- stand/i386/loader/main.c | 9 ++++----- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/stand/common/bootstrap.h b/stand/common/bootstrap.h index 7387569ad65a..b7d6e538f9be 100644 --- a/stand/common/bootstrap.h +++ b/stand/common/bootstrap.h @@ -382,8 +382,4 @@ int gen_setcurrdev(struct env_var *ev, int flags, const void *value); int mount_currdev(struct env_var *, int, const void *); void set_currdev(const char *devname); -#ifndef CTASSERT -#define CTASSERT(x) _Static_assert(x, "compile-time assertion failed") -#endif - #endif /* !_BOOTSTRAP_H_ */ diff --git a/stand/efi/loader/arch/amd64/multiboot2.c b/stand/efi/loader/arch/amd64/multiboot2.c index 4d7b2713685d..6c96d7dc0073 100644 --- a/stand/efi/loader/arch/amd64/multiboot2.c +++ b/stand/efi/loader/arch/amd64/multiboot2.c @@ -334,7 +334,7 @@ exec(struct preloaded_file *fp) struct mb2hdr *hdr; - CTASSERT(sizeof(header) <= PAGE_SIZE); + _Static_assert(sizeof(header) <= PAGE_SIZE, "header too big"); if ((md = file_findmetadata(fp, MODINFOMD_NOCOPY | MODINFOMD_MB2HDR)) == NULL) { diff --git a/stand/i386/libi386/multiboot.c b/stand/i386/libi386/multiboot.c index e11da0444fcd..b69895de9706 100644 --- a/stand/i386/libi386/multiboot.c +++ b/stand/i386/libi386/multiboot.c @@ -165,7 +165,7 @@ multiboot_exec(struct preloaded_file *fp) int error, mod_num; struct xen_header header; - CTASSERT(sizeof(header) <= PAGE_SIZE); + _Static_assert(sizeof(header) <= PAGE_SIZE, "header too large for page"); /* * Don't pass the memory size found by the bootloader, the memory diff --git a/stand/i386/loader/main.c b/stand/i386/loader/main.c index 97c4448afdc3..8a3c1cbc6a42 100644 --- a/stand/i386/loader/main.c +++ b/stand/i386/loader/main.c @@ -51,14 +51,13 @@ #include "libzfs.h" #endif -CTASSERT(sizeof(struct bootargs) == BOOTARGS_SIZE); -CTASSERT(offsetof(struct bootargs, bootinfo) == BA_BOOTINFO); -CTASSERT(offsetof(struct bootargs, bootflags) == BA_BOOTFLAGS); -CTASSERT(offsetof(struct bootinfo, bi_size) == BI_SIZE); +_Static_assert(sizeof(struct bootargs) == BOOTARGS_SIZE, "Bootarg size bad"); +_Static_assert(offsetof(struct bootargs, bootinfo) == BA_BOOTINFO, "BA_BOOTINFO"); +_Static_assert(offsetof(struct bootargs, bootflags) == BA_BOOTFLAGS, "BA_BOOTFLAGS"); +_Static_assert(offsetof(struct bootinfo, bi_size) == BI_SIZE, "BI_SIZE"); /* Arguments passed in from the boot1/boot2 loader */ static struct bootargs *kargs; - static uint32_t initial_howto; static uint32_t initial_bootdev; static struct bootinfo *initial_bootinfo; From nobody Wed Feb 21 15:51:38 2024 X-Original-To: dev-commits-src-main@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 4Tg13b57WLz59pss; Wed, 21 Feb 2024 15:51: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tg13b0LtLz4HmD; Wed, 21 Feb 2024 15:51:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708530699; 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=bMZrX4YnS56F5g9F8d/Q7tB7cEy4z7DrKIfI82bEIAk=; b=qwdrD1kRDSczG7p2cFSlMkOKzGXd1vMtkUtGFOOojWseZ1X8SdwFaRoQx2awAgl6hZUWAU yXMKWi/dlPQtFjeZAEcLbt9MFzXJlGB3JAztS8/NON799r/PPbfUsEvSmu9+bseyPQGzaT 3Zg+kzW8m9ltO8IC/+zbPeoYbNN8A2j2+JCym3mBcCXo5nfY8TA27ZOGXUwMopQBKGrs7w MdPMn7RNvG13VdNJahf1zDkKDXjVa92Ebt5Z+W9RoTh6KFwQD0RfWkihYjcgMcl726cJmQ tjsq3dfKWJ7vNfZqiDbTh7IeHcq1sykIAhmTiSiyBM54u5hkWvk3Xyub1MzpPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708530699; 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=bMZrX4YnS56F5g9F8d/Q7tB7cEy4z7DrKIfI82bEIAk=; b=r7jmdD1fYfwnrHocfbjRVa56hoaZ1mCpz057xl7k26y376tzBl+mVQTDO/+W6Wd3rz62b/ UILydpDf2XYAEmrOmEoaoLcK4hQeBRAPl7OteIgxzBeQEOYTYunOAudbVfqIX6hG5Qj2OV oPVsOSM0c4qN4TJC6hEvPVqxAibJVkG/v7dtOTkHzW3iO+AI89FGmKZTxZpq0RtoLWbmvY H2imn3B+Yh2zRnOGMrPImFsQkDLW6Pi7opNdVwFfyuKoyVGaAP3VRXuw6m2fSzM78cbP5K bFpGnZUfYnBRVw3TyOeHCjuNqx5mW6r4xsnAH5b5pMT6h5Yvwm6RZYKs2gi9wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708530699; a=rsa-sha256; cv=none; b=Iqz7gbrmJynPlBQ6BIMvI59U3V2m3wSV23VGbTUV2wZrnlkcP7bz+ArI2RduW9VAiY1Zro zBCxmlVGrGNkINpx9Uvu6aJkMP5AyTEeQeTyXaanpgpSpY9GrW+h5Gc6cbg8bCLQAeFy8u NtlFQ17HeepxH0PSPIdq3M3wrpT6v1VxUHBWUdkzXR/5HWd1ZoXfWMmmn9LQbl/7hU/lPD 0Oj1Xe9hDzPhAyj+54sd8r+OUMgJzQHue2bGOkTBr6H7oT7AJri2hd2JjmIv8/PK7AF7kP UtHrwmPH2oAS8SQn8AA2CzWo4EMZPvaO99O320YQPEXU3RsAx2JEKY8Fs2PMaw== 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 4Tg13Z6YKwz18MB; Wed, 21 Feb 2024 15:51:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LFpccp023946; Wed, 21 Feb 2024 15:51:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LFpcpZ023943; Wed, 21 Feb 2024 15:51:38 GMT (envelope-from git) Date: Wed, 21 Feb 2024 15:51:38 GMT Message-Id: <202402211551.41LFpcpZ023943@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b2822c40f61d - main - loader/efi: Make gcc friendlier by move md_dev List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b2822c40f61d351bf8a4cac87e12521db06ff962 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b2822c40f61d351bf8a4cac87e12521db06ff962 commit b2822c40f61d351bf8a4cac87e12521db06ff962 Author: Warner Losh AuthorDate: 2024-02-21 15:50:31 +0000 Commit: Warner Losh CommitDate: 2024-02-21 15:51:34 +0000 loader/efi: Make gcc friendlier by move md_dev Move the extern struct devsw md_dev out of the function. gcc is happier with this arrangemnt often. However, we really should move it to a header file, but that requires a bit of a rework of md support and config. Sponsored by: Netflix Reviewed by: manu, tsoome Differential Revision: https://reviews.freebsd.org/D44008 --- stand/efi/loader/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index d7cffe5f6df9..5944c383574e 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -278,10 +278,11 @@ probe_zfs_currdev(uint64_t guid) #endif #ifdef MD_IMAGE_SIZE +extern struct devsw md_dev; + static bool probe_md_currdev(void) { - extern struct devsw md_dev; bool rv; set_currdev_devsw(&md_dev, 0); From nobody Wed Feb 21 16:31:10 2024 X-Original-To: dev-commits-src-main@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 4Tg1xC0cYwz59t4b; Wed, 21 Feb 2024 16:31:11 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tg1xB267Vz4cmX; Wed, 21 Feb 2024 16:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708533070; 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=00ZXB4kVRCQs4toXc8PNk6hxY+LsetKKTb4wLSTFxJE=; b=BSXSyfPiJ9wuQLIwuJyULm4vjFZPsXywJPA3eB0nlxYpuDmSZ3qYEd7Yr+97xE3lsS0CQC b8kA/VSRE/RTUXtONOyaxSx6EVndRByr8cEAjX7NBTZ3w+VDPnR7X80LPJzofcDcZBycFr JahoLHTnxsFh3hfL6CKQZNFlccHoPrLhtxUTfZwz5xn8RhH17dMnTdMV7mKsJusPxsNAPT /1CRwSF8VC92nVer6yglgewbmeGDuBfs6YCTChnNYd45XjZ8Sy/5+YXZ7rtx2QjqgfIpl2 OKoO3SvB19OEEe4XlnJZjlrQR8u1wObr5JNPN0iRgvS+gTyVIWinyg71D/usWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708533070; 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=00ZXB4kVRCQs4toXc8PNk6hxY+LsetKKTb4wLSTFxJE=; b=ksBHU1L7Ms/s08pWiTjoLRiyKtq7pJXoXdbmRe8SGAoQ99JHj0jXwxdH6/jeXxZnbJHuvh OB+et07c6SaQGFAfgjAZc3pVJEOQ3gRSHCdalP/QeihnLMJI9dBdVpGCuAlrN5oWeQX+Ie Zt5KGQmdpQBr/ybMTHB5QNCOyt3rxba+Vozev7fNmBuwIoSm6gNbZJaEtoEtRGVAwGnX5U YVO6siwCteS96GYo14iXJGuKu3exjL+XUpWjZtGBuG2UAWf0GUP8UlPbeQ5l+hzGHVfKG2 PRjsX5iyQ1eEAVfmj4i4x13e8ER6iE+Yu8ACq49+BhYp79cLjzGpHnMOB9zGUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708533070; a=rsa-sha256; cv=none; b=uTPbfC4HSheixLcg1FpjEoUPHAiz56WUaN4tS7GLnMoH8M4z572IoyytQdz1bjwoRh8+++ 0PF8IlsmpqcvTR/N2h9vT7q/G4eblKZFxhHwYUDdKximRKVbPyPS8yj7vrBnoTwOA+VNaF pNk85O8i8iwWQ8jvv+ohJV9dQ603N0w5sPrLaL0uE8HU/LTdU9ILHa5sxICJMm4+uZjb5E um5K7Zat2X+U1B3pTnxziw/K489EaTPiqA30XDS59w2n3uNQx1EHUOUdjZzlNBsj9Q1E4N unPTRUdrGUTUBidPU424yQCElVpGbojIgNTY+FaMNVyjZANcgp1ouxQeE/rPwA== 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 4Tg1xB1BHJz19W6; Wed, 21 Feb 2024 16:31:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LGVAqU093465; Wed, 21 Feb 2024 16:31:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LGVAU5093462; Wed, 21 Feb 2024 16:31:10 GMT (envelope-from git) Date: Wed, 21 Feb 2024 16:31:10 GMT Message-Id: <202402211631.41LGVAU5093462@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 64963dd2f0a2 - main - arm64: Add more spsr_el1 register values List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64963dd2f0a2a47e94fb3f7c56198c475b9821a3 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=64963dd2f0a2a47e94fb3f7c56198c475b9821a3 commit 64963dd2f0a2a47e94fb3f7c56198c475b9821a3 Author: Andrew Turner AuthorDate: 2024-02-21 15:58:20 +0000 Commit: Andrew Turner CommitDate: 2024-02-21 16:27:36 +0000 arm64: Add more spsr_el1 register values Sponsored by: Arm Ltd --- sys/arm64/include/armreg.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 0ff42de90f46..46d13d253746 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -2077,8 +2077,15 @@ #define PSR_DAIF (PSR_D | PSR_A | PSR_I | PSR_F) /* The default DAIF mask. These bits are valid in spsr_el1 and daif */ #define PSR_DAIF_DEFAULT (PSR_F) +#define PSR_BTYPE 0x00000c00UL +#define PSR_SSBS 0x00001000UL +#define PSR_ALLINT 0x00002000UL #define PSR_IL 0x00100000UL #define PSR_SS 0x00200000UL +#define PSR_PAN 0x00400000UL +#define PSR_UAO 0x00800000UL +#define PSR_DIT 0x01000000UL +#define PSR_TCO 0x02000000UL #define PSR_V 0x10000000UL #define PSR_C 0x20000000UL #define PSR_Z 0x40000000UL From nobody Wed Feb 21 16:46:46 2024 X-Original-To: dev-commits-src-main@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 4Tg2HB2myzz59vMK; Wed, 21 Feb 2024 16:46:46 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tg2HB2FP3z4gXV; Wed, 21 Feb 2024 16:46:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708534006; 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=K1lnpryqSIttJewclyC60koxvB+8I3MHFJeSjzrvnt0=; b=YLm196Kj2iw4s+rxWKjd6az/Lrh/InwBYgfM4iO0DpWGbTOd+0sRo+wGc4g1t0sqSolGa4 auT2Ty2mnnGVuM6NexP4BD5GyXEqdbgxGyQXFDSkgFMa+S863dAKkraHum2QuyOEP8Blw+ 4gh8lAbbdPiXrOYreRsTi+zvgjVA6OVOICVoYqojLWSTWNMr0+EyzRDZGHP+cvYfzFDc1e FvdEWW2bGfABCdxKVuLi0XkEMk/c6YgM7xgr7TefZq8noB98ujZuO5+ieQRbnGSFHnXVJ5 T4B9iIFhrlv50F1l5SQHf9bn53EvHKv3uJBUMcW/WeaXaeONoaIScq8qh2GDYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708534006; 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=K1lnpryqSIttJewclyC60koxvB+8I3MHFJeSjzrvnt0=; b=q0u0QfyoXYqZ/sIqxv/XZGgFyexoLuMEalMcNJrqqrdcagXpVJHCMdIlAUPghLmiKlweTz T+y0V1aLwzCnVfr0IGx7b4ic2o6TUA3DHwImCXE3zccY5UMzJr42XGCkhxOMF3SiB3CiQY 66Qoh/4tzd7pjkkXfuhR1wUDGsK7s7ZgWELi7IxgY0p0VHWkUqk7Aof6l3WjtF7XpvoM6q orvrmG8ZyKtv3E+cl833drDilObaDjHKa/c08mhU/BCiaH5HtgRDgIYqOV8ySyR8QH7/Bc pCt4PsEbgbZZZfcKbpMaWArrGPZ7Gr2hW9UTR4Enz+2ECoDnWTAEwC0BQnclzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708534006; a=rsa-sha256; cv=none; b=QtnJRN7+S74CpFFoN2mxlxKEgWSAhrjVmiwSrjqdofwt1QY5x4XYCyzc7Uh9cOl7HgRsSA /az0i/2s4A76K2KQM699xMp0SR/UOK1C3waqfe3m+qi0is7nQxaxzbqgD/d2h04mtFBYAQ ElQJ0g268HsSCqoJNHi+UfszUF24Vf7lpucjUyE0o4hTNINYeptAcd4S+EVkN+1Sv4RO1u o8rY65PltuqRuVUEb9FGFwi1FVGPcHVMPa3mQ2NRU1G5kop6J/xKcBbB78buZA0dPO4bYu 14jBibk0cIsBdh0eXSrqtBZ95BjUkGCx7VhQAXwm0LPphM+SIrgOTdp7yLJPDQ== 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 4Tg2HB1HtFz19kB; Wed, 21 Feb 2024 16:46:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LGkkHd015078; Wed, 21 Feb 2024 16:46:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LGkk5p015075; Wed, 21 Feb 2024 16:46:46 GMT (envelope-from git) Date: Wed, 21 Feb 2024 16:46:46 GMT Message-Id: <202402211646.41LGkk5p015075@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: c81df1c11262 - main - iicbus/mux/pca954x: add support for PCA9546 I2C Switch List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c81df1c112621803abe6a43aa89238c830e86b72 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c81df1c112621803abe6a43aa89238c830e86b72 commit c81df1c112621803abe6a43aa89238c830e86b72 Author: Bjoern A. Zeeb AuthorDate: 2024-02-21 09:10:55 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-21 16:46:15 +0000 iicbus/mux/pca954x: add support for PCA9546 I2C Switch Add support for the 4 channel I2C switch from NXP by adding a new description struct and the list entries. Compared to x=[2345] which require code to support the INT, for this one no further changes are needed. Tested on: WHLE-LS1088A using a SPF+ MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D44009 --- sys/dev/iicbus/mux/pca954x.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sys/dev/iicbus/mux/pca954x.c b/sys/dev/iicbus/mux/pca954x.c index aebd55d6c311..befa0db39172 100644 --- a/sys/dev/iicbus/mux/pca954x.c +++ b/sys/dev/iicbus/mux/pca954x.c @@ -3,7 +3,7 @@ * * Copyright (c) 2019 Ian Lepore * Copyright (c) 2020-2021 Andriy Gapon - * Copyright (c) 2022 Bjoern A. Zeeb + * Copyright (c) 2022-2024 Bjoern A. Zeeb * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -69,6 +69,13 @@ static struct pca954x_descr pca9540_descr = { .enable = 0x04, }; +static struct pca954x_descr pca9546_descr = { + .partname = "pca9546", + .description = "PCA9546 I2C Switch", + .type = PCA954X_SW, + .numchannels = 4, +}; + static struct pca954x_descr pca9547_descr = { .partname = "pca9547", .description = "PCA9547 I2C Mux", @@ -87,6 +94,7 @@ static struct pca954x_descr pca9548_descr = { #ifdef FDT static struct ofw_compat_data compat_data[] = { { "nxp,pca9540", (uintptr_t)&pca9540_descr }, + { "nxp,pca9546", (uintptr_t)&pca9546_descr }, { "nxp,pca9547", (uintptr_t)&pca9547_descr }, { "nxp,pca9548", (uintptr_t)&pca9548_descr }, { NULL, 0 }, @@ -94,6 +102,7 @@ static struct ofw_compat_data compat_data[] = { #else static struct pca954x_descr *part_descrs[] = { &pca9540_descr, + &pca9546_descr, &pca9547_descr, &pca9548_descr, }; From nobody Wed Feb 21 17:23:10 2024 X-Original-To: dev-commits-src-main@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 4Tg35S1cCDz5B04T for ; Wed, 21 Feb 2024 17:23:24 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tg35R4MCpz4mJp for ; Wed, 21 Feb 2024 17:23:23 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-412698ac6f9so22985e9.0 for ; Wed, 21 Feb 2024 09:23:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708536202; x=1709141002; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lfaz/mBcCkRHXE0Fbn5HIcxkL6EKby/AwuiGFignCOk=; b=mH99VBM+0iCTwRvtT5bwiIvcsXIID4HROWbLLYaRcH72zgyOq33ONy3SeTVT3SX0ua GUQea7cWbenoIc6tKM6xg3r78UvQBRwWuAiiomDIawT/ZwwwJXKauxfp60LqkQaXGFg4 5m6hxuWgZcDWX2Kk9qa0J10vK6qVh5NYq56FbkQZA8t3LneyoS824rQVfmebpkE8fu2g eiWUc8hpZmbY5M6kq05I5UTiL29qNrdNBWInfEsra1tftYVo3QSBH1ktrfhCNp9u0jie iyGL8smVoIxq2vdSf3j27rbwZxqPAXvvD69fE63GQBkwFvKlqFq2+HLijVv+t7oDT2H/ PqYA== X-Forwarded-Encrypted: i=1; AJvYcCVY2hDlqLTfSzTd2yyHRvvyLvmCqupDUXHvj4Ry9+M5Jkm1OEN7RgLpYCn3ZSwdKLB8PMdb7H1NEVUsafREjo7dcoWVvBfPWU6J7hVNSfDegw== X-Gm-Message-State: AOJu0Ywz8ipnv2cVePQIjSAbkqPcslazCwBXevKU8mzfwoEzqFhbqhAj LiH+uIbmeEw4w6IDWzYU9Gr1uNv/OKdnCSgQEoj1Bo1MlX4AJmVmzin1AlmuRm8= X-Google-Smtp-Source: AGHT+IGTP4AHl49j7DhFU3z1V74cudhSGvHngciyNefkwSbP5r5mWpXWKRffo/TNvSxsQHD3IH89Qg== X-Received: by 2002:adf:e742:0:b0:33d:3e02:a5b0 with SMTP id c2-20020adfe742000000b0033d3e02a5b0mr135601wrn.11.1708536201650; Wed, 21 Feb 2024 09:23:21 -0800 (PST) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id o11-20020adfcf0b000000b0033b4dae972asm17489417wrj.37.2024.02.21.09.23.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Feb 2024 09:23:21 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: 8271d9b99a3b - main - libsys: remove usage of pthread_once and _once_stub From: Jessica Clarke In-Reply-To: Date: Wed, 21 Feb 2024 17:23:10 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <4715B319-B7DE-4D06-9F27-00CFE5AF89A7@freebsd.org> References: <202402210029.41L0TOH5000231@gitrepo.freebsd.org> <964A29A2-4C51-4037-8EBE-320008D48AE0@freebsd.org> To: Konstantin Belousov X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4Tg35R4MCpz4mJp X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On 21 Feb 2024, at 14:17, Konstantin Belousov = wrote: >=20 > On Wed, Feb 21, 2024 at 12:51:04AM +0000, Jessica Clarke wrote: >> On 21 Feb 2024, at 00:29, Konstantin Belousov = wrote: >>>=20 >>> The branch main has been updated by kib: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D8271d9b99a3b98c662ee9a6257a14428= 4b7e1728 >>>=20 >>> commit 8271d9b99a3b98c662ee9a6257a144284b7e1728 >>> Author: Konstantin Belousov >>> AuthorDate: 2024-02-20 14:45:29 +0000 >>> Commit: Konstantin Belousov >>> CommitDate: 2024-02-21 00:26:11 +0000 >>>=20 >>> libsys: remove usage of pthread_once and _once_stub >>>=20 >>> that existed in auxv.c, use simple bool gate instead. This leaves = a >>> small window if two threads try to call _elf_aux_info(3) = simultaneously. >>> The situation is safe because auxv parsing is really idempotent. = The >>> parsed data is the same, and we store atomic types (int/long/ptr) = so >>> double-init does not matter. >>=20 >> You still need to load acquire and store release aux_once though, >> otherwise you can see aux_once as true yet read the pre-initialised >> data. In practice that=E2=80=99s surely very hard to hit, but the = code as >> written is now wrong. Also, idempotence should probably be made >> unnecessary by using 0/1/2 state for uninitialised/initialising/ >> initialised, as it=E2=80=99s still technically UB from a C AM = perspective due >> to not being data race free if two threads initialise at the same = time. >> Better to just do the correct thing rather than risk things going = wrong. >=20 > There is too much to handle 'in process' state for loosing thread, I = need > the whole libthr machinery. What do you need libthr for? In pseudo-C: x =3D load_acquire(&aux_once) if (__predict_true(x =3D=3D 2)) return; if (x =3D=3D 1 || !compare_exchange_strong_acquire(&aux_once, &x, 1)) { while (x !=3D 2) { yield(); x =3D load_acquire(&aux_once) } return; } /* initialise as before */ store_release(&aux_once, 2); I believe that=E2=80=99s all you need. Or compare exchange 0 to 1 as the initial operation; makes the source code shorter at the expense of a more expensive fast path: x =3D 0; if (__predict_true(!compare_exchange_strong_acquire(&aux_once, &x, 1)) { while (__predict_false(x !=3D 2)) { yield(); x =3D load_acquire(&aux_once) } return; } /* initialise as before */ store_release(&aux_once, 2); I probably have bugs in the above, but you get the gist. > I added the fences, thanks for noting. Thanks. Jess > WRT being UB from pure C, we already have much more assumptions about > atomicity. From nobody Wed Feb 21 18:55:50 2024 X-Original-To: dev-commits-src-main@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 4Tg586337Wz5B8FQ; Wed, 21 Feb 2024 18:55: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tg5862TLhz3xXD; Wed, 21 Feb 2024 18:55:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708541750; 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=CMHLT4eJFYkj/PeDIG0zRvsNg8ejY5ZY3w7Zvymn7Kk=; b=TqbU701OrU3iischBsA4ibdGaGNET2llz6zFxsjlfgZ7lEiI7Ptzh0rj5nAFSeccmiYMH+ 9oOxZZ7eCtiCc/xDp+8s5Ys8hRy7eS7ssKK8JNEEdwSgS8zCHstwuwUIftgdWHvLVpYP4g vx3k8YVNo/+/SDb9NHowx2uREgwgJwB0poebuziQZ88MAFhmGhWT0oxMH8oqFb1mW8W6d+ 9ieCuWnh9Gd2UlSbYsU5QQk00sfB+n5xUghLBiZQjkCkwXZxRNrnViHGsIJMBXivOBVD+4 0ySKioXAiU9ZUHMEfC49do/3H3kyXu4p41yDtK6zO3hse5o7wZAEokdrqe7E4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708541750; 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=CMHLT4eJFYkj/PeDIG0zRvsNg8ejY5ZY3w7Zvymn7Kk=; b=cVVbVnTXkHqnDiZbIKW9Ti6oSHavwyxYm9128dAgG96+BiJqJbblXtMI9+k5DAE0jDnefL x3CXFNoCKaFR/c22lyktJfDvomqJTJ06XDNOiN1X6odAx/r4+NGoysf3pa3+utZN6vRn2J xkQRf/54JoIz3vCpY4cjpBWVIqz4SAyRlaWlkTChwDWvqZcSqStQpVPKpUAW59sdGHXP8m BoNg0wcmbQK0hdPkzYstFx8O1gU0vXOcTe/0UZ0pzj+rZyQ1LbOSXrq1bcjgia2D6pfc5K i2ZfvAfW62AjbRnuJwvT3RwqwjId03qxGDGt3dzmYOrYkZhsf4pOe9sl1VMnfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708541750; a=rsa-sha256; cv=none; b=wT1nQSH01CrR6oor9m/F3zJpcd1DSBSfcNZCQiZ/cKcYYsbPEjjno6OAm6KlfpESjPAqQk J2n+dvL86B9E+SKAr8OwA/t2Iy23n7r8sPk9b+NkLY4dWZ5X2QbOh8AS+rC8w8O2SfOFVP QH8wm+s5vnrzrrkRXIUIGoTu7rwwjzL4phAR+56ooTLWzGBHjbA889BiMkkNVC7xD4tkJ3 EA6gK8NXfxZWuJz4RBVaO/xLvuHjnhPgG4efS/anyDrfE2QkIpVmQyeWUk99Zi9mDoOBNR tlC59ZQKtPgJ1kxs+RIKR3oQayIQlWYvB7dzF8CspWTRfKSdBa/mb0CcARP8hg== 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 4Tg5861HJHz1F6m; Wed, 21 Feb 2024 18:55:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LIto4N033435; Wed, 21 Feb 2024 18:55:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LItoqE033432; Wed, 21 Feb 2024 18:55:50 GMT (envelope-from git) Date: Wed, 21 Feb 2024 18:55:50 GMT Message-Id: <202402211855.41LItoqE033432@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 09ac9cf8971a - main - arm64: Add ISS_MSR_REG for ESR_ELx.ISS values List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09ac9cf8971a0709bb8d5a3a703cd3dbff882b6f Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=09ac9cf8971a0709bb8d5a3a703cd3dbff882b6f commit 09ac9cf8971a0709bb8d5a3a703cd3dbff882b6f Author: Andrew Turner AuthorDate: 2024-02-21 18:10:19 +0000 Commit: Andrew Turner CommitDate: 2024-02-21 18:55:32 +0000 arm64: Add ISS_MSR_REG for ESR_ELx.ISS values Add a macro to get the ESR_ELx ISS value when we trap accessing a special register. --- sys/arm64/include/armreg.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 46d13d253746..41ab55a49c76 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -365,6 +365,12 @@ #define ISS_MSR_REG_MASK \ (ISS_MSR_OP0_MASK | ISS_MSR_OP2_MASK | ISS_MSR_OP1_MASK | \ ISS_MSR_CRn_MASK | ISS_MSR_CRm_MASK) +#define ISS_MSR_REG(reg) \ + (((reg ## _op0) << ISS_MSR_OP0_SHIFT) | \ + ((reg ## _op1) << ISS_MSR_OP1_SHIFT) | \ + ((reg ## _CRn) << ISS_MSR_CRn_SHIFT) | \ + ((reg ## _CRm) << ISS_MSR_CRm_SHIFT) | \ + ((reg ## _op2) << ISS_MSR_OP2_SHIFT)) #define ISS_DATA_ISV_SHIFT 24 #define ISS_DATA_ISV (0x01 << ISS_DATA_ISV_SHIFT) From nobody Wed Feb 21 18:55:51 2024 X-Original-To: dev-commits-src-main@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 4Tg58743FGz5B8KG; Wed, 21 Feb 2024 18:55:51 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tg5872jcwz3xfm; Wed, 21 Feb 2024 18:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708541751; 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=5AP3sQLPYBr9WNzcqaL3MSrswUmsAfiUDxhLNaYJC84=; b=q2TakAQyT3IsVy97gV2hNVYs6k+EoE1NF8BcpZHDJ/C2cs7TSglO6y/AS43RitAhgYS/oa AirSsBkih1eDaZY6OTxvxQMMj4xkW1cIOkmF3p78wsAxmE1xfiU2K1VuRLXAOnMlLXUsM1 p2xxCwkK9R8+HUdnZcqOdMVQknV1U/QtPp9CgNO5nER0JOsBbh11hBPSdwUCL1V2JqVYN2 CUa6zl9h9vgXRLTabgH/t3TGZe5YpsEzWeOmTkgxipcQHzB0anhcTCFa1r9Qysqs+78lZ/ S8kqLT+DCEeOWlW4lM9sslWwjMvoDgT3GjGwLYUEC1bIQs1pP6sZR0Utc2+78g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708541751; 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=5AP3sQLPYBr9WNzcqaL3MSrswUmsAfiUDxhLNaYJC84=; b=A27h50PGdI6GnpN2VeZIAAN3Oq9w/Qea9ZNezLAhcRPn1FW6Wy/7iiwVNF3kQbYi8UwD+h gl6P3/jg1Z2kXVrbDVf5T2ZVc7pvmJ7eTzWQa7+PG3VxlVNi8eP0PZfFsB8EGep7DVH+LP tdD87DGTDvgFYI9s9dlVJaozufllr0oFmrzCyiOe//Jb1DX6gkwwUkbDu6X2v9wP7QiAnI DRsMYLfljCq+PVFE0JN8iQKkbcRmnJGAkpVxdQdBkYOZIY5WeKmc8iXzRNfCNUKariWIoT QHB8rM//hW7BcYbDzU5uc8VUCuEZ5VWb2fdshqpUpaWRHCFlcxgKlgI5QvYQEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708541751; a=rsa-sha256; cv=none; b=jNgKj7ZUzwchxbJ2pjKb0IoF63ofi2tV/Lz/tM8GGbXVfXn2F6DeWVZ7ksd3SV1w0SxlVm 9hhzbemOeII0C6GYHSozMQ81GYGkFVrAmonsFjRXWOUi0zNkCXp7GtY21ktV2xEDhiCaSE cY+zmfw+1E8vvAHTNqVbK2RV4rYYs1HU73plwevRJexH2OVAqFtCuqklBuD1Kjyn5DU5Sq do/ebeFpk9YgLMlk2TwEB2OqQ6lnWqZ/bxT1Q8jCEay+53R3xvTFI1dqlcrnzDCfpgLid+ 4u8ZVOwJx7mp1m6v1sAoK0iOlQCyAzPi85WhWCnL/+syztppKb938qvqgWSHgQ== 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 4Tg5871ldcz1Dw6; Wed, 21 Feb 2024 18:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LItpRG033477; Wed, 21 Feb 2024 18:55:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LItpuu033474; Wed, 21 Feb 2024 18:55:51 GMT (envelope-from git) Date: Wed, 21 Feb 2024 18:55:51 GMT Message-Id: <202402211855.41LItpuu033474@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 9c52f98c9f1a - main - arm64: Add the TCR_EL2.PS mask List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c52f98c9f1abfe6577335522b6007659f759adc Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=9c52f98c9f1abfe6577335522b6007659f759adc commit 9c52f98c9f1abfe6577335522b6007659f759adc Author: Andrew Turner AuthorDate: 2024-02-21 18:16:43 +0000 Commit: Andrew Turner CommitDate: 2024-02-21 18:55:32 +0000 arm64: Add the TCR_EL2.PS mask --- sys/arm64/include/hypervisor.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/arm64/include/hypervisor.h b/sys/arm64/include/hypervisor.h index 589d6e9cbdbe..18f173c77720 100644 --- a/sys/arm64/include/hypervisor.h +++ b/sys/arm64/include/hypervisor.h @@ -169,6 +169,7 @@ #define TCR_EL2_TG0_64K (0x1UL << TCR_EL2_TG0_SHIFT) #define TCR_EL2_TG0_16K (0x2UL << TCR_EL2_TG0_SHIFT) #define TCR_EL2_PS_SHIFT 16 +#define TCR_EL2_PS_MASK (0xfUL << TCR_EL2_PS_SHIFT) #define TCR_EL2_PS_32BITS (0UL << TCR_EL2_PS_SHIFT) #define TCR_EL2_PS_36BITS (1UL << TCR_EL2_PS_SHIFT) #define TCR_EL2_PS_40BITS (2UL << TCR_EL2_PS_SHIFT) From nobody Wed Feb 21 18:55:52 2024 X-Original-To: dev-commits-src-main@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 4Tg5884fGVz5B8KM; Wed, 21 Feb 2024 18:55: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tg5883HRWz3xnP; Wed, 21 Feb 2024 18:55:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708541752; 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=nLhLXfW3liWWFTD8jdPRWb5Jcqw3+FAn4NoRi/CxWro=; b=NEQseQlqcSS8BLGyUJB9eOpkJBvgJ6AfIFOjYDqxRnX8QoXT7Rrd/hDByacGhRI9PrgI5R M2Y9WZ8ECzdfpFyI4jxOQBnLvU8CUGKsfeQqmb1IfQM2EI3WAWd0YC8bL/BShUfcDZRgLe r5Pqm6G+6x+V8z8C4Ic1rxHY5BW90Cx42IsHWNHFllPn3DTXwaNVMTwVpApto1JFAyjl/V wkkA6fm+8E9F2VeswJVL4hgmpbrEwhW/8JH7Airxi2quClYzF5K4ysWYG7ehgXg2Xc1hvU BOqpMvv6Ib5MmEEhfwcDVFib3z8x6voQ0uuIL/X28+TiwJrbD63WV9IDGsSNcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708541752; 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=nLhLXfW3liWWFTD8jdPRWb5Jcqw3+FAn4NoRi/CxWro=; b=hTgAHXQLYs+nJ5aY/65Pz9pN2iEnJh7ZwT635cqTfe32VUIujXX4wnIW7Qu+9BKDfCFhX9 F3o9LzDNV5s4A3K6WGDhMb5q3ad/lrV/1/x4pqWI6RvfOzvrTaCF5P20IRKLEMD/7TcUkN guCObzIPmSSx5t7wzBpEvut7qnNTCa3A0E7K6LJx9EX4nvo9bFEiaDjNr3chRNeyhI2byw 4QK/Nwgc1ANoshNJzUbReCSScKUqtMy7BQjkAdRYG62LPB0kc9Q95U5dpLrswlJU/aSqBJ 7lvgxCYbT+bnIUMcw6il93dL/IGfYwFwH5VGbVE8UVt345u/HDclf3iwfeCKRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708541752; a=rsa-sha256; cv=none; b=TEo3r8apQE6mf95T+OVkREN6fH3wtNGQjHOfbD8FcW2k5KcnZcLVu6rJG4bB7W5swXrEY8 uFytDNHho0EZGJvugnv+yXTsOCxeirgmrNk429tN/f+wpWtGxRsc/lKFGupuYeCa9RUTSE cN52pTOugUXMv+fQiMQmyyIUDFEQwMKBf47/0b/OQQlqycJ86jDQw5z2/7XHLf7rtAgxXH Ecugh5FuZFZHPSV+mkwD4CpDAAMAOq0Vjs3y/Q31mBx8pIbyh6EMqFpG8SsIB+8bExIOpC 3Iomol2hFFUOMqs6oEI3J+d7PhIO8rTgMTzK9E9NYW0N0qH8qlj4DL5xkGFn+Q== 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 4Tg5882PJpz1Dyw; Wed, 21 Feb 2024 18:55:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LItqq7033534; Wed, 21 Feb 2024 18:55:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LItq0g033531; Wed, 21 Feb 2024 18:55:52 GMT (envelope-from git) Date: Wed, 21 Feb 2024 18:55:52 GMT Message-Id: <202402211855.41LItq0g033531@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: b3bbec37ba03 - main - arm64: Add a macro to find a VM fault address List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b3bbec37ba039a46f7166f6fa3571f38da4253e9 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=b3bbec37ba039a46f7166f6fa3571f38da4253e9 commit b3bbec37ba039a46f7166f6fa3571f38da4253e9 Author: Andrew Turner AuthorDate: 2024-02-21 18:17:47 +0000 Commit: Andrew Turner CommitDate: 2024-02-21 18:55:32 +0000 arm64: Add a macro to find a VM fault address Add a macro to find which bits from far_el2 are needed to be copied to get the full intermediate physical address (IPA). The hpfar_el2 register only contains a 4k aligned fault address. We need to include the lower bits from far_el2 if we need the full faulting IPA. --- sys/arm64/include/hypervisor.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/arm64/include/hypervisor.h b/sys/arm64/include/hypervisor.h index 18f173c77720..85ac5cda7037 100644 --- a/sys/arm64/include/hypervisor.h +++ b/sys/arm64/include/hypervisor.h @@ -126,6 +126,8 @@ /* HPFAR_EL2_FIPA holds the 4k page address */ #define HPFAR_EL2_FIPA_ADDR(x) \ (HPFAR_EL2_FIPA_GET(x) << 12) +/* The bits from FAR_EL2 we need to add to HPFAR_EL2_FIPA_ADDR */ +#define FAR_EL2_HPFAR_PAGE_MASK (0xffful) /* ICC_SRE_EL2 */ #define ICC_SRE_EL2_SRE (1UL << 0) From nobody Wed Feb 21 18:55:53 2024 X-Original-To: dev-commits-src-main@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 4Tg5895ZVnz5B85N; Wed, 21 Feb 2024 18:55: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tg5893xMtz3xjf; Wed, 21 Feb 2024 18:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708541753; 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=yqMoX48H2og7iN+0Y/KOmJkpfULM4OJxDWC70DOYUtQ=; b=bX2WBQ1grGW3G4tJ6otCXv/huvt28Mj1V3eqNnNyXa6RmL2HNs/65LOQNl4M5345ZCAN9N 3lV/unWjwl9gknBDVlDHWHY0kdxp+9tFSuDZaOdHl9hnXQiFrLAB89QIm0Fly1omF+AmNN tHI17ECvdSF1fyXzOQQwur/1nB6bfaRI/CJYfzFg1SnLqtLJTjXmUOTxdzcFiWcCg7djXT ntDs++d4H4EtKFwFn9/UcUTPEcWdLfIc072vVXMef32FPfFOnJartkXJ7m6W760zXkkXv/ iBAM/gw3fQRpRbaPprS1MNuy2ntM27/jTLP0I4P24eFgBAI50IStx204rD9MUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708541753; 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=yqMoX48H2og7iN+0Y/KOmJkpfULM4OJxDWC70DOYUtQ=; b=QFBmQfK2GtVZoFByh2y3VVAe2m35SSCOi6n8VsnGBwN7WYchUu/jpv/gwJnPhqbDl5BKV3 krZ7LMswKwCm3oB1lC9tAQCtoiR1SRNRD6LpmA3+PZbfTDuKjMiUhsx2g6wUS04VgrTXH2 +H+ZsjJ8KWRts3EAUWw4mH4f12ZA5dyQ4h3aS1G3hcHkX4xUu2skdwuP3IsMIFGyhL4Eoh bsxqNN1tOG9OtDL8ORjWE6xV1ukFvC5k4Iioje5Y4WVCi7K4BYuVpmcWN59JCPz3Frm6YB s/roU3MgcOMSnvPti1ekcTdXfc2iSNz2LkKOLPOFG9B4/YkIw9wSKd6ZLhvlng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708541753; a=rsa-sha256; cv=none; b=Bs6h4G7s6oyDJzJW4D85ulz9t/PLQgV4CJkqJ8Aetm0qCYDRHv0rSivBuAU/yNNTwNEWg7 LxdE5ddYDPXK4JcLGuLITMwW4QaTUeDBXoDxBbYfc692goDP/mmp/REhMMBQOAcK1JIQwG HKBlwdvbTPjdwXKT3r6nLCh03UuU/CDJVfAxRcg9UZCnlLc1nJ6AtbwQqWUyFrOLggzxLf llhf8juOj4l3h/KSW8vaUrX3eevg5sd2HsAmpUeBhDS0T7bCOKoTK3mXTpeBo7TNtwBZiJ M8vdNV0oqak7xJ/zygW0fp2EmPvAN0hZtdui13pGxqGLd5hXkWTojCjLWVUsfg== 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 4Tg5892zK9z1Dkg; Wed, 21 Feb 2024 18:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LItrB7033591; Wed, 21 Feb 2024 18:55:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LItrK1033588; Wed, 21 Feb 2024 18:55:53 GMT (envelope-from git) Date: Wed, 21 Feb 2024 18:55:53 GMT Message-Id: <202402211855.41LItrK1033588@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 0f4071978e3d - main - arm64: Add TF_LR, it will be used by bhyve asm List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f4071978e3dae6637d4988212661164115f6be8 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=0f4071978e3dae6637d4988212661164115f6be8 commit 0f4071978e3dae6637d4988212661164115f6be8 Author: Andrew Turner AuthorDate: 2024-02-21 18:24:04 +0000 Commit: Andrew Turner CommitDate: 2024-02-21 18:55:32 +0000 arm64: Add TF_LR, it will be used by bhyve asm --- sys/arm64/arm64/genassym.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/arm64/arm64/genassym.c b/sys/arm64/arm64/genassym.c index 2907dd2081a7..c4f52ae61a77 100644 --- a/sys/arm64/arm64/genassym.c +++ b/sys/arm64/arm64/genassym.c @@ -71,6 +71,7 @@ ASSYM(TD_MD_CANARY, offsetof(struct thread, td_md.md_canary)); ASSYM(TF_SIZE, sizeof(struct trapframe)); ASSYM(TF_SP, offsetof(struct trapframe, tf_sp)); +ASSYM(TF_LR, offsetof(struct trapframe, tf_lr)); ASSYM(TF_ELR, offsetof(struct trapframe, tf_elr)); ASSYM(TF_SPSR, offsetof(struct trapframe, tf_spsr)); ASSYM(TF_ESR, offsetof(struct trapframe, tf_esr)); From nobody Wed Feb 21 18:55:54 2024 X-Original-To: dev-commits-src-main@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 4Tg58B6hSkz5B8GY; Wed, 21 Feb 2024 18:55:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tg58B5VnWz3xgM; Wed, 21 Feb 2024 18:55:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708541754; 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=qfmS8gzRtzID0WHWufW3G/UJiYrHZg11OEj/y286Qjk=; b=Y0ubnYYEFoBcjxb92iHFIZ568BimmGy4EfarOZ42DXmaaiR3CT6P5aJ/RYfQ/QN2pMvfid Kjv5feSIyFFY3lQEQiYD4hTImJQUFBeS0XAdk+5ajm75IJy1iZt0BMSGe21mTuhEFrtWjp E6FI+gwbrUJTW7Lkc9jbxqYRGdBfecVDA54WNUBTAtrfQphan2b9QuGFyYR1qdnT4oc1cp hEqJY9vhR6F+P5mSie/WNmMTV4KcD6Pwouh6VsF6pxZ6qdcFVuRSVhS1FLF8d0yLjYpkaz TqVFz3H2F8ax0L9kw4xmASXatvI2tJ3KSj1ycT3C91qBuPDNNKPdeg1cPXo2Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708541754; 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=qfmS8gzRtzID0WHWufW3G/UJiYrHZg11OEj/y286Qjk=; b=FYXuGPlLgOCKgXw7rSG6yH8H+fBwf+wvTAxEkKdBVSr37nP0lyOolZlLvU7H5w4U2Z3ure Q4bVjTRS39va1ikHxBwT/8HgURWLCHIR/2Vla6TwBvlQvBtLpdo/rl3xwAeSC83UD2BVmY YCchhMypyP2etu2yWMbtUe6hOrGX5qWN1LePESZnsDirHd2+YHbl47BmgLYW+tJl1sqHKI 41NTscTBkhcaqWMAMnqTz4Jrs0luQfqP8p8cbumwGZ2HkaufhzKc+pGYcgth0Emh969CjT kWAZZFcam2I/ENGeA9vI4gMKo1+M8u2Vvgxc35lFx4aN6ugxV3Fd1SeEwZLFvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708541754; a=rsa-sha256; cv=none; b=IVLzFYaXtpv1KtbscpOoln+GbWIkaV/bN8VqHFa98gR3E3N6cgayemVkZQOwFfBaUGvLIA aHv6xibjmJXthXgIimXyEvK7DhAuOKtUJMa1BOB30DC9gXnwflM3imAeWilI/CF+6do5cP UDxhoblLdEcUm9yWEpdvZkO6K6CwQxcl5scf6RH8cdxZIKm6R9R1e01e/3IXqVjA4IGMJq EHUJdewnWa3JOYWnr9mYVceVV/7CVOxmzoNMYHyGOzZGGZYoIppL7BHKElkySh5U0ZpPXv 56gBL1OvX6RRGcVzpaJ9iM3iSoyc87b25sCTWGb4OgMguKYRsztxrL79EXV9NA== 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 4Tg58B4bp0z1Dw7; Wed, 21 Feb 2024 18:55:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LItsiE033637; Wed, 21 Feb 2024 18:55:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LItsm2033633; Wed, 21 Feb 2024 18:55:54 GMT (envelope-from git) Date: Wed, 21 Feb 2024 18:55:54 GMT Message-Id: <202402211855.41LItsm2033633@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 47e073941f4e - main - Import the kernel parts of bhyve/arm64 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47e073941f4e7ca6e9bde3fa65abbfcfed6bfa2b Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=47e073941f4e7ca6e9bde3fa65abbfcfed6bfa2b commit 47e073941f4e7ca6e9bde3fa65abbfcfed6bfa2b Author: Andrew Turner AuthorDate: 2024-01-09 15:22:27 +0000 Commit: Andrew Turner CommitDate: 2024-02-21 18:55:32 +0000 Import the kernel parts of bhyve/arm64 To support virtual machines on arm64 add the vmm code. This is based on earlier work by Mihai Carabas and Alexandru Elisei at University Politehnica of Bucharest, with further work by myself and Mark Johnston. All AArch64 CPUs should work, however only the GICv3 interrupt controller is supported. There is initial support to allow the GICv2 to be supported in the future. Only pure Armv8.0 virtualisation is supported, the Virtualization Host Extensions are not currently used. With a separate userspace patch and U-Boot port FreeBSD guests are able to boot to multiuser mode, and the hypervisor can be tested with the kvm unit tests. Linux partially boots, but hangs before entering userspace. Other operating systems are untested. Sponsored by: Arm Ltd Sponsored by: Innovate UK Sponsored by: The FreeBSD Foundation Sponsored by: University Politehnica of Bucharest Differential Revision: https://reviews.freebsd.org/D37428 --- sys/arm64/include/vmm.h | 362 +++++ sys/arm64/include/vmm_dev.h | 272 ++++ sys/arm64/include/vmm_instruction_emul.h | 83 ++ sys/arm64/include/vmm_snapshot.h | 1 + sys/arm64/vmm/arm64.h | 165 +++ sys/arm64/vmm/hyp.h | 114 ++ sys/arm64/vmm/io/vgic.c | 122 ++ sys/arm64/vmm/io/vgic.h | 52 + sys/arm64/vmm/io/vgic_if.m | 104 ++ sys/arm64/vmm/io/vgic_v3.c | 2348 ++++++++++++++++++++++++++++++ sys/arm64/vmm/io/vgic_v3.h | 57 + sys/arm64/vmm/io/vgic_v3_reg.h | 129 ++ sys/arm64/vmm/io/vtimer.c | 503 +++++++ sys/arm64/vmm/io/vtimer.h | 85 ++ sys/arm64/vmm/mmu.h | 52 + sys/arm64/vmm/reset.h | 33 + sys/arm64/vmm/vmm.c | 1803 +++++++++++++++++++++++ sys/arm64/vmm/vmm_arm64.c | 1337 +++++++++++++++++ sys/arm64/vmm/vmm_call.S | 39 + sys/arm64/vmm/vmm_dev.c | 1054 ++++++++++++++ sys/arm64/vmm/vmm_hyp.c | 735 ++++++++++ sys/arm64/vmm/vmm_hyp_el2.S | 39 + sys/arm64/vmm/vmm_hyp_exception.S | 384 +++++ sys/arm64/vmm/vmm_instruction_emul.c | 102 ++ sys/arm64/vmm/vmm_ktr.h | 69 + sys/arm64/vmm/vmm_mmu.c | 430 ++++++ sys/arm64/vmm/vmm_reset.c | 177 +++ sys/arm64/vmm/vmm_stat.c | 165 +++ sys/arm64/vmm/vmm_stat.h | 145 ++ sys/conf/files.arm64 | 33 + sys/conf/ldscript.arm64 | 2 + sys/conf/options.arm64 | 3 + sys/modules/Makefile | 2 + sys/modules/vmm/Makefile | 78 +- 34 files changed, 11066 insertions(+), 13 deletions(-) diff --git a/sys/arm64/include/vmm.h b/sys/arm64/include/vmm.h new file mode 100644 index 000000000000..8e2c9c868635 --- /dev/null +++ b/sys/arm64/include/vmm.h @@ -0,0 +1,362 @@ +/* + * Copyright (C) 2015 Mihai Carabas + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _VMM_H_ +#define _VMM_H_ + +#include +#include +#include +#include + +#include "pte.h" +#include "pmap.h" + +struct vcpu; + +enum vm_suspend_how { + VM_SUSPEND_NONE, + VM_SUSPEND_RESET, + VM_SUSPEND_POWEROFF, + VM_SUSPEND_HALT, + VM_SUSPEND_LAST +}; + +/* + * Identifiers for architecturally defined registers. + */ +enum vm_reg_name { + VM_REG_GUEST_X0 = 0, + VM_REG_GUEST_X1, + VM_REG_GUEST_X2, + VM_REG_GUEST_X3, + VM_REG_GUEST_X4, + VM_REG_GUEST_X5, + VM_REG_GUEST_X6, + VM_REG_GUEST_X7, + VM_REG_GUEST_X8, + VM_REG_GUEST_X9, + VM_REG_GUEST_X10, + VM_REG_GUEST_X11, + VM_REG_GUEST_X12, + VM_REG_GUEST_X13, + VM_REG_GUEST_X14, + VM_REG_GUEST_X15, + VM_REG_GUEST_X16, + VM_REG_GUEST_X17, + VM_REG_GUEST_X18, + VM_REG_GUEST_X19, + VM_REG_GUEST_X20, + VM_REG_GUEST_X21, + VM_REG_GUEST_X22, + VM_REG_GUEST_X23, + VM_REG_GUEST_X24, + VM_REG_GUEST_X25, + VM_REG_GUEST_X26, + VM_REG_GUEST_X27, + VM_REG_GUEST_X28, + VM_REG_GUEST_X29, + VM_REG_GUEST_LR, + VM_REG_GUEST_SP, + VM_REG_GUEST_PC, + VM_REG_GUEST_CPSR, + + VM_REG_GUEST_SCTLR_EL1, + VM_REG_GUEST_TTBR0_EL1, + VM_REG_GUEST_TTBR1_EL1, + VM_REG_GUEST_TCR_EL1, + VM_REG_GUEST_TCR2_EL1, + VM_REG_LAST +}; + +#define VM_INTINFO_VECTOR(info) ((info) & 0xff) +#define VM_INTINFO_DEL_ERRCODE 0x800 +#define VM_INTINFO_RSVD 0x7ffff000 +#define VM_INTINFO_VALID 0x80000000 +#define VM_INTINFO_TYPE 0x700 +#define VM_INTINFO_HWINTR (0 << 8) +#define VM_INTINFO_NMI (2 << 8) +#define VM_INTINFO_HWEXCEPTION (3 << 8) +#define VM_INTINFO_SWINTR (4 << 8) + +#define VM_MAX_SUFFIXLEN 15 + +#define VM_GUEST_BASE_IPA 0x80000000UL /* Guest kernel start ipa */ + +#ifdef _KERNEL + +#define VM_MAX_NAMELEN 32 + +struct vm; +struct vm_exception; +struct vm_exit; +struct vm_run; +struct vm_object; +struct vm_guest_paging; +struct vm_vgic_descr; +struct pmap; + +struct vm_eventinfo { + void *rptr; /* rendezvous cookie */ + int *sptr; /* suspend cookie */ + int *iptr; /* reqidle cookie */ +}; + +int vm_create(const char *name, struct vm **retvm); +struct vcpu *vm_alloc_vcpu(struct vm *vm, int vcpuid); +void vm_slock_vcpus(struct vm *vm); +void vm_unlock_vcpus(struct vm *vm); +void vm_destroy(struct vm *vm); +int vm_reinit(struct vm *vm); +const char *vm_name(struct vm *vm); + +/* + * APIs that modify the guest memory map require all vcpus to be frozen. + */ +void vm_slock_memsegs(struct vm *vm); +void vm_xlock_memsegs(struct vm *vm); +void vm_unlock_memsegs(struct vm *vm); +int vm_mmap_memseg(struct vm *vm, vm_paddr_t gpa, int segid, vm_ooffset_t off, + size_t len, int prot, int flags); +int vm_munmap_memseg(struct vm *vm, vm_paddr_t gpa, size_t len); +int vm_alloc_memseg(struct vm *vm, int ident, size_t len, bool sysmem); +void vm_free_memseg(struct vm *vm, int ident); + +/* + * APIs that inspect the guest memory map require only a *single* vcpu to + * be frozen. This acts like a read lock on the guest memory map since any + * modification requires *all* vcpus to be frozen. + */ +int vm_mmap_getnext(struct vm *vm, vm_paddr_t *gpa, int *segid, + vm_ooffset_t *segoff, size_t *len, int *prot, int *flags); +int vm_get_memseg(struct vm *vm, int ident, size_t *len, bool *sysmem, + struct vm_object **objptr); +vm_paddr_t vmm_sysmem_maxaddr(struct vm *vm); +void *vm_gpa_hold(struct vcpu *vcpu, vm_paddr_t gpa, size_t len, + int prot, void **cookie); +void *vm_gpa_hold_global(struct vm *vm, vm_paddr_t gpa, size_t len, + int prot, void **cookie); +void vm_gpa_release(void *cookie); +bool vm_mem_allocated(struct vcpu *vcpu, vm_paddr_t gpa); + +int vm_gla2gpa_nofault(struct vcpu *vcpu, struct vm_guest_paging *paging, + uint64_t gla, int prot, uint64_t *gpa, int *is_fault); + +uint16_t vm_get_maxcpus(struct vm *vm); +void vm_get_topology(struct vm *vm, uint16_t *sockets, uint16_t *cores, + uint16_t *threads, uint16_t *maxcpus); +int vm_set_topology(struct vm *vm, uint16_t sockets, uint16_t cores, + uint16_t threads, uint16_t maxcpus); +int vm_get_register(struct vcpu *vcpu, int reg, uint64_t *retval); +int vm_set_register(struct vcpu *vcpu, int reg, uint64_t val); +int vm_run(struct vcpu *vcpu); +int vm_suspend(struct vm *vm, enum vm_suspend_how how); +void* vm_get_cookie(struct vm *vm); +int vcpu_vcpuid(struct vcpu *vcpu); +void *vcpu_get_cookie(struct vcpu *vcpu); +struct vm *vcpu_vm(struct vcpu *vcpu); +struct vcpu *vm_vcpu(struct vm *vm, int cpu); +int vm_get_capability(struct vcpu *vcpu, int type, int *val); +int vm_set_capability(struct vcpu *vcpu, int type, int val); +int vm_activate_cpu(struct vcpu *vcpu); +int vm_suspend_cpu(struct vm *vm, struct vcpu *vcpu); +int vm_resume_cpu(struct vm *vm, struct vcpu *vcpu); +int vm_inject_exception(struct vcpu *vcpu, uint64_t esr, uint64_t far); +int vm_attach_vgic(struct vm *vm, struct vm_vgic_descr *descr); +int vm_assert_irq(struct vm *vm, uint32_t irq); +int vm_deassert_irq(struct vm *vm, uint32_t irq); +int vm_raise_msi(struct vm *vm, uint64_t msg, uint64_t addr, int bus, int slot, + int func); +struct vm_exit *vm_exitinfo(struct vcpu *vcpu); +void vm_exit_suspended(struct vcpu *vcpu, uint64_t pc); +void vm_exit_debug(struct vcpu *vcpu, uint64_t pc); +void vm_exit_rendezvous(struct vcpu *vcpu, uint64_t pc); +void vm_exit_astpending(struct vcpu *vcpu, uint64_t pc); + +cpuset_t vm_active_cpus(struct vm *vm); +cpuset_t vm_debug_cpus(struct vm *vm); +cpuset_t vm_suspended_cpus(struct vm *vm); + +static __inline bool +virt_enabled(void) +{ + + return (has_hyp()); +} + +static __inline int +vcpu_rendezvous_pending(struct vm_eventinfo *info) +{ + + return (*((uintptr_t *)(info->rptr)) != 0); +} + +static __inline int +vcpu_suspended(struct vm_eventinfo *info) +{ + + return (*info->sptr); +} + +int vcpu_debugged(struct vcpu *vcpu); + +enum vcpu_state { + VCPU_IDLE, + VCPU_FROZEN, + VCPU_RUNNING, + VCPU_SLEEPING, +}; + +int vcpu_set_state(struct vcpu *vcpu, enum vcpu_state state, bool from_idle); +enum vcpu_state vcpu_get_state(struct vcpu *vcpu, int *hostcpu); + +static int __inline +vcpu_is_running(struct vcpu *vcpu, int *hostcpu) +{ + return (vcpu_get_state(vcpu, hostcpu) == VCPU_RUNNING); +} + +#ifdef _SYS_PROC_H_ +static int __inline +vcpu_should_yield(struct vcpu *vcpu) +{ + struct thread *td; + + td = curthread; + return (td->td_ast != 0 || td->td_owepreempt != 0); +} +#endif + +void *vcpu_stats(struct vcpu *vcpu); +void vcpu_notify_event(struct vcpu *vcpu); + +enum vm_reg_name vm_segment_name(int seg_encoding); + +struct vm_copyinfo { + uint64_t gpa; + size_t len; + void *hva; + void *cookie; +}; + +#endif /* _KERNEL */ + +#define VM_DIR_READ 0 +#define VM_DIR_WRITE 1 + +#define VM_GP_M_MASK 0x1f +#define VM_GP_MMU_ENABLED (1 << 5) + +struct vm_guest_paging { + uint64_t ttbr0_addr; + uint64_t ttbr1_addr; + uint64_t tcr_el1; + uint64_t tcr2_el1; + int flags; + int padding; +}; + +struct vie { + uint8_t access_size:4, sign_extend:1, dir:1, unused:2; + enum vm_reg_name reg; +}; + +struct vre { + uint32_t inst_syndrome; + uint8_t dir:1, unused:7; + enum vm_reg_name reg; +}; + +/* + * Identifiers for optional vmm capabilities + */ +enum vm_cap_type { + VM_CAP_HALT_EXIT, + VM_CAP_MTRAP_EXIT, + VM_CAP_PAUSE_EXIT, + VM_CAP_UNRESTRICTED_GUEST, + VM_CAP_MAX +}; + +enum vm_exitcode { + VM_EXITCODE_BOGUS, + VM_EXITCODE_INST_EMUL, + VM_EXITCODE_REG_EMUL, + VM_EXITCODE_HVC, + VM_EXITCODE_SUSPENDED, + VM_EXITCODE_HYP, + VM_EXITCODE_WFI, + VM_EXITCODE_PAGING, + VM_EXITCODE_SMCCC, + VM_EXITCODE_DEBUG, + VM_EXITCODE_MAX +}; + +struct vm_exit { + enum vm_exitcode exitcode; + int inst_length; + uint64_t pc; + union { + /* + * ARM specific payload. + */ + struct { + uint32_t exception_nr; + uint32_t pad; + uint64_t esr_el2; /* Exception Syndrome Register */ + uint64_t far_el2; /* Fault Address Register */ + uint64_t hpfar_el2; /* Hypervisor IPA Fault Address Register */ + } hyp; + struct { + struct vre vre; + } reg_emul; + struct { + uint64_t gpa; + uint64_t esr; + } paging; + struct { + uint64_t gpa; + struct vm_guest_paging paging; + struct vie vie; + } inst_emul; + + /* + * A SMCCC call, e.g. starting a core via PSCI. + * Further arguments can be read by asking the kernel for + * all register values. + */ + struct { + uint64_t func_id; + uint64_t args[7]; + } smccc_call; + + struct { + enum vm_suspend_how how; + } suspended; + } u; +}; + +#endif /* _VMM_H_ */ diff --git a/sys/arm64/include/vmm_dev.h b/sys/arm64/include/vmm_dev.h new file mode 100644 index 000000000000..9e229665a71e --- /dev/null +++ b/sys/arm64/include/vmm_dev.h @@ -0,0 +1,272 @@ +/* + * Copyright (C) 2015 Mihai Carabas + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _VMM_DEV_H_ +#define _VMM_DEV_H_ + +#ifdef _KERNEL +void vmmdev_init(void); +int vmmdev_cleanup(void); +#endif + +struct vm_memmap { + vm_paddr_t gpa; + int segid; /* memory segment */ + vm_ooffset_t segoff; /* offset into memory segment */ + size_t len; /* mmap length */ + int prot; /* RWX */ + int flags; +}; +#define VM_MEMMAP_F_WIRED 0x01 + +struct vm_munmap { + vm_paddr_t gpa; + size_t len; +}; + +#define VM_MEMSEG_NAME(m) ((m)->name[0] != '\0' ? (m)->name : NULL) +struct vm_memseg { + int segid; + size_t len; + char name[VM_MAX_SUFFIXLEN + 1]; +}; + +struct vm_register { + int cpuid; + int regnum; /* enum vm_reg_name */ + uint64_t regval; +}; + +struct vm_register_set { + int cpuid; + unsigned int count; + const int *regnums; /* enum vm_reg_name */ + uint64_t *regvals; +}; + +struct vm_run { + int cpuid; + cpuset_t *cpuset; /* CPU set storage */ + size_t cpusetsize; + struct vm_exit *vm_exit; +}; + +struct vm_exception { + int cpuid; + uint64_t esr; + uint64_t far; +}; + +struct vm_msi { + uint64_t msg; + uint64_t addr; + int bus; + int slot; + int func; +}; + +struct vm_capability { + int cpuid; + enum vm_cap_type captype; + int capval; + int allcpus; +}; + +#define MAX_VM_STATS 64 +struct vm_stats { + int cpuid; /* in */ + int index; /* in */ + int num_entries; /* out */ + struct timeval tv; + uint64_t statbuf[MAX_VM_STATS]; +}; +struct vm_stat_desc { + int index; /* in */ + char desc[128]; /* out */ +}; + +struct vm_suspend { + enum vm_suspend_how how; +}; + +struct vm_gla2gpa { + int vcpuid; /* inputs */ + int prot; /* PROT_READ or PROT_WRITE */ + uint64_t gla; + struct vm_guest_paging paging; + int fault; /* outputs */ + uint64_t gpa; +}; + +struct vm_activate_cpu { + int vcpuid; +}; + +struct vm_cpuset { + int which; + int cpusetsize; + cpuset_t *cpus; +}; +#define VM_ACTIVE_CPUS 0 +#define VM_SUSPENDED_CPUS 1 +#define VM_DEBUG_CPUS 2 + +struct vm_vgic_version { + u_int version; + u_int flags; +}; + +struct vm_vgic_descr { + struct vm_vgic_version ver; + union { + struct { + uint64_t dist_start; + uint64_t dist_size; + uint64_t redist_start; + uint64_t redist_size; + } v3_regs; + }; +}; + +struct vm_irq { + uint32_t irq; +}; + +struct vm_cpu_topology { + uint16_t sockets; + uint16_t cores; + uint16_t threads; + uint16_t maxcpus; +}; + +enum { + /* general routines */ + IOCNUM_ABIVERS = 0, + IOCNUM_RUN = 1, + IOCNUM_SET_CAPABILITY = 2, + IOCNUM_GET_CAPABILITY = 3, + IOCNUM_SUSPEND = 4, + IOCNUM_REINIT = 5, + + /* memory apis */ + IOCNUM_GET_GPA_PMAP = 12, + IOCNUM_GLA2GPA_NOFAULT = 13, + IOCNUM_ALLOC_MEMSEG = 14, + IOCNUM_GET_MEMSEG = 15, + IOCNUM_MMAP_MEMSEG = 16, + IOCNUM_MMAP_GETNEXT = 17, + IOCNUM_MUNMAP_MEMSEG = 18, + + /* register/state accessors */ + IOCNUM_SET_REGISTER = 20, + IOCNUM_GET_REGISTER = 21, + IOCNUM_SET_REGISTER_SET = 24, + IOCNUM_GET_REGISTER_SET = 25, + + /* statistics */ + IOCNUM_VM_STATS = 50, + IOCNUM_VM_STAT_DESC = 51, + + /* CPU Topology */ + IOCNUM_SET_TOPOLOGY = 63, + IOCNUM_GET_TOPOLOGY = 64, + + /* interrupt injection */ + IOCNUM_ASSERT_IRQ = 80, + IOCNUM_DEASSERT_IRQ = 81, + IOCNUM_RAISE_MSI = 82, + IOCNUM_INJECT_EXCEPTION = 83, + + /* vm_cpuset */ + IOCNUM_ACTIVATE_CPU = 90, + IOCNUM_GET_CPUSET = 91, + IOCNUM_SUSPEND_CPU = 92, + IOCNUM_RESUME_CPU = 93, + + /* vm_attach_vgic */ + IOCNUM_GET_VGIC_VERSION = 110, + IOCNUM_ATTACH_VGIC = 111, +}; + +#define VM_RUN \ + _IOWR('v', IOCNUM_RUN, struct vm_run) +#define VM_SUSPEND \ + _IOW('v', IOCNUM_SUSPEND, struct vm_suspend) +#define VM_REINIT \ + _IO('v', IOCNUM_REINIT) +#define VM_ALLOC_MEMSEG \ + _IOW('v', IOCNUM_ALLOC_MEMSEG, struct vm_memseg) +#define VM_GET_MEMSEG \ + _IOWR('v', IOCNUM_GET_MEMSEG, struct vm_memseg) +#define VM_MMAP_MEMSEG \ + _IOW('v', IOCNUM_MMAP_MEMSEG, struct vm_memmap) +#define VM_MMAP_GETNEXT \ + _IOWR('v', IOCNUM_MMAP_GETNEXT, struct vm_memmap) +#define VM_MUNMAP_MEMSEG \ + _IOW('v', IOCNUM_MUNMAP_MEMSEG, struct vm_munmap) +#define VM_SET_REGISTER \ + _IOW('v', IOCNUM_SET_REGISTER, struct vm_register) +#define VM_GET_REGISTER \ + _IOWR('v', IOCNUM_GET_REGISTER, struct vm_register) +#define VM_SET_REGISTER_SET \ + _IOW('v', IOCNUM_SET_REGISTER_SET, struct vm_register_set) +#define VM_GET_REGISTER_SET \ + _IOWR('v', IOCNUM_GET_REGISTER_SET, struct vm_register_set) +#define VM_SET_CAPABILITY \ + _IOW('v', IOCNUM_SET_CAPABILITY, struct vm_capability) +#define VM_GET_CAPABILITY \ + _IOWR('v', IOCNUM_GET_CAPABILITY, struct vm_capability) +#define VM_STATS \ + _IOWR('v', IOCNUM_VM_STATS, struct vm_stats) +#define VM_STAT_DESC \ + _IOWR('v', IOCNUM_VM_STAT_DESC, struct vm_stat_desc) +#define VM_ASSERT_IRQ \ + _IOW('v', IOCNUM_ASSERT_IRQ, struct vm_irq) +#define VM_DEASSERT_IRQ \ + _IOW('v', IOCNUM_DEASSERT_IRQ, struct vm_irq) +#define VM_RAISE_MSI \ + _IOW('v', IOCNUM_RAISE_MSI, struct vm_msi) +#define VM_INJECT_EXCEPTION \ + _IOW('v', IOCNUM_INJECT_EXCEPTION, struct vm_exception) +#define VM_SET_TOPOLOGY \ + _IOW('v', IOCNUM_SET_TOPOLOGY, struct vm_cpu_topology) +#define VM_GET_TOPOLOGY \ + _IOR('v', IOCNUM_GET_TOPOLOGY, struct vm_cpu_topology) +#define VM_GLA2GPA_NOFAULT \ + _IOWR('v', IOCNUM_GLA2GPA_NOFAULT, struct vm_gla2gpa) +#define VM_ACTIVATE_CPU \ + _IOW('v', IOCNUM_ACTIVATE_CPU, struct vm_activate_cpu) +#define VM_GET_CPUS \ + _IOW('v', IOCNUM_GET_CPUSET, struct vm_cpuset) +#define VM_SUSPEND_CPU \ + _IOW('v', IOCNUM_SUSPEND_CPU, struct vm_activate_cpu) +#define VM_RESUME_CPU \ + _IOW('v', IOCNUM_RESUME_CPU, struct vm_activate_cpu) +#define VM_GET_VGIC_VERSION \ + _IOR('v', IOCNUM_GET_VGIC_VERSION, struct vm_vgic_version) +#define VM_ATTACH_VGIC \ + _IOW('v', IOCNUM_ATTACH_VGIC, struct vm_vgic_descr) +#endif diff --git a/sys/arm64/include/vmm_instruction_emul.h b/sys/arm64/include/vmm_instruction_emul.h new file mode 100644 index 000000000000..a295f7cce127 --- /dev/null +++ b/sys/arm64/include/vmm_instruction_emul.h @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2015 Mihai Carabas + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _VMM_INSTRUCTION_EMUL_H_ +#define _VMM_INSTRUCTION_EMUL_H_ + +/* + * Callback functions to read and write memory regions. + */ +typedef int (*mem_region_read_t)(struct vcpu *vcpu, uint64_t gpa, + uint64_t *rval, int rsize, void *arg); +typedef int (*mem_region_write_t)(struct vcpu *vcpu, uint64_t gpa, + uint64_t wval, int wsize, void *arg); + +/* + * Callback functions to read and write registers. + */ +typedef int (*reg_read_t)(struct vcpu *vcpu, uint64_t *rval, void *arg); +typedef int (*reg_write_t)(struct vcpu *vcpu, uint64_t wval, void *arg); + +/* + * Emulate the decoded 'vie' instruction when it contains a memory operation. + * + * The callbacks 'mrr' and 'mrw' emulate reads and writes to the memory region + * containing 'gpa'. 'mrarg' is an opaque argument that is passed into the + * callback functions. + * + * 'void *vm' should be 'struct vm *' when called from kernel context and + * 'struct vmctx *' when called from user context. + * + */ +int vmm_emulate_instruction(struct vcpu *vcpu, uint64_t gpa, struct vie *vie, + struct vm_guest_paging *paging, mem_region_read_t mrr, + mem_region_write_t mrw, void *mrarg); + +/* + * Emulate the decoded 'vre' instruction when it contains a register access. + * + * The callbacks 'regread' and 'regwrite' emulate reads and writes to the + * register from 'vie'. 'regarg' is an opaque argument that is passed into the + * callback functions. + * + * 'void *vm' should be 'struct vm *' when called from kernel context and + * 'struct vmctx *' when called from user context. + * + */ +int vmm_emulate_register(struct vcpu *vcpu, struct vre *vre, reg_read_t regread, + reg_write_t regwrite, void *regarg); + +#ifdef _KERNEL +void vm_register_reg_handler(struct vm *vm, uint64_t iss, uint64_t mask, + reg_read_t reg_read, reg_write_t reg_write, void *arg); +void vm_deregister_reg_handler(struct vm *vm, uint64_t iss, uint64_t mask); + +void vm_register_inst_handler(struct vm *vm, uint64_t start, uint64_t size, + mem_region_read_t mmio_read, mem_region_write_t mmio_write); +void vm_deregister_inst_handler(struct vm *vm, uint64_t start, uint64_t size); +#endif + +#endif /* _VMM_INSTRUCTION_EMUL_H_ */ diff --git a/sys/arm64/include/vmm_snapshot.h b/sys/arm64/include/vmm_snapshot.h new file mode 100644 index 000000000000..da23dbe43a4f --- /dev/null +++ b/sys/arm64/include/vmm_snapshot.h @@ -0,0 +1 @@ +/* $FreeBSD$ */ diff --git a/sys/arm64/vmm/arm64.h b/sys/arm64/vmm/arm64.h new file mode 100644 index 000000000000..43459d14e143 --- /dev/null +++ b/sys/arm64/vmm/arm64.h @@ -0,0 +1,165 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (C) 2015 Mihai Carabas + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ +#ifndef _VMM_ARM64_H_ +#define _VMM_ARM64_H_ + +#include +#include +#include + +#include "mmu.h" +#include "io/vgic_v3.h" +#include "io/vtimer.h" + +struct vgic_v3; +struct vgic_v3_cpu; + +struct hypctx { + struct trapframe tf; + + /* + * EL1 control registers. + */ + uint64_t elr_el1; /* Exception Link Register */ + uint64_t sp_el0; /* Stack pointer */ + uint64_t tpidr_el0; /* EL0 Software ID Register */ + uint64_t tpidrro_el0; /* Read-only Thread ID Register */ + uint64_t tpidr_el1; /* EL1 Software ID Register */ + uint64_t vbar_el1; /* Vector Base Address Register */ + + uint64_t actlr_el1; /* Auxiliary Control Register */ + uint64_t afsr0_el1; /* Auxiliary Fault Status Register 0 */ + uint64_t afsr1_el1; /* Auxiliary Fault Status Register 1 */ + uint64_t amair_el1; /* Auxiliary Memory Attribute Indirection Register */ + uint64_t contextidr_el1; /* Current Process Identifier */ + uint64_t cpacr_el1; /* Architectural Feature Access Control Register */ + uint64_t csselr_el1; /* Cache Size Selection Register */ + uint64_t esr_el1; /* Exception Syndrome Register */ + uint64_t far_el1; /* Fault Address Register */ + uint64_t mair_el1; /* Memory Attribute Indirection Register */ + uint64_t mdccint_el1; /* Monitor DCC Interrupt Enable Register */ + uint64_t mdscr_el1; /* Monitor Debug System Control Register */ + uint64_t par_el1; /* Physical Address Register */ + uint64_t sctlr_el1; /* System Control Register */ + uint64_t tcr_el1; /* Translation Control Register */ + uint64_t tcr2_el1; /* Translation Control Register 2 */ + uint64_t ttbr0_el1; /* Translation Table Base Register 0 */ + uint64_t ttbr1_el1; /* Translation Table Base Register 1 */ + uint64_t spsr_el1; /* Saved Program Status Register */ + + uint64_t pmcr_el0; /* Performance Monitors Control Register */ + uint64_t pmccntr_el0; + uint64_t pmccfiltr_el0; + uint64_t pmcntenset_el0; + uint64_t pmintenset_el1; + uint64_t pmovsset_el0; + uint64_t pmselr_el0; + uint64_t pmuserenr_el0; + uint64_t pmevcntr_el0[31]; + uint64_t pmevtyper_el0[31]; + + uint64_t dbgbcr_el1[16]; /* Debug Breakpoint Control Registers */ + uint64_t dbgbvr_el1[16]; /* Debug Breakpoint Value Registers */ + uint64_t dbgwcr_el1[16]; /* Debug Watchpoint Control Registers */ + uint64_t dbgwvr_el1[16]; /* Debug Watchpoint Value Registers */ + + /* EL2 control registers */ + uint64_t cptr_el2; /* Architectural Feature Trap Register */ + uint64_t hcr_el2; /* Hypervisor Configuration Register */ + uint64_t mdcr_el2; /* Monitor Debug Configuration Register */ + uint64_t vpidr_el2; /* Virtualization Processor ID Register */ + uint64_t vmpidr_el2; /* Virtualization Multiprocessor ID Register */ + uint64_t el2_addr; /* The address of this in el2 space */ + struct hyp *hyp; + struct vcpu *vcpu; + struct { + uint64_t far_el2; /* Fault Address Register */ + uint64_t hpfar_el2; /* Hypervisor IPA Fault Address Register */ + } exit_info; + + struct vtimer_cpu vtimer_cpu; + + struct vgic_v3_regs vgic_v3_regs; + struct vgic_v3_cpu *vgic_cpu; + bool has_exception; +}; + +struct hyp { + struct vm *vm; + struct vtimer vtimer; + uint64_t vmid_generation; + uint64_t vttbr_el2; + uint64_t el2_addr; /* The address of this in el2 space */ + bool vgic_attached; + struct vgic_v3 *vgic; + struct hypctx *ctx[]; +}; + +#define DEFINE_VMMOPS_IFUNC(ret_type, opname, args) \ + ret_type vmmops_##opname args; + +DEFINE_VMMOPS_IFUNC(int, modinit, (int ipinum)) +DEFINE_VMMOPS_IFUNC(int, modcleanup, (void)) +DEFINE_VMMOPS_IFUNC(void *, init, (struct vm *vm, struct pmap *pmap)) +DEFINE_VMMOPS_IFUNC(int, gla2gpa, (void *vcpui, struct vm_guest_paging *paging, + uint64_t gla, int prot, uint64_t *gpa, int *is_fault)) +DEFINE_VMMOPS_IFUNC(int, run, (void *vcpui, register_t pc, struct pmap *pmap, + struct vm_eventinfo *info)) +DEFINE_VMMOPS_IFUNC(void, cleanup, (void *vmi)) +DEFINE_VMMOPS_IFUNC(void *, vcpu_init, (void *vmi, struct vcpu *vcpu, + int vcpu_id)) +DEFINE_VMMOPS_IFUNC(void, vcpu_cleanup, (void *vcpui)) +DEFINE_VMMOPS_IFUNC(int, exception, (void *vcpui, uint64_t esr, uint64_t far)) +DEFINE_VMMOPS_IFUNC(int, getreg, (void *vcpui, int num, uint64_t *retval)) +DEFINE_VMMOPS_IFUNC(int, setreg, (void *vcpui, int num, uint64_t val)) +DEFINE_VMMOPS_IFUNC(int, getcap, (void *vcpui, int num, int *retval)) +DEFINE_VMMOPS_IFUNC(int, setcap, (void *vcpui, int num, int val)) +DEFINE_VMMOPS_IFUNC(struct vmspace *, vmspace_alloc, (vm_offset_t min, + vm_offset_t max)) +DEFINE_VMMOPS_IFUNC(void, vmspace_free, (struct vmspace *vmspace)) +#ifdef notyet +#ifdef BHYVE_SNAPSHOT +DEFINE_VMMOPS_IFUNC(int, snapshot, (void *vmi, struct vm_snapshot_meta *meta)) +DEFINE_VMMOPS_IFUNC(int, vcpu_snapshot, (void *vcpui, + struct vm_snapshot_meta *meta)) +DEFINE_VMMOPS_IFUNC(int, restore_tsc, (void *vcpui, uint64_t now)) +#endif +#endif + +uint64_t vmm_call_hyp(uint64_t, ...); + +#if 0 +#define eprintf(fmt, ...) printf("%s:%d " fmt, __func__, __LINE__, ##__VA_ARGS__) +#else +#define eprintf(fmt, ...) do {} while(0) +#endif + +struct hypctx *arm64_get_active_vcpu(void); +void raise_data_insn_abort(struct hypctx *, uint64_t, bool, int); + +#endif /* !_VMM_ARM64_H_ */ diff --git a/sys/arm64/vmm/hyp.h b/sys/arm64/vmm/hyp.h new file mode 100644 index 000000000000..0b2977c73960 --- /dev/null +++ b/sys/arm64/vmm/hyp.h *** 10428 LINES SKIPPED *** From nobody Wed Feb 21 20:32:36 2024 X-Original-To: dev-commits-src-main@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 4Tg7Hm5w5yz5BJQh; Wed, 21 Feb 2024 20:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tg7Hm5PXsz4DBX; Wed, 21 Feb 2024 20:32:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708547556; 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=n3PowMyswH05b/P/S4ykNKcBiiiSgv4BCapKZoLQQTY=; b=Tpn2ivYdjfwL3QhnXQ5cSJyWfUSQ+whtYU4UuCDIlx9HsznJTTSNCBkJXslW63aZriNZCn oe6En6FEbqCOucmIEmjf1MRUNrhUMtW7uLel7VriiUKnOL+PJT+LTWq2okw6qicm9fRlGJ KeA4mGi70hSg4xao9mczeXITS8LstgpJfY1A4vtlM0pzLWLP99f1TgxWjOBAqvR0LlJ4op Hk0LOEdixdvpYq+vF81riB+dec2/nRgrnZA+MLwdm8l5lFvnkUa+a5P9csO7Vu1ejMQVeI AUSSDzSRo9t6fvSbde3oWHBX/ShKRU1puYtSvq+eZfRx0suj8/x4Tnw2auzoqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708547556; 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=n3PowMyswH05b/P/S4ykNKcBiiiSgv4BCapKZoLQQTY=; b=anpuNBxme9YGRThnhkMvt7ZjF4zQEH8W1zZmAhzLSo4Si0s3SpC7efR+Tt6P41Oiwc+H0W 1KgLuSHLCD0hCAu0TcXGGTUNty2qLUV20h7FpgpMnuUNjazMtpvK2uC8eacb3NWY8c1tJK iZ6ZknxPWQkn0OSfTY03tIxJInLdtLDtZ0XYu7WhqIJpUimfNsXCkc0T0kqSlpqqVXplyH aZcPih7aqBFg7bS8DxUYQ09TSUq5UpeyiJ2tcmYncTJmvwWAdGNzt6AXoCysmjSre2gph6 fZghdx3aB3L4zKXYllX0dFaaGDwdjZcyXZMFeD9pcGj0yel4IrwUh8e2eAyGdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708547556; a=rsa-sha256; cv=none; b=gX45+7rlg+jYW56LPhE1gpBMZ291an2b8aAC7mhGpXK14yYE6zfclwPryu+mtlScgyauWo joTMu2AD4nxBvGEnEgvOPCVfnoAby0nNntdfQVxW5ZxmP3pDDJQI0PIEcNKKliaP5vMVLC bpYqboZO7Tyslrp4ll2kt15uAs0Sk0jNMI6d2JVdW4VyXuyxzHbudchv+zvLtHoPjqeH6w duNAN5utE8izuP7IHO/i9b3oQ9is+P/FBqJAk/1RylabNbIFgDwfPSlS/ZIivaBiInzfmD eyfNz5wgMXtrTvkDsACVlu+MfXs6HFUW3yQ0TsYn7V/j5oUXGDNCLed5PpESsA== 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 4Tg7Hm4TRzz1Hfq; Wed, 21 Feb 2024 20:32:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LKWaht002249; Wed, 21 Feb 2024 20:32:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LKWaxr002246; Wed, 21 Feb 2024 20:32:36 GMT (envelope-from git) Date: Wed, 21 Feb 2024 20:32:36 GMT Message-Id: <202402212032.41LKWaxr002246@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: c85e6a5c2250 - main - bcm5974(4): Report proper width and depth for Apple Magic Trackpads List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c85e6a5c2250f180620edd147b989a6782acb80e Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=c85e6a5c2250f180620edd147b989a6782acb80e commit c85e6a5c2250f180620edd147b989a6782acb80e Author: Vladimir Kondratyev AuthorDate: 2024-02-21 20:31:38 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-02-21 20:31:38 +0000 bcm5974(4): Report proper width and depth for Apple Magic Trackpads The size of modern Apple Magic Trackpad is about 160x110mm Sponsored by: Serenity Cyber Security MFC after: 1 month --- sys/dev/hid/bcm5974.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/hid/bcm5974.c b/sys/dev/hid/bcm5974.c index 6f15c6030ccc..749f1e7d4b2b 100644 --- a/sys/dev/hid/bcm5974.c +++ b/sys/dev/hid/bcm5974.c @@ -395,8 +395,8 @@ static const struct bcm5974_dev_params bcm5974_dev_params[BCM5974_FLAG_MAX] = { .tp = tp + TYPE_MT2U, .p = { SN_PRESSURE, 0, 256, 256 }, .w = { SN_WIDTH, 0, 2048, 0 }, - .x = { SN_COORD, -3678, 3934, 48 }, - .y = { SN_COORD, -2478, 2587, 44 }, + .x = { SN_COORD, -3678, 3934, 157 }, + .y = { SN_COORD, -2478, 2587, 107 }, .o = { SN_ORIENT, -3, 4, 0 }, }, }; From nobody Wed Feb 21 20:32:37 2024 X-Original-To: dev-commits-src-main@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 4Tg7Hp0Lzyz5BJGG; Wed, 21 Feb 2024 20:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tg7Hn6cpwz4D8S; Wed, 21 Feb 2024 20:32:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708547557; 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=lz3rDz5/2BT9tBNz5fOAdMcn7ff1zGMyCgTe+PUXF1I=; b=Ebf+oFxDvtFtvy0s7n6D25GbtFuY19DutzzPFSFFsXoBBlGFb2D4jrnPbXy+yZPg8gLb+v OnpFGRU+CuHojlSfcjUYdmW83eGYNAcouUWavcejQyD7ET29ghu535oIK/ghcT9uZY+GFz vmhwAg/Nr0LLxSZzZnDQrbxC2eHRmhtf6elC8Y93yLGzopL7brWPRKIg1IqJhbBpFYQdLR Oww+MNGlwue+MiHnzezNyDZuyvSfKRgXRcRsZxDQMhwrqEJWuC0g+fMDYVcZReT6vRzEp+ rYhDy44z4jIs+HTbw2nypMAJjtQZ1EU4ol1ySY8nvZnh224CTlCVfcLJu9ulMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708547557; 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=lz3rDz5/2BT9tBNz5fOAdMcn7ff1zGMyCgTe+PUXF1I=; b=WW1V6nhXBFaBrmVqI6yP9IJ0DEVVRNiJRVkW1LfZXgRfKJPj599P8iMuuV/cHq29wG90T8 KBy2R8nc8d0fmQey9aju9Rh6OGCe+7ELGfgEtX5VwrTwhKWcxQvDDYOvzX8RpxGa//o5VX uzF+grBw1mhA/r+6wLK9UKTfO7xunj4Kf3NG4Q71byW9hLVbpgvIsPdSKU6NgwJykTS3Bq 4VImupw9/DBSbnzxTDV1in9NTvBGjREMfcPL5oQvREuVXjvk6iDebFQNMHTeYbssDXjQHK b4hzVIJhUT3m1RGYO8ZMP40jMggiUtD6V4YK8Er+X6SADEnoKv/b8E/Wvunkdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708547557; a=rsa-sha256; cv=none; b=Scqhmg4dr3Fp6BXA5oD0H/+wBiT9A492fiCXtehyb/HiN2Si6C7H0jErMJwQ25fOD2Bfzm M4c1vZ2Qc2JCsnN0Ry6TAXJ3tgSx3e7UWHdtkoO9E5gVMvwwkf1pWN5EB50Ejio1EQZ9j2 tNIhAx5dyu0pgADi2c0tXT67NNkhw0xlt+69aXzTUW8CKssLn5QPqqi0pOKBUuW+5E/WBQ IFXqv7YO5l6Xr83NlpKFRuoRrHm6VvDxMP4iRAo0BhEX2bbMtATWFSZ4pUMzosMbV8Zf1j fXaSBSrKzg3R9z0nu5eYMWwuoe/62wBjHT58YGW1IoyQrymkhmrmwEsgNsLxIw== 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 4Tg7Hn5gpjz1HPC; Wed, 21 Feb 2024 20:32:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LKWbQJ002304; Wed, 21 Feb 2024 20:32:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LKWb2c002301; Wed, 21 Feb 2024 20:32:37 GMT (envelope-from git) Date: Wed, 21 Feb 2024 20:32:37 GMT Message-Id: <202402212032.41LKWb2c002301@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 4f345989700f - main - bcm5974(4): Respect HID_DEBUG option and fix debugging printf List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f345989700ff962e1f012d732881f1770946c9e Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=4f345989700ff962e1f012d732881f1770946c9e commit 4f345989700ff962e1f012d732881f1770946c9e Author: Vladimir Kondratyev AuthorDate: 2024-02-21 20:31:39 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-02-21 20:31:39 +0000 bcm5974(4): Respect HID_DEBUG option and fix debugging printf Sponsored by: Serenity Cyber Security MFC after: 1 month --- sys/dev/hid/bcm5974.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/dev/hid/bcm5974.c b/sys/dev/hid/bcm5974.c index 749f1e7d4b2b..e76e3dfa805c 100644 --- a/sys/dev/hid/bcm5974.c +++ b/sys/dev/hid/bcm5974.c @@ -27,6 +27,8 @@ * SUCH DAMAGE. */ +#include "opt_hid.h" + #include #include #include @@ -826,7 +828,7 @@ bcm5974_intr(void *context, void *data, hid_size_t len) if ((len < params->tp->offset + fsize) || ((len - params->tp->offset) % fsize) != 0) { DPRINTFN(BCM5974_LLEVEL_INFO, "Invalid length: %d, %x, %x\n", - len, sc->tp_data[0], sc->tp_data[1]); + len, params->tp->offset, fsize); return; } From nobody Wed Feb 21 20:32:38 2024 X-Original-To: dev-commits-src-main@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 4Tg7Hq30S2z5BJNS; Wed, 21 Feb 2024 20:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tg7Hq0sKlz4D8c; Wed, 21 Feb 2024 20:32:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708547559; 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=WX1mhbDQ9llb0yJr8EpWCu+a//pFshMj6plJx7bLeOY=; b=hL088DxTovsNI2Uqckxp2nzbZEDhxorXpOXKuiMZklSxzQHPF3a64/NXcZ+IOHDfIxxgme eNgJZOMwxhwiFV6Sx3CoYGsgVlSpic1va8SfVaF6JBrgakjs5T2lmna1LAEd1K6BDw0+q7 Lo7E49ARqxktMRyrPj1sVOJDDyMuacWrlInS26qOTF5imCQbEFMRVQ+Gvqo25e+gVxdw89 C1nS1X60iUrmDznQna8Nbt7QHS9CLCsr0cA2ZB/UVqId6njfVksqsFn9ZObbqNTfqEyIQR 1SBCt+TTW748uDzZbA9DOM95bf8r5i4R7Q1S3AseJWkcgL9OBuy6n/0vDIO8Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708547559; 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=WX1mhbDQ9llb0yJr8EpWCu+a//pFshMj6plJx7bLeOY=; b=PI2k8+rkn/AZb+ohGAkgPhnUKXGci9E7tF8zzdP8s/ShMpdVB9QGy4Y5hyDIgi1ZcnZNtT x+a98s8hEaNYZC7wiG9tIvCyR6GEjUQuNFv7i3jZVNBmv2waV10AIMmdVT1KOh932NG9ZO TFRuFLrDvzpINBEwfTu2Z6+3Jzm9MEjSVrzTIojP+QWb14SoZI8WYtaRix3jmn1hLN9lRF cxUX2bOb31r+5V+ATasE68WnXBf/y5IyG5TShzGEAPuOgaC+xPCD1z1oVan1FePY8j6h+2 5pidJneW5C/AblRw6wADiVMvecDe4w3sZ1ynPybmVpSE2Hyya7M7gTXhwf0zxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708547559; a=rsa-sha256; cv=none; b=dLqvl2zbWRz4Or1MDWLAxmC/YhJrvYVrdaB/mGjQepgWjXzGsbF0Husv9KNEfJ+xuG3vfh hjjCMaVT+4pIkKYmeqsWyCv2PbPalhUSFg9u09pKdrOLwni/Ct4+7CQ+Ad0el/tKKoFbHQ TCMaI5wQq/U+SY8Ny6SXT0CvpxFA730q0KxhzQ8ONnH42GYLE0SqJM6F9N6DEI0Ldh11q4 jXZBx07YP9ok0PIkzpkT4SJfJS5XvjONpBavyV6fkzM7RmM52xT74DlOUWOjSdEmAit7W+ T0RY437pmKI2sZSIoER/raMYmpUOsX+KcqL+y9XzpRSvQg3/tPjsGaYIpnqS1w== 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 4Tg7Hp6jFWz1HPD; Wed, 21 Feb 2024 20:32:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41LKWcax002358; Wed, 21 Feb 2024 20:32:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41LKWc4H002355; Wed, 21 Feb 2024 20:32:38 GMT (envelope-from git) Date: Wed, 21 Feb 2024 20:32:38 GMT Message-Id: <202402212032.41LKWc4H002355@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 9097284b98be - main - bcm5974(4): Properly assign MT-slot on Apple Magic Trackpad List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9097284b98be57e2e2bf12942844fa3c920dd1a7 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=9097284b98be57e2e2bf12942844fa3c920dd1a7 commit 9097284b98be57e2e2bf12942844fa3c920dd1a7 Author: Vladimir Kondratyev AuthorDate: 2024-02-21 20:31:39 +0000 Commit: Vladimir Kondratyev CommitDate: 2024-02-21 20:31:39 +0000 bcm5974(4): Properly assign MT-slot on Apple Magic Trackpad Assign multi-touch slot number based on internal evdev MT state and reported tracking ID of contact rather than on sequentional number of contact in report. Sponsored by: Serenity Cyber Security Fixes: ef8397c28e98 ("add Magic Trackpad 2 (USB only) support") MFC after: 1 month --- sys/dev/hid/bcm5974.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/dev/hid/bcm5974.c b/sys/dev/hid/bcm5974.c index e76e3dfa805c..442e8905e9bc 100644 --- a/sys/dev/hid/bcm5974.c +++ b/sys/dev/hid/bcm5974.c @@ -820,6 +820,7 @@ bcm5974_intr(void *context, void *data, hid_size_t len) int ibt; /* button status */ int i; int slot; + uint8_t id; uint8_t fsize = sizeof(struct tp_finger) + params->tp->delta; if ((params->tp->caps & USES_COMPACT_REPORT) != 0) @@ -840,18 +841,20 @@ bcm5974_intr(void *context, void *data, hid_size_t len) fc = (struct tp_finger_compact *)(((uint8_t *)data) + params->tp->offset + params->tp->delta + i * fsize); coords = (int)le32toh(fc->coords); + id = fc->id_ori & 0x0f; + slot = evdev_mt_id_to_slot(sc->sc_evdev, id); DPRINTFN(BCM5974_LLEVEL_INFO, "[%d]ibt=%d, taps=%d, x=%5d, y=%5d, state=%4d, " "tchmaj=%4d, tchmin=%4d, size=%4d, pressure=%4d, " - "ot=%4x, id=%4x\n", + "ot=%4x, id=%4x, slot=%d\n", i, ibt, ntouch, coords << 19 >> 19, coords << 6 >> 19, (u_int)coords >> 30, fc->touch_major, fc->touch_minor, fc->size, - fc->pressure, fc->id_ori >> 5, fc->id_ori & 0x0f); - if (fc->touch_major == 0) + fc->pressure, fc->id_ori >> 5, id, slot); + if (fc->touch_major == 0 || slot == -1) continue; slot_data = (union evdev_mt_slot) { - .id = fc->id_ori & 0x0f, + .id = id, .x = coords << 19 >> 19, .y = params->y.min + params->y.max - ((coords << 6) >> 19), @@ -861,7 +864,6 @@ bcm5974_intr(void *context, void *data, hid_size_t len) .ori = (int)(fc->id_ori >> 5) - 4, }; evdev_mt_push_slot(sc->sc_evdev, slot, &slot_data); - slot++; continue; } f = (struct tp_finger *)(((uint8_t *)data) + From nobody Thu Feb 22 01:11:22 2024 X-Original-To: dev-commits-src-main@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 4TgFTY14pFz5BkgT; Thu, 22 Feb 2024 01:11:29 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4TgFTX6W1cz4gSR; Thu, 22 Feb 2024 01:11:28 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 41M1BMTG016477; Thu, 22 Feb 2024 03:11:25 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 41M1BMTG016477 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 41M1BMos016476; Thu, 22 Feb 2024 03:11:22 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 22 Feb 2024 03:11:22 +0200 From: Konstantin Belousov To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 8271d9b99a3b - main - libsys: remove usage of pthread_once and _once_stub Message-ID: References: <202402210029.41L0TOH5000231@gitrepo.freebsd.org> <964A29A2-4C51-4037-8EBE-320008D48AE0@freebsd.org> <4715B319-B7DE-4D06-9F27-00CFE5AF89A7@freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <4715B319-B7DE-4D06-9F27-00CFE5AF89A7@freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4TgFTX6W1cz4gSR X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] On Wed, Feb 21, 2024 at 05:23:10PM +0000, Jessica Clarke wrote: > On 21 Feb 2024, at 14:17, Konstantin Belousov wrote: > > > > On Wed, Feb 21, 2024 at 12:51:04AM +0000, Jessica Clarke wrote: > >> On 21 Feb 2024, at 00:29, Konstantin Belousov wrote: > >>> > >>> The branch main has been updated by kib: > >>> > >>> URL: https://cgit.FreeBSD.org/src/commit/?id=8271d9b99a3b98c662ee9a6257a144284b7e1728 > >>> > >>> commit 8271d9b99a3b98c662ee9a6257a144284b7e1728 > >>> Author: Konstantin Belousov > >>> AuthorDate: 2024-02-20 14:45:29 +0000 > >>> Commit: Konstantin Belousov > >>> CommitDate: 2024-02-21 00:26:11 +0000 > >>> > >>> libsys: remove usage of pthread_once and _once_stub > >>> > >>> that existed in auxv.c, use simple bool gate instead. This leaves a > >>> small window if two threads try to call _elf_aux_info(3) simultaneously. > >>> The situation is safe because auxv parsing is really idempotent. The > >>> parsed data is the same, and we store atomic types (int/long/ptr) so > >>> double-init does not matter. > >> > >> You still need to load acquire and store release aux_once though, > >> otherwise you can see aux_once as true yet read the pre-initialised > >> data. In practice that’s surely very hard to hit, but the code as > >> written is now wrong. Also, idempotence should probably be made > >> unnecessary by using 0/1/2 state for uninitialised/initialising/ > >> initialised, as it’s still technically UB from a C AM perspective due > >> to not being data race free if two threads initialise at the same time. > >> Better to just do the correct thing rather than risk things going wrong. > > > > There is too much to handle 'in process' state for loosing thread, I need > > the whole libthr machinery. > > What do you need libthr for? In pseudo-C: > > x = load_acquire(&aux_once) > if (__predict_true(x == 2)) > return; > if (x == 1 || !compare_exchange_strong_acquire(&aux_once, &x, 1)) { > while (x != 2) { > yield(); > x = load_acquire(&aux_once) > } > return; > } > /* initialise as before */ > store_release(&aux_once, 2); > > I believe that’s all you need. Or compare exchange 0 to 1 as the > initial operation; makes the source code shorter at the expense of a > more expensive fast path: > > x = 0; > if (__predict_true(!compare_exchange_strong_acquire(&aux_once, &x, 1)) { > while (__predict_false(x != 2)) { > yield(); > x = load_acquire(&aux_once) > } > return; > } > /* initialise as before */ > store_release(&aux_once, 2); > > I probably have bugs in the above, but you get the gist. The bug in the fragment above is with the yield(). If low-priority thread enters the '1' (in progress) block, and then is preempted by high-priority thread also entering init_auxv(), the process would never make a progress. This is why I said that we need libthr (or umtx), to use real locking and move the waiting thread off cpu. In kernel, yield can be used in similar situations because we can bump the priority, although it is tricky. > > > I added the fences, thanks for noting. > > Thanks. > > Jess > > > WRT being UB from pure C, we already have much more assumptions about > > atomicity. > > From nobody Thu Feb 22 01:23:08 2024 X-Original-To: dev-commits-src-main@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 4TgFlF3JXhz5Bm5m for ; Thu, 22 Feb 2024 01:23:21 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgFlF13gGz4j8P for ; Thu, 22 Feb 2024 01:23:21 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-33d118a181fso3853053f8f.1 for ; Wed, 21 Feb 2024 17:23:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708564999; x=1709169799; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GwpFvLKQQKeZvLnn326m21S5WjmEDf570EsB3M7L2rs=; b=czVroTElDpBd1ni4tWKXyE8cYcLvoFiLcpkaKgmOkp9guTBB8evxK0MUqtIqJ5/exY acJl/xLDHQRTAjJ17jw92fmiLpEsR6Sx8lj934XY3wEtnJ1LINyLFM53mK78P+oIRCIb dbKJazgKwWvOk62JfnADwZ1HzduidOhzhjWf91udvvYFpMR8q8wS4KxN95wqe8kfGT/r W+pI+fw0Rm1xOYxlIzqbYsfwuK2Lt70bOdxeduR3T73TFy6Cu1z8nkOyLQQ17iALYj9B IoyRs8c6U2+mtFYgK6yy8x2h1tZ+Z6V+2S8soZKBysBXNZHruyt5qYmTvyrwG5wYCJts isoA== X-Forwarded-Encrypted: i=1; AJvYcCUPjuu1jVGnrOqv957xyNmSCPH+4iE0/qAofrxkkUwQSogBURGmXDHwQU4cqp0KFY3ukZ8uyLHIq5ZkvUUaP52oksLfqgH7e8q1fVE0hW+4GQ== X-Gm-Message-State: AOJu0YyaG27ADdiXw5JlFfGCHl2f/uc6Vx1XGtzMW1clKuuJqk3LjR6A 7CZODfx6sTChivL2rRJTv+5IVDJPEd8HAOJ5FKBvu6aPnqMpLHmwTPRs7+DCwj8= X-Google-Smtp-Source: AGHT+IEjqUnjc++rPljqaNoTqfxqJlwzbZFXOuz6t++L4U9Jc4bMggxltBcp6VraA4qjklWbopgB6w== X-Received: by 2002:a5d:5f91:0:b0:33d:4c06:8614 with SMTP id dr17-20020a5d5f91000000b0033d4c068614mr8124188wrb.37.1708564999371; Wed, 21 Feb 2024 17:23:19 -0800 (PST) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id b7-20020adfe647000000b0033b406bc689sm18678602wrn.75.2024.02.21.17.23.18 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Feb 2024 17:23:18 -0800 (PST) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: 8271d9b99a3b - main - libsys: remove usage of pthread_once and _once_stub From: Jessica Clarke In-Reply-To: Date: Thu, 22 Feb 2024 01:23:08 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: References: <202402210029.41L0TOH5000231@gitrepo.freebsd.org> <964A29A2-4C51-4037-8EBE-320008D48AE0@freebsd.org> <4715B319-B7DE-4D06-9F27-00CFE5AF89A7@freebsd.org> To: Konstantin Belousov X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4TgFlF13gGz4j8P X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On 22 Feb 2024, at 01:11, Konstantin Belousov = wrote: >=20 > On Wed, Feb 21, 2024 at 05:23:10PM +0000, Jessica Clarke wrote: >> On 21 Feb 2024, at 14:17, Konstantin Belousov = wrote: >>>=20 >>> On Wed, Feb 21, 2024 at 12:51:04AM +0000, Jessica Clarke wrote: >>>> On 21 Feb 2024, at 00:29, Konstantin Belousov = wrote: >>>>>=20 >>>>> The branch main has been updated by kib: >>>>>=20 >>>>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D8271d9b99a3b98c662ee9a6257a14428= 4b7e1728 >>>>>=20 >>>>> commit 8271d9b99a3b98c662ee9a6257a144284b7e1728 >>>>> Author: Konstantin Belousov >>>>> AuthorDate: 2024-02-20 14:45:29 +0000 >>>>> Commit: Konstantin Belousov >>>>> CommitDate: 2024-02-21 00:26:11 +0000 >>>>>=20 >>>>> libsys: remove usage of pthread_once and _once_stub >>>>>=20 >>>>> that existed in auxv.c, use simple bool gate instead. This leaves = a >>>>> small window if two threads try to call _elf_aux_info(3) = simultaneously. >>>>> The situation is safe because auxv parsing is really idempotent. = The >>>>> parsed data is the same, and we store atomic types (int/long/ptr) = so >>>>> double-init does not matter. >>>>=20 >>>> You still need to load acquire and store release aux_once though, >>>> otherwise you can see aux_once as true yet read the pre-initialised >>>> data. In practice that=E2=80=99s surely very hard to hit, but the = code as >>>> written is now wrong. Also, idempotence should probably be made >>>> unnecessary by using 0/1/2 state for uninitialised/initialising/ >>>> initialised, as it=E2=80=99s still technically UB from a C AM = perspective due >>>> to not being data race free if two threads initialise at the same = time. >>>> Better to just do the correct thing rather than risk things going = wrong. >>>=20 >>> There is too much to handle 'in process' state for loosing thread, I = need >>> the whole libthr machinery. >>=20 >> What do you need libthr for? In pseudo-C: >>=20 >> x =3D load_acquire(&aux_once) >> if (__predict_true(x =3D=3D 2)) >> return; >> if (x =3D=3D 1 || !compare_exchange_strong_acquire(&aux_once, &x, 1)) = { >> while (x !=3D 2) { >> yield(); >> x =3D load_acquire(&aux_once) >> } >> return; >> } >> /* initialise as before */ >> store_release(&aux_once, 2); >>=20 >> I believe that=E2=80=99s all you need. Or compare exchange 0 to 1 as = the >> initial operation; makes the source code shorter at the expense of a >> more expensive fast path: >>=20 >> x =3D 0; >> if (__predict_true(!compare_exchange_strong_acquire(&aux_once, &x, = 1)) { >> while (__predict_false(x !=3D 2)) { >> yield(); >> x =3D load_acquire(&aux_once) >> } >> return; >> } >> /* initialise as before */ >> store_release(&aux_once, 2); >>=20 >> I probably have bugs in the above, but you get the gist. > The bug in the fragment above is with the yield(). If low-priority = thread > enters the '1' (in progress) block, and then is preempted by = high-priority > thread also entering init_auxv(), the process would never make a = progress. >=20 > This is why I said that we need libthr (or umtx), to use real locking = and > move the waiting thread off cpu. In kernel, yield can be used in = similar > situations because we can bump the priority, although it is tricky. Yes, priority inversion is an issue here. But this is (without all the C++ abstraction) how libcxxrt implements __cxa_guard_acquire, so if it=E2=80=99s good enough for C++ constructors for static storage = duration objects declared at local scope, surely it=E2=80=99s also good enough = for aux_once? And if it=E2=80=99s not good enough for aux_once then libcxxrt = should be deemed broken... One could easily adapt the above to use UMTX_OP_WAIT/WAKE though. Jess >>> I added the fences, thanks for noting. >>=20 >> Thanks. >>=20 >> Jess >>=20 >>> WRT being UB from pure C, we already have much more assumptions = about >>> atomicity. From nobody Thu Feb 22 01:27:54 2024 X-Original-To: dev-commits-src-main@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 4TgFrW11zwz5Bm09; Thu, 22 Feb 2024 01:27: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgFrV4np3z4k1g; Thu, 22 Feb 2024 01:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708565274; 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=/TbuVI0kNqCLKd0WvNYdzMU7hFGuIevQH3cyXxQib5U=; b=yPw41TaK1zsIntWUYYvNziaEXgaI193VxOYpWKbQUgob7moV7k89zdGI0MsS2wHZ/TO8GC oILDZ4apVHwqip2UbUCo3lV4D1/3FhLCNSofWJDCGOmW0ZRMT8FKM6/bx2PAY/B+fwjsCQ UaPbMSrbN4P8Mx+19deEe9gkjd1Scqf6sj855kJifn9jmwXh8jmsz6cjp56UtXnbQCi5J9 bpdnluUo1O1XdRgBblzNvURy8OEBq7Wur0C7NxsBRp2dccvteHmctt6x1Ev2qv8EbHit0O MVlG1DW5+Y1zQdDaY7Jh73HO/6UH9JnNWUoUChGX5H089pxmdGuLDyBuA78w5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708565274; 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=/TbuVI0kNqCLKd0WvNYdzMU7hFGuIevQH3cyXxQib5U=; b=WqdxgfgZtCWvzOG9Nb0EoFs71318vo2rxBtEYwJlkuJcHz2iRrdJF+vm/BgRTIGMBdC1m4 eCWr+qwYR+PY1CAaihHOvaDKfLbqwHCBm6xJI2//Kr8378R5OJ406PjL5bO4VQfAsr2Mle s5vshcpNvVGhov1yp9UIW449Zm2HkHz6JYb/mFkYJ5Js7eC5bAb2AifKH7yPhonn7ufjgE a+1/6le5uqt/cYwNjo2dviD7ZHhUFKKlinO6fCRlbkl7UZ05V6d01FmZ0/LeEiicXVkGCq gcfN7ddhAaWP7J5v4h5h8kDQ+pUDLZQDB+vY7T9tM9ODujxL+CDsEEK6vTM8SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708565274; a=rsa-sha256; cv=none; b=D/s7UM81IdWq+ZzWMgqKlcCV7VOUmtwwaRW1pOqDE+lWzygZvJob8xbwE3oIeWfPO3I5V4 yTT2rjIC61CFee1+DtrFiCkxulvrL2NF7HgPDq9qFOJ0rwg/dYYOWkT81UzJ1kEmXb3Tzd fbsCgztGP/VwzcxT6Ky6bggwhAZ09BpOOxn6QcX2zHCr+0NNMflwVRuA9CMrqzJ6kuxPwe JXDHXiu7b/t+h+kM70DLx5/yact8U5JLSMgp+z4H8shQsQQhcEE+kE6ZF0NIA8/pme6xY5 KWWENjTUmk2In1x8SyjjkxZSlR9HvOOT9QTpYl093LNcYRypXva16WmBUZ7yEA== 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 4TgFrV3sMhz1QrN; Thu, 22 Feb 2024 01:27:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41M1RsFb092299; Thu, 22 Feb 2024 01:27:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41M1RsBj092296; Thu, 22 Feb 2024 01:27:54 GMT (envelope-from git) Date: Thu, 22 Feb 2024 01:27:54 GMT Message-Id: <202402220127.41M1RsBj092296@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 452c5e9995ab - main - fdlopen(3): do not create a new object mapping if already loaded List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 452c5e9995ab4cd6c7ea230cffe0c53bfa65c1ab Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=452c5e9995ab4cd6c7ea230cffe0c53bfa65c1ab commit 452c5e9995ab4cd6c7ea230cffe0c53bfa65c1ab Author: Konstantin Belousov AuthorDate: 2024-02-22 01:18:06 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-22 01:27:09 +0000 fdlopen(3): do not create a new object mapping if already loaded This is expected behavior for both dlopen(3) and fdlopen(3). PR: 277169 Reviewed by: emaste Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44019 --- libexec/rtld-elf/rtld.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c index 7d6b8ae52703..30ed48b5c615 100644 --- a/libexec/rtld-elf/rtld.c +++ b/libexec/rtld-elf/rtld.c @@ -2752,8 +2752,9 @@ load_object(const char *name, int fd_u, const Obj_Entry *refobj, int flags) if (obj->ino == sb.st_ino && obj->dev == sb.st_dev) break; } - if (obj != NULL && name != NULL) { - object_add_name(obj, name); + if (obj != NULL) { + if (name != NULL) + object_add_name(obj, name); free(path); close(fd); return (obj); From nobody Thu Feb 22 01:32:06 2024 X-Original-To: dev-commits-src-main@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 4TgFxL5Yp3z5BmXD; Thu, 22 Feb 2024 01:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgFxL56fcz4kRJ; Thu, 22 Feb 2024 01:32:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708565526; 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=fZasIXO8yrxggtCqMhTlitxkrz8DKhot5fzsxK87wBw=; b=hI0/OqM3hbnI2xU0F0yOrvfLuSXOIO056SMWrVD5C8bEMXo4yIEjJ72kwA8FsSfuXJSOyp dgdj4PiYSYP/FvRGEpFxphnE+4reL07ofA0AJEAT+pOOFB9bFgmc0nD6yQaHQt7I2lhYcV pYFC1A0Fg9caG1Sismd1CNfkcEXsALFz52ozRJ0WkkkF2pked+nSqTTRm4eBo9MFywx/i2 MjF/efv7EpeYEMce6mFh8Yx9Ti7Gln2IUTaw29TsnjTYvuHns7xGpwrTQoGHzvoGaOYCit xMMpaUt5RzWgqQPE9Sm9yMhcJaQbLBKGPma3tbZWHaVjlV8AbGoD38i/c6S9oA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708565526; 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=fZasIXO8yrxggtCqMhTlitxkrz8DKhot5fzsxK87wBw=; b=TvcSszvo/bgrQCvcoL0qJz5Xwbu1uJPQk33wsEcLxbX0VQStGUdqqPWS/HGEuv5bPByGg9 jvAT3pRN+4mhyUaNXi0/wo3vg3PFcgb/DlQHFzPn9sn5bIc7KYkzdaP2jXGpaexl+DBeW1 O2s5sHIojf5dnb++mgnm1yKWuOoZ53U9GnxDmEsNtaMpFPUgYQGfM1Npqbmfy2yUi3bXnn ZnbNB9OkFnkKq33F8ScQgTxvmasisLgU2E4oH1CsFUP15C3YAkKBiCTVCsFbHDOYFLuAnP cfKDbJP2wP9Kr1kqWTLhnh6vtRqghMdvr2KES84M0uZN+etCQI6N/6XoqQCUog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708565526; a=rsa-sha256; cv=none; b=qANhTIfZjQp5OUK5uzrQnZSi/YmpC1MzOTQzaf4TiUJMithkHiK7cfjecOsLoudhpEUVp/ SFKDts2UGRAbdOSqfK2IHjIsPPEv/bTwaMGLerrxosITL9I0/0qCsYAIlwhqfaQs17GZ1D R9RKE4pxxVjWgqfa+xQz4AZXuXG5WkeFTT+mbvmtxeS7+IAvbC/d+qx4Ekm7ImibkgjiAh 1WhYRYx6rXqpmAMYceGiQ2BZ0tV1gsg+gde0AS1QE0FyaKAOrj9BsRTknkGWauBUbj/4BC kGMTATRVzk6P5WoSwf+9PeVLTRKRugU7hNoiRe/pWh4ocCIOSpea87bgGMdYHw== 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 4TgFxL4B34z1Qxc; Thu, 22 Feb 2024 01:32:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41M1W6Ma007148; Thu, 22 Feb 2024 01:32:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41M1W6ib007145; Thu, 22 Feb 2024 01:32:06 GMT (envelope-from git) Date: Thu, 22 Feb 2024 01:32:06 GMT Message-Id: <202402220132.41M1W6ib007145@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 99fa799a19ab - main - linux_pwd_onexec: do not abort image activation if emul path does not exist List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 99fa799a19abeb70b1034f65407c276b64709bdc Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=99fa799a19abeb70b1034f65407c276b64709bdc commit 99fa799a19abeb70b1034f65407c276b64709bdc Author: Konstantin Belousov AuthorDate: 2024-02-10 05:02:18 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-22 01:31:39 +0000 linux_pwd_onexec: do not abort image activation if emul path does not exist Instead clear the altroot, if any. Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43833 --- sys/compat/linux/linux_util.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c index 020eb57ea68e..e0c010cb5e48 100644 --- a/sys/compat/linux/linux_util.c +++ b/sys/compat/linux/linux_util.c @@ -79,22 +79,14 @@ int linux_pwd_onexec(struct thread *td) { struct nameidata nd; - struct pwd *pwd; int error; NDINIT(&nd, LOOKUP, FOLLOW, UIO_SYSSPACE, linux_emul_path); error = namei(&nd); if (error != 0) { - /* - * Do not bother if we are in chroot or jail. - */ - pwd = pwd_hold(td); - if (pwd->pwd_rdir != rootvnode) { - pwd_drop(pwd); - return (0); - } - pwd_drop(pwd); - return (error); + /* Do not prevent execution if altroot is non-existent. */ + pwd_altroot(td, NULL); + return (0); } NDFREE_PNBUF(&nd); pwd_altroot(td, nd.ni_vp); From nobody Thu Feb 22 03:11:45 2024 X-Original-To: dev-commits-src-main@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 4TgJ8K3QXrz5BhLl; Thu, 22 Feb 2024 03:11:45 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgJ8K2z9kz40bp; Thu, 22 Feb 2024 03:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708571505; 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=1T65xQ4ExVX6hlUp4m4ijUmCmvv5EL34LONNjn4zriw=; b=JbA4w7et8ptOIpdOHD/F9yyhfDmT+G/J5tG5g0q8lBCXMBSz4iNIuG9rnZipGxyZcydpmg J+HtVZ98epwqDfvi6hyoNVY434ggZQQ4PScS2+rXvDjvvNc/7LgHQlxQQ5AKt2Uzhvvcra 6cgjUnbiQzqCLxy/skdsPjVzyLicC6VjzZQe9fhV5ZsUG9GHirBB3llA53YcP3Jm08cj+n P2NZIAVQxnyKu4SUaBfYwYsfEyiqM4Xr6+t/Y0ZlPWbPl1SiR5hGEkDWwPgnVkjvzfoHXf 8IAiCtdfXD3sFT7MjllnuV/g0w2sH9wiuYGOBZRPTpAhAmhFm5WJ2QkssHXmyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708571505; 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=1T65xQ4ExVX6hlUp4m4ijUmCmvv5EL34LONNjn4zriw=; b=dhNm8Psf/bMaQiEmfQzGId6BpRho/gHEAn7Kd8uqaoRKCVSrRoPFattbwYQ01PlECBH/7B RIONKpg62vWyuznO48yAjbZyW/CPmLLHoGqycn5ge1G8tEP2cT7xPixgW/8WCAbTrpwxFN n+QfpHJpqQXsqXINdiv3+NdJj3MWsd8ModB697NC81N9xygA+MX/r4vtsRB3ItrrqM2EUB uD3SEWh55tPwglvMTBCSSo932TVfTvWSNANAaX5onWyZWs9I9Kr2GTdS1S6GBVZ0QfiV4u m++8/t1uWLSQ+0nP5nWlmn07dNLpknw6winzSks5KcwTkCu8j18fJf0Cea7PIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708571505; a=rsa-sha256; cv=none; b=UShfLfBiU8UDzMiZiglDuKxDxFNSvxhXsExIOnhQU+1pEYzMJf6vECWQY7IFKZeEPoX0Oc RuyCOmrP8wyICSJVyzlBML1JoQbZ3bFRT+eQodG5Tgv5it8HKGxfcSXJk3gwVXArwsRuHT 1+3O38V5Dk1GgtC5GDBZUtBMgBSKuv/CSS3ba0yJLlbP2zMT36ptj7MHTKWcO4QGH7gUaW veVU2UnfGTR5uSbZ554iFtGl50riNmPbFcjf8lU8dBsFnDy5kxvT+gpX8UWEd/+TKf0pge f/vSY578EgO3suDDUolve5ONfTRe8nelWgIvpkfpdPnqT5QYOHYo6qFp+YJ8Ww== 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 4TgJ8K20t0zF3V; Thu, 22 Feb 2024 03:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41M3Bj1X073978; Thu, 22 Feb 2024 03:11:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41M3Bjso073975; Thu, 22 Feb 2024 03:11:45 GMT (envelope-from git) Date: Thu, 22 Feb 2024 03:11:45 GMT Message-Id: <202402220311.41M3Bjso073975@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: bad90cb4f686 - main - nextboot: check unlink, but only warn on !ENOENT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: bad90cb4f6860657917a485893ee790545286018 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bad90cb4f6860657917a485893ee790545286018 commit bad90cb4f6860657917a485893ee790545286018 Author: Warner Losh AuthorDate: 2024-02-22 03:10:45 +0000 Commit: Warner Losh CommitDate: 2024-02-22 03:10:45 +0000 nextboot: check unlink, but only warn on !ENOENT Emulate rm -f from the nextboot.sh script: Report all errors, except ENOENT. This problems show through, except the expected one when nextboot.conf isn't there. Sponsored by: Netflix Reviewed by: rew Differential Revision: https://reviews.freebsd.org/D44013 --- sbin/reboot/reboot.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbin/reboot/reboot.c b/sbin/reboot/reboot.c index e245c78d83bc..3cc77aebe4d4 100644 --- a/sbin/reboot/reboot.c +++ b/sbin/reboot/reboot.c @@ -288,7 +288,8 @@ main(int argc, char *argv[]) errx(1, "-r and -k cannot be used together, there is no next kernel"); if (Dflag) { - (void)unlink(PATH_NEXTBOOT); /* Say nothing if it's not there */ + if (unlink(PATH_NEXTBOOT) != 0 && errno != ENOENT) + warn("unlink " PATH_NEXTBOOT); exit(0); } From nobody Thu Feb 22 04:27:08 2024 X-Original-To: dev-commits-src-main@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 4TgKqT2zxgz5Bnx3; Thu, 22 Feb 2024 04:27:17 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4TgKqS2snLz46pv; Thu, 22 Feb 2024 04:27:16 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1] (may be forged)) by kib.kiev.ua (8.18.1/8.18.1) with ESMTP id 41M4R8vF065353; Thu, 22 Feb 2024 06:27:12 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 41M4R8vF065353 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 41M4R83Y065352; Thu, 22 Feb 2024 06:27:08 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 22 Feb 2024 06:27:08 +0200 From: Konstantin Belousov To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 8271d9b99a3b - main - libsys: remove usage of pthread_once and _once_stub Message-ID: References: <202402210029.41L0TOH5000231@gitrepo.freebsd.org> <964A29A2-4C51-4037-8EBE-320008D48AE0@freebsd.org> <4715B319-B7DE-4D06-9F27-00CFE5AF89A7@freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4TgKqS2snLz46pv X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US] On Thu, Feb 22, 2024 at 01:23:08AM +0000, Jessica Clarke wrote: > On 22 Feb 2024, at 01:11, Konstantin Belousov wrote: > > > > On Wed, Feb 21, 2024 at 05:23:10PM +0000, Jessica Clarke wrote: > >> On 21 Feb 2024, at 14:17, Konstantin Belousov wrote: > >>> > >>> On Wed, Feb 21, 2024 at 12:51:04AM +0000, Jessica Clarke wrote: > >>>> On 21 Feb 2024, at 00:29, Konstantin Belousov wrote: > >>>>> > >>>>> The branch main has been updated by kib: > >>>>> > >>>>> URL: https://cgit.FreeBSD.org/src/commit/?id=8271d9b99a3b98c662ee9a6257a144284b7e1728 > >>>>> > >>>>> commit 8271d9b99a3b98c662ee9a6257a144284b7e1728 > >>>>> Author: Konstantin Belousov > >>>>> AuthorDate: 2024-02-20 14:45:29 +0000 > >>>>> Commit: Konstantin Belousov > >>>>> CommitDate: 2024-02-21 00:26:11 +0000 > >>>>> > >>>>> libsys: remove usage of pthread_once and _once_stub > >>>>> > >>>>> that existed in auxv.c, use simple bool gate instead. This leaves a > >>>>> small window if two threads try to call _elf_aux_info(3) simultaneously. > >>>>> The situation is safe because auxv parsing is really idempotent. The > >>>>> parsed data is the same, and we store atomic types (int/long/ptr) so > >>>>> double-init does not matter. > >>>> > >>>> You still need to load acquire and store release aux_once though, > >>>> otherwise you can see aux_once as true yet read the pre-initialised > >>>> data. In practice that’s surely very hard to hit, but the code as > >>>> written is now wrong. Also, idempotence should probably be made > >>>> unnecessary by using 0/1/2 state for uninitialised/initialising/ > >>>> initialised, as it’s still technically UB from a C AM perspective due > >>>> to not being data race free if two threads initialise at the same time. > >>>> Better to just do the correct thing rather than risk things going wrong. > >>> > >>> There is too much to handle 'in process' state for loosing thread, I need > >>> the whole libthr machinery. > >> > >> What do you need libthr for? In pseudo-C: > >> > >> x = load_acquire(&aux_once) > >> if (__predict_true(x == 2)) > >> return; > >> if (x == 1 || !compare_exchange_strong_acquire(&aux_once, &x, 1)) { > >> while (x != 2) { > >> yield(); > >> x = load_acquire(&aux_once) > >> } > >> return; > >> } > >> /* initialise as before */ > >> store_release(&aux_once, 2); > >> > >> I believe that’s all you need. Or compare exchange 0 to 1 as the > >> initial operation; makes the source code shorter at the expense of a > >> more expensive fast path: > >> > >> x = 0; > >> if (__predict_true(!compare_exchange_strong_acquire(&aux_once, &x, 1)) { > >> while (__predict_false(x != 2)) { > >> yield(); > >> x = load_acquire(&aux_once) > >> } > >> return; > >> } > >> /* initialise as before */ > >> store_release(&aux_once, 2); > >> > >> I probably have bugs in the above, but you get the gist. > > The bug in the fragment above is with the yield(). If low-priority thread > > enters the '1' (in progress) block, and then is preempted by high-priority > > thread also entering init_auxv(), the process would never make a progress. > > > > This is why I said that we need libthr (or umtx), to use real locking and > > move the waiting thread off cpu. In kernel, yield can be used in similar > > situations because we can bump the priority, although it is tricky. > > Yes, priority inversion is an issue here. But this is (without all the > C++ abstraction) how libcxxrt implements __cxa_guard_acquire, so if > it’s good enough for C++ constructors for static storage duration > objects declared at local scope, surely it’s also good enough for > aux_once? And if it’s not good enough for aux_once then libcxxrt should > be deemed broken... > > One could easily adapt the above to use UMTX_OP_WAIT/WAKE though. As I noted, umtx(2) should be the solution. Might be we should provide some park/unpark interface in libc, to hide the umtx interface. Its use started to proliferate recently. > > Jess > > >>> I added the fences, thanks for noting. > >> > >> Thanks. > >> > >> Jess > >> > >>> WRT being UB from pure C, we already have much more assumptions about > >>> atomicity. > > From nobody Thu Feb 22 10:31:17 2024 X-Original-To: dev-commits-src-main@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 4TgTvT4QsDz5CMDN; Thu, 22 Feb 2024 10:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgTvT3sVDz4kRZ; Thu, 22 Feb 2024 10:31:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708597877; 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=VlSGbcSbBXMkwVRdyYQMTDsbdwCPSxSfGCDNAYTZLcI=; b=P84P8i7qHPz1NzhUN+o6IvNQDMK+8wFWhK+D641CGFbdF4TZ9yytJMIWxZRsRKYa+BmefZ me+Nyvy5xmq+N2QVAejCZ/ahDaUAyaEKlx/nDzx4oDhJlhNLUfwzANqyMzdpwHWsLMhhyz CM+S++Npv6IMtdUxi6mJXr2ktyoJ+BD8TYpUQxu2w2C2sK7BbpTynh3uosC0mpX/2WzOwH HX/Up+gm3hVoIaBPVkGvMq+66JVEikwWJ6NJpO68AKl5I8GEMDeSjZS7BhafE8bOHuqdYY lG5GWSbm3DGY0u/WWEv/WonE9SR/RfNouelvELK0WxnFDshRKS6UiH/UA2lEeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708597877; 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=VlSGbcSbBXMkwVRdyYQMTDsbdwCPSxSfGCDNAYTZLcI=; b=Juq2c1MIM6kCQu1Vyz6VZB4PnHWM7m4xod8viYgoj5LVM3ehJ+Se1rBi08/9r6iahY00ao MUrc0Qex4uowUs9yM23+nK+izezcUavGjEuYIvGG3Wvalf4yd1Ix8L6Ed2s+TDytXPsD/i JZ1TQAa/A7JGc7OWBd5h2Z9CGd6mYyxCAWqzJ8/il/vXsiUZRp+xRZw97bKQUlQhFBGDRg vPB288MGs6N6zPZPcHBO8+SM05FW+PFFc0xnegGwr1bTsHuo0klguIxLoG+TxiO9WjsNe7 x/qETKS9gNb4Yiwm+NEu6vqcvdiiPuowkwVgZz8F2hu8FBwQNpO2oeRrlVUcPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708597877; a=rsa-sha256; cv=none; b=qswvuT6JAYnMD4PDgSZWX6XpmZDncF4GYwX0fI3zfEthgPjw/OIq6HVjK5/qx6SFg8oroa cXCtGaSt1LYGJ347m+DAM4+Hq/aDb0ShIr23vh2YNBwapXcoop2b3dvywPCFmhWKLZmbIj eP5EA3uq+dI1Z6pxbYQKUXrZQvzvSu49LT8ZtPKFyjwORJ6ToCqe8VnClPowJSpQZ/0wFw cKbeIrlCD9A6Xp6zfuLhlwoEh35a9zbTq/rWzBVOeA9lK2bIwKnkEQ5yi+uKcmHXEDFYMX I0g5vU3kr3YMQ/0wOUv+vA/0E4XJ97EJvic+fAFQXBneJuvBDanqm/bAUskxhA== 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 4TgTvT2xCFzSK9; Thu, 22 Feb 2024 10:31:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MAVHML016538; Thu, 22 Feb 2024 10:31:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MAVHj1016535; Thu, 22 Feb 2024 10:31:17 GMT (envelope-from git) Date: Thu, 22 Feb 2024 10:31:17 GMT Message-Id: <202402221031.41MAVHj1016535@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roger Pau =?utf-8?Q?Monn=C3=A9?= Subject: git: 4ece79968e70 - main - x86/xen: fix out of bounds access to the event channel masks on resume List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4ece79968e70b96d3283f202635d49a4bf04a7e7 Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=4ece79968e70b96d3283f202635d49a4bf04a7e7 commit 4ece79968e70b96d3283f202635d49a4bf04a7e7 Author: Roger Pau Monné AuthorDate: 2024-02-05 10:47:25 +0000 Commit: Roger Pau Monné CommitDate: 2024-02-22 10:08:03 +0000 x86/xen: fix out of bounds access to the event channel masks on resume When resuming from migration or suspension all regular event channels ports are reset to the INVALID_EVTCHN value, and drivers should re-initialize them according to the new value provided by the other end of the connection. However, the driver would first attempt to unbind the event channel handler before attempting to bind it using the newly provided port. This unbind uses the stale event channel port that has been set to INVALID_EVTCHN for some operations (notably as a result of the handler removal the interrupt subsystem ends up calling disable intr and source PIC hooks). This was fine when INVALID_EVTCHN was 0, as then the operation would just result in pointless setting of the 0 bit in the different event channel related control arrays (evtchn_{pending,mask} for example). However with the change to define INVALID_EVTCHN as ~0 the write is no longer pointless, and we end up triggering a page-fault, or corrupting random data that happens to be mapped at the array position + ~0 bits. In hindsight the change of INVALID_EVTCHN from 0 to ~0 was way more risky than initially assessed, and I believe has end up resulting in more fragile code for no real benefit. Fix the disable intr and source wrappers to check whether the event channel is valid before attempting to use it. Also introduce some extra KASSERTs in several array accesses in order to avoid out of bounds accesses if INVALID_EVTCHN ever reaches those functions. Fixes: 1797ff962769 ('xen/intr: cleanup event channel number use') MFC after: 1 week Sponsored by: Cloud Software Group Reviewed by: markj Differential revision: https://reviews.freebsd.org/D43928 --- sys/dev/xen/bus/xen_intr.c | 8 ++++++-- sys/xen/evtchn/evtchnvar.h | 7 +++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/dev/xen/bus/xen_intr.c b/sys/dev/xen/bus/xen_intr.c index 3fc8fb0fe83a..609f31b5418a 100644 --- a/sys/dev/xen/bus/xen_intr.c +++ b/sys/dev/xen/bus/xen_intr.c @@ -166,6 +166,7 @@ evtchn_cpu_mask_port(u_int cpu, evtchn_port_t port) struct xen_intr_pcpu_data *pcpu; pcpu = DPCPU_ID_PTR(cpu, xen_intr_pcpu); + KASSERT(is_valid_evtchn(port), ("Invalid event channel port")); xen_clear_bit(port, pcpu->evtchn_enabled); } @@ -188,6 +189,7 @@ evtchn_cpu_unmask_port(u_int cpu, evtchn_port_t port) struct xen_intr_pcpu_data *pcpu; pcpu = DPCPU_ID_PTR(cpu, xen_intr_pcpu); + KASSERT(is_valid_evtchn(port), ("Invalid event channel port")); xen_set_bit(port, pcpu->evtchn_enabled); } @@ -619,7 +621,8 @@ void xen_intr_disable_intr(struct xenisrc *isrc) { - evtchn_mask_port(isrc->xi_port); + if (__predict_true(is_valid_evtchn(isrc->xi_port))) + evtchn_mask_port(isrc->xi_port); } /** @@ -706,7 +709,8 @@ xen_intr_disable_source(struct xenisrc *isrc) * unmasked by the generic interrupt code. The event channel * device will unmask them when needed. */ - isrc->xi_masked = !!evtchn_test_and_set_mask(isrc->xi_port); + if (__predict_true(is_valid_evtchn(isrc->xi_port))) + isrc->xi_masked = !!evtchn_test_and_set_mask(isrc->xi_port); } /* diff --git a/sys/xen/evtchn/evtchnvar.h b/sys/xen/evtchn/evtchnvar.h index 455f7bcbd620..3e6575748f6b 100644 --- a/sys/xen/evtchn/evtchnvar.h +++ b/sys/xen/evtchn/evtchnvar.h @@ -37,8 +37,11 @@ #include /* Macros for accessing event channel values */ -#define EVTCHN_PTR(type, port) \ - (HYPERVISOR_shared_info->evtchn_##type + ((port) / __LONG_BIT)) +#define EVTCHN_PTR(type, port) ({ \ + KASSERT(port < nitems(HYPERVISOR_shared_info->evtchn_##type) * \ + sizeof(xen_ulong_t) * 8, ("Invalid event channel port")); \ + (HYPERVISOR_shared_info->evtchn_##type + ((port) / __LONG_BIT));\ +}) #define EVTCHN_BIT(port) ((port) & (__LONG_BIT - 1)) #define EVTCHN_MASK(port) (1UL << EVTCHN_BIT(port)) From nobody Thu Feb 22 10:31:18 2024 X-Original-To: dev-commits-src-main@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 4TgTvV5nz1z5CM5J; Thu, 22 Feb 2024 10:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgTvV4qVtz4kXV; Thu, 22 Feb 2024 10:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708597878; 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=/y1dyd/yiWdO+49/9WWllpUTyBDEclF5EdMNcu6NpWg=; b=dwFBY+EjgAy47AAGl0vrHIzFc4aLWIXQfpCKGHTOVxKa+7vgURTwuNvLxgSbHO05BUdZL4 J5LAkdJ87iOzmxlsBJeVt9jS/Huq/2vvkUOIxRHRSGCJC0k0c7wWccwX8DB6n3U4OKtG+o 3UrecD0TzRULuUQBncIUgu0+m+WMLuYUoQT+HaLZyGEhCXBlkClVNUVuKfsU+NUEXED5Hj c6Xic1h/j2Aob0lW0cg6Ky1HNXKVFdL1zsnpotoodQ93CAHN9cG6r7y5SaTI+CNNWuJkl8 t3pYkf0TjMnzA353HVxe9LR0X6CnPX8+4sKlWy99S8TGhM50Vvxadn3ltqdtgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708597878; 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=/y1dyd/yiWdO+49/9WWllpUTyBDEclF5EdMNcu6NpWg=; b=gN016fy/5Qn0ScDHVZ2E38f1EG8Ub0hWHAQcCb/Hk4bk72Wt/wlqT75kvXbjAi4/h6p0uQ qciZ6kx4R3DBq4gvkLP9P4RObbhnCBllW8DsPGid+bOcbuV+1pFMeWuRIg1XZNAqj1FWB6 MRsbWgthm7Dp+WN3iee0GtnyuwU7pYY00wTPVi8bihLZ7YucSGqzHilzsFoVnVocfphpNc AjW0WSyIRCrBaMDIp/QtrSxxWSvGqXKbmMWm6idhXsMNFA2rQId/1BZHUxEHhtb5yIMyet 1oh73wjEf1GLkn6AyGfY0hQHEJCO4vpCxPK0h1hD7sfyPdVbWXfqF2CrEAYeMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708597878; a=rsa-sha256; cv=none; b=vZkeKdqlFtZay5UHhZYl4YAotKdPEcbVN5L2lTTNA3OlBhngUp0blnOuv4E58wHuAHlNPW pNx0DCOvxdNi9rhObSJM78FTdHn2vU+RL4FKuvUoEinxnjUIJATL6IGCIDsFxAkqnuwTbQ zhhCV4Oa50/muInTxoZXaBxCYlvid1PZiDz/z/EOYDiJp2qH3ArVxXobbP3Pgi1eKrXbKw mpnEwhk6pnaLVJWe+izPQ2DxNMSMfmQ37ZuTX0HBILjJ+zdKHsyWgv0xSkGqKCL2Bgf6Iy 39cNX1vj/uSzuzZCejHdZHPlL5/mzdho9d52vX63xR8HTAh9S+xM/5C/7CiPhQ== 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 4TgTvV3t6mzS74; Thu, 22 Feb 2024 10:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MAVIhe016589; Thu, 22 Feb 2024 10:31:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MAVIts016586; Thu, 22 Feb 2024 10:31:18 GMT (envelope-from git) Date: Thu, 22 Feb 2024 10:31:18 GMT Message-Id: <202402221031.41MAVIts016586@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roger Pau =?utf-8?Q?Monn=C3=A9?= Subject: git: 399386f190f1 - main - x86/xen: introduce non-hypercall based emergency print List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 399386f190f157073baaa56925e92cc90edded8c Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=399386f190f157073baaa56925e92cc90edded8c commit 399386f190f157073baaa56925e92cc90edded8c Author: Roger Pau Monné AuthorDate: 2024-01-22 13:20:25 +0000 Commit: Roger Pau Monné CommitDate: 2024-02-22 10:08:03 +0000 x86/xen: introduce non-hypercall based emergency print The current xc_printf() function uses an hypercall in order to send character buffers to the hypervisor for it to print on the hypervisor console (if the hypervisor is configured to print such messages). This requires the hypercall page to be initialized, which is extra work and can go wrong. On x86 instead of using the console IO hypercall use the debug console IO port, also called "port E9 hack". This allows sending characters to Xen using an outb instruction, without any initialization required. Keep the previous hypervisor based implementation by using the weak attribute, which allows each architecture to provide an alternate (arch-specific) implementation. Sponsored by: Cloud Software Group Reviewed by: markj Differential revision: https://reviews.freebsd.org/D43929 --- sys/dev/xen/console/xen_console.c | 15 ++++++++++----- sys/x86/xen/hvm.c | 5 +++++ sys/xen/xen-os.h | 7 +++++++ 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/sys/dev/xen/console/xen_console.c b/sys/dev/xen/console/xen_console.c index d232dd4e0c1c..f1a298a2aefa 100644 --- a/sys/dev/xen/console/xen_console.c +++ b/sys/dev/xen/console/xen_console.c @@ -138,6 +138,13 @@ struct putchar_arg { size_t n_next; }; +void __weak_symbol +xen_emergency_print(const char *str, size_t size) +{ + KASSERT((xen_domain()), ("call to xc_printf from non Xen guest")); + HYPERVISOR_console_write(str, size); +} + static void putchar(int c, void *arg) { @@ -150,12 +157,12 @@ putchar(int c, void *arg) * We have no buffer, output directly to the * console char by char. */ - HYPERVISOR_console_write((char *)&c, 1); + xen_emergency_print((char *)&c, 1); } else { pca->buf[pca->n_next++] = c; if ((pca->size == pca->n_next) || (c = '\0')) { /* Flush the buffer */ - HYPERVISOR_console_write(pca->buf, pca->n_next); + xen_emergency_print(pca->buf, pca->n_next); pca->n_next = 0; } } @@ -177,15 +184,13 @@ xc_printf(const char *fmt, ...) pca.size = 0; #endif - KASSERT((xen_domain()), ("call to xc_printf from non Xen guest")); - va_start(ap, fmt); kvprintf(fmt, putchar, &pca, 10, ap); va_end(ap); #ifdef PRINTF_BUFR_SIZE if (pca.n_next != 0) - HYPERVISOR_console_write(buf, pca.n_next); + xen_emergency_print(buf, pca.n_next); #endif } diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index b8125e230b6f..6411b790a2be 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -95,6 +95,11 @@ TUNABLE_INT("hw.xen.disable_pv_nics", &xen_disable_pv_nics); /*---------------------- XEN Hypervisor Probe and Setup ----------------------*/ +void xen_emergency_print(const char *str, size_t size) +{ + outsb(XEN_HVM_DEBUGCONS_IOPORT, str, size); +} + uint32_t xen_cpuid_base; static uint32_t diff --git a/sys/xen/xen-os.h b/sys/xen/xen-os.h index d7e9b3ca8632..98be41124846 100644 --- a/sys/xen/xen-os.h +++ b/sys/xen/xen-os.h @@ -151,6 +151,13 @@ int xenmem_free(device_t dev, int res_id, struct resource *res); /* Debug/emergency function, prints directly to hypervisor console */ void xc_printf(const char *, ...) __printflike(1, 2); +/* + * Emergency print function, can be defined per-arch, otherwise defaults to + * HYPERVISOR_console_write. Should not be called directly, use xc_printf + * instead. + */ +void xen_emergency_print(const char *str, size_t size); + #ifndef xen_mb #define xen_mb() mb() #endif From nobody Thu Feb 22 10:31:19 2024 X-Original-To: dev-commits-src-main@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 4TgTvX2Chrz5CMB2; Thu, 22 Feb 2024 10:31:20 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgTvX0Y0Zz4kcw; Thu, 22 Feb 2024 10:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708597880; 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=1op4LSRuMN5oboEiAxzC01fvvJaFwyxFIwfce+VSkuM=; b=sqHqhSCagEeJbHI2ROU2GY02GbHgE5FymH6s6pZYSZFOVclUqgXX7HMkYxFb5Ttdf08lFb rYtcIBpq81m8vtxpxSJnLT+5LrZEbbWbvoe1l0Dzepzjv1sS22NIbRSfzsGG0QM1MBF5ZR yzNOzC6CzlaWAqhjW0dWfFCaX5shRynKu4C0kPltvtAT5rekj8N3oEC6oH+ptfhCA0e//7 YPSdI3C6yYNd+ROtLkdMwKrzSaKDISLTAck3q8/sY0oMMKzVgBa5uiapBmideKn6Xaksq3 71EPcV8XZ62aMijfwdX1PYby+ScabdamtrWVl79HUnwiMjM6SU1o/gKglD525Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708597880; 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=1op4LSRuMN5oboEiAxzC01fvvJaFwyxFIwfce+VSkuM=; b=U9AG6Ti+PAAyT7mEspR2gNPHG7FAl2CG0mxcnOB/7t/H23bQ33CeuAAxEINkZB1eb7VbPf 0kORVOCoVcpKouLw+auoweto7d3/kS6xPZvzvVRdsZrhYJcBh1lT/xxx/WF0afGt4VYojy lYqwIyZG96enrwdbOJJ+fqnmsVWDUZQKSGwjmkwGPzvVBBINJKokzxeIAorsveb11z3Tes ZI0xsA+A3HitcRpB5To9+a1VACoUjtN9FYHNUbEWf8jWVOt8R0fMNm6BtveALUM3CZkx6D MpN/G1VzvQoiAE8rvERFf3fhSzdtV40MXo+uM6x5MfG0Nt3SOFuOutHt/BzF4w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708597880; a=rsa-sha256; cv=none; b=xJmSI70Tq0fDf7EemlWUB5ReSC58v/IBjAA7QqXrTqxPYcAW6qU3bRBhlPSSZRTRaSxjrZ NlWEatDv7JAVmEPus67YaRp98ZbJdAzQhJG3RIB2nZA/RJy2zBiJmxaEZLVbepj5orNXh0 hYDCacB1XbJoDIpPynBfYByLtr1aAMl1BbMT1IAW3UZJ1XLSB1WfvdLdwc4SbFkBK5qy/k fySqY0+0nArMTcO/95gJQfN0VpoO6MDYa4iM3VxxwjNpFo5mRY+KvUmtul6lr4XFprk3Qw RQbBnU9Nyf2jezKeqXKPPNyugKM+lgd57gWCCeKWWOFpl18T8elxprjuNMw3Hw== 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 4TgTvW56P1zSb6; Thu, 22 Feb 2024 10:31:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MAVJeR016634; Thu, 22 Feb 2024 10:31:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MAVJuL016631; Thu, 22 Feb 2024 10:31:19 GMT (envelope-from git) Date: Thu, 22 Feb 2024 10:31:19 GMT Message-Id: <202402221031.41MAVJuL016631@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roger Pau =?utf-8?Q?Monn=C3=A9?= Subject: git: 6744fd8e7503 - main - x86/cpu: improve hypervisor detection List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6744fd8e75032c893e6a80bced8be3a991fa2901 Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=6744fd8e75032c893e6a80bced8be3a991fa2901 commit 6744fd8e75032c893e6a80bced8be3a991fa2901 Author: Roger Pau Monné AuthorDate: 2024-01-19 09:15:17 +0000 Commit: Roger Pau Monné CommitDate: 2024-02-22 10:08:04 +0000 x86/cpu: improve hypervisor detection Some hypervisors can expose multiple signatures, for example Xen will expose both the Xen and the HyperV signatures if Viridian extensions are enabled for the guest. Presence of multiple signatures is currently not handled by FreeBSD, that will exit once a known signature is found in cpuid output. Exposing the HyperV signature on hypervisors different than HyperV is not uncommon, this is done so that such hypervisor can expose a (subset) of the Viridian extensions to Windows guests for performance reasons. Likely for compatibility purposes the HyperV signature is always exposed on the first leaf, and the Xen signature is exposed in the secondary leaf. Fix the specific case of HyperV by not exiting from the scan if the HyperV signature is found, and prefer a second signature if one is found. Note that long term we might wish to convert vm_guest into a bitmap, so that it can signal detection of multiple hypervisor interfaces. Fixes: b0165dc4539f ('x86/xen: fix HVM guest hypercall page setup') PR: 276421 Sponsored by: Cloud Software Group Reviewed by: markj kib Differential revision: https://reviews.freebsd.org/D43508 --- sys/x86/x86/identcpu.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/sys/x86/x86/identcpu.c b/sys/x86/x86/identcpu.c index 9c82f9f8a882..df24c5bddffd 100644 --- a/sys/x86/x86/identcpu.c +++ b/sys/x86/x86/identcpu.c @@ -1385,6 +1385,8 @@ identify_hypervisor_cpuid_base(void) regs[0] = leaf + 1; if (regs[0] >= leaf) { + enum VM_GUEST prev_vm_guest = vm_guest; + for (i = 0; i < nitems(vm_cpuids); i++) if (strncmp((const char *)®s[1], vm_cpuids[i].vm_cpuid, 12) == 0) { @@ -1397,7 +1399,7 @@ identify_hypervisor_cpuid_base(void) * specific hypervisor, record the base, high value, * and vendor identifier. */ - if (vm_guest != VM_GUEST_VM || leaf == 0x40000000) { + if (vm_guest != prev_vm_guest || leaf == 0x40000000) { hv_base = leaf; hv_high = regs[0]; ((u_int *)&hv_vendor)[0] = regs[1]; @@ -1409,7 +1411,18 @@ identify_hypervisor_cpuid_base(void) * If we found a specific hypervisor, then * we are finished. */ - if (vm_guest != VM_GUEST_VM) + if (vm_guest != VM_GUEST_VM && + /* + * Xen and other hypervisors can expose the + * HyperV signature in addition to the + * native one in order to support Viridian + * extensions for Windows guests. + * + * Do the full cpuid scan if HyperV is + * detected, as the native hypervisor is + * preferred. + */ + vm_guest != VM_GUEST_HV) return; } } From nobody Thu Feb 22 10:31:20 2024 X-Original-To: dev-commits-src-main@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 4TgTvY35p8z5CMB3; Thu, 22 Feb 2024 10:31:21 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgTvX6p29z4knb; Thu, 22 Feb 2024 10:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708597880; 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=tBSEtycKBPwVq/BrrUgXMMuotw78kzmFz1UTd5qr3Vk=; b=D693hTdC8m0YhXhzn+U+ZQF4UUfGve3A4a18Ppy9JveLElYUxFpwHJ4uWOMClAqjgCDYIO cErQ/WV1I/PGvUkTP3yPmCBPibfs9WnjfTcsae2VBWuLpkgOIoviTd5YvZb4TPvlUWLoWL pr9kbVpRYNTXTJAj0jsYsaAHc57LWY/h/it9wyiMJw5PKvhPkxQpNn4hMP8S8lSqNoBV0T e1B2UOoiGAfgEaX4IeUQzwDQX3KCogMd11NS3NtvndeLACo0SXBj4F6rFc+QNxm2MYJ0EL NzxTy3GxhUzLKraST45t+JpFjMVqwx4x+yhpEa2hkYfbkqOQmoSZvXXgwXvqBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708597881; 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=tBSEtycKBPwVq/BrrUgXMMuotw78kzmFz1UTd5qr3Vk=; b=Yp8jrgfyT4xkj/RvATjBWJNjnx3dYS0XDj1LuhNXtWTbmLEsed7oa75YZ1a6NIz84Wm0LC OPkF8h3VkSsJ73kWWOPm1CRSt9SKXJn0s76AFkiudS9jdvA+yfB+fIyiKO+f2VwG4hF38c kOm0LX9cbI3HaHQMS/5toy8rU2bttaBuIFI25wiF2Mr2I1O5MOmQYOXB7fNkMBGPrDeNAJ aGWlQrGsIOMuOdtemlOXwhHcwRts4EcQj4WusIgqtLDmfSjmPfHfpHcaL+jOCRAXHnSrlf q4FBAAjI8FYh++pRKGNS3rPmdEuFdEOEUFm4LgyNDXGrZ1or1GaPt4raVkvsTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708597881; a=rsa-sha256; cv=none; b=FfZyx6lniItbjtoArAXrciP2WvkhA/kAATAFxdMIN5fVdDggCOuDkBfOdJG9Zah3rmj+/R CYgv1LH0WflXx73/Zjfy9yyCArm6SfsS80V0QzOABtGXRxaxFue6QSxg5KIXJDNi8ZLQIx SK2RwxZHKQc4+ewJJvl++pdcyUh+ZgXLrhuzFTanDkTcUiPICN/AEMadSRXgu6spYL1tKm +NcftyKLl6c7WsHsZ31GUK3ADSFQyJCcTxgnOYeLkP3mcXYVP3qANc2ulMvFcshImLZ5Ca PIj+JZ24wpYft2U/X9c56aO0gUtZYDlFsLnt6g/Or1T0axi9SJ+eMm0qk8D4MQ== 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 4TgTvX5v8bzSKB; Thu, 22 Feb 2024 10:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MAVKoY016692; Thu, 22 Feb 2024 10:31:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MAVKDV016689; Thu, 22 Feb 2024 10:31:20 GMT (envelope-from git) Date: Thu, 22 Feb 2024 10:31:20 GMT Message-Id: <202402221031.41MAVKDV016689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roger Pau =?utf-8?Q?Monn=C3=A9?= Subject: git: e283c994ab27 - main - x86/xen: fill hypercall page with int3 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e283c994ab270706142ef5dde9092950000af901 Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=e283c994ab270706142ef5dde9092950000af901 commit e283c994ab270706142ef5dde9092950000af901 Author: Roger Pau Monné AuthorDate: 2024-02-02 08:50:16 +0000 Commit: Roger Pau Monné CommitDate: 2024-02-22 10:08:04 +0000 x86/xen: fill hypercall page with int3 Filling the hypercall page with nops is not helpful from a debugging point of view, as for example attempting to execute an hypercall before the page is initialized will result in the execution flow falling through into xen_start32, making the mistake less obvious to spot. Instead fill the page with int3 (0xcc) which will result in a #BP trap. Sponsored by: Cloud Software Group Reviewed by: markj Differential revision: https://reviews.freebsd.org/D43930 --- sys/amd64/amd64/xen-locore.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/amd64/xen-locore.S b/sys/amd64/amd64/xen-locore.S index db949af1e7ca..ed2aae038b6d 100644 --- a/sys/amd64/amd64/xen-locore.S +++ b/sys/amd64/amd64/xen-locore.S @@ -67,7 +67,7 @@ .p2align PAGE_SHIFT, 0x90 /* Hypercall_page needs to be PAGE aligned */ ENTRY(hypercall_page) - .skip 0x1000, 0x90 /* Fill with "nop"s */ + .skip 0x1000, 0xcc /* Fill with `int3` to generate a #BP trap. */ /* PVH entry point. */ .code32 From nobody Thu Feb 22 10:31:21 2024 X-Original-To: dev-commits-src-main@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 4TgTvZ3csNz5CLvJ; Thu, 22 Feb 2024 10:31:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgTvZ0hVDz4ktg; Thu, 22 Feb 2024 10:31:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708597882; 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=Jm/o4vSTLFgA2GZ+QINpIRmPYeE4papFbATDQ+FmebM=; b=lFbxAJmuqzRH7+uxi+DlG5oK+BRTwUedhLFBvDAqBJ0GcwB3C5ZGVdNwocBpNRNvE3N6Tj uOEFuMg9ct04dNyYW3NXZ4NK0Ife/kDkSee+J3I0DtWwmrZJ0lswKijGuKVeduDSOffw/A VZ3Lnsz8xf+pFjHpO4RnE0yNPEE/kuOQPJfri4lGU49Zu+eR/I69oLMcBZmgtM0y6nPTKn ARWizkoqsAyoZcnme8y7DuiCJST3gEOhkadgPYCwE6mTpfNFKulBzUL5OPE3W9aDVZ6v7F vKJDJARua1JDGgiBNzGjkxyDbjjL/44MvWuYsrLAuUUdFjAtuSHcTJ/knO1zyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708597882; 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=Jm/o4vSTLFgA2GZ+QINpIRmPYeE4papFbATDQ+FmebM=; b=kIweKOUpuotsHpDXisGjVw5QH52jqJaPxWEYgPte6DvgvimjVhrd8DFbvYEFbjszyMKy+Y hHiQ5dtZNDLRDxA6bYs+fLitgjmY6w3tE0xj6yy/XRUCtNsjnIjQiGIP6y65SwO4/byp+A EPGKOgfJNQAHbAJPM/seoZdHfWYJwxQ/JN8O0qmwJmVvbNChcro3y+t6/FjMz2AXeDeL9v jZ5JGwJyI3cYpeJ/5IYiQHUGxR9V8Km1yYPgk49q3x3xJczFfBqK1ErN7nK304UU05udsi +gs0a3CkKsvwb/XhGsya8T9YHlj3zviQZxB7GL7bbO3r29muopizVnhnsztIlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708597882; a=rsa-sha256; cv=none; b=Y7noyKGrK7rJ1zVCB4+nsl8hQb33bjvz3voTwFr0+fAiYbn+fL5qXcoA2zFcffjmEKO/3f EkgyitEdt9hwPAtrqaRjblBhjWqMKVspZp7m84y3KabJmBzFUuxgiUBP5vK//tzaejnqKF 8DRwJN4xMg+Pi55WOMn1HkRYQ2GDPi780Rc1/Zrgcjdxjp1OLoUeQsz6E2fEZVWZwfe8kX VOOOuJKqhfrFzqppFzKh/TAg/LFR7uba4Lp0Q3woPiWMGxA7fBqk9J6dfOfqGNLm3fYAAy 72T99kfocgttUfm0UBJ9ZGnfT68biw98d4aPsgTHVKMlkQMaCXp2VNVC2dgcFg== 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 4TgTvY6vfhzSb8; Thu, 22 Feb 2024 10:31:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MAVLe4016743; Thu, 22 Feb 2024 10:31:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MAVLib016740; Thu, 22 Feb 2024 10:31:21 GMT (envelope-from git) Date: Thu, 22 Feb 2024 10:31:21 GMT Message-Id: <202402221031.41MAVLib016740@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roger Pau =?utf-8?Q?Monn=C3=A9?= Subject: git: 848e2719af50 - main - x86/xen: remove parameter from fixup_console() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 848e2719af508516452b447047ddf6642ce42d0f Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=848e2719af508516452b447047ddf6642ce42d0f commit 848e2719af508516452b447047ddf6642ce42d0f Author: Roger Pau Monné AuthorDate: 2024-02-02 08:32:15 +0000 Commit: Roger Pau Monné CommitDate: 2024-02-22 10:08:04 +0000 x86/xen: remove parameter from fixup_console() And instead fetch the metadata inside of the function. This is done in preparation for changing the call site of fixup_console(), which will no longer have the kernel metedata pointer in context. No functional change intended. Sponsored by: Cloud Software Group Reviewed by: markj Differential revision: https://reviews.freebsd.org/D43931 --- sys/x86/xen/pv.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c index 9ea276caee81..75c345ff3a2c 100644 --- a/sys/x86/xen/pv.c +++ b/sys/x86/xen/pv.c @@ -335,7 +335,7 @@ xen_pvh_parse_symtab(void) #endif static void -fixup_console(caddr_t kmdp) +fixup_console(void) { struct xen_platform_op op = { .cmd = XENPF_get_dom0_console, @@ -346,10 +346,19 @@ fixup_console(caddr_t kmdp) struct vbe_fb vbe; } *fb = NULL; int size; + caddr_t kmdp; + + kmdp = preload_search_by_type("elf kernel"); + if (kmdp == NULL) + kmdp = preload_search_by_type("elf64 kernel"); + if (kmdp == NULL) { + xc_printf("Unable to find kernel metadata\n"); + return; + } size = HYPERVISOR_platform_op(&op); if (size < 0) { - xc_printf("Failed to get dom0 video console info: %d\n", size); + xc_printf("Failed to get video console info: %d\n", size); return; } @@ -486,7 +495,7 @@ xen_pvh_parse_preload_data(uint64_t modulep) else strlcpy(bootmethod, "BIOS", sizeof(bootmethod)); - fixup_console(kmdp); + fixup_console(); } else { /* Parse the extra boot information given by Xen */ if (start_info->cmdline_paddr != 0) From nobody Thu Feb 22 10:31:23 2024 X-Original-To: dev-commits-src-main@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 4TgTvb5Dw3z5CMGc; Thu, 22 Feb 2024 10:31:23 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgTvb1wJ4z4ktw; Thu, 22 Feb 2024 10:31:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708597883; 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=S5ZRIYeImaBweCxrnuhMJOKa/e/Agqih8Mc3nXSAVDs=; b=VV+AJmN5V+CVsiHjHjKQQjaC82n36swI+5vjVVGLn4EXhHvvB4SOU0797n/VunRSYAVREO 9Dihi0hu9/TB0fPdEUaRGizxTWiUz7dx+XfJtE09v6/1JA7vDobFaAi4CD1SCgekyrMmZ/ DnNUMt9gTurNBOBNcyelYIUgzkwo7AWkNUfcSF2P7Takmr2J7xzP0fmtrZNOLmiFgAQnAR D4wpuPcTFfnG3sx1PN2z99vu1M8znh87d2o5nQ00g4iQsKvPuK6huk3H4bGJNRe+03iGRi OaG4Vz4gkIktPM9Eg+DzCKHOohzYm6RgeATbp93hNJeqARSuN6gq5iDOV7vX5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708597883; 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=S5ZRIYeImaBweCxrnuhMJOKa/e/Agqih8Mc3nXSAVDs=; b=JeB4ybXFQnkfTEifE0lZK6A4tz/jKGrU9ADoOMIU3kV22UotaW5J7XyDT5YGgpIR9f69RK rKz/OUcFmL9C6UMPYUdPmsQqkp+ZLP2PQaMa3D5ZVgr/JJBSXbqjhX8aEbvxBWXzntwy5u NPIhF9TkElPsvrjKGLeb6MUCNZsgrMG3MjWcYQNJJBybJhm/V0RK6XAk9//r6/uLZhDaBa qyr5RiKJyVhkUteigv4eXlibTsZdqElrfp/qGBBehhzLnbvRWNt8OnLzrt73mnt9/hGCxr 364cBjET8768qwQ+7r1b5qatkyn1SoHLV6kGs5ZNmRR2ryhra0UPmBOUKgR8hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708597883; a=rsa-sha256; cv=none; b=Vcg9k5jEajIEO9wpwoGUiLbXgFJz4FPqzmWTUUjCOntDV2ynCb/OlqxphXmv51k8dQjvft iQpoVUVzkKVeVtvQo6FtzMNYac9O04zWlicZd8AILrGf9NLK+91RuOmPPXnU5yjlzMlizP 5p0g8a3mJMAa9/FHYxmodd4ricnvrSHTZmr9M+8OppFYtC9firGHpwbP04CIXzxl11H7zb nlNt68f9LribdCyP8zBdeMR1pjIboiqjeXx3gisvp2FReCASOmInSXWG0XOSmk++TlEO55 Xnj8EoHTkPiLoxCWTnT7WPZPmtiF/zqW7fnEmcc398TvrcH+0mpadFpWY5E/Hg== 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 4TgTvb0wsvzS5X; Thu, 22 Feb 2024 10:31:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MAVN7J016802; Thu, 22 Feb 2024 10:31:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MAVNLv016799; Thu, 22 Feb 2024 10:31:23 GMT (envelope-from git) Date: Thu, 22 Feb 2024 10:31:23 GMT Message-Id: <202402221031.41MAVNLv016799@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roger Pau =?utf-8?Q?Monn=C3=A9?= Subject: git: 9a687d1fe3af - main - x86/xen: introduce a Xen early init function List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a687d1fe3af460cdc39c3ed08d1e33cc99b8141 Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=9a687d1fe3af460cdc39c3ed08d1e33cc99b8141 commit 9a687d1fe3af460cdc39c3ed08d1e33cc99b8141 Author: Roger Pau Monné AuthorDate: 2024-02-02 10:00:31 +0000 Commit: Roger Pau Monné CommitDate: 2024-02-22 10:08:04 +0000 x86/xen: introduce a Xen early init function Start by moving the hyeprcall setup to such function. The aim is to have a function that does all the required Xen early initialization for both HVM and PVH, instead of having it scattered across different paths. Sponsored by: Cloud Software Group Reviewed by: markj Differential revision: https://reviews.freebsd.org/D43932 --- sys/x86/include/xen/xen-os.h | 3 +++ sys/x86/xen/hvm.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ sys/x86/xen/pv.c | 9 ++++----- 3 files changed, 55 insertions(+), 5 deletions(-) diff --git a/sys/x86/include/xen/xen-os.h b/sys/x86/include/xen/xen-os.h index 12942375be43..ec0d4b1ab9f1 100644 --- a/sys/x86/include/xen/xen-os.h +++ b/sys/x86/include/xen/xen-os.h @@ -96,6 +96,9 @@ xen_pv_nics_disabled(void) bool xen_has_iommu_maps(void); +/* (Very) early initialization. */ +void xen_early_init(void); + #endif /* !__ASSEMBLY__ */ #endif /* _MACHINE_X86_XEN_XEN_OS_H_ */ diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index 6411b790a2be..9d9a64dd29ea 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -41,8 +41,10 @@ #include +#include #include #include +#include #include #include @@ -184,6 +186,52 @@ out: return (0); } +/* + * Translate linear to physical address when still running on the bootloader + * created page-tables. + */ +static vm_paddr_t +early_init_vtop(void *addr) +{ + + /* + * Using a KASSERT won't print anything, as this is before console + * initialization. + */ + if (__predict_false((uintptr_t)addr < KERNBASE)) { + xc_printf("invalid linear address: %#lx\n", (uintptr_t)addr); + halt(); + } + + return ((uintptr_t)addr - KERNBASE +#ifdef __amd64__ + + kernphys - KERNLOAD +#endif + ); +} + +/* Early initialization when running as a Xen guest. */ +void +xen_early_init(void) +{ + uint32_t regs[4]; + + xen_cpuid_base = xen_hvm_cpuid_base(); + if (xen_cpuid_base == 0) + return; + + /* Find the hypercall pages. */ + do_cpuid(xen_cpuid_base + 2, regs); + if (regs[0] != 1) { + xc_printf("Invalid number of hypercall pages %u\n", + regs[0]); + vm_guest = VM_GUEST_VM; + return; + } + + wrmsr(regs[1], early_init_vtop(&hypercall_page)); +} + static void xen_hvm_init_shared_info_page(void) { diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c index 75c345ff3a2c..3c22d9e5cf6f 100644 --- a/sys/x86/xen/pv.c +++ b/sys/x86/xen/pv.c @@ -162,14 +162,13 @@ hammer_time_xen(vm_paddr_t start_info_paddr) struct xen_add_to_physmap xatp; uint64_t physfree; char *kenv; - int rc; if (isxen()) { vm_guest = VM_GUEST_XEN; - rc = xen_hvm_init_hypercall_stubs(XEN_HVM_INIT_EARLY); - if (rc) { - xc_printf("ERROR: failed to initialize hypercall page: %d\n", - rc); + xen_early_init(); + if (xen_cpuid_base == 0) { + xc_printf( + "ERROR: failed to initialize hypercall page\n"); HYPERVISOR_shutdown(SHUTDOWN_crash); } } From nobody Thu Feb 22 10:31:24 2024 X-Original-To: dev-commits-src-main@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 4TgTvd4sjyz5CMJw; Thu, 22 Feb 2024 10:31:25 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgTvc3bjGz4kb5; Thu, 22 Feb 2024 10:31:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708597884; 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=PLNdz/va8uhf1VlV6dgq7/kJfd347v7bwO3c3gUnQdo=; b=WSDhEad2k6NDNMC8AX9bqLLq7EE8KNuM1XLmunpDCm++b4KI9YsPysK94Usyyivg9KXr8m IPdePoTVZyht3MzNU4HyAOGsN5Zpb6V4lHNcIKO1aX7GFJlC0E0lP0CxAzxIQD5MFKVPF/ 674XMfwUCa3iELumAYoglNBKuvv1/g4l4aiNOR9ekoLc6cjP2R8MYHNJQTyHVFNHR6a1NP OtlPFvrkst0QpaGRBCXyRO8rgepgfOjl1c1Eze7SW95qBPnn5b5b/lHdb7i09iKk/l93Uo 1eMt31wWnXTUT/5WsFUWmtXMFk/oOgDuKzAayTKv5ixB+ITZ8ZvwO5j97EmDYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708597884; 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=PLNdz/va8uhf1VlV6dgq7/kJfd347v7bwO3c3gUnQdo=; b=g3OaKAKOwFtT8AbYqvr4VUjwMGFHoblTpftSNK27PwuDNXDHdSzfsSR8lIfjEJ2nnmy+wK +z/yxU2jcxUaALdpHTGBAQSo8Al2l1MXTQL61DBsmZ9pbWj/03xPkjLnuBDFnILNvzT/Dt IFo+l79b6X/0iE5IXC3dNR0hWrnWIexW2JGSfKMg3a5f6y48WDJRgXAvHeubFh3lmBI9Hn 5l0gG4zq2mhHbq6+6qC3+W2ST+DGqox+m3aljoR6i6jdUH1x6gKBjlp/GZM5uuThfpx5re PgNZxdUBNmZPcgkTjHE+fp7knEkuLvyXWHK/wQkzPeMFJ4yOSw68uP8c1Uxrog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708597884; a=rsa-sha256; cv=none; b=LLz2oWw+gYAQfZNctwEdWpNfs7+V/XaRjLxbss013d+DOHBBVoIoNQMWdgdEGf8Vtwcq14 Jhw5fl/8+70pj0DInD55pv1YYOkOy7YSTs9QnYGMLKKcElOQLZDeATgPiu60wegmjf8HHU 51Pmf6lqIifpIhHdfuLQEdZDeaUXYNrakAoB0sQ7zydgSrSLPggPqDbCbG1HQ+fxNFc3H3 Y4o/aH1nos4zhGbGlEeAp8RtM+3JVgt28mHjPuMcZPW3OABe2qJSQ532QAWEurzb2FChEM VKVTZ/c6iMyRZh+322luHP5G/l8aHzKVdwLmeU6LbWnR7c9FsvnoehxMdk2gHA== 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 4TgTvc1tJPzSPT; Thu, 22 Feb 2024 10:31:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MAVO7V017915; Thu, 22 Feb 2024 10:31:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MAVOFW017903; Thu, 22 Feb 2024 10:31:24 GMT (envelope-from git) Date: Thu, 22 Feb 2024 10:31:24 GMT Message-Id: <202402221031.41MAVOFW017903@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roger Pau =?utf-8?Q?Monn=C3=A9?= Subject: git: 5d62aba742ac - main - x86/xen: move shared page setup to early init handler List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5d62aba742ace4f020be5d5e843cf0f89024930b Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=5d62aba742ace4f020be5d5e843cf0f89024930b commit 5d62aba742ace4f020be5d5e843cf0f89024930b Author: Roger Pau Monné AuthorDate: 2024-02-02 10:20:33 +0000 Commit: Roger Pau Monné CommitDate: 2024-02-22 10:08:05 +0000 x86/xen: move shared page setup to early init handler As done with the hypercall page, move the setup fo the shared info page into the newly introduced helper, which the aim of having a single helper and call site used by both HVM and PV in order to setup the basic Xen environment. Sponsored by: Cloud Software Group Reviewed by: markj Differential revision: https://reviews.freebsd.org/D43933 --- sys/x86/xen/hvm.c | 43 +++++++++++++++++++++++++++++++++++++++++++ sys/x86/xen/pv.c | 14 -------------- 2 files changed, 43 insertions(+), 14 deletions(-) diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index 9d9a64dd29ea..9dc9360d719c 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -210,11 +210,48 @@ early_init_vtop(void *addr) ); } +static int +map_shared_info(void) +{ + /* + * TODO shared info page should be mapped in an unpopulated (IOW: + * non-RAM) address. But finding one at this point in boot is + * complicated, hence re-use a RAM address for the time being. This + * sadly causes super-page shattering in the second stage translation + * page tables. + */ + static union { + shared_info_t shared_info; + uint8_t raw[PAGE_SIZE]; + } shared_page __attribute__((aligned(PAGE_SIZE))); + static struct xen_add_to_physmap xatp = { + .domid = DOMID_SELF, + .space = XENMAPSPACE_shared_info, + }; + int rc; + + _Static_assert(sizeof(shared_page) == PAGE_SIZE, + "invalid Xen shared_info struct size"); + + if (xatp.gpfn == 0) + xatp.gpfn = atop(early_init_vtop(&shared_page.shared_info)); + + rc = HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp); + if (rc != 0) { + xc_printf("cannot map shared info page: %d\n", rc); + HYPERVISOR_shared_info = NULL; + } else if (HYPERVISOR_shared_info == NULL) + HYPERVISOR_shared_info = &shared_page.shared_info; + + return (rc); +} + /* Early initialization when running as a Xen guest. */ void xen_early_init(void) { uint32_t regs[4]; + int rc; xen_cpuid_base = xen_hvm_cpuid_base(); if (xen_cpuid_base == 0) @@ -230,6 +267,12 @@ xen_early_init(void) } wrmsr(regs[1], early_init_vtop(&hypercall_page)); + + rc = map_shared_info(); + if (rc != 0) { + vm_guest = VM_GUEST_VM; + return; + } } static void diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c index 3c22d9e5cf6f..515e5c58d304 100644 --- a/sys/x86/xen/pv.c +++ b/sys/x86/xen/pv.c @@ -159,7 +159,6 @@ uint64_t hammer_time_xen(vm_paddr_t start_info_paddr) { struct hvm_modlist_entry *mod; - struct xen_add_to_physmap xatp; uint64_t physfree; char *kenv; @@ -210,19 +209,6 @@ hammer_time_xen(vm_paddr_t start_info_paddr) PAGE_SIZE), physfree); } - if (isxen()) { - xatp.domid = DOMID_SELF; - xatp.idx = 0; - xatp.space = XENMAPSPACE_shared_info; - xatp.gpfn = atop(physfree); - if (HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp)) { - xc_printf("ERROR: failed to setup shared_info page\n"); - HYPERVISOR_shutdown(SHUTDOWN_crash); - } - HYPERVISOR_shared_info = (shared_info_t *)(physfree + KERNBASE); - physfree += PAGE_SIZE; - } - /* * Init a static kenv using a free page. The contents will be filled * from the parse_preload_data hook. From nobody Thu Feb 22 10:31:25 2024 X-Original-To: dev-commits-src-main@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 4TgTvd6zKLz5CM81; Thu, 22 Feb 2024 10:31:25 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgTvd45xmz4kvW; Thu, 22 Feb 2024 10:31:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708597885; 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=NXN3QMFAv30+qKzFEmdzCMIEisk+jQ2WeSOPOFmnwLw=; b=h6AS92pKkr5vpr4PBozBQFJvyUPw6XsU5aiPW+u0gVcTxSd4Lb/ewxtnBpub4Ef/XrGarf XiHwv7BGWs1L8msB20QKtBY9dU0c7NFeh1Y5cxicEW8+M3MYzZSmjEjT2Bb8GpnK6J6J/1 puGKG6MPRFHHc3HH7PCTId24JKDicW+RDWsvGYvg2Y43i42/apV7lwOdTav8n4OG51w5cV n9YrAhFHqo6aCLWAlTsPPIN8ZGBUnOnTL+xG7hj3C/rWhgpZRNJwejeurVlz6DhHaAe7W9 9rhaNiK853UgfLr7C3/5j+KCW9yuZo/iwkvF7k97t6dbG3bFFcCY6LB1u1y8jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708597885; 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=NXN3QMFAv30+qKzFEmdzCMIEisk+jQ2WeSOPOFmnwLw=; b=oUTm2gz782u/gA1ujo4LJXgaifjk320mxohlgee6d85CcCte7vRA2mE8zJMRMdowqQ5yk2 +n/wzwhfU5y87PtUVG6WwPKFj3uodFOgKTJtt/EHwD460aGObZ6heQssGUTSGX1iYaoxjO WqULwBlpEyx+G7t5E3TtfPLlfPm1wqCHhSTKTkCkgwvLh4k+Luk+tPA+gKQK/KPAKP8hVb w78KQ+dnb7XduRPZ9eu7AQYDm8NX22QFy7XClO59IVHoyPuUce3haueoTLcHR1JR78IOi0 erxCsbjo5mdRpOTBbtQcBX1rxGQfpzFLqZVNEVGpvKBuRr9UaP9wooDzXBz5Rg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708597885; a=rsa-sha256; cv=none; b=QLpCA255sIgKegPdXCwScGHpZ2i2BmvlETWkPIPo+nQXFxqyNhQktQZ3m7Begsnkoa/fPQ ybzX5sXqPh6+dv06HJNiN+70lxGOdppe9xnfknuZ2/cgbji/HkvHYxN6JCCr9m1yUkrSO9 yGuHpiaFdx2J8+wGzsxM7QfVa5ODuJ1UV/DxQMsD8ikQfjV51Rd45S+sgVLi3WwbaUMpCW tsiYbGrzcLtFFDXcHK+qL9wgsC5YM/Z/vwUmIolUCzWA28cmWZXgGbZe/agE6k3CgZGUNk OsEj+zNhZjhACtJWLQQjLZdpCkgGJxOWF/2ies9LJdXMgdsdTWbKFTOIcHN2TA== 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 4TgTvd2MYyzSdk; Thu, 22 Feb 2024 10:31:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MAVPJr018169; Thu, 22 Feb 2024 10:31:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MAVP4J018166; Thu, 22 Feb 2024 10:31:25 GMT (envelope-from git) Date: Thu, 22 Feb 2024 10:31:25 GMT Message-Id: <202402221031.41MAVP4J018166@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roger Pau =?utf-8?Q?Monn=C3=A9?= Subject: git: 027b66d64b54 - main - x86/xen: do video console fixup as part of early initialization List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 027b66d64b547b2133c11b596a7e308ea8c83ccb Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=027b66d64b547b2133c11b596a7e308ea8c83ccb commit 027b66d64b547b2133c11b596a7e308ea8c83ccb Author: Roger Pau Monné AuthorDate: 2024-02-02 10:29:57 +0000 Commit: Roger Pau Monné CommitDate: 2024-02-22 10:08:05 +0000 x86/xen: do video console fixup as part of early initialization When FreeBSD is running as dom0 the video console metadata provided by the bootloader might not be accurate, as Xen has very likely taken over the console and possibly changed the mode. Adjust the video console information in the kernel metadata as part of early Xen initialization. Sponsored by: Cloud Software Group Reviewed by: imp Differential revision: https://reviews.freebsd.org/D43934 --- sys/x86/xen/hvm.c | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ sys/x86/xen/pv.c | 83 ---------------------------------------------------- 2 files changed, 87 insertions(+), 83 deletions(-) diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index 9dc9360d719c..85f274175ac6 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -45,6 +46,7 @@ #include #include #include +#include #include #include @@ -246,6 +248,87 @@ map_shared_info(void) return (rc); } +static void +fixup_console(void) +{ + struct xen_platform_op op = { + .cmd = XENPF_get_dom0_console, + }; + xenpf_dom0_console_t *console = &op.u.dom0_console; + union { + struct efi_fb efi; + struct vbe_fb vbe; + } *fb = NULL; + int size; + caddr_t kmdp; + + kmdp = preload_search_by_type("elf kernel"); + if (kmdp == NULL) + kmdp = preload_search_by_type("elf64 kernel"); + if (kmdp == NULL) { + xc_printf("Unable to find kernel metadata\n"); + return; + } + + size = HYPERVISOR_platform_op(&op); + if (size < 0) { + xc_printf("Failed to get video console info: %d\n", size); + return; + } + + switch (console->video_type) { + case XEN_VGATYPE_VESA_LFB: + fb = (__typeof__ (fb))preload_search_info(kmdp, + MODINFO_METADATA | MODINFOMD_VBE_FB); + + if (fb == NULL) { + xc_printf("No VBE FB in kernel metadata\n"); + return; + } + + _Static_assert(offsetof(struct vbe_fb, fb_bpp) == + offsetof(struct efi_fb, fb_mask_reserved) + + sizeof(fb->efi.fb_mask_reserved), + "Bad structure overlay\n"); + fb->vbe.fb_bpp = console->u.vesa_lfb.bits_per_pixel; + /* FALLTHROUGH */ + case XEN_VGATYPE_EFI_LFB: + if (fb == NULL) { + fb = (__typeof__ (fb))preload_search_info(kmdp, + MODINFO_METADATA | MODINFOMD_EFI_FB); + if (fb == NULL) { + xc_printf("No EFI FB in kernel metadata\n"); + return; + } + } + + fb->efi.fb_addr = console->u.vesa_lfb.lfb_base; + if (size > + offsetof(xenpf_dom0_console_t, u.vesa_lfb.ext_lfb_base)) + fb->efi.fb_addr |= + (uint64_t)console->u.vesa_lfb.ext_lfb_base << 32; + fb->efi.fb_size = console->u.vesa_lfb.lfb_size << 16; + fb->efi.fb_height = console->u.vesa_lfb.height; + fb->efi.fb_width = console->u.vesa_lfb.width; + fb->efi.fb_stride = (console->u.vesa_lfb.bytes_per_line << 3) / + console->u.vesa_lfb.bits_per_pixel; +#define FBMASK(c) \ + ((~0u << console->u.vesa_lfb.c ## _pos) & \ + (~0u >> (32 - console->u.vesa_lfb.c ## _pos - \ + console->u.vesa_lfb.c ## _size))) + fb->efi.fb_mask_red = FBMASK(red); + fb->efi.fb_mask_green = FBMASK(green); + fb->efi.fb_mask_blue = FBMASK(blue); + fb->efi.fb_mask_reserved = FBMASK(rsvd); +#undef FBMASK + break; + + default: + xc_printf("Video console type unsupported\n"); + return; + } +} + /* Early initialization when running as a Xen guest. */ void xen_early_init(void) @@ -273,6 +356,10 @@ xen_early_init(void) vm_guest = VM_GUEST_VM; return; } + + if (xen_initial_domain()) + /* Fixup video console information in case Xen changed the mode. */ + fixup_console(); } static void diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c index 515e5c58d304..e33fa41c83d7 100644 --- a/sys/x86/xen/pv.c +++ b/sys/x86/xen/pv.c @@ -319,87 +319,6 @@ xen_pvh_parse_symtab(void) } #endif -static void -fixup_console(void) -{ - struct xen_platform_op op = { - .cmd = XENPF_get_dom0_console, - }; - xenpf_dom0_console_t *console = &op.u.dom0_console; - union { - struct efi_fb efi; - struct vbe_fb vbe; - } *fb = NULL; - int size; - caddr_t kmdp; - - kmdp = preload_search_by_type("elf kernel"); - if (kmdp == NULL) - kmdp = preload_search_by_type("elf64 kernel"); - if (kmdp == NULL) { - xc_printf("Unable to find kernel metadata\n"); - return; - } - - size = HYPERVISOR_platform_op(&op); - if (size < 0) { - xc_printf("Failed to get video console info: %d\n", size); - return; - } - - switch (console->video_type) { - case XEN_VGATYPE_VESA_LFB: - fb = (__typeof__ (fb))preload_search_info(kmdp, - MODINFO_METADATA | MODINFOMD_VBE_FB); - - if (fb == NULL) { - xc_printf("No VBE FB in kernel metadata\n"); - return; - } - - _Static_assert(offsetof(struct vbe_fb, fb_bpp) == - offsetof(struct efi_fb, fb_mask_reserved) + - sizeof(fb->efi.fb_mask_reserved), - "Bad structure overlay\n"); - fb->vbe.fb_bpp = console->u.vesa_lfb.bits_per_pixel; - /* FALLTHROUGH */ - case XEN_VGATYPE_EFI_LFB: - if (fb == NULL) { - fb = (__typeof__ (fb))preload_search_info(kmdp, - MODINFO_METADATA | MODINFOMD_EFI_FB); - if (fb == NULL) { - xc_printf("No EFI FB in kernel metadata\n"); - return; - } - } - - fb->efi.fb_addr = console->u.vesa_lfb.lfb_base; - if (size > - offsetof(xenpf_dom0_console_t, u.vesa_lfb.ext_lfb_base)) - fb->efi.fb_addr |= - (uint64_t)console->u.vesa_lfb.ext_lfb_base << 32; - fb->efi.fb_size = console->u.vesa_lfb.lfb_size << 16; - fb->efi.fb_height = console->u.vesa_lfb.height; - fb->efi.fb_width = console->u.vesa_lfb.width; - fb->efi.fb_stride = (console->u.vesa_lfb.bytes_per_line << 3) / - console->u.vesa_lfb.bits_per_pixel; -#define FBMASK(c) \ - ((~0u << console->u.vesa_lfb.c ## _pos) & \ - (~0u >> (32 - console->u.vesa_lfb.c ## _pos - \ - console->u.vesa_lfb.c ## _size))) - fb->efi.fb_mask_red = FBMASK(red); - fb->efi.fb_mask_green = FBMASK(green); - fb->efi.fb_mask_blue = FBMASK(blue); - fb->efi.fb_mask_reserved = FBMASK(rsvd); -#undef FBMASK - break; - - default: - xc_printf("Video console type unsupported\n"); - return; - } -} - static caddr_t xen_pvh_parse_preload_data(uint64_t modulep) { @@ -479,8 +398,6 @@ xen_pvh_parse_preload_data(uint64_t modulep) strlcpy(bootmethod, "UEFI", sizeof(bootmethod)); else strlcpy(bootmethod, "BIOS", sizeof(bootmethod)); - - fixup_console(); } else { /* Parse the extra boot information given by Xen */ if (start_info->cmdline_paddr != 0) From nobody Thu Feb 22 10:31:26 2024 X-Original-To: dev-commits-src-main@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 4TgTvg1Q5rz5CMM0; Thu, 22 Feb 2024 10:31:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgTvf4Fm5z4krx; Thu, 22 Feb 2024 10:31:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708597886; 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=VrjEDvD+ZTQg0+1FKa9dlUKcjDlG+tLEycs1zeQ5BmQ=; b=YI9PjQ0ALolknl9zUSXkhCqwClRg2yxhFnQ5/2acnAnUp7rpsXaYg4qm9sJ8pkoBijee9c aDGFuzuL/nnLwX3R0Eev3TkR+/7QhWTijGaaqaj25k6h4dZS34KXqZawiw4nG2Qfryjrf5 VurtQWtpWuAGK3VYQio9wrlArFGnBHfi7UD4c3B523r6NgaCaBqxBJZJdArxmI/X+xKSbh MHSJus2l26YpdWnHUNuEXwC8kWD1YiC7p0Bau8Uku4Ky2GpnmjOT6PSBVanUWRa0sq6ndI 4FWcdxJH8UIWNMekR+M6sCyYguGzkHWvgJE66BgsnmBXFdaiOv3enW0LveYI1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708597886; 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=VrjEDvD+ZTQg0+1FKa9dlUKcjDlG+tLEycs1zeQ5BmQ=; b=wd4b0cYbilMpZuHr48FAP0hK2KFOrtGrtnYw6hDqvExnQ/LGOVGGFu/elSw8NgkdnvEddE oBN1dKVn5W1on3/7KRQAVtPPyqwwsasSVDOT7sO9WoNbNAvAnpfoCBKRtOrgsafvtTF0RJ AMiD2Zxt0msWr3o7mIms3vpfqAKBAf3K1IYE8mTIrxjYOfizW5lX1nO0WV0iV0Jnpa0ecF RryXf2VdQYCACn7j8HBdjWLIMhKiRDP9vqmkQ9JRcQKvNTP8aCU7rmDKTaYZXGLvxsTniJ P+VOnM9rw+nWhbRxcb+babzcHLWu28xifLfgMUFy8ihBHhmJwwvtOVVXEqp6YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708597886; a=rsa-sha256; cv=none; b=V08GRxsRXbV+Kr889YbL/tRYxS1GtyfeFwCXNUv1svkikY0pyLUrzyLYDyO+jNyysrRLXH VH6BBIY6stwXj2sDMIrtocjVSDF1P59VZLnSRvKKWGp9f4/utLTPcLTNWtlBOb8U3N4xDB PhOcSIBVeNvj/VKY5kCH9+ueBubtvON9pfmQvtA/JmOYidtggsneNFQE34HvBBhT2+jPyr I80k9PTXoRgrTDGg8GvRkSRwiKH9P8tH/FzvOpeXMoSd7IXgzZS7h0tKD3TY6+9xHWBXdL xVYonT5MvdzuBqNGafLKRfLypyvULnlYhGHGINGph6aE4cOV0JwAiiW93vAPuA== 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 4TgTvf3Bm0zSKH; Thu, 22 Feb 2024 10:31:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MAVQQQ018224; Thu, 22 Feb 2024 10:31:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MAVQ1h018221; Thu, 22 Feb 2024 10:31:26 GMT (envelope-from git) Date: Thu, 22 Feb 2024 10:31:26 GMT Message-Id: <202402221031.41MAVQ1h018221@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roger Pau =?utf-8?Q?Monn=C3=A9?= Subject: git: f0cf86c075cd - main - x86/xen: replace xen_cpuid_base with hv_base List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f0cf86c075cda435c1481fe59440d6c4bbf855dd Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=f0cf86c075cda435c1481fe59440d6c4bbf855dd commit f0cf86c075cda435c1481fe59440d6c4bbf855dd Author: Roger Pau Monné AuthorDate: 2024-02-02 11:04:50 +0000 Commit: Roger Pau Monné CommitDate: 2024-02-22 10:08:05 +0000 x86/xen: replace xen_cpuid_base with hv_base Where possible, replace the usage of xen_cpuid_base for hv_base in preparation for removing xen_cpuid_base. No functional change intended. Sponsored by: Cloud Software Group Reviewed by: markj Differential revision: https://reviews.freebsd.org/D43935 --- sys/x86/xen/hvm.c | 10 +++++----- sys/x86/xen/xen_apic.c | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index 85f274175ac6..6336602c8bc4 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -147,7 +147,7 @@ hypervisor_version(void) uint32_t regs[4]; int major, minor; - do_cpuid(xen_cpuid_base + 1, regs); + do_cpuid(hv_base + 1, regs); major = regs[0] >> 16; minor = regs[0] & 0xffff; @@ -595,8 +595,8 @@ xen_hvm_cpu_init(void) * Set vCPU ID. If available fetch the ID from CPUID, if not just use * the ACPI ID. */ - KASSERT(xen_cpuid_base != 0, ("Invalid base Xen CPUID leaf")); - cpuid_count(xen_cpuid_base + 4, 0, regs); + KASSERT(hv_base != 0, ("Invalid base Xen CPUID leaf")); + cpuid_count(hv_base + 4, 0, regs); KASSERT((regs[0] & XEN_HVM_CPUID_VCPU_ID_PRESENT) || !xen_pv_domain(), ("Xen PV domain without vcpu_id in cpuid")); @@ -626,8 +626,8 @@ xen_has_iommu_maps(void) { uint32_t regs[4]; - KASSERT(xen_cpuid_base != 0, ("Invalid base Xen CPUID leaf")); - cpuid_count(xen_cpuid_base + 4, 0, regs); + KASSERT(hv_base != 0, ("Invalid base Xen CPUID leaf")); + cpuid_count(hv_base + 4, 0, regs); return (regs[0] & XEN_HVM_CPUID_IOMMU_MAPPINGS); } diff --git a/sys/x86/xen/xen_apic.c b/sys/x86/xen/xen_apic.c index 4f2b03879227..994dc3e0804c 100644 --- a/sys/x86/xen/xen_apic.c +++ b/sys/x86/xen/xen_apic.c @@ -343,8 +343,8 @@ xen_setup_cpus(void) * that's faster than using event channels because it avoids the VM * exit. */ - KASSERT(xen_cpuid_base != 0, ("Invalid base Xen CPUID leaf")); - cpuid_count(xen_cpuid_base + 4, 0, regs); + KASSERT(hv_base != 0, ("Invalid base Xen CPUID leaf")); + cpuid_count(hv_base + 4, 0, regs); if ((x2apic_mode && (regs[0] & XEN_HVM_CPUID_X2APIC_VIRT)) || (!x2apic_mode && (regs[0] & XEN_HVM_CPUID_APIC_ACCESS_VIRT))) return; From nobody Thu Feb 22 10:31:27 2024 X-Original-To: dev-commits-src-main@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 4TgTvg6hwvz5CM83; Thu, 22 Feb 2024 10:31:27 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgTvg4d3Gz4kw0; Thu, 22 Feb 2024 10:31:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708597887; 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=3RRZtIl3/J9FjMp1uKOtt4pkZHgZlgy6Hm7j7OSZTDU=; b=cyfUNGFBMtEelkgQ+mr2ipWs9FMiL3WoJaM4wMjm1YckqaM+vcJv00iEN1eMIonzn7EgGQ qlTlibwu5/9kHG6RQeWTvYnqMFCrOUXdH5gAKSfz5W9wq628SWhJDwCtYJw6loeCmLooUT k7ToS7DIqbmikFFnWhWIhWA+7dMnkcWpjYv5AIIKwmYjMSTxufbPvQ3/q1IrYgjjPi3LmX InFm63oq7uSbEPr4h2YMUwUN91fqkwBcNEE9XJlk2+PiS8ll4uhHHJecYjkLsynhZwZmhS MwEmqeQ225GQSjCKobWilBSkskV2Orin1zL8Xtav3ONpdTdhC8NtjrGH5sgrJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708597887; 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=3RRZtIl3/J9FjMp1uKOtt4pkZHgZlgy6Hm7j7OSZTDU=; b=ipxwYyciVb76hNIZPEAyd/ov5ammg+KNweS9SWQkBQX7U9waO3hp1RyzdBBOLlevKKAUwo H4JI+99ar7Rb8VyhT8JV933ReZchVsYEyFXnAxJPCZbitzuvZKnsWOU5qVdReFJ99SmVPQ Tgab+EC/Mvo2kHxRAzod/7HFPvzAlVKBKsmGF7Qdm2787kICDiXkhhubDu/OVaTlq5YWzU IZ95Xv0KaN/s4u41e1gHYkd9T6kBYNfBURvPH/U8J7KAXKtjAoVlHyBihQDRkTe+leUz/Q Mo3wVrGNAZIV8f2A4KAWyr8JReQkehVvPQpoc+C9y9RCPfkDO5r4YEL4WQEC4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708597887; a=rsa-sha256; cv=none; b=McxPtlneBxB+xRMvSJuFX1UcCI/SZ8cibMkKLSSQW8rr7Lb98HZWLOZ42GRQ6vo0vLwfvZ JFCMeXb+bHoxEcBl2Tq7TbitqoJzMIMlFVOfZ74CXjW2CtT5JD4ls3y4UiWoWp8861UV8P lwZmN76PeFQPqKuHZ9jvavnwEXma8Wdiag05hGHw4L6Bkyf5cEX/YGcofw6e8CR6tOqoP9 zkZ+ZXC67jMIkRQfs3tl1MjttQIWtj0D1ldxR2FcyPnnQKQn3xgOMO0NvIHMxhPIZApINv 0QW5cPSTkxxzyWRfG1+zNDo74/ym8A+a1YGOCStG+OL5/4rcRh4KoY4KDi9yQA== 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 4TgTvg3jSszSKJ; Thu, 22 Feb 2024 10:31:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MAVREt018291; Thu, 22 Feb 2024 10:31:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MAVRsT018288; Thu, 22 Feb 2024 10:31:27 GMT (envelope-from git) Date: Thu, 22 Feb 2024 10:31:27 GMT Message-Id: <202402221031.41MAVRsT018288@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roger Pau =?utf-8?Q?Monn=C3=A9?= Subject: git: 4401b0685163 - main - x86/cpu: introduce an optional hook for early hypervisor initialization List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4401b0685163c0a460c1f41b107225b0b0ee2062 Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=4401b0685163c0a460c1f41b107225b0b0ee2062 commit 4401b0685163c0a460c1f41b107225b0b0ee2062 Author: Roger Pau Monné AuthorDate: 2024-02-02 10:36:52 +0000 Commit: Roger Pau Monné CommitDate: 2024-02-22 10:08:05 +0000 x86/cpu: introduce an optional hook for early hypervisor initialization Hypervisor detection is done very early on x86, and so can be used to also do some very early hypervisor related initialization. Such initialization is required when running as a Xen PVH guest, as for example the PIT needs to be replaced with an hypervisor based timecounter. Introduce an optional hook that gets called as part of the early hypervisor detection. No functional change intended. Sponsored by: Cloud Software Group Reviewed by: markj kib Differential revision: https://reviews.freebsd.org/D43763 --- sys/x86/x86/identcpu.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/x86/x86/identcpu.c b/sys/x86/x86/identcpu.c index df24c5bddffd..6df138bccba1 100644 --- a/sys/x86/x86/identcpu.c +++ b/sys/x86/x86/identcpu.c @@ -1343,6 +1343,7 @@ SYSINIT(hook_tsc_freq, SI_SUB_CONFIGURE, SI_ORDER_ANY, hook_tsc_freq, NULL); static struct { const char *vm_cpuid; int vm_guest; + void (*init)(void); } vm_cpuids[] = { { "XenVMMXenVMM", VM_GUEST_XEN }, /* XEN */ { "Microsoft Hv", VM_GUEST_HV }, /* Microsoft Hyper-V */ @@ -1355,6 +1356,7 @@ static struct { static void identify_hypervisor_cpuid_base(void) { + void (*init_fn)(void) = NULL; u_int leaf, regs[4]; int i; @@ -1391,6 +1393,7 @@ identify_hypervisor_cpuid_base(void) if (strncmp((const char *)®s[1], vm_cpuids[i].vm_cpuid, 12) == 0) { vm_guest = vm_cpuids[i].vm_guest; + init_fn = vm_cpuids[i].init; break; } @@ -1423,10 +1426,13 @@ identify_hypervisor_cpuid_base(void) * preferred. */ vm_guest != VM_GUEST_HV) - return; + break; } } } + + if (init_fn != NULL) + init_fn(); } void From nobody Thu Feb 22 10:31:28 2024 X-Original-To: dev-commits-src-main@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 4TgTvj10B3z5CMDW; Thu, 22 Feb 2024 10:31:29 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgTvh5F6Bz4kn0; Thu, 22 Feb 2024 10:31:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708597888; 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=W/YYLxXq4VEz9QxlqfODU+aiqHoTVJdDmUvFK6B1dXM=; b=LoxiWS7AaydXHYMxI7OQecFF8HnNtr6ZFrAX7VWy9P2PHOu06Jxd1oHMQjtd/2L85TPV6w H48jdRvPFUb33oDj05wzbwOZH9wXPfzqqYvfCd2eoqvBqS0+mstkt4dn55qZEmapQSxp3s /mfSSJd0Q6soWBXbSkxK5k8ZN7Fr5j4Or/6iERXM7SDct2RuBUyAGsViqd2UMeUSctJSAO 1tL+Iq955Y/TH9XJ1zSvVfzB7BgYPfrDTq/pjjBmVSiqyW2S68giIHF0C763Td0+3l3I6M hdbibn4jepPzJipuViZglhjOrGIMH3CYTtzqzVewUAwi4oOr0vxD/S50dTItuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708597888; 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=W/YYLxXq4VEz9QxlqfODU+aiqHoTVJdDmUvFK6B1dXM=; b=D4SAGvUM2I6N0KjewYKTe0gi/cEgmCg+4Lz5KsE+WnrnvANg5oK5JYHZ7ufPpBEAUHjeKp 29C5qlIo/2XMSqg13/Jg4iSNuSuEaqgKrkyrk6G41b5m9cwi9Fn01CGRxxzdF6DpKf76zE 4FpMc4fk7z4plHdHf0LirRZ7Q0PpvvZtyo1qdPwfnSQY5iXl+jUrm9n6YTiL0Gju5hm2uM 4Vf/rgh59Up+oFIHjm4abO/gI0GILOMTgCmxlTnda4PdbIY7nrCcjfPInypos+syCJ40Xp YR3o2VYR5d1jor4SPyuDQluN+YEAhCQl5m9TP95Z4HoqPl/6FSMGumzwVW7owA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708597888; a=rsa-sha256; cv=none; b=h0JIHwQ2GWc0aqg6NbbP/uxkVScWYJ4zaJGzKQ76GWm4PMP+OZ7wU0DA92LuNot35aXNbu acib96Lqkw+QpzVcIoHzm/HghdE5MCWx1iqD6XQcpaYZ7oicXyCirBYq4mat4Ob3P3EJTt 9UFu7VgvAwlIag4PFqJDRmE2qZUhGwFcHHsMLdDonZaaViZq60C88hME+k9IG64gtqvapC unr+S4NS/odktH9ncwas5V2vw3AeMXFxXKNtFbpcEYrllUhUsL0X67ykrknmfT64FiQqGE 2ESCRLte62ZIfx3eknP02+bwdRSMuen/RXtOkUHkO8ccC3AGC7q+i5PC8JviRQ== 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 4TgTvh4LkgzS75; Thu, 22 Feb 2024 10:31:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MAVS5F018341; Thu, 22 Feb 2024 10:31:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MAVSjF018338; Thu, 22 Feb 2024 10:31:28 GMT (envelope-from git) Date: Thu, 22 Feb 2024 10:31:28 GMT Message-Id: <202402221031.41MAVSjF018338@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roger Pau =?utf-8?Q?Monn=C3=A9?= Subject: git: 8f5406c77f1b - main - x86/xen: implement early init hook List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8f5406c77f1b7009c36df4e025fd8789a46d33ce Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=8f5406c77f1b7009c36df4e025fd8789a46d33ce commit 8f5406c77f1b7009c36df4e025fd8789a46d33ce Author: Roger Pau Monné AuthorDate: 2024-02-02 10:56:32 +0000 Commit: Roger Pau Monné CommitDate: 2024-02-22 10:08:05 +0000 x86/xen: implement early init hook Unify the HVM and PVH early setup, byt making both rely on the hypervisor initialization hook part of identify_hypervisor(). The current initialization takes care of the hypercall page, the sahred info page and does any fixup necessary to metadata video console information if FreeBSD is booted as the initial domain (so the video console is handed from Xen into FreeBSD). Note this has the nice side effect of also allowing to use the Xen console on HVM guests, which allows to get rid of the QEMU emulated uart and still get a nice text console. Sponsored by: Cloud Software Group Reviewed by: markj Differential revision: https://reviews.freebsd.org/D43764 --- sys/x86/include/xen/xen-os.h | 2 - sys/x86/x86/identcpu.c | 10 ++++- sys/x86/xen/hvm.c | 105 +++++-------------------------------------- sys/x86/xen/pv.c | 17 +------ 4 files changed, 22 insertions(+), 112 deletions(-) diff --git a/sys/x86/include/xen/xen-os.h b/sys/x86/include/xen/xen-os.h index ec0d4b1ab9f1..d3f21e2a6c45 100644 --- a/sys/x86/include/xen/xen-os.h +++ b/sys/x86/include/xen/xen-os.h @@ -52,8 +52,6 @@ extern int xen_disable_pv_disks; /* tunable for disabling PV nics */ extern int xen_disable_pv_nics; -extern uint32_t xen_cpuid_base; - /* compatibility for accessing xen_ulong_t with atomics */ #define atomic_clear_xen_ulong atomic_clear_long #define atomic_set_xen_ulong atomic_set_long diff --git a/sys/x86/x86/identcpu.c b/sys/x86/x86/identcpu.c index 6df138bccba1..919dda722d71 100644 --- a/sys/x86/x86/identcpu.c +++ b/sys/x86/x86/identcpu.c @@ -67,6 +67,10 @@ #include #include +#ifdef XENHVM +#include +#endif + #ifdef __i386__ #define IDENTBLUE_CYRIX486 0 #define IDENTBLUE_IBMCPU 1 @@ -1345,7 +1349,11 @@ static struct { int vm_guest; void (*init)(void); } vm_cpuids[] = { - { "XenVMMXenVMM", VM_GUEST_XEN }, /* XEN */ + { "XenVMMXenVMM", VM_GUEST_XEN, +#ifdef XENHVM + &xen_early_init, +#endif + }, /* XEN */ { "Microsoft Hv", VM_GUEST_HV }, /* Microsoft Hyper-V */ { "VMwareVMware", VM_GUEST_VMWARE }, /* VMware VM */ { "KVMKVMKVM", VM_GUEST_KVM }, /* KVM */ diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index 6336602c8bc4..17500516debf 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -104,22 +104,6 @@ void xen_emergency_print(const char *str, size_t size) outsb(XEN_HVM_DEBUGCONS_IOPORT, str, size); } -uint32_t xen_cpuid_base; - -static uint32_t -xen_hvm_cpuid_base(void) -{ - uint32_t base, regs[4]; - - for (base = 0x40000000; base < 0x40010000; base += 0x100) { - do_cpuid(base, regs); - if (!memcmp("XenVMMXenVMM", ®s[1], 12) - && (regs[0] - base) >= 2) - return (base); - } - return (0); -} - static void hypervisor_quirks(unsigned int major, unsigned int minor) { @@ -156,38 +140,6 @@ hypervisor_version(void) hypervisor_quirks(major, minor); } -/* - * Allocate and fill in the hypcall page. - */ -int -xen_hvm_init_hypercall_stubs(enum xen_hvm_init_type init_type) -{ - uint32_t regs[4]; - - if (xen_cpuid_base != 0) - /* Already setup. */ - goto out; - - xen_cpuid_base = xen_hvm_cpuid_base(); - if (xen_cpuid_base == 0) - return (ENXIO); - - /* - * Find the hypercall pages. - */ - do_cpuid(xen_cpuid_base + 2, regs); - if (regs[0] != 1) - return (EINVAL); - - wrmsr(regs[1], (init_type == XEN_HVM_INIT_EARLY) - ? (vm_paddr_t)((uintptr_t)&hypercall_page - KERNBASE) - : vtophys(&hypercall_page)); - -out: - hypervisor_version(); - return (0); -} - /* * Translate linear to physical address when still running on the bootloader * created page-tables. @@ -336,12 +288,14 @@ xen_early_init(void) uint32_t regs[4]; int rc; - xen_cpuid_base = xen_hvm_cpuid_base(); - if (xen_cpuid_base == 0) + if (hv_high < hv_base + 2) { + xc_printf("Invalid maximum leaves for hv_base\n"); + vm_guest = VM_GUEST_VM; return; + } /* Find the hypercall pages. */ - do_cpuid(xen_cpuid_base + 2, regs); + do_cpuid(hv_base + 2, regs); if (regs[0] != 1) { xc_printf("Invalid number of hypercall pages %u\n", regs[0]); @@ -362,33 +316,6 @@ xen_early_init(void) fixup_console(); } -static void -xen_hvm_init_shared_info_page(void) -{ - struct xen_add_to_physmap xatp; - - if (xen_pv_domain()) { - /* - * Already setup in the PV case, shared_info is passed inside - * of the start_info struct at start of day. - */ - return; - } - - if (HYPERVISOR_shared_info == NULL) { - HYPERVISOR_shared_info = malloc(PAGE_SIZE, M_XENHVM, M_NOWAIT); - if (HYPERVISOR_shared_info == NULL) - panic("Unable to allocate Xen shared info page"); - } - - xatp.domid = DOMID_SELF; - xatp.idx = 0; - xatp.space = XENMAPSPACE_shared_info; - xatp.gpfn = vtophys(HYPERVISOR_shared_info) >> PAGE_SHIFT; - if (HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp)) - panic("HYPERVISOR_memory_op failed"); -} - static int set_percpu_callback(unsigned int vcpu) { @@ -505,32 +432,29 @@ xen_hvm_disable_emulated_devices(void) static void xen_hvm_init(enum xen_hvm_init_type init_type) { - int error; - int i; + unsigned int i; if (!xen_domain() || init_type == XEN_HVM_INIT_CANCELLED_SUSPEND) return; - error = xen_hvm_init_hypercall_stubs(init_type); + hypervisor_version(); switch (init_type) { case XEN_HVM_INIT_LATE: - if (error != 0) - return; - setup_xen_features(); #ifdef SMP cpu_ops = xen_hvm_cpu_ops; #endif break; case XEN_HVM_INIT_RESUME: - if (error != 0) - panic("Unable to init Xen hypercall stubs on resume"); - /* Clear stale vcpu_info. */ CPU_FOREACH(i) DPCPU_ID_SET(i, vcpu_info, NULL); + + if (map_shared_info() != 0) + panic("cannot map Xen shared info page"); + break; default: panic("Unsupported HVM initialization type"); @@ -540,13 +464,6 @@ xen_hvm_init(enum xen_hvm_init_type init_type) xen_evtchn_needs_ack = false; xen_hvm_set_callback(NULL); - /* - * On (PV)HVM domains we need to request the hypervisor to - * fill the shared info page, for PVH guest the shared_info page - * is passed inside the start_info struct and is already set, so this - * functions are no-ops. - */ - xen_hvm_init_shared_info_page(); xen_hvm_disable_emulated_devices(); } diff --git a/sys/x86/xen/pv.c b/sys/x86/xen/pv.c index e33fa41c83d7..0e6492b124b8 100644 --- a/sys/x86/xen/pv.c +++ b/sys/x86/xen/pv.c @@ -147,12 +147,9 @@ isxen(void) } #define CRASH(...) do { \ - if (isxen()) { \ + if (isxen()) \ xc_printf(__VA_ARGS__); \ - HYPERVISOR_shutdown(SHUTDOWN_crash); \ - } else { \ - halt(); \ - } \ + halt(); \ } while (0) uint64_t @@ -162,16 +159,6 @@ hammer_time_xen(vm_paddr_t start_info_paddr) uint64_t physfree; char *kenv; - if (isxen()) { - vm_guest = VM_GUEST_XEN; - xen_early_init(); - if (xen_cpuid_base == 0) { - xc_printf( - "ERROR: failed to initialize hypercall page\n"); - HYPERVISOR_shutdown(SHUTDOWN_crash); - } - } - start_info = (struct hvm_start_info *)(start_info_paddr + KERNBASE); if (start_info->magic != XEN_HVM_START_MAGIC_VALUE) { CRASH("Unknown magic value in start_info struct: %#x\n", From nobody Thu Feb 22 13:14:38 2024 X-Original-To: dev-commits-src-main@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 4TgYWy2pdHz5CbCc; Thu, 22 Feb 2024 13:14: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgYWy2Bnyz56jM; Thu, 22 Feb 2024 13:14:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708607678; 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=4U4fkfw7GEEpMYwi3mqxU7xW2pzmQBV65rvZkRZhFYM=; b=PDFoYPBAc3ajOHiwTOBrMcUBe79XCHOuRIvol8FfEJ2MUO44u9cx0j1dlABFMruHQltgHv nuy0JiYJ0FKwYhE1HOCEgGTFt1+F7Dg3mRst5EdYYGlXKJHBbpsgYLb8y+fMMWTDsmfbMH hs6E5KWu4EQ1H98mYiQJ6Wntpidi8tH3c4LmgJbh0v09Mmw7LZZiwB/ttSzegSAqNH709G IvgMUs3hmC40JkF3VY/Kg7b+YaEVrSSzIQl276MI9pxlKxuL5INzGIWjP6Gt0VxQFpqS5d CmOE9Oi/IfXJaLmOxjOqNUTW+gPJoifFKxHNCwrS5klTOIqKKVYAooVPyEJMFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708607678; 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=4U4fkfw7GEEpMYwi3mqxU7xW2pzmQBV65rvZkRZhFYM=; b=wMOy2NFAlxeeQt5fmL1Essm+OR8EaE/bUXWm6nQYFGA83IqysQGQE2gLi0OrD2tVYefjMp 5XKjzPStBamrTWNfjM/oGhAq3fcK85IlbQOO3s76BDq4ihlCJX6Fjp0BUnPw2TlSBOXtn3 Dy/3wkmLzCOH1iQT9hulf8N3nWiab+RGUYAV0wYFhgDKXfK9TnfIXe4LQfokfPWtpq4Ywt Yf2/TSxqF3rZe5TwMLVNcVqrLUDielpjthhk/dPpNzTzy2hkNJgkRBA1HxxzzYu+/RZwUK iK3eWUtHfkYB5oy5AQsCDVeIlGehMuiidGMfdfiBO4OwH9vYDDJ50NrGi8fMYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708607678; a=rsa-sha256; cv=none; b=RcgjAtCeJALcHVF7BLuBZOEr2AMe3IW2D8gD2SG8MExq+JizZvdCfG4ZzVUtETNgTMpUre XBhyo4e7WCGxSHMf+hCQjj2mgoBOOdHLRIOQGt7Zl6kk6qdF7VUBXNz8RekcRIGUpQGCN4 V57WOuApqw5z0m84xMnsz2bPGIldNoXg8/eh8QvpbdpNpcl83ASoYoRjE8zLQKhVfQ2d6Z OCOrt56KSqZ5/fX/vkLUHJfqarvauIwu2UzppMIMPNDQ3ThXxaFByq+Dyy24qJEEjKtVkB cADFEyfUI69bMgaZX2C9+tBRgRLMwPm60X6LgwISOH+9BVgPF8s5lAMR51LD+Q== 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 4TgYWy1FPNzYpb; Thu, 22 Feb 2024 13:14:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MDEcIS093249; Thu, 22 Feb 2024 13:14:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MDEc4R093246; Thu, 22 Feb 2024 13:14:38 GMT (envelope-from git) Date: Thu, 22 Feb 2024 13:14:38 GMT Message-Id: <202402221314.41MDEc4R093246@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 059fd69e7499 - main - umcs(4): Fix two typos in source code comments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 059fd69e749953c12b2cf099b34d3323d9c67d11 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=059fd69e749953c12b2cf099b34d3323d9c67d11 commit 059fd69e749953c12b2cf099b34d3323d9c67d11 Author: Gordon Bergling AuthorDate: 2024-02-22 13:14:08 +0000 Commit: Gordon Bergling CommitDate: 2024-02-22 13:14:08 +0000 umcs(4): Fix two typos in source code comments - s/frequences/frequencies/ MFC after: 3 days --- sys/dev/usb/serial/umcs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/usb/serial/umcs.c b/sys/dev/usb/serial/umcs.c index ec8c89ab1f8b..18135e3bf67d 100644 --- a/sys/dev/usb/serial/umcs.c +++ b/sys/dev/usb/serial/umcs.c @@ -1047,7 +1047,7 @@ umcs7840_set_baudrate(struct umcs7840_softc *sc, uint8_t portno, uint32_t rate) } DPRINTF("Port %d set speed: %d (%02x / %d)\n", portno, rate, clk, divisor); - /* Set clock source for standard BAUD frequences */ + /* Set clock source for standard BAUD frequencies */ err = umcs7840_get_reg_sync(sc, umcs7840_port_registers[portno].reg_sp, &data); if (err) return (err); @@ -1078,7 +1078,7 @@ umcs7840_set_baudrate(struct umcs7840_softc *sc, uint8_t portno, uint32_t rate) return (0); } -/* Maximum speeds for standard frequences, when PLL is not used */ +/* Maximum speeds for standard frequencies, when PLL is not used */ static const uint32_t umcs7840_baudrate_divisors[] = {0, 115200, 230400, 403200, 460800, 806400, 921600, 1572864, 3145728,}; static const uint8_t umcs7840_baudrate_divisors_len = nitems(umcs7840_baudrate_divisors); From nobody Thu Feb 22 13:50:51 2024 X-Original-To: dev-commits-src-main@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 4TgZKy4W1sz5Cf1w; Thu, 22 Feb 2024 13:51:02 +0000 (UTC) (envelope-from bapt@nours.eu) Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4TgZKx4j61z41B7; Thu, 22 Feb 2024 13:51:01 +0000 (UTC) (envelope-from bapt@nours.eu) Authentication-Results: mx1.freebsd.org; none Received: from [IPv6:::1] (unknown [IPv6:2a01:e0a:9a1:e510:e757:27e8:1d54:bfb5]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aniel.nours.eu (Postfix) with ESMTPSA id E0D1977208; Thu, 22 Feb 2024 14:50:53 +0100 (CET) Date: Thu, 22 Feb 2024 14:50:51 +0100 From: Baptiste Daroussin To: =?ISO-8859-1?Q?Roger_Pau_Monn=E9?= , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 8f5406c77f1b - main - x86/xen: implement early init hook User-Agent: K-9 Mail for Android In-Reply-To: <202402221031.41MAVSjF018338@gitrepo.freebsd.org> References: <202402221031.41MAVSjF018338@gitrepo.freebsd.org> Message-ID: <69A06BC5-5DF4-4A39-8E70-3B16AC7D3C6C@nours.eu> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary=----X3FJVLSHKXFQGXUY681CX7HTPDB8CZ Content-Transfer-Encoding: 7bit X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4TgZKx4j61z41B7 X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16276, ipnet:176.31.0.0/16, country:FR] ------X3FJVLSHKXFQGXUY681CX7HTPDB8CZ Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Le 22 f=C3=A9vrier 2024 11:31:28 GMT+01:00, "Roger Pau Monn=C3=A9" a =C3=A9crit=C2=A0: >The branch main has been updated by royger: > >URL: https://cgit=2EFreeBSD=2Eorg/src/commit/?id=3D8f5406c77f1b7009c36df4= e025fd8789a46d33ce > >commit 8f5406c77f1b7009c36df4e025fd8789a46d33ce >Author: Roger Pau Monn=C3=A9 >AuthorDate: 2024-02-02 10:56:32 +0000 >Commit: Roger Pau Monn=C3=A9 >CommitDate: 2024-02-22 10:08:05 +0000 > > x86/xen: implement early init hook > =20 > Unify the HVM and PVH early setup, byt making both rely on the hyperv= isor > initialization hook part of identify_hypervisor()=2E > =20 > The current initialization takes care of the hypercall page, the sahr= ed info > page and does any fixup necessary to metadata video console informati= on if > FreeBSD is booted as the initial domain (so the video console is hand= ed from > Xen into FreeBSD)=2E > =20 > Note this has the nice side effect of also allowing to use the Xen co= nsole on > HVM guests, which allows to get rid of the QEMU emulated uart and sti= ll get > a nice text console=2E > =20 > Sponsored by: Cloud Software Group > Reviewed by: markj > Differential revision: https://reviews=2Efreebsd=2Eorg/D43764 >--- > sys/x86/include/xen/xen-os=2Eh | 2 - > sys/x86/x86/identcpu=2Ec | 10 ++++- > sys/x86/xen/hvm=2Ec | 105 +++++------------------------------= -------- > sys/x86/xen/pv=2Ec | 17 +------ > 4 files changed, 22 insertions(+), 112 deletions(-) > >diff --git a/sys/x86/include/xen/xen-os=2Eh b/sys/x86/include/xen/xen-os= =2Eh >index ec0d4b1ab9f1=2E=2Ed3f21e2a6c45 100644 >--- a/sys/x86/include/xen/xen-os=2Eh >+++ b/sys/x86/include/xen/xen-os=2Eh >@@ -52,8 +52,6 @@ extern int xen_disable_pv_disks; > /* tunable for disabling PV nics */ > extern int xen_disable_pv_nics; >=20 >-extern uint32_t xen_cpuid_base; >- > /* compatibility for accessing xen_ulong_t with atomics */ > #define atomic_clear_xen_ulong atomic_clear_long > #define atomic_set_xen_ulong atomic_set_long >diff --git a/sys/x86/x86/identcpu=2Ec b/sys/x86/x86/identcpu=2Ec >index 6df138bccba1=2E=2E919dda722d71 100644 >--- a/sys/x86/x86/identcpu=2Ec >+++ b/sys/x86/x86/identcpu=2Ec >@@ -67,6 +67,10 @@ > #include > #include >=20 >+#ifdef XENHVM >+#include >+#endif >+ > #ifdef __i386__ > #define IDENTBLUE_CYRIX486 0 > #define IDENTBLUE_IBMCPU 1 >@@ -1345,7 +1349,11 @@ static struct { > int vm_guest; > void (*init)(void); > } vm_cpuids[] =3D { >- { "XenVMMXenVMM", VM_GUEST_XEN }, /* XEN */ >+ { "XenVMMXenVMM", VM_GUEST_XEN, >+#ifdef XENHVM >+ &xen_early_init, >+#endif >+ }, /* XEN */ > { "Microsoft Hv", VM_GUEST_HV }, /* Microsoft Hyper-V */ > { "VMwareVMware", VM_GUEST_VMWARE }, /* VMware VM */ > { "KVMKVMKVM", VM_GUEST_KVM }, /* KVM */ >diff --git a/sys/x86/xen/hvm=2Ec b/sys/x86/xen/hvm=2Ec >index 6336602c8bc4=2E=2E17500516debf 100644 >--- a/sys/x86/xen/hvm=2Ec >+++ b/sys/x86/xen/hvm=2Ec >@@ -104,22 +104,6 @@ void xen_emergency_print(const char *str, size_t siz= e) > outsb(XEN_HVM_DEBUGCONS_IOPORT, str, size); > } >=20 >-uint32_t xen_cpuid_base; >- >-static uint32_t >-xen_hvm_cpuid_base(void) >-{ >- uint32_t base, regs[4]; >- >- for (base =3D 0x40000000; base < 0x40010000; base +=3D 0x100) { >- do_cpuid(base, regs); >- if (!memcmp("XenVMMXenVMM", ®s[1], 12) >- && (regs[0] - base) >=3D 2) >- return (base); >- } >- return (0); >-} >- > static void > hypervisor_quirks(unsigned int major, unsigned int minor) > { >@@ -156,38 +140,6 @@ hypervisor_version(void) > hypervisor_quirks(major, minor); > } >=20 >-/* >- * Allocate and fill in the hypcall page=2E >- */ >-int >-xen_hvm_init_hypercall_stubs(enum xen_hvm_init_type init_type) >-{ >- uint32_t regs[4]; >- >- if (xen_cpuid_base !=3D 0) >- /* Already setup=2E */ >- goto out; >- >- xen_cpuid_base =3D xen_hvm_cpuid_base(); >- if (xen_cpuid_base =3D=3D 0) >- return (ENXIO); >- >- /* >- * Find the hypercall pages=2E >- */ >- do_cpuid(xen_cpuid_base + 2, regs); >- if (regs[0] !=3D 1) >- return (EINVAL); >- >- wrmsr(regs[1], (init_type =3D=3D XEN_HVM_INIT_EARLY) >- ? (vm_paddr_t)((uintptr_t)&hypercall_page - KERNBASE) >- : vtophys(&hypercall_page)); >- >-out: >- hypervisor_version(); >- return (0); >-} >- > /* > * Translate linear to physical address when still running on the bootlo= ader > * created page-tables=2E >@@ -336,12 +288,14 @@ xen_early_init(void) > uint32_t regs[4]; > int rc; >=20 >- xen_cpuid_base =3D xen_hvm_cpuid_base(); >- if (xen_cpuid_base =3D=3D 0) >+ if (hv_high < hv_base + 2) { >+ xc_printf("Invalid maximum leaves for hv_base\n"); >+ vm_guest =3D VM_GUEST_VM; > return; >+ } >=20 > /* Find the hypercall pages=2E */ >- do_cpuid(xen_cpuid_base + 2, regs); >+ do_cpuid(hv_base + 2, regs); > if (regs[0] !=3D 1) { > xc_printf("Invalid number of hypercall pages %u\n", > regs[0]); >@@ -362,33 +316,6 @@ xen_early_init(void) > fixup_console(); > } >=20 >-static void >-xen_hvm_init_shared_info_page(void) >-{ >- struct xen_add_to_physmap xatp; >- >- if (xen_pv_domain()) { >- /* >- * Already setup in the PV case, shared_info is passed inside >- * of the start_info struct at start of day=2E >- */ >- return; >- } >- >- if (HYPERVISOR_shared_info =3D=3D NULL) { >- HYPERVISOR_shared_info =3D malloc(PAGE_SIZE, M_XENHVM, M_NOWAIT); >- if (HYPERVISOR_shared_info =3D=3D NULL) >- panic("Unable to allocate Xen shared info page"); >- } >- >- xatp=2Edomid =3D DOMID_SELF; >- xatp=2Eidx =3D 0; >- xatp=2Espace =3D XENMAPSPACE_shared_info; >- xatp=2Egpfn =3D vtophys(HYPERVISOR_shared_info) >> PAGE_SHIFT; >- if (HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp)) >- panic("HYPERVISOR_memory_op failed"); >-} >- > static int > set_percpu_callback(unsigned int vcpu) > { >@@ -505,32 +432,29 @@ xen_hvm_disable_emulated_devices(void) > static void > xen_hvm_init(enum xen_hvm_init_type init_type) > { >- int error; >- int i; >+ unsigned int i; >=20 > if (!xen_domain() || > init_type =3D=3D XEN_HVM_INIT_CANCELLED_SUSPEND) > return; >=20 >- error =3D xen_hvm_init_hypercall_stubs(init_type); >+ hypervisor_version(); >=20 > switch (init_type) { > case XEN_HVM_INIT_LATE: >- if (error !=3D 0) >- return; >- > setup_xen_features(); > #ifdef SMP > cpu_ops =3D xen_hvm_cpu_ops; > #endif > break; > case XEN_HVM_INIT_RESUME: >- if (error !=3D 0) >- panic("Unable to init Xen hypercall stubs on resume"); >- > /* Clear stale vcpu_info=2E */ > CPU_FOREACH(i) > DPCPU_ID_SET(i, vcpu_info, NULL); >+ >+ if (map_shared_info() !=3D 0) >+ panic("cannot map Xen shared info page"); >+ > break; > default: > panic("Unsupported HVM initialization type"); >@@ -540,13 +464,6 @@ xen_hvm_init(enum xen_hvm_init_type init_type) > xen_evtchn_needs_ack =3D false; > xen_hvm_set_callback(NULL); >=20 >- /* >- * On (PV)HVM domains we need to request the hypervisor to >- * fill the shared info page, for PVH guest the shared_info page >- * is passed inside the start_info struct and is already set, so this >- * functions are no-ops=2E >- */ >- xen_hvm_init_shared_info_page(); > xen_hvm_disable_emulated_devices(); > }=20 >=20 >diff --git a/sys/x86/xen/pv=2Ec b/sys/x86/xen/pv=2Ec >index e33fa41c83d7=2E=2E0e6492b124b8 100644 >--- a/sys/x86/xen/pv=2Ec >+++ b/sys/x86/xen/pv=2Ec >@@ -147,12 +147,9 @@ isxen(void) > } >=20 > #define CRASH(=2E=2E=2E) do { \ >- if (isxen()) { \ >+ if (isxen()) \ > xc_printf(__VA_ARGS__); \ >- HYPERVISOR_shutdown(SHUTDOWN_crash); \ >- } else { \ >- halt(); \ >- } \ >+ halt(); \ > } while (0) >=20 > uint64_t >@@ -162,16 +159,6 @@ hammer_time_xen(vm_paddr_t start_info_paddr) > uint64_t physfree; > char *kenv; >=20 >- if (isxen()) { >- vm_guest =3D VM_GUEST_XEN; >- xen_early_init(); >- if (xen_cpuid_base =3D=3D 0) { >- xc_printf( >- "ERROR: failed to initialize hypercall page\n"); >- HYPERVISOR_shutdown(SHUTDOWN_crash); >- } >- } >- > start_info =3D (struct hvm_start_info *)(start_info_paddr + KERNBASE); > if (start_info->magic !=3D XEN_HVM_START_MAGIC_VALUE) { > CRASH("Unknown magic value in start_info struct: %#x\n", This breaks i386 kernel build /home/bapt/worktrees/main/sys/x86/xen/hvm=2Ec:156:47: error: format specif= ies type 'unsigned long' but the argument has type 'uintptr_t' (aka 'unsign= ed int') [-Werror,-Wformat] Bapt ------X3FJVLSHKXFQGXUY681CX7HTPDB8CZ Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable
Le 22= f=C3=A9vrier 2024 11:31:28 GMT+01:00, "Roger Pau Monn=C3=A9" <royger@Fr= eeBSD=2Eorg> a =C3=A9crit=C2=A0:
The branch main has been updated b=
y royger:

URL: https://cgit=2EFreeBSD=2Eorg/=
src/commit/?id=3D8f5406c77f1b7009c36df4e025fd8789a46d33ce

commit=
 8f5406c77f1b7009c36df4e025fd8789a46d33ce
Author:     Roger Pau Monn=C3=
=A9 <royger@FreeBSD=2Eorg>
AuthorDate: 2024-02-02 10:56:32 +0000Commit:     Roger Pau Monn=C3=A9 <royger@FreeBSD=2Eorg>
CommitDa=
te: 2024-02-22 10:08:05 +0000

    x86/xen: implement early init hook=

    
    Unify the HVM and PVH early setup, byt making both rely on =
the hypervisor
    initialization hook part of identify_hypervisor()=2E<=
br>    
    The current initialization takes care of the hypercall page,=
 the sahred info
    page and does any fixup necessary to metadata video=
 console information if
    FreeBSD is booted as the initial domain (so =
the video console is handed from
    Xen into FreeBSD)=2E
    
   =
 Note this has the nice side effect of also allowing to use the Xen console=
 on
    HVM guests, which allows to get rid of the QEMU emulated uart an=
d still get
    a nice text console=2E
    
    Sponsored by: Clou=
d Software Group
    Reviewed by: markj
    Differential revision: https://reviews=2Efreebsd=
=2Eorg/D43764
 sys/x86/include/xen/xen-os=2Eh |   2 -
 sys/x86/x8=
6/identcpu=2Ec       |  10 ++++-
 sys/x86/xen/hvm=2Ec            | 105 +=
++++--------------------------------------
 sys/x86/xen/pv=2Ec          =
   |  17 +------
 4 files changed, 22 insertions(+), 112 deletions(-)
diff --git a/sys/x86/include/xen/xen-os=2Eh b/sys/x86/include/xen/xen-=
os=2Eh
index ec0d4b1ab9f1=2E=2Ed3f21e2a6c45 100644
--- a/sys/x86/incl=
ude/xen/xen-os=2Eh
+++ b/sys/x86/include/xen/xen-os=2Eh
@@ -52,8 +52,=
6 @@ extern int xen_disable_pv_disks;
 /* tunable for disabling PV nics =
*/
 extern int xen_disable_pv_nics;
 
-extern uint32_t xen_cpuid_b=
ase;
-
 /* compatibility for accessing xen_ulong_t with atomics */ #define	atomic_clear_xen_ulong		atomic_clear_long
 #define	atomic_set_=
xen_ulong		atomic_set_long
diff --git a/sys/x86/x86/identcpu=2Ec b/sys/x=
86/x86/identcpu=2Ec
index 6df138bccba1=2E=2E919dda722d71 100644
--- a=
/sys/x86/x86/identcpu=2Ec
+++ b/sys/x86/x86/identcpu=2Ec
@@ -67,6 +67=
,10 @@
 #include <x86/isa/icu=2Eh>
 #include <x86/vmware=2Eh=
>
 
+#ifdef XENHVM
+#include <xen/xen-os=2Eh>
+#endif<=
br>+
 #ifdef __i386__
 #define	IDENTBLUE_CYRIX486	0
 #define	IDENT=
BLUE_IBMCPU	1
@@ -1345,7 +1349,11 @@ static struct {
 	int		vm_guest;=

 	void		(*init)(void);
 } vm_cpuids[] =3D {
-	{ "XenVMMXenVMM",	V=
M_GUEST_XEN },		/* XEN */
+	{ "XenVMMXenVMM",	VM_GUEST_XEN,
+#ifdef X=
ENHVM
+	  &xen_early_init,
+#endif
+	},						/* XEN */
 	{ =
"Microsoft Hv",	VM_GUEST_HV },		/* Microsoft Hyper-V */
 	{ "VMwareVMwar=
e",	VM_GUEST_VMWARE },	/* VMware VM */
 	{ "KVMKVMKVM",		VM_GUEST_KVM },=
		/* KVM */
diff --git a/sys/x86/xen/hvm=2Ec b/sys/x86/xen/hvm=2Ec
in=
dex 6336602c8bc4=2E=2E17500516debf 100644
--- a/sys/x86/xen/hvm=2Ec
+=
++ b/sys/x86/xen/hvm=2Ec
@@ -104,22 +104,6 @@ void xen_emergency_print(c=
onst char *str, size_t size)
 	outsb(XEN_HVM_DEBUGCONS_IOPORT, str, size=
);
 }
 
-uint32_t xen_cpuid_base;
-
-static uint32_t
-xen=
_hvm_cpuid_base(void)
-{
-	uint32_t base, regs[4];
-
-	for (bas=
e =3D 0x40000000; base < 0x40010000; base +=3D 0x100) {
-		do_cpuid(b=
ase, regs);
-		if (!memcmp("XenVMMXenVMM", &regs[1], 12)
-		    &=
amp;& (regs[0] - base) >=3D 2)
-			return (base);
-	}
-	ret=
urn (0);
-}
-
 static void
 hypervisor_quirks(unsigned int majo=
r, unsigned int minor)
 {
@@ -156,38 +140,6 @@ hypervisor_version(voi=
d)
 	hypervisor_quirks(major, minor);
 }
 
-/*
- * Allocate =
and fill in the hypcall page=2E
- */
-int
-xen_hvm_init_hypercall_=
stubs(enum xen_hvm_init_type init_type)
-{
-	uint32_t regs[4];
--	if (xen_cpuid_base !=3D 0)
-		/* Already setup=2E */
-		goto out;=

-
-	xen_cpuid_base =3D xen_hvm_cpuid_base();
-	if (xen_cpuid_base=
 =3D=3D 0)
-		return (ENXIO);
-
-	/*
-	 * Find the hypercall pa=
ges=2E
-	 */
-	do_cpuid(xen_cpuid_base + 2, regs);
-	if (regs[0] !=
=3D 1)
-		return (EINVAL);
-
-	wrmsr(regs[1], (init_type =3D=3D XE=
N_HVM_INIT_EARLY)
-	    ? (vm_paddr_t)((uintptr_t)&hypercall_page - =
KERNBASE)
-	    : vtophys(&hypercall_page));
-
-out:
-	hype=
rvisor_version();
-	return (0);
-}
-
 /*
  * Translate linea=
r to physical address when still running on the bootloader
  * created p=
age-tables=2E
@@ -336,12 +288,14 @@ xen_early_init(void)
 	uint32_t r=
egs[4];
 	int rc;
 
-	xen_cpuid_base =3D xen_hvm_cpuid_base();
=
-	if (xen_cpuid_base =3D=3D 0)
+	if (hv_high < hv_base + 2) {
+		x=
c_printf("Invalid maximum leaves for hv_base\n");
+		vm_guest =3D VM_GUE=
ST_VM;
 		return;
+	}
 
 	/* Find the hypercall pages=2E */
=
-	do_cpuid(xen_cpuid_base + 2, regs);
+	do_cpuid(hv_base + 2, regs);
=
 	if (regs[0] !=3D 1) {
 		xc_printf("Invalid number of hypercall pages =
%u\n",
 		    regs[0]);
@@ -362,33 +316,6 @@ xen_early_init(void)
=
 	    fixup_console();
 }
 
-static void
-xen_hvm_init_shared_i=
nfo_page(void)
-{
-	struct xen_add_to_physmap xatp;
-
-	if (xen=
_pv_domain()) {
-		/*
-		 * Already setup in the PV case, shared_info=
 is passed inside
-		 * of the start_info struct at start of day=2E
-=
		 */
-		return;
-	}
-
-	if (HYPERVISOR_shared_info =3D=3D NULL=
) {
-		HYPERVISOR_shared_info =3D malloc(PAGE_SIZE, M_XENHVM, M_NOWAIT);=

-		if (HYPERVISOR_shared_info =3D=3D NULL)
-			panic("Unable to allo=
cate Xen shared info page");
-	}
-
-	xatp=2Edomid =3D DOMID_SELF;<=
br>-	xatp=2Eidx =3D 0;
-	xatp=2Espace =3D XENMAPSPACE_shared_info;
-	=
xatp=2Egpfn =3D vtophys(HYPERVISOR_shared_info) >> PAGE_SHIFT;
-	i=
f (HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp))
-		panic("HYP=
ERVISOR_memory_op failed");
-}
-
 static int
 set_percpu_callba=
ck(unsigned int vcpu)
 {
@@ -505,32 +432,29 @@ xen_hvm_disable_emulat=
ed_devices(void)
 static void
 xen_hvm_init(enum xen_hvm_init_type in=
it_type)
 {
-	int error;
-	int i;
+	unsigned int i;
 
 	i=
f (!xen_domain() ||
 	    init_type =3D=3D XEN_HVM_INIT_CANCELLED_SUSPEN=
D)
 		return;
 
-	error =3D xen_hvm_init_hypercall_stubs(init_type=
);
+	hypervisor_version();
 
 	switch (init_type) {
 	case XEN_=
HVM_INIT_LATE:
-		if (error !=3D 0)
-			return;
-
 		setup_xen_=
features();
 #ifdef SMP
 		cpu_ops =3D xen_hvm_cpu_ops;
 #endif 		break;
 	case XEN_HVM_INIT_RESUME:
-		if (error !=3D 0)
-			pa=
nic("Unable to init Xen hypercall stubs on resume");
-
 		/* Clear st=
ale vcpu_info=2E */
 		CPU_FOREACH(i)
 			DPCPU_ID_SET(i, vcpu_info, =
NULL);
+
+		if (map_shared_info() !=3D 0)
+			panic("cannot map Xe=
n shared info page");
+
 		break;
 	default:
 		panic("Unsuppor=
ted HVM initialization type");
@@ -540,13 +464,6 @@ xen_hvm_init(enum xe=
n_hvm_init_type init_type)
 	xen_evtchn_needs_ack =3D false;
 	xen_hv=
m_set_callback(NULL);
 
-	/*
-	 * On (PV)HVM domains we need to re=
quest the hypervisor to
-	 * fill the shared info page, for PVH guest th=
e shared_info page
-	 * is passed inside the start_info struct and is al=
ready set, so this
-	 * functions are no-ops=2E
-	 */
-	xen_hvm_in=
it_shared_info_page();
 	xen_hvm_disable_emulated_devices();
 } 
 =

diff --git a/sys/x86/xen/pv=2Ec b/sys/x86/xen/pv=2Ec
index e33fa41c8=
3d7=2E=2E0e6492b124b8 100644
--- a/sys/x86/xen/pv=2Ec
+++ b/sys/x86/x=
en/pv=2Ec
@@ -147,12 +147,9 @@ isxen(void)
 }
 
 #define CRASH(=
=2E=2E=2E) do {					\
-	if (isxen()) {					\
+	if (isxen())					\
=
 		xc_printf(__VA_ARGS__);			\
-		HYPERVISOR_shutdown(SHUTDOWN_crash);	\=

-	} else {					\
-		halt();					\
-	}						\
+	halt();						\<=
br> } while (0)
 
 uint64_t
@@ -162,16 +159,6 @@ hammer_time_xen(v=
m_paddr_t start_info_paddr)
 	uint64_t physfree;
 	char *kenv;
 -	if (isxen()) {
-		vm_guest =3D VM_GUEST_XEN;
-		xen_early_init();=

-		if (xen_cpuid_base =3D=3D 0) {
-			xc_printf(
-			    "ERROR: =
failed to initialize hypercall page\n");
-			HYPERVISOR_shutdown(SHUTDOW=
N_crash);
-		}
-	}
-
 	start_info =3D (struct hvm_start_info *)=
(start_info_paddr + KERNBASE);
 	if (start_info->magic !=3D XEN_HVM_S=
TART_MAGIC_VALUE) {
 		CRASH("Unknown magic value in start_info struct: =
%#x\n",

This breaks i386 kernel build

/home/bapt/worktrees/main/sys/x86/x= en/hvm=2Ec:156:47: error: format specifies type 'unsigned long' but the arg= ument has type 'uintptr_t' (aka 'unsigned int') [-Werror,-Wformat]

B= apt
------X3FJVLSHKXFQGXUY681CX7HTPDB8CZ-- From nobody Thu Feb 22 14:40:32 2024 X-Original-To: dev-commits-src-main@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 4TgbR42Wtdz5CjbN; Thu, 22 Feb 2024 14:40: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgbR41yRFz46Jn; Thu, 22 Feb 2024 14:40:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708612832; 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=N7ekdBNUOxLiucva1CiiyE8kKMtaOgphWqSb/6fkLPc=; b=SoqrOBCVd6MTJmuDMQ5yxgfTUTu3yP9F4I7iMWuTw+F89mQ4l4huDBivo1IlgVIaL7HWDk uzsv5s+V/WnpPVNRnvFSSDzw1KFg1fYJBOVf/HU+82+BqMPt1+JFXWHKJifQ6lzHDROijO 1BBqAotTr7EXJwxcTvi61WXL1DmThSqJqTaL++iZL0iAk7mDNsNUAYJLkNHgfgO3toLiQm at01IWeeMoBEbPT0r3MY3TY4xoZxkmkF/x+qkbn5mbWjp0IUG0ZqG3CO7Fo+v/8sastmXI 11fasmLVlVlSpWyWabI4BrI8DScpx1R41PQ4xMqrYi/2kLdg/PL7mBR9Z6lEQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708612832; 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=N7ekdBNUOxLiucva1CiiyE8kKMtaOgphWqSb/6fkLPc=; b=GaTZxeQHcuf1AmsDmVgpYwhdWY0TetOCJJdJS10KsTQiZqay0b9DwLynDjEZwoza1WXq2X iNjhpBF3XCVU4abHcRrhqltibsA+qirIiTtMHmSqfchAX3KzbCR37Wp0ERGubobkxbR4OM Tubn662Is/Mgy7CzwDZjfci2xYG67gADm419b9Njz3OjLDZbIesS6INZKmwrjIiN8dd0OC TsHoLrhTwQ9selDBPU6Iioh5XdowqaCH8WE2DN9RBuYOGhn5nNRmY2rqfaRSuLoWHFdMRj 4rTGkqhn56h4rNQ0siVxUli7xzvNpIrlLcgo10l8koMyHGDfMVz0Z6OdFfnXuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708612832; a=rsa-sha256; cv=none; b=LBAdHM3e1GVPy981fL9HQ6tsapC0iridvZ9ys/g4TPET5B8TinLXzajGRf8RUzBb2fOn6L clF1ABY2yXFLWPhe5KCE7c27aNB73JN6rZgUGzaME6QPo9zvZHSRTijONG6/uSkb4r51lI /WlUVSOMFd8/mx/VSy/C/xolYTvncACvNVoCZstudhHG7nr7wczsmB5S4alyzuwupFwRPb PQKl/1vESt2MSFMOvLQHGEA0tR1mCuxd7uwrfGzDGVO7dTxLue2meLYkWkxm6pqqHAJcKK q7hTMuL+a6YaVfmsftCtRTmy3FS7V/yfqFaaDOIcIJYdo7f/nR0151oZDcJ8oQ== 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 4TgbR410dBzbGP; Thu, 22 Feb 2024 14:40:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MEeWkt039681; Thu, 22 Feb 2024 14:40:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MEeW9B039678; Thu, 22 Feb 2024 14:40:32 GMT (envelope-from git) Date: Thu, 22 Feb 2024 14:40:32 GMT Message-Id: <202402221440.41MEeW9B039678@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Roger Pau =?utf-8?Q?Monn=C3=A9?= Subject: git: f62d90e5e938 - main - x86/xen: use correct printf specifier. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f62d90e5e938ce72249bc9f5e5e2834ed4727fc4 Auto-Submitted: auto-generated The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=f62d90e5e938ce72249bc9f5e5e2834ed4727fc4 commit f62d90e5e938ce72249bc9f5e5e2834ed4727fc4 Author: Roger Pau Monné AuthorDate: 2024-02-22 14:26:56 +0000 Commit: Roger Pau Monné CommitDate: 2024-02-22 14:32:36 +0000 x86/xen: use correct printf specifier. Use %p instead of wrongly casting to uintptr_t and printing with %lx. Reported by: bapt Fixes: 9a687d1fe3af ('x86/xen: introduce a Xen early init function') Sponsored by: Cloud Software Group --- sys/x86/xen/hvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/xen/hvm.c b/sys/x86/xen/hvm.c index 17500516debf..22f070213f9b 100644 --- a/sys/x86/xen/hvm.c +++ b/sys/x86/xen/hvm.c @@ -153,7 +153,7 @@ early_init_vtop(void *addr) * initialization. */ if (__predict_false((uintptr_t)addr < KERNBASE)) { - xc_printf("invalid linear address: %#lx\n", (uintptr_t)addr); + xc_printf("invalid linear address: %p\n", addr); halt(); } From nobody Thu Feb 22 15:56:01 2024 X-Original-To: dev-commits-src-main@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 4Tgd6B25qdz59rcY; Thu, 22 Feb 2024 15:56:02 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tgd696v1Jz4FsX; Thu, 22 Feb 2024 15:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708617362; 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=Aw20vqJkMV+TyqU7EGgmGi0DySraBSHWy5DDxog+ddc=; b=k2Hb6/Iq8YEiv1RkmmsjzVpUPcj1dCskZJxfNbrOusM9rch1L/qF4juQOu+tmzepwyzvBY zgrZYbFzgjrXqAAYglqjiVDrBcGMl5hIeILVyje5Jubj3X0Z05Sl513A+GR+ZECP07dp/M spAx8IWU4fcI7wgP7uinldY67S1WGOq7Oq+Jqo27sEmzAgSM7g+XAWhBYjsLjEek1TgvBF juZGrdlh3ismVbMgokqpokC9JKG/HkymFC38JkwZaDu4C9ucgTZS8yvKz0ehtaL8BQn1Ve Rlt+P/5QCixhnaWbbd9rppFLd0kii/Zd98L9jIuRfimXZxJSaQ3HfHE7G5ZolQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708617362; 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=Aw20vqJkMV+TyqU7EGgmGi0DySraBSHWy5DDxog+ddc=; b=XUku+OPKBqtlIqpeU8l0oHkwcISAvnq+2l4dppucm5rhdKL5LVbGmnn7O51DILrvoElOQ1 Y/xTnXrfPdZ+iFkxp1y4GySrU1YLSerNIx7BZjzVkEsKEGMVrm0Jll5Yuffepil30MBsUr 19TvPce6Ms90zQqk9evChrLdT57G37K+j1TofFhW25N7NndYdM8ye+G+7XYC8L2dG0vsdx 9Wu6OZUqgT7xFCvRwx00BSFd/SRakjCc5yWbk+fnqFyjVwiGDhCCaY3DCvEtZa4vbNzhEV Zbx1QeuIvHY9f2b086oqBcCG1GU4ps3VJmiigBA5ueFekcY6cNxjM8HqOukpmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708617362; a=rsa-sha256; cv=none; b=pyn6av8zzBQlP7nJu/yF2NtDIiGWnKMxVHUjHhTHVqcxk8AnpTcPmiKgYbZJ+y+U8ArpZw bcv5Kfz+XrZQ1Sn4Gw//vwSN2n67Yz5N2iEbb87eHCEFXIaEZs1nozvDAYLlJSzFD3OI2r czuIZxX8vZHCreKaexxBQr9DAYs8tb1biP8TVjOpOSMrH4DIgyTdfu15V5hY7O2O/nWgAv qZt30tBcNyQbQAV7eVHrxcAJt2Ehh42xNT9IXn+58mapshaVnuJRXI7px+l5WVPr9NQYMW g8yKirm8UINfvXnSxSnCsasfxaOk/1bmO6s0k4vuiyYW/B0MrhTCeLxIRMDKUA== 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 4Tgd69610YzdrC; Thu, 22 Feb 2024 15:56:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MFu16K064192; Thu, 22 Feb 2024 15:56:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MFu1w3064189; Thu, 22 Feb 2024 15:56:01 GMT (envelope-from git) Date: Thu, 22 Feb 2024 15:56:01 GMT Message-Id: <202402221556.41MFu1w3064189@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 5e89e34f846a - main - random(4): Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5e89e34f846a233fb97302c05af5a47c694405a1 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=5e89e34f846a233fb97302c05af5a47c694405a1 commit 5e89e34f846a233fb97302c05af5a47c694405a1 Author: Gordon Bergling AuthorDate: 2024-02-22 15:54:50 +0000 Commit: Gordon Bergling CommitDate: 2024-02-22 15:54:50 +0000 random(4): Fix a typo in a source code comment - s/parmeter/parameter/ MFC after: 3 days --- sys/dev/random/hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/random/hash.c b/sys/dev/random/hash.c index 8e63d0f638f3..90ac65f42241 100644 --- a/sys/dev/random/hash.c +++ b/sys/dev/random/hash.c @@ -124,7 +124,7 @@ randomdev_encrypt_init(union randomdev_key *context, const void *data) /* * Create a pseudorandom output stream of 'bytecount' bytes using a CTR-mode - * cipher or similar. The 128-bit counter is supplied in the in-out parmeter + * cipher or similar. The 128-bit counter is supplied in the in-out parameter * 'ctr.' The output stream goes to 'd_out.' * * If AES is used, 'bytecount' is guaranteed to be a multiple of From nobody Thu Feb 22 15:56:02 2024 X-Original-To: dev-commits-src-main@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 4Tgd6C1zrfz59rX5; Thu, 22 Feb 2024 15:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tgd6C0b5bz4GHd; Thu, 22 Feb 2024 15:56:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708617363; 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=LgVmPBJDwdoXsxkuzfttmC+cRNanppeYAWWwBLMk28g=; b=qTyRUQRvYy2iI2pbWYw1Uen99iAHhQVDqE2b/jwuKeEGIipyk5o4fbrLounQj4CsX08Ph+ BLL/IQZ88DgDAZdcq7WqrCgQXPctYD42C/xTCw0HjdLTYymadN5m2mYYMORB/dRyCCBswM BpzDX03CaPymEOwwpag0/PCzSDXAnZQCfwchDpCsNT1n7pUX/AZHeTXNKaFBgir6exVOnK c8dadf7UmaBEsArJaaG1fg34xWjOEIGttBEYrUisKdNno01BUTdHw3W3tXt0UDVbCvkTK9 sRH8ZV98r91fmVXd3G+qrU+5bvqpu7j6FCccRZmLWY6m4u5TyojDnrS5Sp3lpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708617363; 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=LgVmPBJDwdoXsxkuzfttmC+cRNanppeYAWWwBLMk28g=; b=YaLov5l2hKMYf28yq0uv8LBzMtA5zHyHzU+ZZUhuOz3r7VQWSbRCm5k1FarGhoWgSZBaVe PgEqzph18hlVWUu1r6KxqL1nOUmi9xe95q0ipDKFclLc9kezo5Jxyz5v0LJWLvi8zFYeU0 DlZzfjyWv4qAHzU8RzwwRzx3vqAsouXhtue//jVtGCa2I50JnNB5923YRg9sAyRE+Ioqzk cjNlSEJdSuqIlmzLvAbEZRpiSwXE2Brglc+ujv6w50g7lx4LB1nzZH/KkQSIjl8riF4r7K WU9b/qGOHvrz6/Bpj5lGFUpx2wB1v8VCvUfYRQcDxUeb1ik7e+2JRRaMeOyEAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708617363; a=rsa-sha256; cv=none; b=NHpBjow1oKrbCKTk5v2IodmDibfJGrFpfXQteEkjL9A7EkJjMG+BUn3D7k5Mli6u7BZto6 biIfPVbp9+u2URMNrqY4pfPqGmOs6nz175qkMHpvw1n/xp620duS8pZxLbkODwLQmImIZS KdfXF9mxI1RXtkNgFI+0vto0mRka8g2A5MRAuz56YAq8HmoSqIpd59qpH+d4mWQ1gEXQjF WRKkfdo/2ffagbat90eeAl5qY1aN/xd5ghyeWjuTGHmwtR5x6iosJak9ETetJDgJESupyz V3XMonh/pnPYmpXcJRM3BKMNKj1RhDOs2MX6yA1JIec1dBpr2qD206FwUHpVrw== 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 4Tgd6B6mfczdZ7; Thu, 22 Feb 2024 15:56:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MFu2wn064246; Thu, 22 Feb 2024 15:56:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MFu2eX064243; Thu, 22 Feb 2024 15:56:02 GMT (envelope-from git) Date: Thu, 22 Feb 2024 15:56:02 GMT Message-Id: <202402221556.41MFu2eX064243@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 5a476e64b543 - main - uath(4): Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5a476e64b543dc63fae7fcd243dc066dced31c3b Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=5a476e64b543dc63fae7fcd243dc066dced31c3b commit 5a476e64b543dc63fae7fcd243dc066dced31c3b Author: Gordon Bergling AuthorDate: 2024-02-22 15:55:51 +0000 Commit: Gordon Bergling CommitDate: 2024-02-22 15:55:51 +0000 uath(4): Fix a typo in a source code comment - s/parmeter/parameter/ MFC after: 3 days --- sys/dev/usb/wlan/if_uathreg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/wlan/if_uathreg.h b/sys/dev/usb/wlan/if_uathreg.h index 47ec13267e17..91e5f04bc902 100644 --- a/sys/dev/usb/wlan/if_uathreg.h +++ b/sys/dev/usb/wlan/if_uathreg.h @@ -50,7 +50,7 @@ struct uath_fwblock { * parameter 2 * ... * - * A variable-length parameter, or a parmeter that is larger than + * A variable-length parameter, or a parameter that is larger than * 32 bits is passed as pair, where length is a * 32-bit quantity and data is padded to 32 bits. */ From nobody Thu Feb 22 16:17:25 2024 X-Original-To: dev-commits-src-main@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 4TgdZs5Nhxz59ttC; Thu, 22 Feb 2024 16:17:25 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgdZs36cFz4J0c; Thu, 22 Feb 2024 16:17:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708618645; 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=NzMi6+LUPrWq/YC/FaGTqfSzj7O3UkhLvAsGYIna5zY=; b=TJnTVQKAnnZ18gdtEA45NJN04ssDfk24r5a3r0DzY74omo5PEDEK+t9OiN7GrJybEbvNw0 oEqj0dF3kqeJIBiU/w1Su8dkUQKij7lDJnV6k0bLdBT8pkEwha8X/+Bh/UtzbroA9EgWtb L/LPh6TCbofM3xrT+3oYKz2DrwnJ5HA0eNnJ3kKiOXHXAK4etALL8ZBKL0rL//245kLMlQ tOBjN+Ze2XWN507ige3t6yBpR70SVXMs7gocdVeRLV3f7O+brmHTS+ID7Tbgh9gIEaqk0K cPU9pwMWY2coy7NvsZvWKTHwth0Yf41P6vSWz9DwwI7oHWBSVBX5ekMZwBHWfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708618645; 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=NzMi6+LUPrWq/YC/FaGTqfSzj7O3UkhLvAsGYIna5zY=; b=pWwMTMSE26eTT2V0il+uo7wkM4QbwRGoxMJdukuIUNDLjXSubKJbYJ9Vvd1hRCdsTxkx1e iGev1wjV9ZQSKuQg8teGGXq5SqdrU8rfZ1rCv7eTeS5snAplySA4BuN6QeAk7FDOQ2/F5t UMyDIyBsQEHs+23VMiU4UUcyYy4m73XA5TaN4xka84KFOwiEYlqP2GvM4T9AP0+Lbf/HKo 4GmtBEJrao96MtDtBdaxad9s/KowGwesStQweWxViXoRVQ9LFjDn/qx+ETgmxNswhOL4L7 ldh0Ldnj7C+MvL93PudV66rokoXc19wyPMmTqsp0VDUHG3TfTgJKiJKrK6Ag8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708618645; a=rsa-sha256; cv=none; b=ceEYlB/3RWwdsLryeDguard5kUxuAqHvVcTTIGTvhPHPqW+cpZH7T2bDSncG6A6pAp+IZo +GiHK4WV5G4N8Kmvlc/F7lLjrp16A3lGY4WifP+jDw2CsVAU7Ikf9IBuPHLPTVIqQ6mlmX S/sMfIci7AfkIPr8HD6B5ccymgNMwZeDgLIdBoasiiYh6w9lkGw+7M4xBeyRCPi8tGw40z 6EWCpyPYt9+w8vBPq5k2ImlAHJfXZWKoCBnitz2QHVLtHv1HR0uc9GdWKwoSVsbNvZU+ir sONX1daUMbYT7r2R72z+5ZVh++vo9fJrkq8UKgShcc9cu2wOXo4V2m9SON2KCg== 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 4TgdZs25CGzfT3; Thu, 22 Feb 2024 16:17:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MGHPFT098319; Thu, 22 Feb 2024 16:17:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MGHPN3098316; Thu, 22 Feb 2024 16:17:25 GMT (envelope-from git) Date: Thu, 22 Feb 2024 16:17:25 GMT Message-Id: <202402221617.41MGHPN3098316@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: a53204c22790 - main - sk(4): Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: a53204c22790a94a15f0e3c153f7fa12f9d57d27 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=a53204c22790a94a15f0e3c153f7fa12f9d57d27 commit a53204c22790a94a15f0e3c153f7fa12f9d57d27 Author: Gordon Bergling AuthorDate: 2024-02-22 16:16:49 +0000 Commit: Gordon Bergling CommitDate: 2024-02-22 16:16:49 +0000 sk(4): Fix a typo in a source code comment - /integeated/integrated/ - s/extented/extended/ Obtained from: NetBSD MFC after: 3 days --- sys/dev/sk/if_skreg.h | 2 +- sys/dev/sk/xmaciireg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/sk/if_skreg.h b/sys/dev/sk/if_skreg.h index 29284025463d..63452e30f575 100644 --- a/sys/dev/sk/if_skreg.h +++ b/sys/dev/sk/if_skreg.h @@ -405,7 +405,7 @@ * fiber-based cards or BCOM for 1000baseT cards with a Broadcom * PHY. */ -#define SK_PHYTYPE_XMAC 0 /* integeated XMAC II PHY */ +#define SK_PHYTYPE_XMAC 0 /* integrated XMAC II PHY */ #define SK_PHYTYPE_BCOM 1 /* Broadcom BCM5400 */ #define SK_PHYTYPE_LONE 2 /* Level One LXT1000 */ #define SK_PHYTYPE_NAT 3 /* National DP83891 */ diff --git a/sys/dev/sk/xmaciireg.h b/sys/dev/sk/xmaciireg.h index ff836dd48903..dcd91e1640ab 100644 --- a/sys/dev/sk/xmaciireg.h +++ b/sys/dev/sk/xmaciireg.h @@ -335,7 +335,7 @@ #define XM_PHY_ANEXP 0x0006 /* autoneg expansion */ #define XM_PHY_NEXTP 0x0007 /* nextpage */ #define XM_PHY_LPNEXTP 0x0008 /* link partner's nextpage */ -#define XM_PHY_EXTSTS 0x000F /* extented status */ +#define XM_PHY_EXTSTS 0x000F /* extended status */ #define XM_PHY_RESAB 0x0010 /* resolved ability */ #define XM_BMCR_DUPLEX 0x0100 From nobody Thu Feb 22 16:28:03 2024 X-Original-To: dev-commits-src-main@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 4Tgdq82CsMz59wPh; Thu, 22 Feb 2024 16:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tgdq806Ssz4JhC; Thu, 22 Feb 2024 16:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708619284; 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=e+NAsISze0ielcyJ8yWim/swGxC20K89xeqh440xfoE=; b=UlZ7PWjlEbV24tSAGh3QAzkktTLCbeXrJmBKkEMKD9iuKfYqrmOuYxWImS//JMP74WBQc8 4/9peDFV42vO/NHq28ncENhRf41A4OV4cEIK/3P17BKdFIngNsl3o/uPfKNSL1wwz0GcxC xIzEZUZnxgsPFmvl2dtvrmG8Mu2lvITZsCMZUGXAlrAuYAc3BcwrAarGZ+rX7UmXJTZBx4 MGgXKBO81jInGPaWD3LydCiPosxWsJSTFg6nEwkyF8Q9ie9estbrFiuasNQzKLMV6XtY4i 42pmvjIEs6f2JpGbqwvZReBxAIFj3gzTK+WCvcjmx9kxe9AS8JHDelgxJ5cPEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708619284; 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=e+NAsISze0ielcyJ8yWim/swGxC20K89xeqh440xfoE=; b=iW74IHPAxwxoOlBueYyfRdQIXTisdr01HFXAwEEaA5fAfSmSJ03KM4ldCe8v8Pqg4GOwg9 o8MYZxyHpFeQMa90pH4uo4hY1ngjIL8H4DbWHBUA8qSxG8PetwRoL4UmUjneKvGV6QyhcO WCp1cGg2wJICh/Ozqg1fELJK2x8pDDwpgNqfI7kFMOSvsYW1FBa49sM4rrzWZ/HHFsmvdL lXM0M0pJqrqNILk21YOJ7UCEs1YHMoXDCkIEaTnOehBQE+MAzcbft/cRSDV0/SMGFeGr75 mwtaxIWnE9j/HHo6Cg+kiPUpU3d0PutEIaQg8GTavtQ3RI90cEjIrKsMVkKHQw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708619284; a=rsa-sha256; cv=none; b=KUwd3DyX0ziM4oRxPoh8aWDeLCe6G+wBq0fBEwFmnlXWkmJek/RFCJX/XL7LoKPcGiBUfT Jh4vLMKx4cdySg8l6iEaQYKxoclWdQk+G1wCr+Rxc7iTd/3XhBR7BcI5D9dp/UFywzJsin UyDFLveZIUTQtG4Q6Ult5xSCUipYX6r/HZTQoCQgR5hmyX+2/7UNH2mfvK6eJqLQ89Y8lP 1YXzisiYRlXsaDddlEbV5kNKiRAda3blTzc8vXOBLGmVl6VsOKN+qhEawKRVYYqxiBjXGd GIwgqXppbLxZRXhQfobxxGOMAozWxH3wQTkpCEdlUcyRMo/VO+hbIICt+7NUTQ== 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 4Tgdq76JtwzfGL; Thu, 22 Feb 2024 16:28:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MGS3En015332; Thu, 22 Feb 2024 16:28:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MGS3cb015329; Thu, 22 Feb 2024 16:28:03 GMT (envelope-from git) Date: Thu, 22 Feb 2024 16:28:03 GMT Message-Id: <202402221628.41MGS3cb015329@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: d3eae160b21f - main - arm64: Add BTI support to pmap List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3eae160b21f12c769f1e275901ad8ef18901744 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=d3eae160b21f12c769f1e275901ad8ef18901744 commit d3eae160b21f12c769f1e275901ad8ef18901744 Author: Andrew Turner AuthorDate: 2023-04-05 12:31:41 +0000 Commit: Andrew Turner CommitDate: 2024-02-22 16:27:47 +0000 arm64: Add BTI support to pmap Add a rangeset to the arm64 pmap to describe which address space needs the Branch Target Identification (BTI) Guard Page flag set in the page table. On hardware that supports BTI the Guard Page flag tells the hardware to raise an exception if the target of a BR* and BLR* instruction is not an appropriate landing pad instruction. To support this in userspace we need to know which address space should be guarded. For this add a rangeset to the arm64 pmap when the hardware supports BTI. The kernel can then use pmap_bti_set and pmap_bti_clear mark and unmark which address space is guarded. Sponsored by: Arm Ltd Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42328 --- sys/arm64/arm64/pmap.c | 270 ++++++++++++++++++++++++++++++++++++++++++++--- sys/arm64/include/pmap.h | 13 +-- 2 files changed, 263 insertions(+), 20 deletions(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index d9b6425cc20e..21912535bb6a 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -119,6 +119,7 @@ #include #include #include +#include #include #include #include @@ -432,6 +433,12 @@ SYSCTL_INT(_vm_pmap, OID_AUTO, superpages_enabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &superpages_enabled, 0, "Are large page mappings enabled?"); +/* + * True when Branch Target Identification should be used by userspace. This + * allows pmap to mark pages as guarded with ATTR_S1_GP. + */ +__read_mostly static bool pmap_bti_support = false; + /* * Internal flags for pmap_enter()'s helper functions. */ @@ -478,7 +485,14 @@ static void _pmap_unwire_l3(pmap_t pmap, vm_offset_t va, vm_page_t m, static int pmap_unuse_pt(pmap_t, vm_offset_t, pd_entry_t, struct spglist *); static __inline vm_page_t pmap_remove_pt_page(pmap_t pmap, vm_offset_t va); +static uma_zone_t pmap_bti_ranges_zone; +static bool pmap_bti_same(pmap_t pmap, vm_offset_t sva, vm_offset_t eva); static pt_entry_t pmap_pte_bti(pmap_t pmap, vm_offset_t va); +static void pmap_bti_on_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva); +static void *bti_dup_range(void *ctx, void *data); +static void bti_free_range(void *ctx, void *node); +static int pmap_bti_copy(pmap_t dst_pmap, pmap_t src_pmap); +static void pmap_bti_deassign_all(pmap_t pmap); /* * These load the old table data and store the new value. @@ -2320,6 +2334,7 @@ pmap_pinit0(pmap_t pmap) pmap->pm_levels = 4; pmap->pm_ttbr = pmap->pm_l0_paddr; pmap->pm_asid_set = &asids; + pmap->pm_bti = NULL; PCPU_SET(curpmap, pmap); } @@ -2345,9 +2360,16 @@ pmap_pinit_stage(pmap_t pmap, enum pmap_stage stage, int levels) MPASS(levels == 3 || levels == 4); pmap->pm_levels = levels; pmap->pm_stage = stage; + pmap->pm_bti = NULL; switch (stage) { case PM_STAGE1: pmap->pm_asid_set = &asids; + if (pmap_bti_support) { + pmap->pm_bti = malloc(sizeof(struct rangeset), M_DEVBUF, + M_ZERO | M_WAITOK); + rangeset_init(pmap->pm_bti, bti_dup_range, + bti_free_range, pmap, M_NOWAIT); + } break; case PM_STAGE2: pmap->pm_asid_set = &vmids; @@ -2652,7 +2674,7 @@ void pmap_release(pmap_t pmap) { bool rv __diagused; - struct spglist free; + struct spglist freelist; struct asid_set *set; vm_page_t m; int asid; @@ -2665,13 +2687,13 @@ pmap_release(pmap_t pmap) KASSERT((pmap->pm_l0[0] & ATTR_DESCR_VALID) == ATTR_DESCR_VALID, ("pmap_release: Invalid l0 entry: %lx", pmap->pm_l0[0])); - SLIST_INIT(&free); + SLIST_INIT(&freelist); m = PHYS_TO_VM_PAGE(pmap->pm_ttbr); PMAP_LOCK(pmap); - rv = pmap_unwire_l3(pmap, 0, m, &free); + rv = pmap_unwire_l3(pmap, 0, m, &freelist); PMAP_UNLOCK(pmap); MPASS(rv == true); - vm_page_free_pages_toq(&free, true); + vm_page_free_pages_toq(&freelist, true); } KASSERT(pmap->pm_stats.resident_count == 0, @@ -2699,6 +2721,11 @@ pmap_release(pmap_t pmap) bit_clear(set->asid_set, asid); } mtx_unlock_spin(&set->asid_set_mutex); + + if (pmap->pm_bti != NULL) { + rangeset_fini(pmap->pm_bti); + free(pmap->pm_bti, M_DEVBUF); + } } m = PHYS_TO_VM_PAGE(pmap->pm_l0_paddr); @@ -3631,14 +3658,8 @@ pmap_remove_l3_range(pmap_t pmap, pd_entry_t l2e, vm_offset_t sva, pmap_invalidate_range(pmap, va, sva, true); } -/* - * Remove the given range of addresses from the specified map. - * - * It is assumed that the start and end are properly - * rounded to the page size. - */ -void -pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +static void +pmap_remove1(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, bool map_delete) { struct rwlock *lock; vm_offset_t va_next; @@ -3655,6 +3676,8 @@ pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) SLIST_INIT(&free); PMAP_LOCK(pmap); + if (map_delete) + pmap_bti_on_remove(pmap, sva, eva); lock = NULL; for (; sva < eva; sva = va_next) { @@ -3737,6 +3760,18 @@ pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) vm_page_free_pages_toq(&free, true); } +/* + * Remove the given range of addresses from the specified map. + * + * It is assumed that the start and end are properly + * rounded to the page size. + */ +void +pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +{ + pmap_remove1(pmap, sva, eva, false); +} + /* * Remove the given range of addresses as part of a logical unmap * operation. This has the effect of calling pmap_remove(), but @@ -3746,7 +3781,7 @@ pmap_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) void pmap_map_delete(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) { - pmap_remove(pmap, sva, eva); + pmap_remove1(pmap, sva, eva, true); } /* @@ -4355,6 +4390,8 @@ pmap_enter_largepage(pmap_t pmap, vm_offset_t va, pt_entry_t newpte, int flags, PTE_TO_PHYS(newpte), newpte, psind)); restart: + if (!pmap_bti_same(pmap, va, va + pagesizes[psind])) + return (KERN_PROTECTION_FAILURE); if (psind == 2) { PMAP_ASSERT_L1_BLOCKS_SUPPORTED; @@ -4848,6 +4885,14 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, return (KERN_RESOURCE_SHORTAGE); } + /* + * If bti is not the same for the whole l2 range, return failure + * and let vm_fault() cope. Check after l2 allocation, since + * it could sleep. + */ + if (!pmap_bti_same(pmap, va, va + L2_SIZE)) + return (KERN_PROTECTION_FAILURE); + /* * If there are existing mappings, either abort or remove them. */ @@ -5496,6 +5541,38 @@ out: PMAP_UNLOCK(dst_pmap); } +int +pmap_vmspace_copy(pmap_t dst_pmap, pmap_t src_pmap) +{ + int error; + + if (dst_pmap->pm_stage != src_pmap->pm_stage) + return (EINVAL); + + if (dst_pmap->pm_stage != PM_STAGE1 || src_pmap->pm_bti == NULL) + return (0); + + for (;;) { + if (dst_pmap < src_pmap) { + PMAP_LOCK(dst_pmap); + PMAP_LOCK(src_pmap); + } else { + PMAP_LOCK(src_pmap); + PMAP_LOCK(dst_pmap); + } + error = pmap_bti_copy(dst_pmap, src_pmap); + /* Clean up partial copy on failure due to no memory. */ + if (error == ENOMEM) + pmap_bti_deassign_all(dst_pmap); + PMAP_UNLOCK(src_pmap); + PMAP_UNLOCK(dst_pmap); + if (error != ENOMEM) + break; + vm_wait(NULL); + } + return (error); +} + /* * pmap_zero_page zeros the specified hardware page by mapping * the page into KVM and using bzero to clear its contents. @@ -5907,6 +5984,7 @@ pmap_remove_pages(pmap_t pmap) if (lock != NULL) rw_wunlock(lock); pmap_invalidate_all(pmap); + pmap_bti_deassign_all(pmap); free_pv_chunk_batch(free_chunks); PMAP_UNLOCK(pmap); vm_page_free_pages_toq(&free, true); @@ -7436,6 +7514,29 @@ pmap_set_cnp(void *arg) isb(); } +/* + * Defer enabling some features until we have read the ID registers to know + * if they are supported on all CPUs. + */ +static void +pmap_init_mp(void *dummy __unused) +{ + uint64_t reg; + + if (get_kernel_reg(ID_AA64PFR1_EL1, ®)) { + if (ID_AA64PFR1_BT_VAL(reg) != ID_AA64PFR1_BT_NONE) { + if (bootverbose) + printf("Enabling BTI\n"); + pmap_bti_support = true; + + pmap_bti_ranges_zone = uma_zcreate("BTI ranges", + sizeof(struct rs_el), NULL, NULL, NULL, NULL, + UMA_ALIGN_PTR, 0); + } + } +} +SYSINIT(pmap_init_mp, SI_SUB_CPU, SI_ORDER_ANY, pmap_init_mp, NULL); + /* * Defer enabling CnP until we have read the ID registers to know if it's * supported on all CPUs. @@ -7871,8 +7972,85 @@ pmap_is_valid_memattr(pmap_t pmap __unused, vm_memattr_t mode) return (mode >= VM_MEMATTR_DEVICE && mode <= VM_MEMATTR_WRITE_THROUGH); } +static void * +bti_dup_range(void *ctx __unused, void *data) +{ + struct rs_el *node, *new_node; + + new_node = uma_zalloc(pmap_bti_ranges_zone, M_NOWAIT); + if (new_node == NULL) + return (NULL); + node = data; + memcpy(new_node, node, sizeof(*node)); + return (new_node); +} + +static void +bti_free_range(void *ctx __unused, void *node) +{ + + uma_zfree(pmap_bti_ranges_zone, node); +} + +static int +pmap_bti_assign(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +{ + struct rs_el *rs; + int error; + + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + PMAP_ASSERT_STAGE1(pmap); + MPASS(pmap->pm_bti != NULL); + rs = uma_zalloc(pmap_bti_ranges_zone, M_NOWAIT); + if (rs == NULL) + return (ENOMEM); + error = rangeset_insert(pmap->pm_bti, sva, eva, rs); + if (error != 0) + uma_zfree(pmap_bti_ranges_zone, rs); + return (error); +} + +static void +pmap_bti_deassign_all(pmap_t pmap) +{ + + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + if (pmap->pm_bti != NULL) + rangeset_remove_all(pmap->pm_bti); +} + +static bool +pmap_bti_same(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +{ + struct rs_el *prev_rs, *rs; + vm_offset_t va; + + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + KASSERT(ADDR_IS_CANONICAL(sva), + ("%s: Start address not in canonical form: %lx", __func__, sva)); + KASSERT(ADDR_IS_CANONICAL(eva), + ("%s: End address not in canonical form: %lx", __func__, eva)); + + if (pmap->pm_bti == NULL || ADDR_IS_KERNEL(sva)) + return (true); + MPASS(!ADDR_IS_KERNEL(eva)); + for (va = sva; va < eva; prev_rs = rs) { + rs = rangeset_lookup(pmap->pm_bti, va); + if (va == sva) + prev_rs = rs; + else if ((rs == NULL) ^ (prev_rs == NULL)) + return (false); + if (rs == NULL) { + va += PAGE_SIZE; + continue; + } + va = rs->re_end; + } + return (true); +} + static pt_entry_t -pmap_pte_bti(pmap_t pmap, vm_offset_t va __diagused) +pmap_pte_bti(pmap_t pmap, vm_offset_t va) { PMAP_LOCK_ASSERT(pmap, MA_OWNED); MPASS(ADDR_IS_CANONICAL(va)); @@ -7881,9 +8059,73 @@ pmap_pte_bti(pmap_t pmap, vm_offset_t va __diagused) return (0); if (pmap == kernel_pmap) return (ATTR_KERN_GP); + if (pmap->pm_bti != NULL && rangeset_lookup(pmap->pm_bti, va) != NULL) + return (ATTR_S1_GP); return (0); } +static void +pmap_bti_on_remove(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +{ + + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + if (pmap->pm_bti != NULL) + rangeset_remove(pmap->pm_bti, sva, eva); +} + +static int +pmap_bti_copy(pmap_t dst_pmap, pmap_t src_pmap) +{ + + PMAP_LOCK_ASSERT(dst_pmap, MA_OWNED); + PMAP_LOCK_ASSERT(src_pmap, MA_OWNED); + MPASS(src_pmap->pm_stage == dst_pmap->pm_stage); + MPASS(src_pmap->pm_bti != NULL); + MPASS(dst_pmap->pm_bti != NULL); + if (src_pmap->pm_bti->rs_data_ctx == NULL) + return (0); + return (rangeset_copy(dst_pmap->pm_bti, src_pmap->pm_bti)); +} + +static void +pmap_bti_update_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, bool set) +{ + PMAP_LOCK_ASSERT(pmap, MA_OWNED); + PMAP_ASSERT_STAGE1(pmap); + + pmap_mask_set_locked(pmap, sva, eva, ATTR_S1_GP, set ? ATTR_S1_GP : 0, + true); +} + +int +pmap_bti_set(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) +{ + int error; + + if (pmap->pm_bti == NULL) + return (0); + if (!ADDR_IS_CANONICAL(sva) || !ADDR_IS_CANONICAL(eva)) + return (EINVAL); + if (pmap->pm_stage != PM_STAGE1) + return (EINVAL); + if (eva <= sva || ADDR_IS_KERNEL(eva)) + return (EFAULT); + + sva = trunc_page(sva); + eva = round_page(eva); + for (;;) { + PMAP_LOCK(pmap); + error = pmap_bti_assign(pmap, sva, eva); + if (error == 0) + pmap_bti_update_range(pmap, sva, eva, true); + PMAP_UNLOCK(pmap); + if (error != ENOMEM) + break; + vm_wait(NULL); + } + return (error); +} + #if defined(KASAN) || defined(KMSAN) static pd_entry_t *pmap_san_early_l2; diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h index 4b4d47ccc7af..d69924080610 100644 --- a/sys/arm64/include/pmap.h +++ b/sys/arm64/include/pmap.h @@ -63,6 +63,8 @@ void pmap_page_set_memattr(vm_page_t m, vm_memattr_t ma); * Pmap stuff */ +struct rangeset; + struct md_page { TAILQ_HEAD(,pv_entry) pv_list; int pv_gen; @@ -97,7 +99,8 @@ struct pmap { struct asid_set *pm_asid_set; /* The ASID/VMID set to use */ enum pmap_stage pm_stage; int pm_levels; - uint64_t pm_reserved[4]; + struct rangeset *pm_bti; + uint64_t pm_reserved[3]; }; typedef struct pmap *pmap_t; @@ -182,12 +185,10 @@ extern void (*pmap_stage2_invalidate_range)(uint64_t, vm_offset_t, vm_offset_t, bool); extern void (*pmap_stage2_invalidate_all)(uint64_t); -static inline int -pmap_vmspace_copy(pmap_t dst_pmap __unused, pmap_t src_pmap __unused) -{ +int pmap_vmspace_copy(pmap_t, pmap_t); - return (0); -} +int pmap_bti_set(pmap_t, vm_offset_t, vm_offset_t); +int pmap_bti_clear(pmap_t, vm_offset_t, vm_offset_t); #if defined(KASAN) || defined(KMSAN) struct arm64_bootparams; From nobody Thu Feb 22 16:28:04 2024 X-Original-To: dev-commits-src-main@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 4Tgdq92n2Vz59wGH; Thu, 22 Feb 2024 16:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tgdq9153Lz4K3j; Thu, 22 Feb 2024 16:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708619285; 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=6uYSW5/MuKNuTgNhkDC4M4uthACp0GYN8IGvo7oPLh0=; b=WJ4bp/+WxHuu2nWfE45YEZrhX3TMvYz1T+p7DFDyMTxUD8/M2XmSSB1Y5odCucg4gtNmRf jTY8oKX5WqSUMZI+21HNam/15S4bEmY0Jc7vS4QeETHaBaDyJUJ/YjtIV7qlXJRoxlWMBq XoNWy7l0xH2G603HIC306HoVmelhCAqb90Z9Cj3b/8d+IGsZTEwMvqp8jgtwbB2tmGdgWi fa5mx1tvZMITIZud9xJ3gdGoHpHlZ+sj+KbgNcT6J5tPhlZJWypwjgBPA9JXhxv5WGsTFr S9NV9dMbpFuLz6smVt1BMD1YpM8JsII2yUhpdkgqdPJ8u5wbB9Ggo+UnekVsFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708619285; 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=6uYSW5/MuKNuTgNhkDC4M4uthACp0GYN8IGvo7oPLh0=; b=JxrXF1npXN0mQRdHgJmRWhr0boE29ydst1Ql+I7bgsnRe9TKUZ1O9F1DLhTox2kQo5wp+e dtfGvkvscGiCiwXvQvVEZrDw4lT9huY8VhTYOhd9M/3UrU19RugV6+2WC+pVKHfft66KP/ A45J3DBCXzHZm9BVtl/AVPtg9AcOZQkGKqGA2JydHVB7hCxhkSCVbj7qqWrSUJ59iW3zC4 cOfCT8W3KTvI2DM0fCI01AHmCYVWAT/Vh0mz/nvxdjk0qUHUorCwBZmxvbqa8sP/h7ztz/ 1KUpmOjH5MNiv5tt0IS91R44d4xaUXZJnABIp11gNgpYXoL92CLMdyrG+1svaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708619285; a=rsa-sha256; cv=none; b=Cersl54WwLAO1lGbNJdisPKLf1B1COq13yqqYRI5mPZqwleLt8X3pJZoSMWuEWNyyT3dG2 c8bqRS15d6HPWPf9+Hu7Kq/cpDPTDa8XBJ+8nQksxNED0M6URZmZXvDA0+HZZ/YMxGsicF g+FXJU1bsnNnhez224UHUk3NBtNiDOmf8zojFYgX8hzYY8FERsRqh+r1LzqBmjXI5+Z4Rn 4ugeCj7PPueMxFwqZ6SHuLlyuJ/Q3ZRGmgsyUPeqFj+OnoFIQDS/4yXzowTKFWDJI0/Y/N PP9gGa9Iggs8qV1vIAc6bg8pYoBO5+VHVd06j/IqLSO2WxVhg/TyTnZQ4Q/8cw== 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 4Tgdq909W4zfVN; Thu, 22 Feb 2024 16:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MGS4Gg015371; Thu, 22 Feb 2024 16:28:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MGS4Wp015368; Thu, 22 Feb 2024 16:28:04 GMT (envelope-from git) Date: Thu, 22 Feb 2024 16:28:04 GMT Message-Id: <202402221628.41MGS4Wp015368@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: c4e4a7596beb - main - Add a BTI sysarch List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c4e4a7596beb488b4878e9fa2a67cf49e330f78b Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c4e4a7596beb488b4878e9fa2a67cf49e330f78b commit c4e4a7596beb488b4878e9fa2a67cf49e330f78b Author: Andrew Turner AuthorDate: 2023-04-05 12:45:19 +0000 Commit: Andrew Turner CommitDate: 2024-02-22 16:27:47 +0000 Add a BTI sysarch This is used to enable the guard page when an elf binary is built with BTI instructions. Reviewed by: markj Sponsored by: Arm Ltd Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39453 --- sys/arm64/arm64/sys_machdep.c | 43 ++++++++++++++++++++++++++++++++++++++++++- sys/arm64/include/sysarch.h | 7 +++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/sys_machdep.c b/sys/arm64/arm64/sys_machdep.c index 79546d29e251..eedc57f7c572 100644 --- a/sys/arm64/arm64/sys_machdep.c +++ b/sys/arm64/arm64/sys_machdep.c @@ -29,13 +29,54 @@ #include #include +#include #include +#include +#include +#include + #include +#include int sysarch(struct thread *td, struct sysarch_args *uap) { + struct arm64_guard_page_args gp_args; + vm_offset_t eva; + int error; + + switch (uap->op) { + case ARM64_GUARD_PAGE: + error = copyin(uap->parms, &gp_args, sizeof(gp_args)); + if (error != 0) + return (error); + + /* Only accept canonical addresses, no PAC or TBI */ + if (!ADDR_IS_CANONICAL(gp_args.addr)) + return (EINVAL); + + eva = gp_args.addr + gp_args.len; + + /* Check for a length overflow */ + if (gp_args.addr > eva) + return (EINVAL); + + /* Check in the correct address space */ + if (eva >= VM_MAX_USER_ADDRESS) + return (EINVAL); + + /* Nothing to do */ + if (gp_args.len == 0) + return (0); + + error = pmap_bti_set(vmspace_pmap(td->td_proc->p_vmspace), + trunc_page(gp_args.addr), round_page(eva)); + break; + default: + error = EINVAL; + break; + } - return (ENOTSUP); + return (error); } diff --git a/sys/arm64/include/sysarch.h b/sys/arm64/include/sysarch.h index 2bd45d384743..83094943423a 100644 --- a/sys/arm64/include/sysarch.h +++ b/sys/arm64/include/sysarch.h @@ -39,6 +39,13 @@ #ifndef _MACHINE_SYSARCH_H_ #define _MACHINE_SYSARCH_H_ +#define ARM64_GUARD_PAGE 0x100 + +struct arm64_guard_page_args { + __uintptr_t addr; + __size_t len; +}; + #ifndef _KERNEL __BEGIN_DECLS From nobody Thu Feb 22 16:28:06 2024 X-Original-To: dev-commits-src-main@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 4TgdqB4cTkz59wR4; Thu, 22 Feb 2024 16:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgdqB2B4Pz4Jyh; Thu, 22 Feb 2024 16:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708619286; 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=Viie4LC0ZWcna1gZRzOxnQoW7kid327RVGsU/oSwoZc=; b=rtZ0yQEROHp6fj6qpf2cT/my8TNnrHvdy6TpQ8YE87Temtt+/CxhmTGyxcxd9kRBnXTs7R EIxjc6MUAx8j4JuleRKr23GClY1fs4T43Lg2WYVV7m23mg9XdtWsBwfFOWtSiirNEEh0pW mUwOt4N4t8Ay7li+0Cs2PVJfSMtEXWoawlzh7AE6w14JdSkRjaR9R44VAzODGu+Ot3ZAn/ A5cKdugTom9wegwogdTeqd8C6TJfjV09+IYAL5uSuj0BE7mMDpIQ/agMdQ3mWIl2fas6DK AaJxeB3UKsgt2Cr7aEByH/n8eJTUcN9aTyIIyqURM5a602d6jv5NyYaPKcnyrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708619286; 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=Viie4LC0ZWcna1gZRzOxnQoW7kid327RVGsU/oSwoZc=; b=JTxS0sfE3EPN+UJPg9zLMe/t6Q8jPWERPFACKqXNX5YJaqUsdCsSteNX36aDhZZwhLUFug NpzhtmRfoqz48nKDsSgKHbRWPG4GIDw2Tc+s6J2evwQPGkCBdX5mXaBXGhQLFE82Q/VlXe C6aXWhfGNzx+DaIlnWwWC0w38qKIWcb8k/poCjAPvhDCw9fHenxIDIV1P2uCayR4sHsZRB FhZH8X/859m+BWV3zCSiEDjbahSHFt7U+R7tWa9NrtFK3/CEjNlyrv6qxCBcx7d21I22K6 51DU16C7ZYjCv9je/npyR/7GJpMeZUSKUNI/Z5yfhlZSmySCeEFjo2V7bEC8Hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708619286; a=rsa-sha256; cv=none; b=NIx4ujkNHaeE5gJFyGIWwk4uxsh98k6KUDM9XXLq7MofveCueYz1MufuNjSH8X9kAej4Y5 8xso8tTCwuqigoE597Ny9emyikwpDvmQluGOLQ6GLx08fnppyyGI2uw9bLea4gBUGx7DV6 k0+5FYZi3wCjdC1Zbw4PDRYUnDReJ/qtwBr9VIILqAL6bpMjQ+e/9GhDFWUZjsq4C4rNhH DOT4QdcvMT0jpFTxWo91xKYO8WM5meG1g91NGW2ZDgUXaq7emnYKhJPXBb+DnBbBjiXb+c GG1v/Oue2Pa3OkVkahNkTa4kzx6KRYUDJVGwNIdZMJkYJLi4uNOCTzdn4gEiJw== 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 4TgdqB13XkzfVP; Thu, 22 Feb 2024 16:28:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MGS6T8015422; Thu, 22 Feb 2024 16:28:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MGS6hh015419; Thu, 22 Feb 2024 16:28:06 GMT (envelope-from git) Date: Thu, 22 Feb 2024 16:28:06 GMT Message-Id: <202402221628.41MGS6hh015419@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 670af174e27b - main - arm64: Enable BTI in the kernel ELF loader List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 670af174e27b4f42f6e17521f18508ec78d5a776 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=670af174e27b4f42f6e17521f18508ec78d5a776 commit 670af174e27b4f42f6e17521f18508ec78d5a776 Author: Andrew Turner AuthorDate: 2023-11-02 09:56:09 +0000 Commit: Andrew Turner CommitDate: 2024-02-22 16:27:47 +0000 arm64: Enable BTI in the kernel ELF loader Enable BTI in binaries loaded by the kernel. When the ELF file contains the needed note indicating BTI is supported set the guarded page flag for all segments. Reviewed by: markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42441 --- sys/arm64/arm64/elf_machdep.c | 73 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/sys/arm64/arm64/elf_machdep.c b/sys/arm64/arm64/elf_machdep.c index 29427d04ee54..350651c42723 100644 --- a/sys/arm64/arm64/elf_machdep.c +++ b/sys/arm64/arm64/elf_machdep.c @@ -46,7 +46,9 @@ #include #include +#include #include +#include #include #include @@ -61,6 +63,8 @@ u_long __read_frequently linux_elf_hwcap2; struct arm64_addr_mask elf64_addr_mask; +static void arm64_exec_protect(struct image_params *, int); + static struct sysentvec elf64_freebsd_sysvec = { .sv_size = SYS_MAXSYSCALL, .sv_table = sysent, @@ -98,6 +102,7 @@ static struct sysentvec elf64_freebsd_sysvec = { .sv_hwcap = &elf_hwcap, .sv_hwcap2 = &elf_hwcap2, .sv_onexec_old = exec_onexec_old, + .sv_protect = arm64_exec_protect, .sv_onexit = exit_onexit, .sv_regset_begin = SET_BEGIN(__elfN(regset)), .sv_regset_end = SET_LIMIT(__elfN(regset)), @@ -311,3 +316,71 @@ elf_cpu_parse_dynamic(caddr_t loadbase __unused, Elf_Dyn *dynamic __unused) return (0); } + +static Elf_Note gnu_property_note = { + .n_namesz = sizeof(GNU_ABI_VENDOR), + .n_descsz = 16, + .n_type = NT_GNU_PROPERTY_TYPE_0, +}; + +static bool +gnu_property_cb(const Elf_Note *note, void *arg0, bool *res) +{ + const uint32_t *data; + uintptr_t p; + + *res = false; + p = (uintptr_t)(note + 1); + p += roundup2(note->n_namesz, 4); + data = (const uint32_t *)p; + if (data[0] != GNU_PROPERTY_AARCH64_FEATURE_1_AND) + return (false); + /* + * The data length should be at least the size of a uint32, and be + * a multiple of uint32_t's + */ + if (data[1] < sizeof(uint32_t) || (data[1] % sizeof(uint32_t)) != 0) + return (false); + if ((data[2] & GNU_PROPERTY_AARCH64_FEATURE_1_BTI) != 0) + *res = true; + + return (true); +} + +static void +arm64_exec_protect(struct image_params *imgp, int flags __unused) +{ + const Elf_Ehdr *hdr; + const Elf_Phdr *phdr; + vm_offset_t sva, eva; + int i; + bool found; + + /* Skip if BTI is not supported */ + if ((elf_hwcap2 & HWCAP2_BTI) == 0) + return; + + hdr = (const Elf_Ehdr *)imgp->image_header; + phdr = (const Elf_Phdr *)(imgp->image_header + hdr->e_phoff); + + found = false; + for (i = 0; i < hdr->e_phnum; i++) { + if (phdr[i].p_type == PT_NOTE && __elfN(parse_notes)(imgp, + &gnu_property_note, GNU_ABI_VENDOR, &phdr[i], + gnu_property_cb, NULL)) { + found = true; + break; + } + } + if (!found) + return; + + for (i = 0; i < hdr->e_phnum; i++) { + if (phdr[i].p_type != PT_LOAD || phdr[i].p_memsz == 0) + continue; + + sva = phdr[i].p_vaddr + imgp->et_dyn_addr; + eva = sva + phdr[i].p_memsz; + pmap_bti_set(vmspace_pmap(imgp->proc->p_vmspace), sva, eva); + } +} From nobody Thu Feb 22 16:28:07 2024 X-Original-To: dev-commits-src-main@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 4TgdqC5qNBz59wPp; Thu, 22 Feb 2024 16:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgdqC374Yz4K1y; Thu, 22 Feb 2024 16:28:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708619287; 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=PC/MosRYVErGL2yZJ30OE/mqViMIOyGMTtbP6FQieOo=; b=vTyuN/3z0Og7ikji4rnJTp4KqDkG3o8uns6ceBOGFmtTEIUb4yz1itNwTWabBos6JCB7XJ 2rbN48O1+Kf6kVlqpWzCyRY0+Ct3q2zSoZs6AVyYmAjCGGYafsSmcwWiayoP82nNmL47Tp OAmBLSrllnb8W7JNDPYMW6V1ANA0Wafvfv+8VFctwNkKijycocxgUxASsCjNAWEwDt777s 730Zt/+KsqZmS3OPMAajn+JRdUd37XO7X8XnaxCoCFC4y+RP61EDcvqdrHnUukqs3u7mq5 09Ghyx36rxP1mdCVndKfIChn94tisPfFGYwm66XBrP66dhUjFlFMv2yS4kStQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708619287; 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=PC/MosRYVErGL2yZJ30OE/mqViMIOyGMTtbP6FQieOo=; b=p51A+aKMYbRz6bJ4vYnb6VQw1F2R92ZBHtYYRm9VqgE28zB4FDWKQoe3zhgj4mKulw76cj duxHh8U56/4niT6DtPtYPrYLUaZ1/hESBuQ7/3tCy46Xa2pCKglrKJbLpYld23LuY1TvmG 0/StFF7bw2Ys129x2B3rmHe+HBRjCrm9xVV/hQrzMbd/NlK+VyclWkHFvWjLEb3xN9PUHW IKKTdSNVtoDyLPwVE5k9fLnxEQGA1c2XJsSgrHThvplRDq6oBBkePUfQIAfQCPuvIoYSWv JwuZuGJGq3Z7utSK1P3k5yXz9sIp5FLh1HZkXJrL7VHmariPd9rQbE8ycanIfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708619287; a=rsa-sha256; cv=none; b=x+cW6yfoLyy3FkLHIffzf9YWjFv0EZItSMo5bHh6Mz918es1UtUihzu6vFSy/dnBM3OLAH FTbrYjxDaFIlyCdyNevGmqfyA5xxK1/AUL1EE9gtel2Je5Udv7zs2O45G0aF/s72D7Bguc GQo/B5CixtG0gG3MJRWp3ywWOxGXG0BFp49mVWAhZsSmYhaWpSrz/IGd75E6AxeRhwRdK7 Kx1YX6Kt2foL63ciBiKWPY98VTx0+2MHR4kv6Fa8fGyXpbdI8kMd8RaQWTmzj/rxOU6DMZ nU6hUUun8BAEBrP3In1YULrQvKQCymqb5AnudyIvqi6rLkq+GCtk3+U8h6QRNA== 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 4TgdqC264gzfXc; Thu, 22 Feb 2024 16:28:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MGS7l1015471; Thu, 22 Feb 2024 16:28:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MGS7Zd015468; Thu, 22 Feb 2024 16:28:07 GMT (envelope-from git) Date: Thu, 22 Feb 2024 16:28:07 GMT Message-Id: <202402221628.41MGS7Zd015468@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: e68136d3635c - main - arm64: Tell userspace when BTI is supported List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e68136d3635ca75a056dc499485417d5eb9fc2f8 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=e68136d3635ca75a056dc499485417d5eb9fc2f8 commit e68136d3635ca75a056dc499485417d5eb9fc2f8 Author: Andrew Turner AuthorDate: 2023-10-26 09:50:28 +0000 Commit: Andrew Turner CommitDate: 2024-02-22 16:27:47 +0000 arm64: Tell userspace when BTI is supported To allow userspace to decide when to try enabling BTI report if it's available via the ID register and hwcaps. Sponsored by: Arm Ltd --- sys/arm64/arm64/identcpu.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/identcpu.c b/sys/arm64/arm64/identcpu.c index 7cdcc9dfcb56..7706c42f7fdb 100644 --- a/sys/arm64/arm64/identcpu.c +++ b/sys/arm64/arm64/identcpu.c @@ -1530,13 +1530,10 @@ static const struct mrs_field_value id_aa64pfr1_bt[] = { MRS_FIELD_VALUE_END, }; -#if 0 -/* Enable when we add BTI support */ static const struct mrs_field_hwcap id_aa64pfr1_bt_caps[] = { MRS_HWCAP(2, HWCAP2_BTI, ID_AA64PFR1_BT_IMPL), MRS_HWCAP_END }; -#endif static const struct mrs_field id_aa64pfr1_fields[] = { MRS_FIELD(ID_AA64PFR1, NMI, false, MRS_EXACT, id_aa64pfr1_nmi), @@ -1552,7 +1549,8 @@ static const struct mrs_field id_aa64pfr1_fields[] = { MRS_FIELD(ID_AA64PFR1, MTE, false, MRS_EXACT, id_aa64pfr1_mte), MRS_FIELD_HWCAP(ID_AA64PFR1, SSBS, false, MRS_LOWER, id_aa64pfr1_ssbs, id_aa64pfr1_ssbs_caps), - MRS_FIELD(ID_AA64PFR1, BT, false, MRS_EXACT, id_aa64pfr1_bt), + MRS_FIELD_HWCAP_SPLIT(ID_AA64PFR1, BT, false, MRS_LOWER, MRS_EXACT, + id_aa64pfr1_bt, id_aa64pfr1_bt_caps), MRS_FIELD_END, }; From nobody Thu Feb 22 16:32:14 2024 X-Original-To: dev-commits-src-main@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 4Tgdvz21Bkz59wY7; Thu, 22 Feb 2024 16:32:15 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tgdvz0Xvmz4Ls7; Thu, 22 Feb 2024 16:32:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708619535; 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=Ewl9Dbi/5xiHm2/h2NKQkE2VFaj6uDwhXEAtqAXRTwY=; b=BLZVLHg437+ViKbayAuTIUDl7wE5Eyn4LzSoqFPLP7ND2gNhjSFEl3/NZsCC0KdSnc7jOU h663MyzBFr4m0uPC92q2z60c9BsiMSXoqbOciqKFhzUfJh/EY3YFDVzxpthlYIwM11AQJI fcauXpMO56YRmGHPQlIgngz9GHYjPkOj6HMho98GY97e0iMjrTvG0aKIPk/GH4EJ6XFVxI wyQ/sk5ioQP97SnF0lXeKwonzbpgpkjLvvZARECSfEZ63h/ErEF05j8uxojR2nMy3TxURr BRRbnm3MuaBYg0IaxR1daOdr0QBrkTZIU0Ewr1QdusaimeX9itSqs50ziMYgvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708619535; 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=Ewl9Dbi/5xiHm2/h2NKQkE2VFaj6uDwhXEAtqAXRTwY=; b=S9iGm0dISTAt/mU+ytYIli9D3KlYveBrj58oOELits6PdYH8ak2udRooVEu5Ts4xv/7H9E tOM+gZ2bB0DiaCmqc3v9kaK7rkFUOex4BmcR2DMr5o6UmEQGT5eSBID0e1sE924EkLoWjN T/off2vqHf8gvF1q6surRdr07tyYHXc5mwhkMYqRMXNAQIi7bkgSo5S+5efGRQWKYfMJCd O5/lPtz2ICOCqkH2d+lEwqJhL6ctnQjzdKJ9sf1f5yxMfqqN8CWDkv9YZ9IKFURAQZ0/v0 qwm2CFTSDNlUMmDYsj2CWwn9nD05bu622Gg/+GrV2sdthM0jegt5f47RrqedlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708619535; a=rsa-sha256; cv=none; b=Cbn1q4pc1VDpPuG/8jVcvQKWHKoY3PcLIl1QTH3whe1C2jkZhNc3aLqKIUNcImvy4HKu+P 2HDZjCzMt5EZDPwbBGjl5KOkNibzb0UrZDnuufC9X4DyRBhYstc5I9c6oAW/fgRIjvkgnU /HySEKEzoSgpLUFrRgOj7BHq8/VsM81pT5f4b6iSGiotRoEe524JkGwCgTI0EnTxPyvu8w 140kyoBzRQ9PBvc4psWAaBYNlSPIBSKPJGrZoXVsc+2UnZeAA/jK/Xql+q7XIhUiSDqEq8 pgHq9sd2uhsQsnvYJ72htT1zBC2XFvOgbLGKodAgZs0vcLNf66PLaAuq9dJENQ== 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 4Tgdvy6S4Vzfdr; Thu, 22 Feb 2024 16:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MGWEnt031860; Thu, 22 Feb 2024 16:32:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MGWEU0031857; Thu, 22 Feb 2024 16:32:14 GMT (envelope-from git) Date: Thu, 22 Feb 2024 16:32:14 GMT Message-Id: <202402221632.41MGWEU0031857@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b3e76e3d9e22 - main - kboot: Implement write support for hostdisk List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b3e76e3d9e2262c4b79e81e63e09bfe62c1f6baa Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b3e76e3d9e2262c4b79e81e63e09bfe62c1f6baa commit b3e76e3d9e2262c4b79e81e63e09bfe62c1f6baa Author: Warner Losh AuthorDate: 2024-02-22 15:17:48 +0000 Commit: Warner Losh CommitDate: 2024-02-22 16:31:55 +0000 kboot: Implement write support for hostdisk Don't assume that strategy is only called for read. Check the passed flag for F_READ or F_WRITE and fail if it is neither. Open the disks for writing and call host_read/host_write depending on that flag. Sponsored by: Netflix Reviewed by: kevans, gallatin Differential Revision: https://reviews.freebsd.org/D44016 --- stand/kboot/kboot/hostdisk.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/stand/kboot/kboot/hostdisk.c b/stand/kboot/kboot/hostdisk.c index 423151983523..a9117d4c1c9d 100644 --- a/stand/kboot/kboot/hostdisk.c +++ b/stand/kboot/kboot/hostdisk.c @@ -305,7 +305,6 @@ hostdisk_strategy(void *devdata, int flag, daddr_t dblk, size_t size, struct devdesc *desc = devdata; daddr_t pos; int n; - int64_t off; uint64_t res; uint32_t posl, posh; @@ -313,12 +312,14 @@ hostdisk_strategy(void *devdata, int flag, daddr_t dblk, size_t size, posl = pos & 0xffffffffu; posh = (pos >> 32) & 0xffffffffu; - if ((off = host_llseek(desc->d_unit, posh, posl, &res, 0)) < 0) { - printf("Seek error on fd %d to %ju (dblk %ju) returns %jd\n", - desc->d_unit, (uintmax_t)pos, (uintmax_t)dblk, (intmax_t)off); + if (host_llseek(desc->d_unit, posh, posl, &res, 0) < 0) return (EIO); - } - n = host_read(desc->d_unit, buf, size); + if (flag & F_READ) + n = host_read(desc->d_unit, buf, size); + else if (flag & F_WRITE) + n = host_write(desc->d_unit, buf, size); + else + return (EINVAL); if (n < 0) return (EIO); @@ -339,7 +340,7 @@ hostdisk_open(struct open_file *f, ...) va_end(vl); fn = dev2hd(desc)->hd_dev; - desc->d_unit = host_open(fn, O_RDONLY, 0); + desc->d_unit = host_open(fn, O_RDWR, 0); if (desc->d_unit <= 0) { printf("hostdisk_open: couldn't open %s: %d\n", fn, errno); return (ENOENT); From nobody Thu Feb 22 16:32:15 2024 X-Original-To: dev-commits-src-main@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 4Tgdw02Rrqz59wwr; Thu, 22 Feb 2024 16:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tgdw01GScz4LY6; Thu, 22 Feb 2024 16:32:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708619536; 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=6eH/r9ACSiOzvK6W4DwnfgI4Kkl/hpHlNRiDeNY1u0c=; b=MUbjDLRqiLkSVjSVk3hq8/eaUAD0DYBwr/YWT3ECvpweYbJeUyidQFJP/u0Jek9KX+6mHG BIJs+3b4Ma/7WyqHyhYC41ie1CA3tkCSrubwA2HpjPeih9nXDhQFxjI7EZ9ZyUllBshaDQ sK9/Uiln5mbm1fmQc5HouLJYl59z3GyQ5zVa4+OxbCAq36rjSC79mN/1lXOCkczwabrt7g 60vvxnK4zqv0fZJSrAlIJzAN1AbBLK2Td5vTkPQXv4pDbzVt3ZLVt/+rhSmAve1GhQBnuu yX1S23ojLpUOWRZeUvJGJR6VIHKBI/Vo5EGBndLStQaKDoEGmdNdRzNI//7DBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708619536; 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=6eH/r9ACSiOzvK6W4DwnfgI4Kkl/hpHlNRiDeNY1u0c=; b=ZDUA7iP0hth7234YQGJfGztBVdzZWc8B/YqAqSd31RnNcHzrAZoyZ2q+a+j1dJeiy1t5/Y NC7o1yvE01cFC2dty7pDYKSsgDQGzghzoRHIBDUMD1Zf2g8QsJYZN/cAuoGrFLAGt6OzN5 Hh4DU3Dkxmn08c2V9Z8Qfc0uVSAAFK5X0pSqgESZRQEt5VNFofSmeSSKLPT0k8NOqQfR+B yjX57pqy+QKMw43KBTya+RFjpaKIh8Q1/scyR60CWtSsCrH2y2BHJCEkCgPGS2owAeqaTg PCdjf+hvJMNtC5FFNWuX7Z2+HtdQwBMJeEJPitw7n8XrKb5/ruD+hm79iUYjBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708619536; a=rsa-sha256; cv=none; b=AGj7Zaxheb5mcvUKkv+J8bAFYC82i+9TMSyhvsEirsLGqAwvh1a2N/pyVC0gB+4arCGS5M eQXC7fmgimFj1UQiH0Hxgpgh5PTyaxdJmBaze1CoUsFe6CIKrgoZTp2Q5XV0jzLHWtsHx7 WU3U3Z2+TsApezEpKD7Bo9fuoYlNGwH9v3ww3tQShe0EHnefss4kl26mOp3Hr3xZ1DgnAe M8BqptWKApBQHwpk448Tmp5HTI2l8QeK48czcA/cIR6hDIyAjZVagjgvP1ctHkOMvR3w4j ZpGaFJHXRLhG2Ry0pOMJhYe788MQ0eM+NmPxD5wEXGBHtAr92q0qiBmEmEwo0w== 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 4Tgdw00MNBzfHB; Thu, 22 Feb 2024 16:32:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MGWFBN031910; Thu, 22 Feb 2024 16:32:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MGWFMd031907; Thu, 22 Feb 2024 16:32:15 GMT (envelope-from git) Date: Thu, 22 Feb 2024 16:32:15 GMT Message-Id: <202402221632.41MGWFMd031907@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: e54bb0ad8058 - main - loader: return errors from writing ZFS labels List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: e54bb0ad8058c0f84ceb08b49bb1d22af829a9e8 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e54bb0ad8058c0f84ceb08b49bb1d22af829a9e8 commit e54bb0ad8058c0f84ceb08b49bb1d22af829a9e8 Author: Warner Losh AuthorDate: 2024-02-22 15:17:56 +0000 Commit: Warner Losh CommitDate: 2024-02-22 16:31:56 +0000 loader: return errors from writing ZFS labels vdev_write_bootenv_impl can only return success. Instead, return the last error. This will make any write errors more visible. The old code masked kboot's inability to write bootenv. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D44018 --- stand/libsa/zfs/zfsimpl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index ed9c3753dd19..fc9bedac7621 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -1688,7 +1688,7 @@ vdev_write_bootenv_impl(vdev_t *vdev, vdev_boot_envblock_t *be) if (kid->v_state != VDEV_STATE_HEALTHY) continue; rc = vdev_write_bootenv_impl(kid, be); - if (rv == 0) + if (rv != 0) rv = rc; } From nobody Thu Feb 22 16:32:17 2024 X-Original-To: dev-commits-src-main@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 4Tgdw14L4Yz59x00; Thu, 22 Feb 2024 16:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tgdw120j2z4LY8; Thu, 22 Feb 2024 16:32:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708619537; 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=YXU+g3STzHZSTfe7dhHWsAFXlyTf8xBcU4/bzxkiATk=; b=x7xz+cnXmMAPGOfkFBvuFblZnEoQ8fPaSgk8m6fpmrHLpTYoMxP5x0hgfViq7fKffK20W7 eOVsiqoKQxC2l2hmRdJoMNu7IfXeVHDAn5XP7qYZuKRBAQOjnYt//lhKD/4f89B70yn03y M/EyPk2SQfdPq2UskmVoru0HlbauXCee7j7jMVrCeEBGVY/uHO9HUSj0J2EEHa1D8xKSw0 fu3oXAH2gB5x6l0hRh2jnBquMfPIP/rY8b+ZfRHDP/LN2L841yEew3xPASZLN/mqaI47uR K3+nC8b0D+10XoWHyO4FJekpfj9ZQAmpZ4AqufnnU2ZYgvZIYe7AfXGCg3+Gog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708619537; 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=YXU+g3STzHZSTfe7dhHWsAFXlyTf8xBcU4/bzxkiATk=; b=mt01HqisvN94njp992eHs8G0t28ZlK3t9e+sLnQe+h3md6J4l8hM7KbYhbV8sJ689oRrDJ OzYly97DX66ruQWMyPIcyuiKGqKYgGVivHy4lpKlpE8cKlpvfKzgtrLalsJd1JWVPiVLKJ 3ifMGsgt1zhS1EhXtD+YWA8IPrkY84NmDX29HL7/mOlZDCgix5lQ6t0Tlu2ss54H/Ly5uw /UKt7mKemJojCqYzEfCXuAom1C8oITOet3Jxi334ESIWaTbw8XP5Nv7Bd38iYXA86/7hLa KfOJDIdb5fhS7cD9t35St4sUMMUkSEsp9ggnynz+Pz4BF9FGijIlOLnZND+rqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708619537; a=rsa-sha256; cv=none; b=APUheG8VatV9VIEZFpmar9x10deitUzuOYmAovLCEr097lwKqEw1w7kTSrtx5reabENcHR N39Bf4ankRDBsi8HXaLWnCRegsElKvt4PBM59b/Lg0h0jd/D0YKrh+XIHgpY/Ru2483GfJ RoeSnDxsRD/EKE54nVtLa6sHn6vETF765D1+6aNaxBp5eyiib733TaKB6NlgZiIFQ4FsPK f26bdq9JDoZEqWH2cnD9lreLwtCSKR7cNjAcV7ul36FrZwH95qSJiimgvlqXJ4ZZfy0a/6 0TprRG26evnf/+FFBV5JAy8gS9cMXMiOLDBvet8UbduYjLFLFuBI2gevKLmUYw== 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 4Tgdw115g3zfHD; Thu, 22 Feb 2024 16:32:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MGWHSD031954; Thu, 22 Feb 2024 16:32:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MGWHvR031950; Thu, 22 Feb 2024 16:32:17 GMT (envelope-from git) Date: Thu, 22 Feb 2024 16:32:17 GMT Message-Id: <202402221632.41MGWHvR031950@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 3e15b01d6914 - main - libsa: Remove redundant sys/cdefs.h List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 3e15b01d6914c927e37d1699645783acf286655c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3e15b01d6914c927e37d1699645783acf286655c commit 3e15b01d6914c927e37d1699645783acf286655c Author: Warner Losh AuthorDate: 2024-02-22 15:18:02 +0000 Commit: Warner Losh CommitDate: 2024-02-22 16:31:57 +0000 libsa: Remove redundant sys/cdefs.h Sponsored by: Netflix --- stand/common/boot.c | 1 - stand/common/commands.c | 1 - stand/common/dev_net.c | 1 - stand/common/devopen.c | 1 - stand/common/disk.c | 1 - stand/common/interp.c | 1 - stand/common/interp_backslash.c | 1 - stand/common/interp_lua.c | 1 - stand/common/interp_parse.c | 1 - stand/common/interp_simple.c | 1 - stand/common/isapnp.c | 1 - stand/common/load_elf32.c | 2 -- stand/common/load_elf32_obj.c | 2 -- stand/common/load_elf64.c | 2 -- stand/common/load_elf64_obj.c | 2 -- stand/common/md.c | 1 - stand/common/metadata.c | 1 - stand/common/misc.c | 1 - stand/common/module.c | 1 - stand/common/part.c | 1 - stand/common/pnp.c | 1 - stand/common/reloc_elf32.c | 2 -- stand/common/reloc_elf64.c | 2 -- stand/common/vdisk.c | 1 - stand/common/zfs_cmd.c | 1 - stand/efi/libefi/delay.c | 1 - stand/efi/libefi/devicename.c | 1 - stand/efi/libefi/devpath.c | 1 - stand/efi/libefi/eficom.c | 1 - stand/efi/libefi/efienv.c | 1 - stand/efi/libefi/efipart.c | 1 - stand/efi/libefi/env.c | 1 - stand/efi/libefi/errno.c | 1 - stand/efi/libefi/handles.c | 1 - stand/efi/libefi/libefi.c | 1 - stand/efi/libefi/time.c | 1 - stand/efi/libefi/time_arm64.c | 1 - stand/efi/libefi/time_event.c | 1 - stand/efi/libefi/wchar.c | 1 - stand/efi/loader/arch/amd64/elf64_freebsd.c | 1 - stand/efi/loader/arch/amd64/multiboot2.c | 2 -- stand/efi/loader/arch/amd64/trap.c | 1 - stand/efi/loader/arch/arm64/exec.c | 1 - stand/efi/loader/autoload.c | 1 - stand/efi/loader/bootinfo.c | 1 - stand/efi/loader/conf.c | 1 - stand/efi/loader/efi_main.c | 1 - stand/efi/loader/framebuffer.c | 1 - stand/efi/loader/main.c | 1 - stand/fdt/fdt_loader_cmd.c | 1 - stand/i386/libi386/bio.c | 1 - stand/i386/libi386/biosacpi.c | 1 - stand/i386/libi386/biosdisk.c | 1 - stand/i386/libi386/biosmem.c | 1 - stand/i386/libi386/biospci.c | 1 - stand/i386/libi386/biospnp.c | 1 - stand/i386/libi386/biossmap.c | 1 - stand/i386/libi386/bootinfo.c | 1 - stand/i386/libi386/bootinfo32.c | 1 - stand/i386/libi386/bootinfo64.c | 1 - stand/i386/libi386/comconsole.c | 1 - stand/i386/libi386/devicename.c | 1 - stand/i386/libi386/elf64_freebsd.c | 1 - stand/i386/libi386/i386_copy.c | 1 - stand/i386/libi386/i386_module.c | 1 - stand/i386/libi386/nullconsole.c | 1 - stand/i386/libi386/pread.c | 1 - stand/i386/libi386/pxe.c | 1 - stand/i386/libi386/spinconsole.c | 1 - stand/i386/libi386/textvidc.c | 5 +---- stand/i386/libi386/time.c | 1 - stand/i386/libi386/vbe.c | 1 - stand/i386/libi386/vidconsole.c | 3 +-- stand/i386/loader/chain.c | 1 - stand/i386/loader/conf.c | 1 - stand/i386/loader/main.c | 1 - stand/i386/zfsboot/zfsboot.c | 1 - stand/kboot/kboot/arch/aarch64/exec.c | 1 - stand/kboot/kboot/arch/amd64/elf64_freebsd.c | 1 - stand/kboot/kboot/arch/powerpc64/ppc64_elf_freebsd.c | 1 - stand/kboot/kboot/conf.c | 1 - stand/kboot/kboot/main.c | 1 - stand/liblua/lerrno.c | 1 - stand/liblua/lpager.c | 1 - stand/liblua/lstd.c | 1 - stand/libofw/devicename.c | 1 - stand/libofw/ofw_copy.c | 1 - stand/libofw/ofw_disk.c | 1 - stand/libofw/ofw_module.c | 1 - stand/libofw/ofw_reboot.c | 1 - stand/libofw/ofw_time.c | 1 - stand/libofw/openfirm.c | 1 - stand/libsa/abort.c | 1 - stand/libsa/assert.c | 2 -- stand/libsa/bootp.c | 1 - stand/libsa/bootparam.c | 1 - stand/libsa/bzipfs.c | 1 - stand/libsa/cd9660.c | 1 - stand/libsa/close.c | 1 - stand/libsa/closeall.c | 1 - stand/libsa/dosfs.c | 1 - stand/libsa/environment.c | 1 - stand/libsa/ext2fs.c | 1 - stand/libsa/fstat.c | 1 - stand/libsa/geli/pwgets.c | 1 - stand/libsa/getopt.c | 2 -- stand/libsa/gets.c | 1 - stand/libsa/gzipfs.c | 1 - stand/libsa/hexdump.c | 1 - stand/libsa/inet_ntoa.c | 2 -- stand/libsa/ioctl.c | 1 - stand/libsa/lseek.c | 1 - stand/libsa/mount.c | 1 - stand/libsa/netif.c | 1 - stand/libsa/nullfs.c | 1 - stand/libsa/nvstore.c | 1 - stand/libsa/open.c | 1 - stand/libsa/pager.c | 1 - stand/libsa/panic.c | 1 - stand/libsa/pkgfs.c | 1 - stand/libsa/printf.c | 1 - stand/libsa/rpc.c | 1 - stand/libsa/sbrk.c | 1 - stand/libsa/smbios.c | 1 - stand/libsa/splitfs.c | 1 - stand/libsa/stand.h | 2 -- stand/libsa/stat.c | 1 - stand/libsa/strcasecmp.c | 5 +---- stand/libsa/strdup.c | 2 -- stand/libsa/strerror.c | 1 - stand/libsa/tftp.c | 1 - stand/libsa/time.c | 1 - stand/libsa/ufs.c | 1 - stand/libsa/ufsread.c | 1 - stand/libsa/x86/hypervisor.c | 1 - stand/libsa/zalloc_malloc.c | 1 - stand/libsa/zfs/zfs.c | 1 - stand/libsa/zfs/zfsimpl.c | 1 - stand/powerpc/ofw/cas.c | 1 - stand/powerpc/ofw/conf.c | 1 - stand/powerpc/ofw/main.c | 1 - stand/powerpc/ofw/ofwfdt.c | 1 - stand/powerpc/ofw/ppc64_elf_freebsd.c | 1 - stand/powerpc/ofw/start.c | 1 - stand/uboot/arch/arm/conf.c | 1 - stand/uboot/arch/powerpc/conf.c | 1 - stand/uboot/arch/powerpc/ppc64_elf_freebsd.c | 1 - stand/uboot/devicename.c | 1 - stand/uboot/reboot.c | 1 - stand/uboot/time.c | 2 -- stand/uboot/uboot_console.c | 1 - stand/uboot/uboot_module.c | 1 - stand/userboot/userboot/autoload.c | 1 - stand/userboot/userboot/biossmap.c | 1 - stand/userboot/userboot/bootinfo.c | 1 - stand/userboot/userboot/bootinfo32.c | 1 - stand/userboot/userboot/bootinfo64.c | 1 - stand/userboot/userboot/conf.c | 1 - stand/userboot/userboot/copy.c | 1 - stand/userboot/userboot/devicename.c | 1 - stand/userboot/userboot/elf64_freebsd.c | 1 - stand/userboot/userboot/host.c | 1 - stand/userboot/userboot/main.c | 1 - stand/userboot/userboot/userboot_cons.c | 1 - stand/userboot/userboot/userboot_disk.c | 1 - 165 files changed, 3 insertions(+), 185 deletions(-) diff --git a/stand/common/boot.c b/stand/common/boot.c index 658da097b9a9..e0775c0fca26 100644 --- a/stand/common/boot.c +++ b/stand/common/boot.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include /* * Loading modules, booting the system */ diff --git a/stand/common/commands.c b/stand/common/commands.c index b09bb9604386..e6e4fd005f72 100644 --- a/stand/common/commands.c +++ b/stand/common/commands.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/common/dev_net.c b/stand/common/dev_net.c index b6880e894477..3cd78c5346ac 100644 --- a/stand/common/dev_net.c +++ b/stand/common/dev_net.c @@ -29,7 +29,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include /*- * This module implements a "raw device" interface suitable for * use by the stand-alone I/O library NFS code. This interface diff --git a/stand/common/devopen.c b/stand/common/devopen.c index a51ebaf0c9d7..a50334ba61e3 100644 --- a/stand/common/devopen.c +++ b/stand/common/devopen.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/common/disk.c b/stand/common/disk.c index e1add50bd1fb..c1650f0fa1ec 100644 --- a/stand/common/disk.c +++ b/stand/common/disk.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/common/interp.c b/stand/common/interp.c index 0f142902b4ac..c6ac01ea099b 100644 --- a/stand/common/interp.c +++ b/stand/common/interp.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include /* * Simple commandline interpreter, toplevel and misc. * diff --git a/stand/common/interp_backslash.c b/stand/common/interp_backslash.c index 6d650cd2e286..e1bc84c3a1a7 100644 --- a/stand/common/interp_backslash.c +++ b/stand/common/interp_backslash.c @@ -14,7 +14,6 @@ * Routine for doing backslash elimination. */ -#include #include #include #include "bootstrap.h" diff --git a/stand/common/interp_lua.c b/stand/common/interp_lua.c index 11595b78a7bd..aa759aa99ec1 100644 --- a/stand/common/interp_lua.c +++ b/stand/common/interp_lua.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include "bootstrap.h" diff --git a/stand/common/interp_parse.c b/stand/common/interp_parse.c index 6e883a81e383..9efcade04b36 100644 --- a/stand/common/interp_parse.c +++ b/stand/common/interp_parse.c @@ -14,7 +14,6 @@ * The meat of the simple parser. */ -#include #include #include #include "bootstrap.h" diff --git a/stand/common/interp_simple.c b/stand/common/interp_simple.c index 61ed724af9d0..d64c0d27b97f 100644 --- a/stand/common/interp_simple.c +++ b/stand/common/interp_simple.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include /* * Simple commandline interpreter, toplevel and misc. */ diff --git a/stand/common/isapnp.c b/stand/common/isapnp.c index 3f554305c2e2..eaf5a08cf82a 100644 --- a/stand/common/isapnp.c +++ b/stand/common/isapnp.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include /* * Machine-independent ISA PnP enumerator implementing a subset of the * ISA PnP specification. diff --git a/stand/common/load_elf32.c b/stand/common/load_elf32.c index 5b942fd63444..4737670d2eeb 100644 --- a/stand/common/load_elf32.c +++ b/stand/common/load_elf32.c @@ -1,5 +1,3 @@ -#include #define __ELF_WORD_SIZE 32 #define _MACHINE_ELF_WANT_32BIT - #include "load_elf.c" diff --git a/stand/common/load_elf32_obj.c b/stand/common/load_elf32_obj.c index dffb0070b0c0..e37b4dfddb49 100644 --- a/stand/common/load_elf32_obj.c +++ b/stand/common/load_elf32_obj.c @@ -1,5 +1,3 @@ -#include #define __ELF_WORD_SIZE 32 #define _MACHINE_ELF_WANT_32BIT - #include "load_elf_obj.c" diff --git a/stand/common/load_elf64.c b/stand/common/load_elf64.c index e3a913c0ce8c..98ef7dc40985 100644 --- a/stand/common/load_elf64.c +++ b/stand/common/load_elf64.c @@ -1,4 +1,2 @@ -#include #define __ELF_WORD_SIZE 64 - #include "load_elf.c" diff --git a/stand/common/load_elf64_obj.c b/stand/common/load_elf64_obj.c index 14d6e3dc3d4d..43de8cc1214f 100644 --- a/stand/common/load_elf64_obj.c +++ b/stand/common/load_elf64_obj.c @@ -1,4 +1,2 @@ -#include #define __ELF_WORD_SIZE 64 - #include "load_elf_obj.c" diff --git a/stand/common/md.c b/stand/common/md.c index 6b6e6303c898..d12429c3c45c 100644 --- a/stand/common/md.c +++ b/stand/common/md.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/common/metadata.c b/stand/common/metadata.c index 8d5003ec47bf..f95763bfd01b 100644 --- a/stand/common/metadata.c +++ b/stand/common/metadata.c @@ -26,7 +26,6 @@ * from: FreeBSD: src/sys/boot/sparc64/loader/metadata.c,v 1.6 */ -#include #include #include #include diff --git a/stand/common/misc.c b/stand/common/misc.c index 046094f868e0..402213100951 100644 --- a/stand/common/misc.c +++ b/stand/common/misc.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/common/module.c b/stand/common/module.c index ac0ad466484a..832a8eb4988d 100644 --- a/stand/common/module.c +++ b/stand/common/module.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include /* * file/module function dispatcher, support, etc. */ diff --git a/stand/common/part.c b/stand/common/part.c index 41c0eef95d7d..5f7bc2103c01 100644 --- a/stand/common/part.c +++ b/stand/common/part.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/common/pnp.c b/stand/common/pnp.c index 8ee7f5f711b1..aab84e07935d 100644 --- a/stand/common/pnp.c +++ b/stand/common/pnp.c @@ -3,7 +3,6 @@ * */ -#include /* * "Plug and Play" functionality. * diff --git a/stand/common/reloc_elf32.c b/stand/common/reloc_elf32.c index ee2617b371c1..04b4969a51b3 100644 --- a/stand/common/reloc_elf32.c +++ b/stand/common/reloc_elf32.c @@ -1,4 +1,2 @@ -#include #define __ELF_WORD_SIZE 32 - #include "reloc_elf.c" diff --git a/stand/common/reloc_elf64.c b/stand/common/reloc_elf64.c index c7b76ca6b265..1230f27741cd 100644 --- a/stand/common/reloc_elf64.c +++ b/stand/common/reloc_elf64.c @@ -1,4 +1,2 @@ -#include #define __ELF_WORD_SIZE 64 - #include "reloc_elf.c" diff --git a/stand/common/vdisk.c b/stand/common/vdisk.c index 3bbb13d908c5..067e3ca3a481 100644 --- a/stand/common/vdisk.c +++ b/stand/common/vdisk.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/common/zfs_cmd.c b/stand/common/zfs_cmd.c index 9a4dc01f0159..0180d31f374b 100644 --- a/stand/common/zfs_cmd.c +++ b/stand/common/zfs_cmd.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include /* * MD bootstrap main() and assorted miscellaneous * commands. diff --git a/stand/efi/libefi/delay.c b/stand/efi/libefi/delay.c index becdcb3fa267..af03f0075330 100644 --- a/stand/efi/libefi/delay.c +++ b/stand/efi/libefi/delay.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/efi/libefi/devicename.c b/stand/efi/libefi/devicename.c index 22844bbbd6ec..c18017429665 100644 --- a/stand/efi/libefi/devicename.c +++ b/stand/efi/libefi/devicename.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/efi/libefi/devpath.c b/stand/efi/libefi/devpath.c index 6b4b8785a2dd..85a5459c7d6b 100644 --- a/stand/efi/libefi/devpath.c +++ b/stand/efi/libefi/devpath.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/efi/libefi/eficom.c b/stand/efi/libefi/eficom.c index c84e040420e7..d5f3f07e083f 100644 --- a/stand/efi/libefi/eficom.c +++ b/stand/efi/libefi/eficom.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/efi/libefi/efienv.c b/stand/efi/libefi/efienv.c index 031c144ee194..83da2acc816b 100644 --- a/stand/efi/libefi/efienv.c +++ b/stand/efi/libefi/efienv.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/efi/libefi/efipart.c b/stand/efi/libefi/efipart.c index 475a796b4da5..3df6034571f5 100644 --- a/stand/efi/libefi/efipart.c +++ b/stand/efi/libefi/efipart.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/efi/libefi/env.c b/stand/efi/libefi/env.c index 6887038fe950..328476a9f68b 100644 --- a/stand/efi/libefi/env.c +++ b/stand/efi/libefi/env.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/efi/libefi/errno.c b/stand/efi/libefi/errno.c index e614824a2bed..92050af7f4e1 100644 --- a/stand/efi/libefi/errno.c +++ b/stand/efi/libefi/errno.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/stand/efi/libefi/handles.c b/stand/efi/libefi/handles.c index bc42ae144509..d3ec428b8d4a 100644 --- a/stand/efi/libefi/handles.c +++ b/stand/efi/libefi/handles.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/stand/efi/libefi/libefi.c b/stand/efi/libefi/libefi.c index c33c61cdef16..f615bd214bfc 100644 --- a/stand/efi/libefi/libefi.c +++ b/stand/efi/libefi/libefi.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/efi/libefi/time.c b/stand/efi/libefi/time.c index bab8e4f73434..99d86e30ee96 100644 --- a/stand/efi/libefi/time.c +++ b/stand/efi/libefi/time.c @@ -38,7 +38,6 @@ * */ -#include #include #include diff --git a/stand/efi/libefi/time_arm64.c b/stand/efi/libefi/time_arm64.c index 616d05adb806..d3c7a4e236d0 100644 --- a/stand/efi/libefi/time_arm64.c +++ b/stand/efi/libefi/time_arm64.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/efi/libefi/time_event.c b/stand/efi/libefi/time_event.c index e6aad64342ce..c4334412a4fe 100644 --- a/stand/efi/libefi/time_event.c +++ b/stand/efi/libefi/time_event.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/efi/libefi/wchar.c b/stand/efi/libefi/wchar.c index d67f1bf34cf8..953f29418c21 100644 --- a/stand/efi/libefi/wchar.c +++ b/stand/efi/libefi/wchar.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/stand/efi/loader/arch/amd64/elf64_freebsd.c b/stand/efi/loader/arch/amd64/elf64_freebsd.c index 5a41ea99867e..91dd979a677e 100644 --- a/stand/efi/loader/arch/amd64/elf64_freebsd.c +++ b/stand/efi/loader/arch/amd64/elf64_freebsd.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #define __ELF_WORD_SIZE 64 #include #include diff --git a/stand/efi/loader/arch/amd64/multiboot2.c b/stand/efi/loader/arch/amd64/multiboot2.c index 6c96d7dc0073..130caa82aa49 100644 --- a/stand/efi/loader/arch/amd64/multiboot2.c +++ b/stand/efi/loader/arch/amd64/multiboot2.c @@ -34,8 +34,6 @@ * https://www.gnu.org/software/grub/manual/multiboot2/multiboot.html */ -#include - #include #include #include diff --git a/stand/efi/loader/arch/amd64/trap.c b/stand/efi/loader/arch/amd64/trap.c index 56a3ee67da6f..95a42a18f719 100644 --- a/stand/efi/loader/arch/amd64/trap.c +++ b/stand/efi/loader/arch/amd64/trap.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/efi/loader/arch/arm64/exec.c b/stand/efi/loader/arch/arm64/exec.c index ef410a7d556c..877cff658d1e 100644 --- a/stand/efi/loader/arch/arm64/exec.c +++ b/stand/efi/loader/arch/arm64/exec.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/stand/efi/loader/autoload.c b/stand/efi/loader/autoload.c index a7a5f8212e9c..ba7997487ffc 100644 --- a/stand/efi/loader/autoload.c +++ b/stand/efi/loader/autoload.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #if defined(LOADER_FDT_SUPPORT) #include #include diff --git a/stand/efi/loader/bootinfo.c b/stand/efi/loader/bootinfo.c index 13b6df9c5b06..b55c2184d9fe 100644 --- a/stand/efi/loader/bootinfo.c +++ b/stand/efi/loader/bootinfo.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/efi/loader/conf.c b/stand/efi/loader/conf.c index 389489726d84..3bc74ea6354c 100644 --- a/stand/efi/loader/conf.c +++ b/stand/efi/loader/conf.c @@ -24,7 +24,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/efi/loader/efi_main.c b/stand/efi/loader/efi_main.c index 25b13d5d3728..2a5120dc89d7 100644 --- a/stand/efi/loader/efi_main.c +++ b/stand/efi/loader/efi_main.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/efi/loader/framebuffer.c b/stand/efi/loader/framebuffer.c index 56693187b576..2f580309c2f3 100644 --- a/stand/efi/loader/framebuffer.c +++ b/stand/efi/loader/framebuffer.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 5944c383574e..12efe594e0e2 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -27,7 +27,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include diff --git a/stand/fdt/fdt_loader_cmd.c b/stand/fdt/fdt_loader_cmd.c index eb152ae1949c..c51e8c5ab583 100644 --- a/stand/fdt/fdt_loader_cmd.c +++ b/stand/fdt/fdt_loader_cmd.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/i386/libi386/bio.c b/stand/i386/libi386/bio.c index e3b17ccc2a44..357d6cbedf6e 100644 --- a/stand/i386/libi386/bio.c +++ b/stand/i386/libi386/bio.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include "libi386.h" diff --git a/stand/i386/libi386/biosacpi.c b/stand/i386/libi386/biosacpi.c index fcad64d81549..077b6c7e53de 100644 --- a/stand/i386/libi386/biosacpi.c +++ b/stand/i386/libi386/biosacpi.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/i386/libi386/biosdisk.c b/stand/i386/libi386/biosdisk.c index 29cd39e157b8..9ad9b67f5b57 100644 --- a/stand/i386/libi386/biosdisk.c +++ b/stand/i386/libi386/biosdisk.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include /* * BIOS disk device handling. * diff --git a/stand/i386/libi386/biosmem.c b/stand/i386/libi386/biosmem.c index eaf41743bb1f..fc612eda5d69 100644 --- a/stand/i386/libi386/biosmem.c +++ b/stand/i386/libi386/biosmem.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include /* * Obtain memory configuration information from the BIOS */ diff --git a/stand/i386/libi386/biospci.c b/stand/i386/libi386/biospci.c index 1003e368043d..5b39eab1e5e5 100644 --- a/stand/i386/libi386/biospci.c +++ b/stand/i386/libi386/biospci.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include /* * PnP enumerator using the PCI BIOS. */ diff --git a/stand/i386/libi386/biospnp.c b/stand/i386/libi386/biospnp.c index a26c0d4d52d8..5b22f066d4ef 100644 --- a/stand/i386/libi386/biospnp.c +++ b/stand/i386/libi386/biospnp.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include /* * PnP BIOS enumerator. */ diff --git a/stand/i386/libi386/biossmap.c b/stand/i386/libi386/biossmap.c index a2ad83cafdba..c281e6949c20 100644 --- a/stand/i386/libi386/biossmap.c +++ b/stand/i386/libi386/biossmap.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include /* * Obtain memory configuration information from the BIOS */ diff --git a/stand/i386/libi386/bootinfo.c b/stand/i386/libi386/bootinfo.c index 4f652632b755..b81d181a75bd 100644 --- a/stand/i386/libi386/bootinfo.c +++ b/stand/i386/libi386/bootinfo.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/i386/libi386/bootinfo32.c b/stand/i386/libi386/bootinfo32.c index 1b038ff6b245..535849011b6b 100644 --- a/stand/i386/libi386/bootinfo32.c +++ b/stand/i386/libi386/bootinfo32.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/i386/libi386/bootinfo64.c b/stand/i386/libi386/bootinfo64.c index 2a62eba4fc09..a55b86eb5ba7 100644 --- a/stand/i386/libi386/bootinfo64.c +++ b/stand/i386/libi386/bootinfo64.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/i386/libi386/comconsole.c b/stand/i386/libi386/comconsole.c index 6fff811bd34c..b2d48b13a9f4 100644 --- a/stand/i386/libi386/comconsole.c +++ b/stand/i386/libi386/comconsole.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/i386/libi386/devicename.c b/stand/i386/libi386/devicename.c index c6125ba7a78b..628b969ad132 100644 --- a/stand/i386/libi386/devicename.c +++ b/stand/i386/libi386/devicename.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include "bootstrap.h" diff --git a/stand/i386/libi386/elf64_freebsd.c b/stand/i386/libi386/elf64_freebsd.c index da034437c6e0..b1340fd1f2e2 100644 --- a/stand/i386/libi386/elf64_freebsd.c +++ b/stand/i386/libi386/elf64_freebsd.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #define __ELF_WORD_SIZE 64 #include #include diff --git a/stand/i386/libi386/i386_copy.c b/stand/i386/libi386/i386_copy.c index 3fcf9d09b280..44ca51f6b2ae 100644 --- a/stand/i386/libi386/i386_copy.c +++ b/stand/i386/libi386/i386_copy.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include /* * MD primitives supporting placement of module data * diff --git a/stand/i386/libi386/i386_module.c b/stand/i386/libi386/i386_module.c index 8c6300b3ad98..26f2ed3eec40 100644 --- a/stand/i386/libi386/i386_module.c +++ b/stand/i386/libi386/i386_module.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include /* * i386-specific module functionality. * diff --git a/stand/i386/libi386/nullconsole.c b/stand/i386/libi386/nullconsole.c index b39e52630c9d..b4ffd3e30789 100644 --- a/stand/i386/libi386/nullconsole.c +++ b/stand/i386/libi386/nullconsole.c @@ -35,7 +35,6 @@ * OF SUCH DAMAGE. */ -#include #include #include diff --git a/stand/i386/libi386/pread.c b/stand/i386/libi386/pread.c index 854f28068ab0..5a922e3bfc6b 100644 --- a/stand/i386/libi386/pread.c +++ b/stand/i386/libi386/pread.c @@ -33,7 +33,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include /* read into destination in flat addr space */ #include diff --git a/stand/i386/libi386/pxe.c b/stand/i386/libi386/pxe.c index 895e8fc5ff51..aa392b83718c 100644 --- a/stand/i386/libi386/pxe.c +++ b/stand/i386/libi386/pxe.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/stand/i386/libi386/spinconsole.c b/stand/i386/libi386/spinconsole.c index 05ce33bfc5a8..156eaf35e1c0 100644 --- a/stand/i386/libi386/spinconsole.c +++ b/stand/i386/libi386/spinconsole.c @@ -35,7 +35,6 @@ *** 1182 LINES SKIPPED *** From nobody Thu Feb 22 16:32:18 2024 X-Original-To: dev-commits-src-main@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 4Tgdw26N1Lz59wns; Thu, 22 Feb 2024 16:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tgdw23KNCz4LxR; Thu, 22 Feb 2024 16:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708619538; 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=4lCzdrGcu/J1OaJTOPfKKIfYdFN7n3RR94OwW4jPOdQ=; b=LRpR7yTENH19F3kSd0PTUlHuZl8UcT/qiUif3nTVFjMpOQut/q0MGF7YCe/PzQiz5Bs6w0 Dg6AZUdf4/ToOL+zXhG4xanFMfFBxYv4yOPuZCcjCz7GQbUJzf5gnqiG6P/8YFnl3DmEfI R2f+Sv6TzE85fmYa2UJcDknC2HGkORHiE4zGOPD+mZHhICie3jZxkKa9CwZuIq8I9pc/z/ otODZslHZJD30UBrPdg8rJa3I/d9zrCSdrt6uaTDLy0q1nua+CB0+eOmYHW+bTj4N72qTG eeIAYYkHm7E0m9P5q5R4azyVg5PY5QDnUjWk+48YGffBmkYjgVsBoVU19pujNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708619538; 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=4lCzdrGcu/J1OaJTOPfKKIfYdFN7n3RR94OwW4jPOdQ=; b=fW7wImFsNxQ7wGE/qkmeHiOuX2mHpbl7cudnUyrn1VkEYRkgj++eBAVHc62bHXU3bTjznj 0yVFrDNWDZBxK0O36m9Q/PnG+L7gFdB9EBczS6WIwwdoAkadr57r8ppD1GGwdodn+rJkMP ny7cFZZfw3shZlNkKIeIuOShkHIbCoRl6lt67pIAqvRQCrn1YPygRxtAbRM4fPjtEtvI8s CFX2jhyQsun3D6jyjHxM4nbfyPRYmetUEDq1YhqVN/U4sVkvZRpS3BokhyOlpuPKiDM0zI gVC8vCmgN2H18VtwbfDmEsEIVNucMd0GCi2xn4oPpjQkhuNdODCocC3E3JAhTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708619538; a=rsa-sha256; cv=none; b=exKUPMJwuNMGzHt6Bnv9xQCWPJDWrvJlopPnsSmA7/00OB0SOAXQOafsXam189vQagPuxs c5C6vlHqiffVSmYyevbZZda3ClCeBOYrZq07OqiQnLOkHHIIRZB4qMCxVak2BQmJVATrOj rLnCFu2nDGhK2it9gWIKd759qgdXyaD8QtbQqnz2bmwBO96YBCXj0WvcuY+DWCDTt3ukM8 MjbjjPNz6nLafGCb9Oo7sAOzRGdD0O7hU4Q0c/7sNLy2UgL0CL6SBK3/HHSagndg1o8lDm EmT0gd6/O8k7rLLp4zv3Fy/I8pz13UWKr2WZ+9YmWQ93XX9PyFkNyAJ2CSzXvg== 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 4Tgdw22LbSzfdv; Thu, 22 Feb 2024 16:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MGWIr3032007; Thu, 22 Feb 2024 16:32:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MGWIF3032004; Thu, 22 Feb 2024 16:32:18 GMT (envelope-from git) Date: Thu, 22 Feb 2024 16:32:18 GMT Message-Id: <202402221632.41MGWIF3032004@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 27c0f2a54498 - main - loader: These files have no copyrightable material List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 27c0f2a544989760c4b3b16a3615839c8ab44b32 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=27c0f2a544989760c4b3b16a3615839c8ab44b32 commit 27c0f2a544989760c4b3b16a3615839c8ab44b32 Author: Warner Losh AuthorDate: 2024-02-22 16:30:59 +0000 Commit: Warner Losh CommitDate: 2024-02-22 16:31:57 +0000 loader: These files have no copyrightable material These files have no copyrightable material, and so are in the public domain. Sponsored by: Netflix --- stand/common/load_elf32.c | 2 ++ stand/common/load_elf32_obj.c | 2 ++ stand/common/load_elf64.c | 2 ++ stand/common/load_elf64_obj.c | 2 ++ 4 files changed, 8 insertions(+) diff --git a/stand/common/load_elf32.c b/stand/common/load_elf32.c index 4737670d2eeb..4ecdeb773228 100644 --- a/stand/common/load_elf32.c +++ b/stand/common/load_elf32.c @@ -1,3 +1,5 @@ +/* This file is in the public domain */ + #define __ELF_WORD_SIZE 32 #define _MACHINE_ELF_WANT_32BIT #include "load_elf.c" diff --git a/stand/common/load_elf32_obj.c b/stand/common/load_elf32_obj.c index e37b4dfddb49..d0278930f5e4 100644 --- a/stand/common/load_elf32_obj.c +++ b/stand/common/load_elf32_obj.c @@ -1,3 +1,5 @@ +/* This file is in the public domain */ + #define __ELF_WORD_SIZE 32 #define _MACHINE_ELF_WANT_32BIT #include "load_elf_obj.c" diff --git a/stand/common/load_elf64.c b/stand/common/load_elf64.c index 98ef7dc40985..d55f139d1e6a 100644 --- a/stand/common/load_elf64.c +++ b/stand/common/load_elf64.c @@ -1,2 +1,4 @@ +/* This file is in the public domain */ + #define __ELF_WORD_SIZE 64 #include "load_elf.c" diff --git a/stand/common/load_elf64_obj.c b/stand/common/load_elf64_obj.c index 43de8cc1214f..0f01258fa372 100644 --- a/stand/common/load_elf64_obj.c +++ b/stand/common/load_elf64_obj.c @@ -1,2 +1,4 @@ +/* This file is in the public domain */ + #define __ELF_WORD_SIZE 64 #include "load_elf_obj.c" From nobody Thu Feb 22 16:34:30 2024 X-Original-To: dev-commits-src-main@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 4TgdyZ6Ztkz59x2Y; Thu, 22 Feb 2024 16:34:30 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgdyZ5jw7z4NnZ; Thu, 22 Feb 2024 16:34:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708619670; 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=BAbxW5tcrFFg7MKNTCBuhNSKcaRDw07EudHYsttLXws=; b=IxK3yL9wWd+Xn7zwESQ7eXljRJrZ3G0h6Ex4SQk13qhIadpz0tzjFvim2mgNYnF4/xp/7M bx9pss2eQc3b7iwxN7f8GIqzE5lza+XFUGIqmMH5yHhQP9+RNJvhAwL41jZHV2oEJTYx/P jIT9myNu978BphKty9rWK/wWO83K8uXt4Smd82CGaQB4f88nAfEdLHYL+z+IM9DsGwoz6n Et7gRDegw6GoEiLThEkoeYgf+b0X0a5CBuSoIgxHLOyPNQnqUtU9sQaqM5Im1x/6hJH3JS 9rfvqwRIg2Q+5oGrjlAwyrHNU69vEBy5ya20L6kmDgVpAgwln8TWiOS5H6JcVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708619670; 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=BAbxW5tcrFFg7MKNTCBuhNSKcaRDw07EudHYsttLXws=; b=QylWlfjmUicWe1WavuTpX14H8778iM8HNY3yAth/yKg4Pr0qlMYDOSTojqZapP07hqDqpX jbFH5CS2Oh0NVDXrujr0tjjFkZu5qkwm9qFLD3GOGd3g1In2cmkdQn8ddD7233h0rH8S7n 868FXkT5cvxlHIlXgCKdzBsuuXsYIvDbSf2qAj67sOKwaTaWDpXapEalSRleIjwP/AVKtx CP29F2BtQT0AL3biSfygsBrJQ0UyznexRbKh8Z4RbN1t0bgGeoySAdOjbpuIEr/Hlx1jBy PNyYmkLnpXbSQPMCBl61ZIQZwtSCJrmsb22jgp67ifcG5LkiEGdPfo2RmpVDRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708619670; a=rsa-sha256; cv=none; b=hIpcNXLCOD3f87zFhHSZT8BfnYS5Y+w/PGsKVDewqXjzNMpF0ZwZKkoDLEy5GhngdnsCra M0AjWe5ID/qg1mLFb0s1PcmJI0t2WBISsYoLE7KvSnXrRa8qAyjmERpPPtOL+K+yBM6wZF ThJED1ofk4lX6192GypQ0EtVMOpOTyfcV8cRCcXxdTQgplRaqKmkjM2MKPkrXL5AzDI+s0 M6FoQDpuI5egcr7/EHFzioVfAWjxqi33UrxFrF/Rqcpl/4s0ajLSwmaBVBEF7XVmAmZLyw vnUTZxoWTRVefj+497hDAfzDI9QK4xuQn+U7n/oQ1lmJbbHIII4cb25+meSU0w== 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 4TgdyZ4m60zfnl; Thu, 22 Feb 2024 16:34:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MGYUrA032503; Thu, 22 Feb 2024 16:34:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MGYUrS032500; Thu, 22 Feb 2024 16:34:30 GMT (envelope-from git) Date: Thu, 22 Feb 2024 16:34:30 GMT Message-Id: <202402221634.41MGYUrS032500@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 04440331b570 - main - vge(4): Fix a typo in a source code comment List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 04440331b5700e124c42b570ae1dfd00ea9c26f7 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=04440331b5700e124c42b570ae1dfd00ea9c26f7 commit 04440331b5700e124c42b570ae1dfd00ea9c26f7 Author: Gordon Bergling AuthorDate: 2024-02-22 16:33:35 +0000 Commit: Gordon Bergling CommitDate: 2024-02-22 16:34:13 +0000 vge(4): Fix a typo in a source code comment - s/embadded/embedded/ MFC after: 3 days --- sys/dev/vge/if_vgereg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/vge/if_vgereg.h b/sys/dev/vge/if_vgereg.h index e005526c95c1..c5cb53ef2ca7 100644 --- a/sys/dev/vge/if_vgereg.h +++ b/sys/dev/vge/if_vgereg.h @@ -444,7 +444,7 @@ #define VGE_MIICMD_MOUT 0x08 /* data out pin enable */ #define VGE_MIICMD_MDP 0x10 /* enable direct programming mode */ #define VGE_MIICMD_WCMD 0x20 /* embedded mode write */ -#define VGE_MIICMD_RCMD 0x40 /* embadded mode read */ +#define VGE_MIICMD_RCMD 0x40 /* embedded mode read */ #define VGE_MIICMD_MAUTO 0x80 /* enable autopolling */ /* MII address register */ From nobody Thu Feb 22 17:08:53 2024 X-Original-To: dev-commits-src-main@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 4TgfkG0sLfz5B11s; Thu, 22 Feb 2024 17:08:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgfkG0LYFz4SPw; Thu, 22 Feb 2024 17:08:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708621734; 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=zHCMJCJsENAMoK3FhMIHrKKsGCQ92qkGel5kP/0yQ6w=; b=YOaJC1sJFgSMougFUuwk8FFMSNOGCckA1gq+HBhYCVNffzBsqTU4m5EgyNr6o6NgXtwN03 CfzcP42iSk1asjwqXeQTaKA0LHblO0gGRjXHar59WmQe+WqVdHQT7EN/u1cfaejKIi2YPU vnMO6DffqYj6Ft6zSY7/3l6p4UkQUhYWYUO8Do7sO9tf/I6uNFb0i7f4oF/DWiWAaHtta2 T2Lr/+YMfawNK+7XyUdUMXYSyrYosd3YYlwaFNlYlY/TVA0PViWQLZxGeZSshzG7ExLPk+ y4tvDwiuPrrDAQGaEwqwa4I2wiPDE32h0BZgASqxwgLRJjsU1ihhgLCZFWGGOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708621734; 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=zHCMJCJsENAMoK3FhMIHrKKsGCQ92qkGel5kP/0yQ6w=; b=LhO+nHJF+D3m1P78vVHATX0BxsKIMtZdt4qk3Ci14I+OMK08asF2qRPCeWNbPXhI2DTi2K qThhWNnCghnjMjFWLTj7ppmTHfHaSs3vyavUdq6gQwpLcAfGokHznfPfMAdrE9X65VNh0q 3XroK14QR+x5bWkoUUqv1/gU0wBFI3otFw771lRk0UVoJjY+7ciTGQriH4eo01v3gzFJBA u4fM4GT8Eogn0HJ4Kem1hvFUvyFwVXvM/s3POxPH9XStwA96ayR30iRJKnVnmfO9d7BEvZ vHaNBxf/CcJegSPqjg8VHfB0IRx6snutsr56Y6MOtqG/5/mICJiAi/MeF9ed5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708621734; a=rsa-sha256; cv=none; b=KqI5dtHpdkdIIDEv+x4d2stVD/fZfLvXsVmJ5jJwCUGJN8INiqYBoZYcZ06HqTKkXBx1Xh IhPPbxNcqE/xfUZZzWk+6jz2/R8QDl1Gwk1x9PZoYiRSVn3v6/VLXzA/RUFOiC+BBgUS0a v0eHUwxvbbJTu3UGo+k3u9DzA1iAMKWFAIg3qFbUDQX9ofZbouonGJzWAGu5YkN/f/oM+S nzny5Bg1iLH3fUbR2hgGxRQ6ZWDgoFppwP+liGm7GB3q63NEm0PywBd4pH4Xm5308lGYq0 LlN0SWOb5kMxo64AC2LVcyr0+sMaZAApt7GjdgCCqA4eSXMDQiW/+rIh5/1wRA== 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 4TgfkF6X8szfsH; Thu, 22 Feb 2024 17:08:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MH8rl8083621; Thu, 22 Feb 2024 17:08:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MH8rkv083618; Thu, 22 Feb 2024 17:08:53 GMT (envelope-from git) Date: Thu, 22 Feb 2024 17:08:53 GMT Message-Id: <202402221708.41MH8rkv083618@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: dcb621efd664 - main - loader: Mark BEARSSL broken on powerpc List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: dcb621efd6645d3f3a227c8c9113cc717e903389 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=dcb621efd6645d3f3a227c8c9113cc717e903389 commit dcb621efd6645d3f3a227c8c9113cc717e903389 Author: Warner Losh AuthorDate: 2024-02-22 17:05:40 +0000 Commit: Warner Losh CommitDate: 2024-02-22 17:08:12 +0000 loader: Mark BEARSSL broken on powerpc When BEARSSL is enabled, we pull in libsecureboot, which has EFI dependencies which don't exist on powerpc. This needs to be detangled, but until then mark it as broken. Sponsored by: Netflix --- share/mk/src.opts.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index e154fbd4059d..3eec831db2cc 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -313,6 +313,9 @@ BROKEN_OPTIONS+=LIB32 .if ${__T:Mpowerpc*} || ${__T} == "i386" BROKEN_OPTIONS+=EFI .endif +# Bad coupling for libsecure stuff with bearssl and efi, so broken on EFI +.if ${__T:Mpowerpc*} +BROKEN_OPTIONS+=BEARSSL # bearssl brings in secure efi stuff xxx # OFW is only for powerpc, exclude others .if ${__T:Mpowerpc*} == "" BROKEN_OPTIONS+=LOADER_OFW From nobody Thu Feb 22 17:15:48 2024 X-Original-To: dev-commits-src-main@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 4TgftT6J1Wz5B1YG for ; Thu, 22 Feb 2024 17:16:01 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgftT22BMz4TPj for ; Thu, 22 Feb 2024 17:16:01 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-33d509ab80eso2660294f8f.3 for ; Thu, 22 Feb 2024 09:16:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708622160; x=1709226960; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HAYOv+D+kiz80VsbjsXpMCLoj3zBgH/KWNB5hp1/vP0=; b=t4jhm3l8Q5yeJccVl9WwqTzLfYGVVdpBhjsb23FEvh74D0cR4tSiJ0va+jqW0PCoKM Zg4QmVQpXcBlqDO+3IidB8r7UFvBUknej69OvwMWmWcj8z49KqwwlMDqrLaDX+2YAQG7 gQw3rJp0PaOCYRKeDpFWQt4gJsyHKBXURvpvhqmNQp5CcvTNCc4qBSMuNKwWONonwxpY h0+h6PCJQT8MYtqCIs0PUzrqaJ1l3ejsJh5nVNuYBXwWek6obcGn+9yXlp5cro/F6UDk DqYlxKJFJAlu/x+hK9x3dpuyxEDg6FWHSV1x4TZ3H8upYb0i5zBXyQWK34gtlWBdpurh n2RA== X-Forwarded-Encrypted: i=1; AJvYcCWHF0iz2UvY6+AS/jvUIQXxagKdlkYosuC/DV97zWKBY95W+GGugCJ43JNSQ5axaV9Zcy1BEER34SwdgQhq/N34Qn1HWFcLM1GdG965F+0nlA== X-Gm-Message-State: AOJu0YxYhIFv1qVsGFEsDAU2U1ttQ2rzWOkEW3D8/uqsbW0DItxsMYdA 0xKVXlRKX6c/Vis8Wz7+ggy4BFKxyAia7E9U+cPCA7n+LEP3xFyeqysf7XNunzo= X-Google-Smtp-Source: AGHT+IFeMVIpAcml9qft0vNmkja2Q4aKJ079kLGyXm4sGjmvoC6JZ3KA4jSrpkz22AdjU5muh73WRw== X-Received: by 2002:a05:6000:156b:b0:33d:7c8:2230 with SMTP id 11-20020a056000156b00b0033d07c82230mr18934425wrz.24.1708622159641; Thu, 22 Feb 2024 09:15:59 -0800 (PST) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id n2-20020a5d67c2000000b0033d8871acc3sm3490394wrw.77.2024.02.22.09.15.59 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Feb 2024 09:15:59 -0800 (PST) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.200.91.1.1\)) Subject: Re: git: dcb621efd664 - main - loader: Mark BEARSSL broken on powerpc From: Jessica Clarke In-Reply-To: <202402221708.41MH8rkv083618@gitrepo.freebsd.org> Date: Thu, 22 Feb 2024 17:15:48 +0000 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <7777BCB9-E648-46A5-894F-982ED906A678@freebsd.org> References: <202402221708.41MH8rkv083618@gitrepo.freebsd.org> To: Warner Losh X-Mailer: Apple Mail (2.3774.200.91.1.1) X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4TgftT22BMz4TPj X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] On 22 Feb 2024, at 17:08, Warner Losh wrote: >=20 > The branch main has been updated by imp: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Ddcb621efd6645d3f3a227c8c9113cc71= 7e903389 >=20 > commit dcb621efd6645d3f3a227c8c9113cc717e903389 > Author: Warner Losh > AuthorDate: 2024-02-22 17:05:40 +0000 > Commit: Warner Losh > CommitDate: 2024-02-22 17:08:12 +0000 >=20 > loader: Mark BEARSSL broken on powerpc >=20 > When BEARSSL is enabled, we pull in libsecureboot, which has EFI > dependencies which don't exist on powerpc. This needs to be = detangled, > but until then mark it as broken. >=20 > Sponsored by: Netflix > --- > share/mk/src.opts.mk | 3 +++ > 1 file changed, 3 insertions(+) >=20 > diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk > index e154fbd4059d..3eec831db2cc 100644 > --- a/share/mk/src.opts.mk > +++ b/share/mk/src.opts.mk > @@ -313,6 +313,9 @@ BROKEN_OPTIONS+=3DLIB32 > .if ${__T:Mpowerpc*} || ${__T} =3D=3D "i386" > BROKEN_OPTIONS+=3DEFI > .endif > +# Bad coupling for libsecure stuff with bearssl and efi, so broken on = EFI > +.if ${__T:Mpowerpc*} > +BROKEN_OPTIONS+=3DBEARSSL # bearssl brings in secure efi stuff xxx > # OFW is only for powerpc, exclude others Missing .endif (maybe you initially had it in the block below?) Jess > .if ${__T:Mpowerpc*} =3D=3D "" > BROKEN_OPTIONS+=3DLOADER_OFW From nobody Thu Feb 22 17:18:36 2024 X-Original-To: dev-commits-src-main@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 4TgfxT1Cwxz5B1gN; Thu, 22 Feb 2024 17:18: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgfxT0f5Wz4V8d; Thu, 22 Feb 2024 17:18:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708622317; 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=bVWAihppeMyHB9lIFtBRKheylAEXgGdEGr4lBGAAvY8=; b=W7C/DSALvRRX16vd2MyQ8fcCOCa+ip10FI/MWf74gHymdTi6z6wOeMkIv6+4xXgxY/o0hp FdMrAqV4aDxpHy3CnS3zQVenf3nsSA99woaqUjhe8S0CkqawI36q3EMvQY3SNYLH+6XVj7 WxZZs5EMf5j31GTgpCfufsndze/cQGvb1OO60iwoRkcteoNqFRV0hUx31o1PnUoVOq65Rk YVzprtELGacwYhdDiYl7esxJ0gouLs/UYyX75EDWmmmz0V7f3prsqSg5zrj78C1+WdISL7 +fQ8OE7wkfPLyrJjSVMMBBTmvYjOWoohCLJ580pLdlyyoC3f6gTRGXB4AnBm/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708622317; 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=bVWAihppeMyHB9lIFtBRKheylAEXgGdEGr4lBGAAvY8=; b=qonZCYMwkDaF5cjz6zdbqNJuEZ7HGNqoQ7UITicnFDk4QUjCR1q4m8yD+S4M85iTWXqvkR dzquqneliev6Iwj4KcuQNYb6Y597SGuyaNT1CpsIiHT8zR+iwjTVCPLdmDmtNOQFamTPg0 /pjf//+gmjW7IGsMKZ4JnVrKn0umzocZU4DRDXKycJYOkWMeNI+wPh+GDyvgMbgD0Xf/01 qi+UDxGWTawQEaWCrWgKKSbfnz/IwI40Gdczagc4fTJlx5KM29MuO6dmX0QpxpfMRxBQK4 /jVst6lbZN59GjuH3fyyUn6M1xN9noDuzFCbDzNjkey6Gl79xuYQD2F3i+dtPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708622317; a=rsa-sha256; cv=none; b=YDFa1nnpTmLPxhOBDexR2fImAT2ngWBOlEkvIpGhT38gLgBJDIYBEym/ei5d+iSWuphgIj 350uJkKgVm7iuLhk3hEhCEcU8ivAAMsZrkHPZOXER09QA0scmQTBfjWguI/jHmIT4vM//V s9lGHwakNcnGqStajdTrxJr1QVZs58ouf9J+WDNERBO1NNIKF1OVayOmg/UqgwJ6MX63as W0WEcpL+mUN0qld+YY9UCJmQglBDyd88tgqW/7b92KwdVOWCQpXVsfOnSGezGQ12NdRojs EUJiWZqMi5HBG6RpjFAnIlzTIgvl2VkTeN8Ny/tJ7NPFB54q1Tn2O0/nSNag8w== 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 4TgfxS6pZ3zgW2; Thu, 22 Feb 2024 17:18:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MHIa2g000403; Thu, 22 Feb 2024 17:18:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MHIaK3000400; Thu, 22 Feb 2024 17:18:36 GMT (envelope-from git) Date: Thu, 22 Feb 2024 17:18:36 GMT Message-Id: <202402221718.41MHIaK3000400@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 0da51f1f6a9a - main - Add missing .endif List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 0da51f1f6a9abb78ecf914065aab07364fc4a590 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0da51f1f6a9abb78ecf914065aab07364fc4a590 commit 0da51f1f6a9abb78ecf914065aab07364fc4a590 Author: Warner Losh AuthorDate: 2024-02-22 17:16:37 +0000 Commit: Warner Losh CommitDate: 2024-02-22 17:17:34 +0000 Add missing .endif Last second move from inside the prior block to outside bites me. Noticed by: jrtc23 Fixes: dcb621efd664 Sponsored by: Netflix --- share/mk/src.opts.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 3eec831db2cc..3666094bfc40 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -316,6 +316,7 @@ BROKEN_OPTIONS+=EFI # Bad coupling for libsecure stuff with bearssl and efi, so broken on EFI .if ${__T:Mpowerpc*} BROKEN_OPTIONS+=BEARSSL # bearssl brings in secure efi stuff xxx +.endif # OFW is only for powerpc, exclude others .if ${__T:Mpowerpc*} == "" BROKEN_OPTIONS+=LOADER_OFW From nobody Thu Feb 22 18:07:14 2024 X-Original-To: dev-commits-src-main@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 4Tgh1Z4DXlz5B606; Thu, 22 Feb 2024 18:07: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tgh1Z3tgxz4ZsN; Thu, 22 Feb 2024 18:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708625234; 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=xq0yBLd7ovEwp6d60SgnIMDdj+rwzhLczRR6fIGZMpA=; b=fhwczF7Jwzsz32QrEvVmZcjY+KYXgYwtvELloxNtmRWJTuZZggrx+995sh8iFxcoqvQq/6 DOfv0bjctXqhEnVk7zRm2bxc6CbWx3nJBqpDSLXLWNKik2MbZhC+54QmktHVCSLYDVYLUg dUzWh2qauO+HabZO1YuWJQXFM20PLatrqfzxzd11MTI6hS5jQEKko5GBeY1Woa8Uadxk5Z khXcbBHsY1bXUPq9lwER3mSqjke3n2D2xUdQNUNd8lSH2KyjtU2vxwBTsl2Hg5NU1vEZkJ JfS5J1HAZsmkxD+U/zAm1tWmHHjsPIgy3NlY01Bxr2/Pt+5nheG+CqHVJYbDKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708625234; 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=xq0yBLd7ovEwp6d60SgnIMDdj+rwzhLczRR6fIGZMpA=; b=tERFU+mVQpcABdKodNr25zC1Pb97wA1lKF9ryXB+g8brmvleQW13Xx/FSITjfudYCJkyJZ tMHVVwzUyQcLAmS+yFHEIOCvBR9OgtDrzBlSoR0Sn4dwlxSfiSizcv7VbTPSM1VJMCIW/0 nwmT0/+VLrkVE3dLd9JaxPdjFQFkU9cD6wMsw29Di3SxlSgr/5GstNbU8HbFTr1q4et0NJ tbu93ciSr9N1eqJAagVhEB6u6LrDWUX32iU9xYPGwXH8FcaYNZM3qa3m9t72Ps4uKefmaW vrTlWhOO9CBRUYsc4/6r1jp7a1scE3Ep3PfllbP4B+k6Qt6+g3pcPsguYME9oQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708625234; a=rsa-sha256; cv=none; b=i7q+7A6s8jwGO5jRIqKiht4r4Lg6S2cdRz46bdzcj5cUtwyF+HI8eT+Cq72hGu+AgP1wQk q4HwN5MkmbbfiaCTuPOquduhMdKPhgXMj8mSXQM2P0ORHR5wVDhKe+DuWZQ0xNbotI+GOt YGcyQo55QvchgbfzEdk4GXQDCoPDt7/rlaON5f88uCsyDv3obkNBv9hZyDQqLBqiOwpY12 yPqeP8LNABeHrosAU69HkWhp8W4+ba4xkNNXt3BLyerd46ZfhE9kyhACmu9Qk8UZb9mnFj QBsJtz1SK5OFUqBfL29UiN9sdH/JQ2bDlqe4XMidG6/TYPxV0nrNBzOusc1SCQ== 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 4Tgh1Z2wsPzj3b; Thu, 22 Feb 2024 18:07:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MI7EWh084466; Thu, 22 Feb 2024 18:07:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MI7ENV084463; Thu, 22 Feb 2024 18:07:14 GMT (envelope-from git) Date: Thu, 22 Feb 2024 18:07:14 GMT Message-Id: <202402221807.41MI7ENV084463@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Chuck Silvers Subject: git: 34467bd762a7 - main - x86/ucode: add support for early loading of CPU ucode on AMD. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: chs X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 34467bd762a77345915d07f4f0630c3fe0b53a23 Auto-Submitted: auto-generated The branch main has been updated by chs: URL: https://cgit.FreeBSD.org/src/commit/?id=34467bd762a77345915d07f4f0630c3fe0b53a23 commit 34467bd762a77345915d07f4f0630c3fe0b53a23 Author: Chuck Silvers AuthorDate: 2024-02-22 18:03:53 +0000 Commit: Chuck Silvers CommitDate: 2024-02-22 18:04:31 +0000 x86/ucode: add support for early loading of CPU ucode on AMD. Sponsored by: Netflix Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D43318 --- sys/conf/files.x86 | 1 + sys/x86/include/ucode.h | 11 ++ sys/x86/x86/ucode.c | 55 ++++++++++ sys/x86/x86/ucode_subr.c | 239 +++++++++++++++++++++++++++++++++++++++++++ usr.sbin/cpucontrol/Makefile | 6 +- usr.sbin/cpucontrol/amd.h | 41 -------- usr.sbin/cpucontrol/amd10h.c | 141 +------------------------ 7 files changed, 316 insertions(+), 178 deletions(-) diff --git a/sys/conf/files.x86 b/sys/conf/files.x86 index 15781eea8fee..8bd58ab4d339 100644 --- a/sys/conf/files.x86 +++ b/sys/conf/files.x86 @@ -347,6 +347,7 @@ x86/x86/pvclock.c optional kvm_clock | xenhvm x86/x86/stack_machdep.c optional ddb | stack x86/x86/tsc.c standard x86/x86/ucode.c standard +x86/x86/ucode_subr.c standard x86/x86/delay.c standard x86/xen/hvm.c optional xenhvm x86/xen/xen_apic.c optional xenhvm smp diff --git a/sys/x86/include/ucode.h b/sys/x86/include/ucode.h index e97d41c89ed0..0338d48a0832 100644 --- a/sys/x86/include/ucode.h +++ b/sys/x86/include/ucode.h @@ -31,6 +31,12 @@ #ifndef _MACHINE_UCODE_H_ #define _MACHINE_UCODE_H_ +#ifdef _KERNEL +#include +#else +#include +#endif + struct ucode_intel_header { uint32_t header_version; int32_t update_revision; @@ -56,8 +62,13 @@ struct ucode_intel_extsig_table { } entries[0]; }; +const void *ucode_amd_find(const char *path, uint32_t signature, + uint32_t revision, const uint8_t *fw_data, size_t fw_size, + size_t *selected_sizep); int ucode_intel_load(const void *data, bool unsafe, uint64_t *nrevp, uint64_t *orevp); +int ucode_amd_load(const void *data, bool unsafe, + uint64_t *nrevp, uint64_t *orevp); size_t ucode_load_bsp(uintptr_t free); void ucode_load_ap(int cpu); void ucode_reload(void); diff --git a/sys/x86/x86/ucode.c b/sys/x86/x86/ucode.c index 8e9f8e113c40..923d9e31b44e 100644 --- a/sys/x86/x86/ucode.c +++ b/sys/x86/x86/ucode.c @@ -54,6 +54,8 @@ static const void *ucode_intel_match(const uint8_t *data, size_t *len); static int ucode_intel_verify(const struct ucode_intel_header *hdr, size_t resid); +static const void *ucode_amd_match(const uint8_t *data, size_t *len); + static struct ucode_ops { const char *vendor; int (*load)(const void *, bool, uint64_t *, uint64_t *); @@ -64,6 +66,11 @@ static struct ucode_ops { .load = ucode_intel_load, .match = ucode_intel_match, }, + { + .vendor = AMD_VENDOR_ID, + .load = ucode_amd_load, + .match = ucode_amd_match, + }, }; /* Selected microcode update data. */ @@ -225,6 +232,54 @@ ucode_intel_match(const uint8_t *data, size_t *len) return (NULL); } +int +ucode_amd_load(const void *data, bool unsafe, uint64_t *nrevp, uint64_t *orevp) +{ + uint64_t nrev, orev; + uint32_t cpuid[4]; + + orev = rdmsr(MSR_BIOS_SIGN); + + /* + * Perform update. + */ + if (unsafe) + wrmsr_safe(MSR_K8_UCODE_UPDATE, (uint64_t)(uintptr_t)data); + else + wrmsr(MSR_K8_UCODE_UPDATE, (uint64_t)(uintptr_t)data); + + /* + * Serialize instruction flow. + */ + do_cpuid(0, cpuid); + + /* + * Verify that the microcode revision changed. + */ + nrev = rdmsr(MSR_BIOS_SIGN); + if (nrevp != NULL) + *nrevp = nrev; + if (orevp != NULL) + *orevp = orev; + if (nrev <= orev) + return (EEXIST); + return (0); + +} + +static const void * +ucode_amd_match(const uint8_t *data, size_t *len) +{ + uint32_t signature, revision; + uint32_t regs[4]; + + do_cpuid(1, regs); + signature = regs[0]; + revision = rdmsr(MSR_BIOS_SIGN); + + return (ucode_amd_find("loader blob", signature, revision, data, *len, len)); +} + /* * Release any memory backing unused microcode blobs back to the system. * We copy the selected update and free the entire microcode file. diff --git a/sys/x86/x86/ucode_subr.c b/sys/x86/x86/ucode_subr.c new file mode 100644 index 000000000000..9e128ad2bf04 --- /dev/null +++ b/sys/x86/x86/ucode_subr.c @@ -0,0 +1,239 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2006, 2008 Stanislav Sedov . + * All rights reserved. + * Copyright (c) 2012 Andriy Gapon . + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include +#include + +#include + +#ifndef _KERNEL +#include + +#include "cpucontrol.h" +#endif + + +#ifdef _KERNEL +#define WARNX(level, ...) \ + if (bootverbose) { \ + printf(__VA_ARGS__); \ + printf("\n"); \ + } +#endif + +/* + * AMD family 10h and later. + */ +typedef struct amd_10h_fw_header { + uint32_t data_code; + uint32_t patch_id; + uint16_t mc_patch_data_id; + uint8_t mc_patch_data_len; + uint8_t init_flag; + uint32_t mc_patch_data_checksum; + uint32_t nb_dev_id; + uint32_t sb_dev_id; + uint16_t processor_rev_id; + uint8_t nb_rev_id; + uint8_t sb_rev_id; + uint8_t bios_api_rev; + uint8_t reserved1[3]; + uint32_t match_reg[8]; +} amd_10h_fw_header_t; + +typedef struct equiv_cpu_entry { + uint32_t installed_cpu; + uint32_t fixed_errata_mask; + uint32_t fixed_errata_compare; + uint16_t equiv_cpu; + uint16_t res; +} equiv_cpu_entry_t; + +typedef struct section_header { + uint32_t type; + uint32_t size; +} section_header_t; + +typedef struct container_header { + uint32_t magic; +} container_header_t; + +#define AMD_10H_MAGIC 0x414d44 +#define AMD_10H_EQUIV_TABLE_TYPE 0 +#define AMD_10H_uCODE_TYPE 1 + +/* + * NB: the format of microcode update files is not documented by AMD. + * It has been reverse engineered from studying Coreboot, illumos and Linux + * source code. + */ +const void * +ucode_amd_find(const char *path, uint32_t signature, uint32_t revision, + const uint8_t *fw_data, size_t fw_size, size_t *selected_sizep) +{ + const amd_10h_fw_header_t *fw_header; + const amd_10h_fw_header_t *selected_fw; + const equiv_cpu_entry_t *equiv_cpu_table; + const section_header_t *section_header; + const container_header_t *container_header; + size_t selected_size; + uint16_t equiv_id; + int i; + + WARNX(1, "found cpu family %#x model %#x " + "stepping %#x extfamily %#x extmodel %#x.", + ((signature >> 8) & 0x0f) + ((signature >> 20) & 0xff), + (signature >> 4) & 0x0f, + (signature >> 0) & 0x0f, (signature >> 20) & 0xff, + (signature >> 16) & 0x0f); + WARNX(1, "microcode revision %#x", revision); + +nextfile: + WARNX(1, "checking %s for update.", path); + WARNX(3, "processing next container file"); + if (fw_size < + (sizeof(*container_header) + sizeof(*section_header))) { + WARNX(2, "file too short: %s", path); + return (NULL); + } + + container_header = (const container_header_t *)fw_data; + if (container_header->magic != AMD_10H_MAGIC) { + WARNX(2, "%s is not a valid amd firmware: bad magic", path); + return (NULL); + } + fw_data += sizeof(*container_header); + fw_size -= sizeof(*container_header); + + section_header = (const section_header_t *)fw_data; + if (section_header->type != AMD_10H_EQUIV_TABLE_TYPE) { + WARNX(2, "%s is not a valid amd firmware: " + "first section is not CPU equivalence table", path); + return (NULL); + } + if (section_header->size == 0) { + WARNX(2, "%s is not a valid amd firmware: " + "first section is empty", path); + return (NULL); + } + fw_data += sizeof(*section_header); + fw_size -= sizeof(*section_header); + + if (section_header->size > fw_size) { + WARNX(2, "%s is not a valid amd firmware: " + "file is truncated", path); + return (NULL); + } + if (section_header->size < sizeof(*equiv_cpu_table)) { + WARNX(2, "%s is not a valid amd firmware: " + "first section is too short", path); + return (NULL); + } + equiv_cpu_table = (const equiv_cpu_entry_t *)fw_data; + fw_data += section_header->size; + fw_size -= section_header->size; + + equiv_id = 0; + for (i = 0; equiv_cpu_table[i].installed_cpu != 0; i++) { + WARNX(3, "signature 0x%x i %d installed_cpu 0x%x equiv 0x%x", + signature, i, equiv_cpu_table[i].installed_cpu, + equiv_cpu_table[i].equiv_cpu); + if (signature == equiv_cpu_table[i].installed_cpu) { + equiv_id = equiv_cpu_table[i].equiv_cpu; + WARNX(3, "equiv_id: %x, signature %8x," + " equiv_cpu_table[%d] %8x", equiv_id, signature, + i, equiv_cpu_table[i].installed_cpu); + break; + } + } + if (equiv_id == 0) { + WARNX(2, "CPU is not found in the equivalence table"); + } + + while (fw_size >= sizeof(*section_header)) { + section_header = (const section_header_t *)fw_data; + if (section_header->type == AMD_10H_MAGIC) { + WARNX(2, "%s next section is actually a new container", + path); + if (selected_fw != NULL) + goto found; + else + goto nextfile; + } + fw_data += sizeof(*section_header); + fw_size -= sizeof(*section_header); + if (section_header->type != AMD_10H_uCODE_TYPE) { + WARNX(2, "%s is not a valid amd firmware: " + "section has incorrect type", path); + break; + } + if (section_header->size > fw_size) { + WARNX(2, "%s is not a valid amd firmware: " + "file is truncated", path); + break; + } + if (section_header->size < sizeof(*fw_header)) { + WARNX(2, "%s is not a valid amd firmware: " + "section is too short", path); + break; + } + fw_header = (const amd_10h_fw_header_t *)fw_data; + fw_data += section_header->size; + fw_size -= section_header->size; + + if (fw_header->processor_rev_id != equiv_id) { + WARNX(1, "firmware processor_rev_id %x, equiv_id %x", + fw_header->processor_rev_id, equiv_id); + continue; /* different cpu */ + } + if (fw_header->patch_id <= revision) { + WARNX(1, "patch_id %x, revision %x", + fw_header->patch_id, revision); + continue; /* not newer revision */ + } + if (fw_header->nb_dev_id != 0 || fw_header->sb_dev_id != 0) { + WARNX(2, "Chipset-specific microcode is not supported"); + } + + WARNX(3, "selecting revision: %x", fw_header->patch_id); + revision = fw_header->patch_id; + selected_fw = fw_header; + selected_size = section_header->size; + } + + if (fw_size != 0) { + WARNX(2, "%s is not a valid amd firmware: " + "file is truncated", path); + selected_fw = NULL; + } + +found: + *selected_sizep = selected_size; + return (selected_fw); +} diff --git a/usr.sbin/cpucontrol/Makefile b/usr.sbin/cpucontrol/Makefile index 41f573d02cc2..a468ca59b461 100644 --- a/usr.sbin/cpucontrol/Makefile +++ b/usr.sbin/cpucontrol/Makefile @@ -1,8 +1,12 @@ PROG= cpucontrol MAN= cpucontrol.8 -SRCS= cpucontrol.c intel.c amd.c amd10h.c via.c +SRCS= cpucontrol.c intel.c amd.c amd10h.c via.c ucode_subr.c + +.PATH: ${SRCTOP}/sys/x86/x86 NO_WCAST_ALIGN= +CFLAGS+= -I${.CURDIR} + .include diff --git a/usr.sbin/cpucontrol/amd.h b/usr.sbin/cpucontrol/amd.h index 7e53048a81d7..8e4efe60dca6 100644 --- a/usr.sbin/cpucontrol/amd.h +++ b/usr.sbin/cpucontrol/amd.h @@ -48,45 +48,4 @@ typedef struct amd_fw_header { #define AMD_MAGIC 0xaaaaaa -/* - * AMD family 10h and later. - */ -typedef struct amd_10h_fw_header { - uint32_t data_code; - uint32_t patch_id; - uint16_t mc_patch_data_id; - uint8_t mc_patch_data_len; - uint8_t init_flag; - uint32_t mc_patch_data_checksum; - uint32_t nb_dev_id; - uint32_t sb_dev_id; - uint16_t processor_rev_id; - uint8_t nb_rev_id; - uint8_t sb_rev_id; - uint8_t bios_api_rev; - uint8_t reserved1[3]; - uint32_t match_reg[8]; -} amd_10h_fw_header_t; - -typedef struct equiv_cpu_entry { - uint32_t installed_cpu; - uint32_t fixed_errata_mask; - uint32_t fixed_errata_compare; - uint16_t equiv_cpu; - uint16_t res; -} equiv_cpu_entry_t; - -typedef struct section_header { - uint32_t type; - uint32_t size; -} section_header_t; - -typedef struct container_header { - uint32_t magic; -} container_header_t; - -#define AMD_10H_MAGIC 0x414d44 -#define AMD_10H_EQUIV_TABLE_TYPE 0 -#define AMD_10H_uCODE_TYPE 1 - #endif /* !AMD_H */ diff --git a/usr.sbin/cpucontrol/amd10h.c b/usr.sbin/cpucontrol/amd10h.c index aceb6bfa2ba5..4fda44f0b797 100644 --- a/usr.sbin/cpucontrol/amd10h.c +++ b/usr.sbin/cpucontrol/amd10h.c @@ -33,6 +33,8 @@ #include #include +#include + #include #include #include @@ -79,33 +81,21 @@ amd10h_probe(int fd) return (0); } -/* - * NB: the format of microcode update files is not documented by AMD. - * It has been reverse engineered from studying Coreboot, illumos and Linux - * source code. - */ void amd10h_update(const struct ucode_update_params *params) { cpuctl_cpuid_args_t idargs; cpuctl_msr_args_t msrargs; cpuctl_update_args_t args; - const amd_10h_fw_header_t *fw_header; - const amd_10h_fw_header_t *selected_fw; - const equiv_cpu_entry_t *equiv_cpu_table; - const section_header_t *section_header; - const container_header_t *container_header; - const uint8_t *fw_data; const uint8_t *fw_image; const char *dev, *path; + const void *selected_fw; size_t fw_size; size_t selected_size; uint32_t revision; uint32_t new_rev; uint32_t signature; - uint16_t equiv_id; int devfd; - unsigned int i; int error; dev = params->dev_path; @@ -133,129 +123,8 @@ amd10h_update(const struct ucode_update_params *params) } revision = (uint32_t)msrargs.data; - WARNX(1, "found cpu family %#x model %#x " - "stepping %#x extfamily %#x extmodel %#x.", - ((signature >> 8) & 0x0f) + ((signature >> 20) & 0xff), - (signature >> 4) & 0x0f, - (signature >> 0) & 0x0f, (signature >> 20) & 0xff, - (signature >> 16) & 0x0f); - WARNX(1, "microcode revision %#x", revision); - - /* - * Open the firmware file. - */ - WARNX(1, "checking %s for update.", path); - if (fw_size < - (sizeof(*container_header) + sizeof(*section_header))) { - WARNX(2, "file too short: %s", path); - goto done; - } - - /* - * mmap the whole image. - */ - fw_data = fw_image; - container_header = (const container_header_t *)fw_data; - if (container_header->magic != AMD_10H_MAGIC) { - WARNX(2, "%s is not a valid amd firmware: bad magic", path); - goto done; - } - fw_data += sizeof(*container_header); - fw_size -= sizeof(*container_header); - - section_header = (const section_header_t *)fw_data; - if (section_header->type != AMD_10H_EQUIV_TABLE_TYPE) { - WARNX(2, "%s is not a valid amd firmware: " - "first section is not CPU equivalence table", path); - goto done; - } - if (section_header->size == 0) { - WARNX(2, "%s is not a valid amd firmware: " - "first section is empty", path); - goto done; - } - fw_data += sizeof(*section_header); - fw_size -= sizeof(*section_header); - - if (section_header->size > fw_size) { - WARNX(2, "%s is not a valid amd firmware: " - "file is truncated", path); - goto done; - } - if (section_header->size < sizeof(*equiv_cpu_table)) { - WARNX(2, "%s is not a valid amd firmware: " - "first section is too short", path); - goto done; - } - equiv_cpu_table = (const equiv_cpu_entry_t *)fw_data; - fw_data += section_header->size; - fw_size -= section_header->size; - - equiv_id = 0; - for (i = 0; equiv_cpu_table[i].installed_cpu != 0; i++) { - if (signature == equiv_cpu_table[i].installed_cpu) { - equiv_id = equiv_cpu_table[i].equiv_cpu; - WARNX(3, "equiv_id: %x, signature %8x," - " equiv_cpu_table[%d] %8x", equiv_id, signature, - i, equiv_cpu_table[i].installed_cpu); - break; - } - } - if (equiv_id == 0) { - WARNX(2, "CPU is not found in the equivalence table"); - goto done; - } - - selected_fw = NULL; - selected_size = 0; - while (fw_size >= sizeof(*section_header)) { - section_header = (const section_header_t *)fw_data; - fw_data += sizeof(*section_header); - fw_size -= sizeof(*section_header); - if (section_header->type != AMD_10H_uCODE_TYPE) { - WARNX(2, "%s is not a valid amd firmware: " - "section has incorrect type", path); - goto done; - } - if (section_header->size > fw_size) { - WARNX(2, "%s is not a valid amd firmware: " - "file is truncated", path); - goto done; - } - if (section_header->size < sizeof(*fw_header)) { - WARNX(2, "%s is not a valid amd firmware: " - "section is too short", path); - goto done; - } - fw_header = (const amd_10h_fw_header_t *)fw_data; - fw_data += section_header->size; - fw_size -= section_header->size; - - if (fw_header->processor_rev_id != equiv_id) { - WARNX(1, "firmware processor_rev_id %x, equiv_id %x", - fw_header->processor_rev_id, equiv_id); - continue; /* different cpu */ - } - if (fw_header->patch_id <= revision) { - WARNX(1, "patch_id %x, revision %x", - fw_header->patch_id, revision); - continue; /* not newer revision */ - } - if (fw_header->nb_dev_id != 0 || fw_header->sb_dev_id != 0) { - WARNX(2, "Chipset-specific microcode is not supported"); - } - - WARNX(3, "selecting revision: %x", fw_header->patch_id); - revision = fw_header->patch_id; - selected_fw = fw_header; - selected_size = section_header->size; - } - - if (fw_size != 0) { - WARNX(2, "%s is not a valid amd firmware: " - "file is truncated", path); - goto done; - } + selected_fw = ucode_amd_find(path, signature, revision, fw_image, + fw_size, &selected_size); if (selected_fw != NULL) { WARNX(1, "selected ucode size is %zu", selected_size); From nobody Thu Feb 22 18:28:46 2024 X-Original-To: dev-commits-src-main@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 4TghVQ5k2Tz5B8HV; Thu, 22 Feb 2024 18:28:46 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TghVQ3Jz7z4gTk; Thu, 22 Feb 2024 18:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708626526; 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=I7xHNSjVa1cJ/cruJeg2uFpnkwrn0zm5/yXTVfN//es=; b=STnig3hmhEwF+IoalqK3XJs0WTj01lu1hDNDZvx4IK8PmEFIXK7fD5mYmbfO20ax7L0TgP qBFumb6G4OL8gkyOkhOy9gd6VLoqaUOQLnn5uSIuMWScaA/7tkb93ZbY9iDWpDNM2VRS1P I+tS1NaE6K0FWcFPHt4yiA3dymfeXaqbYquSGNMd/RvKB/QZPgEoqdYxzvElP/nJPJp/BD xRMcvWIkMmx7MdPKHjwf5qqOwnoXocaQsRXmSRjtRxwXRy/rcPuCJ1md7N5HMHBLgvL4YL ONDW+fecyB4q/wCsAOoG+An+N/vleHPeT08CfA6PrsedFznUYaLRrHGlTxZtXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708626526; 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=I7xHNSjVa1cJ/cruJeg2uFpnkwrn0zm5/yXTVfN//es=; b=rQSO7Xkq+HBu2Wg4846We8guiJCRYfigWvYMAQp59S5Yw9rgOTHFNUhPx2p3Re1FaEs4pM m2ZPZ14LCL7wOimnlzDG69yyzoHqpcsMALThmIfMGI1udUgAhdaWKFEfkV8v7Eb47QiHzK BEWggh+wwOOfnGMi8FZWh6sQsuSYjFW5DWKnhPOr578gwcwxTwcGVgyypxO4VhM0vx6Yxv YbyFeunJwBQdP4D3TTTji8CzsBkDr7NQ1JDGnUtt5Lcl8PNL5ylPhewevHqorOsPikTNFy LJokW+D+8JqazqDpLiXB1kHHy1MGhFDrGZp/wKMeFhOt/TPTmFHbtk5zdbFDsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708626526; a=rsa-sha256; cv=none; b=g/zYOu/gyGtXe/o5QW99JmxQl+WTJGluzO+xXySq0bZ/yNJUoKnfoewV2l5WwCkPXua2hJ AlmQKhn0b9MaKqQwcPteXayduoijBf5ZUioV1951GnDaRbkhf0kLp627SOXGE0R5yyBIfB DemQsGoS6wpNo4M81E5XOAkUkn/T+OE3CEdtxjQmZMYqa3US+/yICT5JpsSC3vHArPUX5U P/WnY82aEMSxA+OIrQk1FTolv1YhiSi3qAyPzf0IqYlBvawRUW2Qt0I8STpIRN50YUuXGW kUAgaa6nD3owWldEmYK7xNjiCRjm7U2x6arrW/gbWZIdCMoLPzEnjkrRpJcrzw== 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 4TghVQ2NqhzjQb; Thu, 22 Feb 2024 18:28:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MISkDU019892; Thu, 22 Feb 2024 18:28:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MISkuT019889; Thu, 22 Feb 2024 18:28:46 GMT (envelope-from git) Date: Thu, 22 Feb 2024 18:28:46 GMT Message-Id: <202402221828.41MISkuT019889@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 121be555997b - main - arm: Set NEW_PCIB in DEFAULTS rather than a subset of kernel configs List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 121be555997b3d7727e50d15acabd0ffbf4a4247 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=121be555997b3d7727e50d15acabd0ffbf4a4247 commit 121be555997b3d7727e50d15acabd0ffbf4a4247 Author: Jessica Clarke AuthorDate: 2024-02-22 18:27:45 +0000 Commit: Jessica Clarke CommitDate: 2024-02-22 18:27:45 +0000 arm: Set NEW_PCIB in DEFAULTS rather than a subset of kernel configs All other architectures set NEW_PCIB in DEFAULTS, with arm being the one remaining straggler that only sets it for GENERIC and TEGRA124. ARMADA38X and ARMADAXP contain device pci but don't set NEW_PCIB, however GENERIC claims to support them and as part of that NEW_PCIB support was added to mv_pci, so these configs are most likely just stale. Other than NOTES that just leaves ALPINE as the one kernel with PCI support not covered by GENERIC, but al_pci is supported by arm64 which enables NEW_PCIB, and it's just a generic_pcie_fdt_driver with some fixup code to deal with quirks so should support PCI_RES_BUS just fine. Therefore it is believed that all in-tree kernel configs support NEW_PCIB in reality, and so let's take a step towards removing all the non-NEW_PCIB code by having it always-on everywhere. Reviewed by: emaste, jhb, manu MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D43806 --- sys/arm/conf/DEFAULTS | 2 ++ sys/arm/conf/GENERIC | 1 - sys/arm/conf/TEGRA124 | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm/conf/DEFAULTS b/sys/arm/conf/DEFAULTS index d28e7b6302f9..85d090dfa782 100644 --- a/sys/arm/conf/DEFAULTS +++ b/sys/arm/conf/DEFAULTS @@ -6,4 +6,6 @@ device mem # Default congestion control algorithm options CC_CUBIC # include CUBIC congestion control + +options NEW_PCIB options INTRNG # All arm systems use INTRNG these days diff --git a/sys/arm/conf/GENERIC b/sys/arm/conf/GENERIC index f8a39cb370d5..ea4076230c5e 100644 --- a/sys/arm/conf/GENERIC +++ b/sys/arm/conf/GENERIC @@ -98,7 +98,6 @@ device ahci # AHCI-compatible SATA controllers #device ata # Legacy ATA/SATA controllers # PCI -options NEW_PCIB device pci device pci_host_generic diff --git a/sys/arm/conf/TEGRA124 b/sys/arm/conf/TEGRA124 index 9b75bf2e94f8..223dd925e56b 100644 --- a/sys/arm/conf/TEGRA124 +++ b/sys/arm/conf/TEGRA124 @@ -111,7 +111,6 @@ device ums # USB mouse #device wlan_amrr # AMRR transmit rate control algorithm # PCI -options NEW_PCIB device pci # PCI Ethernet NICs that use the common MII bus controller code. From nobody Thu Feb 22 18:30:23 2024 X-Original-To: dev-commits-src-main@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 4TghXL1FrCz5B8Hw; Thu, 22 Feb 2024 18:30:26 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TghXL0jnqz4h24; Thu, 22 Feb 2024 18:30:26 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708626626; 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: in-reply-to:in-reply-to:references:references; bh=Q2LnYu3eX2GO09ZGDLboF5vWpgw19LTY1h3gKb6RwLs=; b=bOPyufXgPGWP9Su0FURVJmQkqzuAX74rhFLfb2JwTIUjeXSKd389rQJrP3H/X4Jo8ViV5i 0AQVC1Isr5LfVbHrFydfLfIzyU1lHh/k/XWioffL5hb3vQagIzldo7j5ePdysBzUMaD/j0 tXKr4bHnNJSIBb7EFI4Nqmdnwq7exkd0I46xpFsPE2v09JaoyJ5+nP0td1Mb4JyAxrPjqd QHhRrElAcsQOGwxs5dvT7Up/6OhfHv46J1PKpMsGXFoFkItl/GXG/ZRqS3+QJlNnFdvdP1 gJZTEl+DydemteP2uL8blp/eJi3Gt/zXH70exSfPWwS/n5WlZASeCqgWyMWD2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708626626; 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: in-reply-to:in-reply-to:references:references; bh=Q2LnYu3eX2GO09ZGDLboF5vWpgw19LTY1h3gKb6RwLs=; b=c/dq3RRGzWT49H1/3GRNUgJ9rTe7l8Bs7VH4nCM7oppiYTvigFG8wW6dXRvyowmlDoTANw jSRX0NQ4VQsX+m1LyKkYZ3obAyJ0xrSrcem1xMG5H2tj9RNvAYT2G055tHaDbIHtPncJ04 E+/gyJV6f7UvjZY+e5BoRWm7Une6Z4Ath2Dp8uH3cqfWE8sG9412iKisylibKby+YjY+Zb uhvSDyw4Q0L5f6SMNULI+qPeP0O0uSTQRmXFKEu2bpOjQI8Oo6R5IU2YaFglWOHYP53510 8FzMRs+T6x3X21FVk7lt3ZqS7YRYSgTG3+h9RPkgN4A15G21FcYCcQnhKQ1sPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708626626; a=rsa-sha256; cv=none; b=kqgkNyOV3MRgdFxjCaSCvVdw76zf9epMB/JovbIemBA5IUL4CdqJ+u6g0hDIn/98T92TUl NtReBTYW3x3EJI0qkzffXi718gCsx1Dnj+7BU0r2/C1ReEaFGNioHCdDTRzO4MIsd7jgP/ qFmFThfnvpr5cyMTdD8X7H/132U3olziIXzy4QpVVXNIrHsRyTIYTFIm82ydIRldhrijrW ECmMGBvUrMXhqe/Etd/QrCdrl2nAQ/CUcToCBNUyJcZhwfqO8hvnuKi889XTZfrB1zxKy7 j98Z91AxaKxKQ9iVC67RvBdGQ0PCv16oTknzHFOsvNjfQHrPQ0maaBeGNGXBEw== Received: from [IPV6:2601:644:937f:4c50:9110:97a:5df4:795c] (unknown [IPv6:2601:644:937f:4c50:9110:97a:5df4:795c]) (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) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TghXK2VFXzK7j; Thu, 22 Feb 2024 18:30:25 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <23101a96-4901-4086-bdbf-dfbab2b66e49@FreeBSD.org> Date: Thu, 22 Feb 2024 10:30:23 -0800 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 47e073941f4e - main - Import the kernel parts of bhyve/arm64 Content-Language: en-US To: Andrew Turner , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202402211855.41LItsm2033633@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202402211855.41LItsm2033633@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/21/24 10:55 AM, Andrew Turner wrote: > The branch main has been updated by andrew: > > URL: https://cgit.FreeBSD.org/src/commit/?id=47e073941f4e7ca6e9bde3fa65abbfcfed6bfa2b > > commit 47e073941f4e7ca6e9bde3fa65abbfcfed6bfa2b > Author: Andrew Turner > AuthorDate: 2024-01-09 15:22:27 +0000 > Commit: Andrew Turner > CommitDate: 2024-02-21 18:55:32 +0000 > > Import the kernel parts of bhyve/arm64 > > To support virtual machines on arm64 add the vmm code. This is based on > earlier work by Mihai Carabas and Alexandru Elisei at University > Politehnica of Bucharest, with further work by myself and Mark Johnston. > > All AArch64 CPUs should work, however only the GICv3 interrupt > controller is supported. There is initial support to allow the GICv2 > to be supported in the future. Only pure Armv8.0 virtualisation is > supported, the Virtualization Host Extensions are not currently used. > > With a separate userspace patch and U-Boot port FreeBSD guests are able > to boot to multiuser mode, and the hypervisor can be tested with the > kvm unit tests. Linux partially boots, but hangs before entering > userspace. Other operating systems are untested. > > Sponsored by: Arm Ltd > Sponsored by: Innovate UK > Sponsored by: The FreeBSD Foundation > Sponsored by: University Politehnica of Bucharest > Differential Revision: https://reviews.freebsd.org/D37428 FYI, sys/arm64/vmm/vmm.c shares a fair bit of code with sys/amd64/vmm/vmm.c and looks to be derived from the amd64 file, so I think it should preserve NetApp's copyright line in addition to Mihai's. -- John Baldwin From nobody Thu Feb 22 18:43:55 2024 X-Original-To: dev-commits-src-main@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 4Tghqv6NdLz5B9lg; Thu, 22 Feb 2024 18:43: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tghqv5pTHz4jxp; Thu, 22 Feb 2024 18:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708627435; 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=vQg6tamwgKK4w29TIsv210V3JQYcupjgwYfLJPGdeEY=; b=i6NGNOTdEt/e8LUJ696KNpUqqelFnCEaHtEuwkGDE7G+/nezcnLQupLxQZH0p6X9vLUPvJ 5faPw5OR1D7xEfwy9nAkxu1PrBe3QN83aoOuGQ4L+mTkMXfImCP+38lJ4pmucNMv+Qv9pM XjkzMPDJHN0FXf53b/dkvynllcOC297CbH4HIN0BR8CFP9MEBk7UUhqDijGXe1Nst+3yeN bVKeqgiN3h20/XdNsIL3FH55xS9dmW2AjP08mcBwQ2iHtC/oXewB7NVdQlsbafPu2F3pvw DdURodY/elsnkfIHa89bp4BOZ/tDKdL7YrS1dqlLX4ge6VjjeMJuxw3t2l3u5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708627435; 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=vQg6tamwgKK4w29TIsv210V3JQYcupjgwYfLJPGdeEY=; b=VXavkxG5hZS4C4LaL3MKFob3TPUjEbtxxlEyvJxjODVpSmUzREwGBW1uiEfJtlwZX4Ikmx h3Pws+nfPUazwE74KsC9QJuEHCEvjgoD1/y9QdnTopXbPh23xIxOReSpJK/KUTPjimsilL jNcATSH4g0S7EPG1Ge3/pYf8TJcLrHWvAXCmGHtDTZrKXGDBosWoToK8snfWuQ4beV9lqo s8Etc131Y31aMxO3pIaJzUJjLyyHuwometQmd4m5Or8q9y5av7HHkIo91dat3xOs6W+UAp i7lEeXio01HjFrta65EDuffOeepYn/FtlaJ/3yI9gh0MRu9D/xF6KFkG17AAfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708627435; a=rsa-sha256; cv=none; b=YDoYxs4GuTTC5yHH/qRmvM6Gc5I0+xDex6A9dhTTi/4poeFpnT1mdXknMjRbiOXbT5S8SZ 7Vv1EW83SWLD4uwxeMfqbZL7neICXhIDRsdGLA031OAuWH26fUrsUCkyh5RtWFYzPmT2iC vlsxwSSOck4b47Aldj7/8xw07KMjcvvc4elxFiIcUI20tB4jSE6L9+YaFq8xN9wqMk1mOi i4Gi+XULsigK0pdSkDwjJEVzWecdf+2nNuzZykb2+D6SPcxXMMGibLlD+3ezBQVkPLnZQF piblmLwn3xo1p4pkx+fPWeJ7A0C3jv1dtO3+Rcj9M2AUpMH68/yN/BRDvq133Q== 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 4Tghqv4lfYzjjs; Thu, 22 Feb 2024 18:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MIht5r052652; Thu, 22 Feb 2024 18:43:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MIhtVO052649; Thu, 22 Feb 2024 18:43:55 GMT (envelope-from git) Date: Thu, 22 Feb 2024 18:43:55 GMT Message-Id: <202402221843.41MIhtVO052649@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: f2fcb68074a5 - main - acpi: Defer reserving resources for ACPI devices List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f2fcb68074a51a8b399dc80d4c03fbe98a0ab92c Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f2fcb68074a51a8b399dc80d4c03fbe98a0ab92c commit f2fcb68074a51a8b399dc80d4c03fbe98a0ab92c Author: John Baldwin AuthorDate: 2024-02-22 18:43:43 +0000 Commit: John Baldwin CommitDate: 2024-02-22 18:43:43 +0000 acpi: Defer reserving resources for ACPI devices The goal of reserving firmware-assigned resources is to ensure that "wildcard" resource allocation requests will not claim an address range that is actually in use even if no attached driver is actively using that range. However, the current approach can break in some cases. In particular, ACPI can enumerate devices behind PCI bridges that don't show up in a normal PCI scan, but those device_t objects can end up as direct children of acpi0. Reserving resources for those devices directly from acpi0 ends up conflicting with later attempts to reserve the PCI bridge windows. As a workaround, defer reserving unclaimed resources until after the initial probe and attach scan. Eventually this pass of reserving unclaimed resources can be moved earlier, but it requires changes to other drivers in the tree to permit enumerating devices and reserving firmware-assigned resources in a depth-first traversal before attaching devices whose drivers request wildcard allocations. PR: 272507 Reported by: Justin Tocci Reported by: john@feith.com, many others Tested by: Oleg Sidorkin , dch --- sys/dev/acpica/acpi.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index 43aed279ab35..defca923e36c 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -1369,8 +1369,17 @@ acpi_sysres_alloc(device_t dev) } /* - * Reserve declared resources for devices found during attach once system - * resources have been allocated. + * Reserve declared resources for active devices found during the + * namespace scan once the boot-time attach of devices has completed. + * + * Ideally reserving firmware-assigned resources would work in a + * depth-first traversal of the device namespace, but this is + * complicated. In particular, not all resources are enumerated by + * ACPI (e.g. PCI bridges and devices enumerate their resources via + * other means). Some systems also enumerate devices via ACPI behind + * PCI bridges but without a matching a PCI device_t enumerated via + * PCI bus scanning, the device_t's end up as direct children of + * acpi0. Doing this scan late is not ideal, but works for now. */ static void acpi_reserve_resources(device_t dev) @@ -2257,9 +2266,6 @@ acpi_probe_children(device_t bus) /* Pre-allocate resources for our rman from any sysresource devices. */ acpi_sysres_alloc(bus); - /* Reserve resources already allocated to children. */ - acpi_reserve_resources(bus); - /* Create any static children by calling device identify methods. */ ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "device identify routines\n")); bus_generic_probe(bus); @@ -2268,6 +2274,12 @@ acpi_probe_children(device_t bus) ACPI_DEBUG_PRINT((ACPI_DB_OBJECTS, "acpi bus_generic_attach\n")); bus_generic_attach(bus); + /* + * Reserve resources allocated to children but not yet allocated + * by a driver. + */ + acpi_reserve_resources(bus); + /* Attach wake sysctls. */ acpi_wake_sysctl_walk(bus); From nobody Thu Feb 22 18:45:35 2024 X-Original-To: dev-commits-src-main@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 4Tghsr0jvDz5B9vJ; Thu, 22 Feb 2024 18:45: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tghsr0C2Pz4k0b; Thu, 22 Feb 2024 18:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708627536; 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=fHTXNyDVF9w7l7qh6V6RUSH6xD1bRnCVeAia1sOVWw8=; b=lVGUc8QWY81Jfjk2+4myZv94gWEFATRs0BscOKJ4Aj6pZyO1OICeT+Tly/ItYMBUlKiaCE aN+IGIL/nG42ZT9bh/NtyTR2Wx188NgqmizSoGn6ZxofcaLYmwkjZ7TvwMkPzbURj45syQ RqpCHfa4Nq6yCpAHfBI1Mh/bBGN1UpzjMpl19FANc65fWHoZ64BbGo5A/Wn1soa81RKGnI z/vf2DKtR2MaM4alTVdSJdKsaMpbT0/U9uLVQfVq9RjIHUE3GQgBmSsuQZSrA7Y1R/z7Ex zAIJ7hosiog2KPippGzAfpnPr0YVlx8swQ0ShYaMsZLrPAVaB6Sq5ChftvNYqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708627536; 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=fHTXNyDVF9w7l7qh6V6RUSH6xD1bRnCVeAia1sOVWw8=; b=iMk/GjQSzvMI3WKAJcEe2hU6yfSN7g/235FH8ZfkPJiA8DN7PzufWD9dK/yBp8dT4WMIem 9Y8pfrnz/GI5stqSYSE+ZsxihLJZ6XudAQzVOMBGSshPuT/AmrAR8V4tWHArhT3nMd+baJ 3lI8m0L3GhDGQAA2WOiRNLk71JWjwriOpqIWp1KLIrLdzkaEfrmfOUq0fx6nTmBz5UoFOa Tqq8LNasVQhWZOQvM8NSeOW7IB8JTNH979oBqaDQtstg7kYOqy+JKpXoXbG9zwugEj8uCB CuC65Rd1hAXOy7YXDEa6dSIWUBHBI06kaVzxQzXp3LlbwoxIRnLtp2zHAAMb0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708627536; a=rsa-sha256; cv=none; b=RrNPVU/BvgMEyIqf4z7s3VmLlf3QJh/7SeOfYPvfspOIBHbKeI4GIu+2ByvTuBcvtXZ5t2 hgw38SJUlwN8BKuJ2mbBmr6Elig4auVdiYPmMBeX0RBlJTUmo6SKtBZs/gF/JLT/IvDSmu 3qSnwy5tjSubQZEm1usG/OJUkBpS0xygVLu9b++wK4/rN7MWOLvJ0ev2kGYqEpK+82Bz8m zFBeSuu3xCV0otYHk7L4E/njRUSF3foPy8Z9LA9O9bD53JOZ7ZxBV0H+CkpN4l0MQ67DEm FbJocXYOR51Czd37uFjpYom5Rp/A8sHGbMtJ3vxM79LN8Ro2cszxTvVf8srEiA== 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 4Tghsq6MHLzk8C; Thu, 22 Feb 2024 18:45:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MIjZfq053069; Thu, 22 Feb 2024 18:45:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MIjZOk053066; Thu, 22 Feb 2024 18:45:35 GMT (envelope-from git) Date: Thu, 22 Feb 2024 18:45:35 GMT Message-Id: <202402221845.41MIjZOk053066@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Li-Wen Hsu Subject: git: 1b09a310b78c - main - Add link from if_iwlwifi(4) to iwlwifi(4) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b09a310b78cd2965e3a2fc392327d9cc1376a44 Auto-Submitted: auto-generated The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/src/commit/?id=1b09a310b78cd2965e3a2fc392327d9cc1376a44 commit 1b09a310b78cd2965e3a2fc392327d9cc1376a44 Author: Li-Wen Hsu AuthorDate: 2024-02-22 18:45:22 +0000 Commit: Li-Wen Hsu CommitDate: 2024-02-22 18:45:22 +0000 Add link from if_iwlwifi(4) to iwlwifi(4) MFC after: 3 days Sponsored by: The FreeBSD Foundation --- share/man/man4/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index ab951b107f27..cfa42afa6a71 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -690,6 +690,7 @@ MLINKS+=ipfirewall.4 ipaccounting.4 \ MLINKS+=ipheth.4 if_ipheth.4 MLINKS+=ipw.4 if_ipw.4 MLINKS+=iwi.4 if_iwi.4 +MLINKS+=iwlwifi.4 if_iwlwifi.4 MLINKS+=iwm.4 if_iwm.4 MLINKS+=iwn.4 if_iwn.4 MLINKS+=ixgbe.4 ix.4 From nobody Thu Feb 22 19:40:20 2024 X-Original-To: dev-commits-src-main@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 4Tgk503rlsz5BGYJ; Thu, 22 Feb 2024 19:40:20 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tgk5037Kkz4pW9; Thu, 22 Feb 2024 19:40:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708630820; 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=liZWINqpIXrXclOsBgLKecN420Eebf7fGjRiQN85b2U=; b=JJfCpoE2CJbE21RFlSLFm+PI3cRIKRmuRE6chlUem70I+qBTWgC0GuROar9FJiVkyDn11s GVhzonlGfV6h7+wK2CIBvR3HTEQtIg7m4lIVa/Y4CjuF/YAzzH0JmZzGgvqOkZD+8XcfCB oANr8sBjJ5vHvyLJF0KgC8ay6K4RiAz41Y/3e02MaQvlXiXXyEIdIniFPJD1Q3SWh8Gck5 UAzKYn8XJuCermIvAKT/fBeH26y8IRqeBcg0KguCh0IaY813laAgg0DjFZcgKn/RHXMXqN +KavwEOwuMF1qJtEkFlFvQj2gffMY1JLk8DbNVPj7gHBe8x9PjSfYl/PjKTusw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708630820; 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=liZWINqpIXrXclOsBgLKecN420Eebf7fGjRiQN85b2U=; b=GXUSqBpLZEtOZc4RPWOhhCIQJ4GjoUQ7fUZprPkrvjE+e8Wq7bGqXDBzLAgcd3aKrJfdbm wZjnhYQ/672CYKS0fCHygyeOmwr+CjYRftz0XpNV+ZHe84UKYkFcpeU8cM6F8b5ai7Hx6I aiWJIUZiplPVwfjREwUiGXFp4SUtxfEaKg54wGriEZ5QLappSZ+eujcjn51j5uEt4b5g2g fTwPCtvJZcgfsltd+RrHR4ybPM6jfv2dbSiVgnWZahWSyqou/8nvW9FE6O3gbokj+r6tOv Yi/92C21vQWO1I42XhmbhCv4Lt87QwZB1flD2VtY/jbUft3UYApLyyCIKNbAXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708630820; a=rsa-sha256; cv=none; b=kb3ERx2BZhR1rlspw+vI0ihvkU5iaZOV38J7byT5seVqLHugHyzScp+33TD4obfUMi/Rss XDChM9SWORljP3pTGCxheKKcA5x6ar08nzHAGuDpd3Bz/uP8nOozTtvbJqulyvrToIIbyZ fYOltf0+mw0Cz2S9XtW0Rl2+Cnpxjb8OvDqerlYRPHHX4D/krHNEjZio8tkSdDlKTmubbE 3DicvOFUpAQ3A7cvUUtsdWzETeh0stSrkSaMGE/qAT6GauFZNOtXOhtGyen+pg6po2YoYM 2+P8973xGVAawibB6jpQoTaFTprLx00/+eomF3WGgcOWnwEydsE5gL+y1tjVpQ== 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 4Tgk5022NqzkxZ; Thu, 22 Feb 2024 19:40:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MJeKMN047307; Thu, 22 Feb 2024 19:40:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MJeK4b047304; Thu, 22 Feb 2024 19:40:20 GMT (envelope-from git) Date: Thu, 22 Feb 2024 19:40:20 GMT Message-Id: <202402221940.41MJeK4b047304@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: d646dca3bc1b - main - bge(4): Fix some typos in source code comments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: d646dca3bc1bbd3bfd38bc5ed375d7a346768dcf Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d646dca3bc1bbd3bfd38bc5ed375d7a346768dcf commit d646dca3bc1bbd3bfd38bc5ed375d7a346768dcf Author: Gordon Bergling AuthorDate: 2024-02-22 19:38:50 +0000 Commit: Gordon Bergling CommitDate: 2024-02-22 19:40:10 +0000 bge(4): Fix some typos in source code comments - s/firwmare/firmware/ - s/recue/reduce/ - s/throughpout/throughput/ - s/hardwares/hardware/ Obtainted from: NetBSD MFC after: 3 days --- sys/dev/bge/if_bge.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index ce4d0856f447..15cd3b0df8e9 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -701,7 +701,7 @@ bge_ape_read_fw_ver(struct bge_softc *sc) sc->bge_mfw_flags |= BGE_MFW_ON_APE; - /* Fetch the APE firwmare type and version. */ + /* Fetch the APE firmware type and version. */ apedata = APE_READ_4(sc, BGE_APE_FW_VERSION); features = APE_READ_4(sc, BGE_APE_FW_FEATURES); if ((features & BGE_APE_FW_FEATURE_NCSI) != 0) { @@ -2159,7 +2159,7 @@ bge_blockinit(struct bge_softc *sc) * The BD ring replenish thresholds control how often the * hardware fetches new BD's from the producer rings in host * memory. Setting the value too low on a busy system can - * starve the hardware and recue the throughpout. + * starve the hardware and reduce the throughput. * * Set the BD ring replentish thresholds. The recommended * values are 1/8th the number of descriptors allocated to @@ -2295,7 +2295,7 @@ bge_blockinit(struct bge_softc *sc) */ CSR_WRITE_4(sc, BGE_RXLP_CFG, 0x181); - /* Inialize RX list placement stats mask. */ + /* Initialize RX list placement stats mask. */ CSR_WRITE_4(sc, BGE_RXLP_STATS_ENABLE_MASK, 0x007FFFFF); CSR_WRITE_4(sc, BGE_RXLP_STATS_CTL, 0x1); @@ -3536,7 +3536,7 @@ bge_attach(device_t dev) * known bug which can't handle TSO if Ethernet header + IP/TCP * header is greater than 80 bytes. A workaround for the TSO * bug exist but it seems it's too expensive than not using - * TSO at all. Some hardwares also have the TSO bug so limit + * TSO at all. Some hardware also have the TSO bug so limit * the TSO to the controllers that are not affected TSO issues * (e.g. 5755 or higher). */ From nobody Thu Feb 22 20:10:48 2024 X-Original-To: dev-commits-src-main@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 4TgkmR0LQJz5BKBR for ; Thu, 22 Feb 2024 20:11:03 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) (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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgkmQ5dpgz4s3R for ; Thu, 22 Feb 2024 20:11:02 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-564647bcdbfso26256a12.2 for ; Thu, 22 Feb 2024 12:11:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1708632660; x=1709237460; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=xN2jAPHWu1hUzRDZcsqA/Far3O8FpaiMVVbq4GuoqoM=; b=qvuoFyd/9qW0f0/DBKdCQAcYkL+sX8uoB6MDI1RxBWmHlYm8MEb7gDGHmMgzrVB3jE dOHYOKSgpNmcsiMTieh49thg4/OF5atMzaONAE+HvQOfGoyD1vAnBADs9EBNAOV3zJi8 w2tIx7tpAb1VTDzxp4cT/Nfi6bpCQCExVu+CUUVLTbU2bpRNYan+s0I2ptYNl02leWIZ Ov8wQlFemeXQtTd7Gh9keJZqe9sofE+qGjUV/wM4IpTaiRVowcYWP3VRzQgB2Dx/GnWk VR9NL9hQoAybd96/59o01EVx9gS/7o5v1qP3B2ZgaI+G2HO2GeASPQ7oOh5afEZFWOlv pW2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708632660; x=1709237460; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xN2jAPHWu1hUzRDZcsqA/Far3O8FpaiMVVbq4GuoqoM=; b=urrF1VsTrnRJEys6K20TVRxciZYZK0KIVV8P3yM9YawoxlaCwkSJJZ1Y7jUEp1AQlE cK9326cIj0WdCPTjJkZYslMvKz4hNm6WQUA21KSZnikPGjgbXKwD7I2cLvD7eEu4kl0d +qDFxmZGx83qyLe4HZVQxUQ/Ozv92q7d9O8xOYXL7a4XmvL+74B/koKLZ4f+cW+Xe+OT AvFWcaZ5voVbqGmB3FRO/lzQWnbR/lnL7fNbhbgkmcmmVNa4B0HKO4rJwW2RafK1GLxc 4aNuW69V6RKTbYSxX2etaXdYoC+WHwzVKzIK4PLsbAsk+Cyw4Jhdk5sO+zo3OKN9FkH7 +EFw== X-Forwarded-Encrypted: i=1; AJvYcCUPCBHGsPxHNARYO9kTD0MZpsDoqfz1lqYBOTl2viytIm/HUQENH/gHSKMXdRBbw+Fz/GKlwsSlrawIPbSQM+224HpFuUBCU+nNunexOuJ9XQ== X-Gm-Message-State: AOJu0Ywa1Zbnu1YlyA6SJend8gSoZZJzDwFYFgTVBWb1e4urAAww9Dy8 YqxnskJCynCF99kyfPX0zjcNlvzUbPobPDLMzqSOpnMOGVuYQzDKw4b2Z94+z3YfVJHJDsPLAEr l8IuFwvG7By8zqM3v/GtUhdIWkwWNz7csXjqo+g== X-Google-Smtp-Source: AGHT+IH/gBt3b+6GzPE8Ve9z3CzVlXs3S5IOdvyFVEE61J/vWNZlAm0r6XGBWx9wfAsutMWZbQg1T3xPoTYO11izg30= X-Received: by 2002:aa7:d713:0:b0:564:3b2e:2a2e with SMTP id t19-20020aa7d713000000b005643b2e2a2emr9298621edq.9.1708632659990; Thu, 22 Feb 2024 12:10:59 -0800 (PST) List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 References: <202402211855.41LItsm2033633@gitrepo.freebsd.org> <23101a96-4901-4086-bdbf-dfbab2b66e49@FreeBSD.org> In-Reply-To: <23101a96-4901-4086-bdbf-dfbab2b66e49@FreeBSD.org> From: Warner Losh Date: Thu, 22 Feb 2024 13:10:48 -0700 Message-ID: Subject: Re: git: 47e073941f4e - main - Import the kernel parts of bhyve/arm64 To: John Baldwin Cc: Andrew Turner , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000c02ced0611fe0a4f" X-Spamd-Bar: ---- X-Rspamd-Queue-Id: 4TgkmQ5dpgz4s3R X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] --000000000000c02ced0611fe0a4f Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Feb 22, 2024 at 11:30=E2=80=AFAM John Baldwin wro= te: > On 2/21/24 10:55 AM, Andrew Turner wrote: > > The branch main has been updated by andrew: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D47e073941f4e7ca6e9bde3fa65abbfc= fed6bfa2b > > > > commit 47e073941f4e7ca6e9bde3fa65abbfcfed6bfa2b > > Author: Andrew Turner > > AuthorDate: 2024-01-09 15:22:27 +0000 > > Commit: Andrew Turner > > CommitDate: 2024-02-21 18:55:32 +0000 > > > > Import the kernel parts of bhyve/arm64 > > > > To support virtual machines on arm64 add the vmm code. This is > based on > > earlier work by Mihai Carabas and Alexandru Elisei at University > > Politehnica of Bucharest, with further work by myself and Mark > Johnston. > > > > All AArch64 CPUs should work, however only the GICv3 interrupt > > controller is supported. There is initial support to allow the GIC= v2 > > to be supported in the future. Only pure Armv8.0 virtualisation is > > supported, the Virtualization Host Extensions are not currently > used. > > > > With a separate userspace patch and U-Boot port FreeBSD guests are > able > > to boot to multiuser mode, and the hypervisor can be tested with t= he > > kvm unit tests. Linux partially boots, but hangs before entering > > userspace. Other operating systems are untested. > > > > Sponsored by: Arm Ltd > > Sponsored by: Innovate UK > > Sponsored by: The FreeBSD Foundation > > Sponsored by: University Politehnica of Bucharest > > Differential Revision: https://reviews.freebsd.org/D37428 > > FYI, sys/arm64/vmm/vmm.c shares a fair bit of code with sys/amd64/vmm/vmm= .c > and looks to be derived from the amd64 file, so I think it should preserv= e > NetApp's copyright line in addition to Mihai's. > In general, the advice I've been giving is that one should retain copyrights when there's at least 10%-20% remaining of the original work. And one should hesitate to add them unless you've contributed 10%-20% or more to the work (ideally more, but sometimes that's gets squishy because the underlying law is based on words like substantial and de-minimus, which don't translate well to line counts, and for large works what is substantial can be a bit subjective). If they share so much, maybe we should also look at sharing directly, rather than by cut and paste in the future. Warner --000000000000c02ced0611fe0a4f Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Feb 22, 2024 at 11:30=E2=80= =AFAM John Baldwin <jhb@freebsd.org> wrote:
On= 2/21/24 10:55 AM, Andrew Turner wrote:
> The branch main has been updated by andrew:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3D47e073941f4e7ca6e9bde3fa65abbfcfed6bfa2b<= /a>
>
> commit 47e073941f4e7ca6e9bde3fa65abbfcfed6bfa2b
> Author:=C2=A0 =C2=A0 =C2=A0Andrew Turner <andrew@FreeBSD.org> > AuthorDate: 2024-01-09 15:22:27 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Andrew Turner <andrew@FreeBSD.org> > CommitDate: 2024-02-21 18:55:32 +0000
>
>=C2=A0 =C2=A0 =C2=A0 Import the kernel parts of bhyve/arm64
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 To support virtual machines on arm64 add the vmm c= ode. This is based on
>=C2=A0 =C2=A0 =C2=A0 earlier work by Mihai Carabas and Alexandru Elisei= at University
>=C2=A0 =C2=A0 =C2=A0 Politehnica of Bucharest, with further work by mys= elf and Mark Johnston.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 All AArch64 CPUs should work, however only the GIC= v3 interrupt
>=C2=A0 =C2=A0 =C2=A0 controller is supported. There is initial support = to allow the GICv2
>=C2=A0 =C2=A0 =C2=A0 to be supported in the future. Only pure Armv8.0 v= irtualisation is
>=C2=A0 =C2=A0 =C2=A0 supported, the Virtualization Host Extensions are = not currently used.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 With a separate userspace patch and U-Boot port Fr= eeBSD guests are able
>=C2=A0 =C2=A0 =C2=A0 to boot to multiuser mode, and the hypervisor can = be tested with the
>=C2=A0 =C2=A0 =C2=A0 kvm unit tests. Linux partially boots, but hangs b= efore entering
>=C2=A0 =C2=A0 =C2=A0 userspace. Other operating systems are untested. >=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0Arm Ltd
>=C2=A0 =C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0Innovate UK
>=C2=A0 =C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0The FreeBSD Foundation >=C2=A0 =C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0University Politehnica o= f Bucharest
>=C2=A0 =C2=A0 =C2=A0 Differential Revision:=C2=A0 https://revi= ews.freebsd.org/D37428

FYI, sys/arm64/vmm/vmm.c shares a fair bit of code with sys/amd64/vmm/vmm.c=
and looks to be derived from the amd64 file, so I think it should preserve<= br> NetApp's copyright line in addition to Mihai's.

In general, the advice I've been giving is that one sh= ould retain copyrights when
there's at least 10%-20% remainin= g of the original work. And one should hesitate to add
them unles= s you've contributed=C2=A010%-20% or more to the work (ideally more, bu= t sometimes
that's gets squishy because the underlying law is= based on words like substantial
and de-minimus, which don't = translate well to line counts, and for large works what
is substa= ntial can be a bit subjective).

If they share so m= uch, maybe we should also look at sharing directly, rather than by
cut and paste in the future.

Warner
<= /div> --000000000000c02ced0611fe0a4f-- From nobody Thu Feb 22 20:56:21 2024 X-Original-To: dev-commits-src-main@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 4Tglmj4Xgcz5BPJQ; Thu, 22 Feb 2024 20:56:21 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tglmj40lvz3wvK; Thu, 22 Feb 2024 20:56:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708635381; 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=OIpEA8QI7YIPYyr7kqvScof02SoPH7yc5yG76E/FeHk=; b=BjFHRT4vcbve78rMEYcJVag5AqOTG4zDdtSdEYLzHSDeiGHznde8vrMr4ZzZHAhVMQjRYH UMxTXDb/V2DHx5MusNsVjZvzV17+cBfqwC0s5HOmJ2Fyta7lbXDVnIph+yzl8ClH3eHtEP rpLUZPMjEooy4MpGE4rVnVrB0fLewCb2XSEQmSkAAQJyp14ps0I6CRLQ1k0pfTmNAZ64Jg rXnBSb0qwylqXliDDigy20yVXe/4Sz+b+4EgtwqX0d6DO225s6Mt1C8tC++ndEPY0AZ5A+ KFI0skqqTJ30RMz+L3USB3vDnLr//zgFrX3U8itxek0YiDkDoXvgJ2cM5JkSWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708635381; 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=OIpEA8QI7YIPYyr7kqvScof02SoPH7yc5yG76E/FeHk=; b=EldjmV6l0uc2QVAgTjfw4+dl4osTPM7g0JhG+qwK3KxUG+Kd1aAGLMFUuXT8rYT16dLtPh OnLJzV6zOMX6zc4J6sWa4DTqIQ1W+J2/LiFG/v/sIELLRBIBK/XVBvpN13pI/e84iygE7X Er/I4bV51XvSY93+op9+hDUeM2xHrVyRJsNz6Tk31lgruzxVedQXnvz+eAlSnmVREFiwlw wKop0CW+rjIj3rFz/9I+2sLFpWSNVyheqEOYekAF2EU1JrmVeIpoYHemxxuB3rSac6sd1B sb4DOXRmN4nYLD1VHK4upSozKfc/vOZwuokEpAajFLxbWS8f8uZZB80pPEfm7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708635381; a=rsa-sha256; cv=none; b=Ng05iAwHAmGOEElkpD5MhafBzxj03do+MDodt2yO4/Ckh+YrIGcs3OzapSMc668u/zbZHt oi9wsDL4eR+anheVlt7lGYncSrVGnaL+4svxbXm1ghNewZWFvNq84iIQOidXIUd8E2wtW9 ys3Zloyg4Fq0t9LR5ly5tKvUGEBw6v3p/s+kWnpGxhTnUIrx3l1Job4Y4Jcn8dzv+ifLqO iNhfgj0/nNRmaT6ly4tko02sQu9x7aHko9mOTyiirkSfZaxQjJIZAjz9zDC1z8Bb8fuHZl SR1dICM9Ex+CylfnnW1I7YSNQg8mcYyJuJadq1BnPGfXbFoh/Bu9xD+TAHtT0w== 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 4Tglmj33Y1zn8H; Thu, 22 Feb 2024 20:56:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MKuLFr072406; Thu, 22 Feb 2024 20:56:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MKuL5Z072403; Thu, 22 Feb 2024 20:56:21 GMT (envelope-from git) Date: Thu, 22 Feb 2024 20:56:21 GMT Message-Id: <202402222056.41MKuL5Z072403@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: ff6b71c2b214 - main - rescue: Stop using LDADD_zstd List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ff6b71c2b214c8a22c53c79228ef51e445508cc2 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=ff6b71c2b214c8a22c53c79228ef51e445508cc2 commit ff6b71c2b214c8a22c53c79228ef51e445508cc2 Author: Jessica Clarke AuthorDate: 2024-02-22 20:56:05 +0000 Commit: Jessica Clarke CommitDate: 2024-02-22 20:56:05 +0000 rescue: Stop using LDADD_zstd Ideally we'd be able to use LDADD_foo here for all our various libs and get the implicit dependencies, but rescue is a bit special. Historically this was just used to pick up the "private" in the name automatically (as far as I can tell), but now that _DP_pthread includes c we end up pulling in a -lc from this (along with -lcompiler_rt and -lsys). This results in -lc being before -lmd (and after, implictly, from the compiler driver), which, for the specific situation here, results in both libc.a's and libmd.a's md5c.o being included, giving duplicate definitions of _libmd_MD5Init and other symbols. With LLD 16+ we currently make that not an error for other reasons (which should probably be fixed), but not for older versions, nor for BFD, and so the build fails. Fix all this by just using -lprivatezstd in place of LDADD_zstd, which results in the exact same clang command line as we used to have prior to adding c (and sys) to _DP_pthread when linking rescue. Note that bsdbox already uses -lprivatezstd rather than LDADD_zstd. This reverts commit 5fead429ebb3800fdd3fc0817d2c330b2a8d640f. Reviewed by: imp Fixes: 99ea67573164 ("lib{c,sys}: move auxargs more firmly into libsys") --- rescue/rescue/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 5d5c609eb218..c1ba22885618 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -216,7 +216,7 @@ CRUNCH_ALIAS_xz= unxz lzma unlzma xzcat lzcat CRUNCH_PROGS_usr.bin+= zstd CRUNCH_ALIAS_zstd= unzstd zstdcat zstdmt -CRUNCH_LIBS+= ${LDADD_zstd} +CRUNCH_LIBS+= -lprivatezstd CRUNCH_PROGS_usr.bin+= fetch CRUNCH_LIBS+= -lfetch From nobody Thu Feb 22 22:39:31 2024 X-Original-To: dev-commits-src-main@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 4Tgp3m0wFZz5BZHB; Thu, 22 Feb 2024 22:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tgp3l6LZDz4F4G; Thu, 22 Feb 2024 22:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708641571; 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=M78agfIl0bxjeBcuSEjLoJqBDsn+MXjloSOW5ScPQA0=; b=StyzmTrtgueQPmMqwS9Xf5uKyPCmOaLTya2upP1OoJubX+JawhZLfJERhfDRKpZphRl9ll StZMuxbGbOpN5msl7VyJU9y8mPI3d17GSzfm+FTtbD1qBRj5BSxhzkVXSoh1BYhz7exJ+t JR3Q4sBntepS6lS5OMBYHxlM+EDJ953QC4dK5Px/Nzgff9DPgUOELAmk2WitQeKMUIASn2 yALcQaa63Nd7Nn5miNPu4gjb7ktyPBy8cQu2n3H6VFw82puh014vkn2j2K7I5DAsW8Yzuz OGvSf1E7ylopi4bs+ejVzuYEpHeDFk8/aFCqJRVyknlW3iY5hv6B8upcy2eXwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708641571; 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=M78agfIl0bxjeBcuSEjLoJqBDsn+MXjloSOW5ScPQA0=; b=SzemRMQCEJMu06Hq2M6XPU6lL9tHcualCb3grzDpbX4BlZRJYesu75Op9pKMcDFMWYjv/B JNQ2FVI1hJV/HGIQWJSHgLgO6CixkviAw3AF/1B2x5HYwR6NxzcRKPYEGeYj1xJENbCFS0 PeOERxItlpzeozj3pOLTdP67HAhFrA/OecBioZUopENmd4En6IB/G4QmPLVIV+zaHsNzZM 95nRJKIk0Ii4zt/bpOc2dmYplq+2yuLfNJhngirvVzOElpG8gshncjXeTOUqnzvSkSUYEh 8TGnyN4FhA72z1O5a7Q1Z+o4RStPq3eJcAylAjWccoh5qrAm58Yb8w+Hip83Fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708641571; a=rsa-sha256; cv=none; b=V0uhTqe0PGBZTVkK9N+8OpdV36Rg7oCJGhEUUMsrAWZ0TcLcykEeJVcjgqGTZ0ZuP5u7+h jo5PcszJxrmF65yvdODsGNyDsw3/MQstPrIrEARZ5f9LWHTGCxVR37BjJnL5b6ISHdcXUV NjuvV29HMIZPYXzHk993FIfEtIyXrT0ZZGuuhVrRhNZ/DQMjHdJIzmguu1JBlOpD+Tg9wJ NYyvgDygYwPxu5S8B12EIn7sxzuKJlyYG74BwCFr6PrkIr/LecED0msh6LnlM/tyR5DCMr 7knIECWuSpjnl/L+KxhRbQF39cTuGVhRUmo3+5GibFSArVrB69qhShzI6wmFBg== 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 4Tgp3l5PTQzqf9; Thu, 22 Feb 2024 22:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MMdVrQ043471; Thu, 22 Feb 2024 22:39:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MMdVHX043468; Thu, 22 Feb 2024 22:39:31 GMT (envelope-from git) Date: Thu, 22 Feb 2024 22:39:31 GMT Message-Id: <202402222239.41MMdVHX043468@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 89c1e54a71cc - main - ath(4): always enable 11n List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89c1e54a71cc4e04d4c575ee6df956a12e163cde Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=89c1e54a71cc4e04d4c575ee6df956a12e163cde commit 89c1e54a71cc4e04d4c575ee6df956a12e163cde Author: Bjoern A. Zeeb AuthorDate: 2024-02-18 18:16:24 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-22 22:34:17 +0000 ath(4): always enable 11n Enabling 11n for ath(4) so far was handled by a kernel option, which was only enabled for certain kernel configurations. In order to allow loading ath(4) as a module with 11n support on all platforms, remove the kernel option and unconditionally enable 11n in ath(4). Reported by: pkubaj Discussed with: adrian in D43549. Reviewed by: adrian, imp Differential Revision: https://reviews.freebsd.org/D43964 --- sys/amd64/conf/GENERIC | 1 - sys/arm/conf/ARMADA38X | 1 - sys/conf/options | 1 - sys/dev/ath/if_athvar.h | 1 + sys/i386/conf/GENERIC | 1 - sys/powerpc/conf/GENERIC64 | 1 - sys/powerpc/conf/GENERIC64LE | 1 - 7 files changed, 1 insertion(+), 6 deletions(-) diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 1c1fde99ba8e..cfdfb2c89d4a 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -305,7 +305,6 @@ device wlan_amrr # AMRR transmit rate control algorithm device ath # Atheros CardBus/PCI NICs device ath_hal # Atheros CardBus/PCI chip support options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation -options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath #device bwi # Broadcom BCM430x/BCM431x wireless NICs. #device bwn # Broadcom BCM43xx wireless NICs. diff --git a/sys/arm/conf/ARMADA38X b/sys/arm/conf/ARMADA38X index d0c7ddcef60b..bb7ef098f350 100644 --- a/sys/arm/conf/ARMADA38X +++ b/sys/arm/conf/ARMADA38X @@ -90,7 +90,6 @@ device wlan # 802.11 support device ath # Atheros CardBus/PCI NICs device ath_hal device ath_rate_sample -options ATH_ENABLE_11N # CESA device cesa diff --git a/sys/conf/options b/sys/conf/options index f20e43aad962..555484360a2b 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -816,7 +816,6 @@ ATH_TXBUF opt_ath.h ATH_RXBUF opt_ath.h ATH_DIAGAPI opt_ath.h ATH_TX99_DIAG opt_ath.h -ATH_ENABLE_11N opt_ath.h ATH_ENABLE_DFS opt_ath.h ATH_EEPROM_FIRMWARE opt_ath.h ATH_ENABLE_RADIOTAP_VENDOR_EXT opt_ath.h diff --git a/sys/dev/ath/if_athvar.h b/sys/dev/ath/if_athvar.h index f706b360946a..96c4318d5987 100644 --- a/sys/dev/ath/if_athvar.h +++ b/sys/dev/ath/if_athvar.h @@ -59,6 +59,7 @@ /* * 802.11n requires more TX and RX buffers to do AMPDU. */ +#define ATH_ENABLE_11N /* 802.11n support for AR5416 and later */ #ifdef ATH_ENABLE_11N #define ATH_TXBUF 512 #define ATH_RXBUF 512 diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index 948c44114d7d..461a21fe7b70 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -261,7 +261,6 @@ device wlan_amrr # AMRR transmit rate control algorithm device ath # Atheros CardBus/PCI NICs device ath_hal # Atheros CardBus/PCI chip support options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation -options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath #device bwi # Broadcom BCM430x/BCM431x wireless NICs. #device bwn # Broadcom BCM43xx wireless NICs. diff --git a/sys/powerpc/conf/GENERIC64 b/sys/powerpc/conf/GENERIC64 index ac041c420ee0..9d2de9c8095b 100644 --- a/sys/powerpc/conf/GENERIC64 +++ b/sys/powerpc/conf/GENERIC64 @@ -244,7 +244,6 @@ device wlan_amrr # AMRR transmit rate control algorithm device ath # Atheros CardBus/PCI NICs device ath_hal # Atheros CardBus/PCI chip support options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation -options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath # FireWire support diff --git a/sys/powerpc/conf/GENERIC64LE b/sys/powerpc/conf/GENERIC64LE index d90018802d37..6ca1a01e5969 100644 --- a/sys/powerpc/conf/GENERIC64LE +++ b/sys/powerpc/conf/GENERIC64LE @@ -240,7 +240,6 @@ device wlan_amrr # AMRR transmit rate control algorithm device ath # Atheros CardBus/PCI NICs device ath_hal # Atheros CardBus/PCI chip support options AH_AR5416_INTERRUPT_MITIGATION # AR5416 interrupt mitigation -options ATH_ENABLE_11N # Enable 802.11n support for AR5416 and later device ath_rate_sample # SampleRate tx rate control for ath # FireWire support From nobody Thu Feb 22 22:44:55 2024 X-Original-To: dev-commits-src-main@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 4Tgp9z6Cjrz5Bb3b; Thu, 22 Feb 2024 22:44: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tgp9z5jp6z4FrK; Thu, 22 Feb 2024 22:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708641895; 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=Z9cNSwx1WRBis7tQtkb5yukqOUUd893FQxM/pDOikeM=; b=TnrSkfrFMsJs3WFlKiu0cpy0p0ydh1TjIUrVMWqvv/XAQG1Uv6lmyxM4KgqmcXNSSK2DRj Gq4ZiN8bTN2Can2UMI8JHfI53Q0MujJUI1VWRCJTsEACSYkozeqL4ZY4+XvwtrBnGCVHK3 Tn8bjYKZxYZtown10A6rK+Ot9mDVirjsCalZoJ7vUppcdabU+t3fs1HFTR+3aGZ0p3qYQ3 nGAFtnwIKaFdaVli3XSg1brU82z5UU7k1ar3f09gkykwnljFbkeYq5r3jyCv0u+nxslvo5 +JpQ4T+wVb9H9lDzB8b7xCZxdxOybmiFgTYVLxqQZrsP3IHidhZjcnjeTai9zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708641895; 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=Z9cNSwx1WRBis7tQtkb5yukqOUUd893FQxM/pDOikeM=; b=vU6m1A/kpJXLXKyKk5x/1Wad52Hvnsm/CFh03FEpXC9ce8IGvWmSzNsNg1YwGbsurOsfGU gn9G/msyDwlmtAUU9XUZHYjIuJLrIYI4otM/V4OE/gXPLGw0F6wh3msYq2kHYZU47XpcQT trTtLwqjdSvQSouHUdPEfNcUn90vDHMqIcYF1HgSiWlmpYg0GSoEsefuE4e2UdMXAcmzxH 4d07KlNihpI2skZJGGoqZ0b/316ps3/XNcAp4xSZxcgbioz+ySKyaNDgbh4nAlOoXuZXWh Gp5dp4QuOvnbManW7zPSOQHLh8G25z+lbgZGQoBvpB9G9Fs4KwtllO0bPZpYKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708641895; a=rsa-sha256; cv=none; b=RxGqvrxyH/HfeVbWDaqb5ohyPU+ZepxLvxGbNSH6Kr3/CmKvSNwI3UUcG/ikO2hDCa29Rx Zdp1aJg2Qr1iu3zzFjf3hj3idO4mNrAxTItk6hP0KBZqpxEDmpijLzKUi+EeKCcfqC1TYb 2Gz678GUNlzKG/dVeM3OBAWzW5BlYsmZOOD/YrzBBpMgvxueYmeHYCDTKPbctGS+he7QB+ tgRtBglZd+AgTd+J1xL1EvLcWKoMDqY7TyXmI6FuzN4PconWDiA7RIgfs1iJhg41iV3kUh Xw96B2OduvFbXerZyriq5LCtD8Dfz291klUYES5e7ndy+QnYAzlkcmYP6r7bfA== 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 4Tgp9z4ndfzqcd; Thu, 22 Feb 2024 22:44:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MMit8v059869; Thu, 22 Feb 2024 22:44:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MMit0n059866; Thu, 22 Feb 2024 22:44:55 GMT (envelope-from git) Date: Thu, 22 Feb 2024 22:44:55 GMT Message-Id: <202402222244.41MMit0n059866@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 46a968ecfb57 - main - dev/uart: name uart_class_set DATA_SET macro UART_CLASS() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 46a968ecfb57ed3e7429c5ca9b184a8efe4e3d83 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=46a968ecfb57ed3e7429c5ca9b184a8efe4e3d83 commit 46a968ecfb57ed3e7429c5ca9b184a8efe4e3d83 Author: Bjoern A. Zeeb AuthorDate: 2024-02-19 20:40:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-22 22:43:22 +0000 dev/uart: name uart_class_set DATA_SET macro UART_CLASS() Use the macro "UART_CLASS()" for the newly created data set 'uart_class_set' as we do for other data sets. This further hides the data set name. Also add UART_CLASS for quicc, which was previously not done. MFC after: 1 week Improves: 949670f8f466 dev/uart: Use a linker set to find uart classes Obtained from: jhb, https://github.com/freebsd/freebsd/commit/269e99ac86902127bfaee1500d8747a3c7be5912 Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D43981 --- sys/dev/uart/uart_bus.h | 3 +++ sys/dev/uart/uart_dev_ns8250.c | 2 +- sys/dev/uart/uart_dev_pl011.c | 2 +- sys/dev/uart/uart_dev_quicc.c | 1 + sys/dev/uart/uart_dev_z8530.c | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sys/dev/uart/uart_bus.h b/sys/dev/uart/uart_bus.h index e42ab7f5f0ba..ccf8ad06a8ec 100644 --- a/sys/dev/uart/uart_bus.h +++ b/sys/dev/uart/uart_bus.h @@ -70,6 +70,9 @@ struct uart_class { u_int uc_riowidth; /* Default reg io width for this device. */ }; +#define UART_CLASS(class) \ + DATA_SET(uart_class_set, class) + struct uart_softc { KOBJ_FIELDS; struct uart_class *sc_class; diff --git a/sys/dev/uart/uart_dev_ns8250.c b/sys/dev/uart/uart_dev_ns8250.c index f660639862ff..16c3cb2fc5a9 100644 --- a/sys/dev/uart/uart_dev_ns8250.c +++ b/sys/dev/uart/uart_dev_ns8250.c @@ -451,7 +451,7 @@ struct uart_class uart_ns8250_class = { .uc_rclk = DEFAULT_RCLK, .uc_rshift = 0 }; -DATA_SET(uart_class_set, uart_ns8250_class); +UART_CLASS(uart_ns8250_class); /* * XXX -- refactor out ACPI and FDT ifdefs diff --git a/sys/dev/uart/uart_dev_pl011.c b/sys/dev/uart/uart_dev_pl011.c index d91ae256f2a3..daba9d19704c 100644 --- a/sys/dev/uart/uart_dev_pl011.c +++ b/sys/dev/uart/uart_dev_pl011.c @@ -340,7 +340,7 @@ static struct uart_class uart_pl011_class = { .uc_rclk = 0, .uc_rshift = 2 }; -DATA_SET(uart_class_set, uart_pl011_class); +UART_CLASS(uart_pl011_class); #ifdef FDT static struct ofw_compat_data fdt_compat_data[] = { diff --git a/sys/dev/uart/uart_dev_quicc.c b/sys/dev/uart/uart_dev_quicc.c index 444efb8c933d..bd735f2da6f4 100644 --- a/sys/dev/uart/uart_dev_quicc.c +++ b/sys/dev/uart/uart_dev_quicc.c @@ -273,6 +273,7 @@ struct uart_class uart_quicc_class = { .uc_rclk = DEFAULT_RCLK, .uc_rshift = 0 }; +UART_CLASS(uart_quicc_class); #define SIGCHG(c, i, s, d) \ if (c) { \ diff --git a/sys/dev/uart/uart_dev_z8530.c b/sys/dev/uart/uart_dev_z8530.c index 107fcb1eb4ba..2ca480a5690d 100644 --- a/sys/dev/uart/uart_dev_z8530.c +++ b/sys/dev/uart/uart_dev_z8530.c @@ -309,7 +309,7 @@ struct uart_class uart_z8530_class = { .uc_rclk = DEFAULT_RCLK, .uc_rshift = 0 }; -DATA_SET(uart_class_set, uart_z8530_class); +UART_CLASS(uart_z8530_class); #define SIGCHG(c, i, s, d) \ if (c) { \ From nobody Thu Feb 22 22:49:19 2024 X-Original-To: dev-commits-src-main@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 4TgpH424xJz5BbCJ; Thu, 22 Feb 2024 22:49:20 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgpH36hPnz4GBn; Thu, 22 Feb 2024 22:49:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708642159; 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=ibA8Ca8V+2OE850wgNogmc1I1r8zXCJg3i1AonV6ULg=; b=gMnGuqmgoW4NX1qUpT/oFPOWp7iPP1zRwIGmJNpsOkX4PCiMYNBgZuTzV6aPuvC5ideQGb NPqo/6K2xfkfzj3dJhAHwoXBbZGiww3Ph5N9owiwtist728Cx8uNNybLnMvJrspUmWAcH4 BZ6Mwmp9iwlKmdgL/53uoMjybP0bhykPR3thLiNc/ZdBP5wYRF5Fx6o8UWaAJkcvGHR/zB rakMEgL46TW1BWpYWi1/Ggdgm5PyC4FMlKLsBgG0m0YD3fUK9MNGSDs4APdl3wXMCmUnHG BdpSwRHvj76zFCzHaETSOin/BuUJ5IU4cEPx+wXG7tdQpjXQD9sZtI97JGl9sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708642159; 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=ibA8Ca8V+2OE850wgNogmc1I1r8zXCJg3i1AonV6ULg=; b=QsPcJRzI+azsRp7wt9YMtTrwZi2VNpgWpu55W/IwZsFqeaFUESQ1RoDx7n45ocWTjRQXQk VsRVII3T12Sl7PoPJU88PGX/xjcq/P7ax3aIE1+0lDLjyBolQ/leS546KAq8JQUkcMHO5l vtRSoDNIeeHfqXd3LsDI/6sCdY+ihWOlqsQ/du/7En7Um2JtUmJuDRAOmxb2mZQauWCUba 9aEbr2GqEvF6RquJWPTWlz1MOLieuNQ/X/LhpI1C5EBagl0JdACur8nbHRlJNENIEOPIgI cYwwaesKpomfyi6fs0EwywyRiS1FVKBPclqCHPWDoYMA8xzZ0L4+lJWNMMxe3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708642159; a=rsa-sha256; cv=none; b=JcRt3NBNDtkDHttKbd7n2lxkkyu2cnMj/RfKUOKRJxED6e4PXXoQzj+tHcGAcFfGLsd+bU I+gCMttNvzrEJmESpLbQaZmFVrwXevXAQkSmqGg7OHOPcP0IrBaZdPInh6kDSysQSjvtX+ RCpQ4WNG5nM+PTic2HqrXOPAd4+z+c63IfoY8pNsg5n44p/lAIIsOmcnCjzSMUfOlfYxVq gJGfJga/KOP/Zxm/iISewdg29e7I/bxM8REG99/85jT8ZTM+j+zCewTPGU2JbALLYw1bPG VmetG4M2tW9UNN9ljX23qAialIyDYhegcd/pbzE/u++UfneZxwOXjgMIRgaMDw== 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 4TgpH35n3szqcf; Thu, 22 Feb 2024 22:49:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MMnJIU060610; Thu, 22 Feb 2024 22:49:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MMnJMO060607; Thu, 22 Feb 2024 22:49:19 GMT (envelope-from git) Date: Thu, 22 Feb 2024 22:49:19 GMT Message-Id: <202402222249.41MMnJMO060607@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 759a996d610d - main - LinuxKPI: 802.11: implement a deferred RX path List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 759a996d610d9354aac5c48a6bdc9cedcba2f48b Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=759a996d610d9354aac5c48a6bdc9cedcba2f48b commit 759a996d610d9354aac5c48a6bdc9cedcba2f48b Author: Bjoern A. Zeeb AuthorDate: 2024-02-12 16:03:13 +0000 Commit: Bjoern A. Zeeb CommitDate: 2024-02-22 22:46:48 +0000 LinuxKPI: 802.11: implement a deferred RX path Some calls, e.g., action frames cause us to call through all the way down to firmware from the RX path without any deferral in net80211. For LinuxKPI and iwlwifi this goes (with omissions) like this: lkpi_napi_task -> linuxkpi_ieee80211_rx -> ieee80211_input_mimo -> sta_input -> ht_recv_action_ba_addba_request -> lkpi_ic_ampdu_rx_start -> iwl_mvm_mac_ampdu_action -> iwl_trans_txq_send_hcmd. At that point we are waiting for an interrupt from the firmware but given the lkpi_napi_task has not finished (and may have more to dispatch based on budget and what was received) we will not see the new interrupt/fw response. With no answer from the firmware, the software timeout in the driver kills the command and the firmware and issues a complete restart. Implement the deferred RX path in LinuxKPI for the moment. At a later point we should carefully shift this into net80211. This fixes the hangs for (*ic_ampdu_rx_start)() calls with iwlwifi. MFC after: 3 days PR: 276083 Reviewed by: cc Differential Revision: https://reviews.freebsd.org/D43968 --- sys/compat/linuxkpi/common/src/linux_80211.c | 134 ++++++++++++++++++++++++--- sys/compat/linuxkpi/common/src/linux_80211.h | 31 +++++++ 2 files changed, 154 insertions(+), 11 deletions(-) diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 6ed5722ab998..ced2f2dc8cca 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -144,6 +144,7 @@ const struct cfg80211_ops linuxkpi_mac80211cfgops = { static struct lkpi_sta *lkpi_find_lsta_by_ni(struct lkpi_vif *, struct ieee80211_node *); static void lkpi_80211_txq_task(void *, int); +static void lkpi_80211_lhw_rxq_task(void *, int); static void lkpi_ieee80211_free_skb_mbuf(void *); #ifdef LKPI_80211_WME static int lkpi_wme_update(struct lkpi_hw *, struct ieee80211vap *, bool); @@ -4271,6 +4272,12 @@ linuxkpi_ieee80211_alloc_hw(size_t priv_len, const struct ieee80211_ops *ops) TAILQ_INIT(&lhw->scheduled_txqs[ac]); } + /* Deferred RX path. */ + LKPI_80211_LHW_RXQ_LOCK_INIT(lhw); + TASK_INIT(&lhw->rxq_task, 0, lkpi_80211_lhw_rxq_task, lhw); + mbufq_init(&lhw->rxq, IFQ_MAXLEN); + lhw->rxq_stopped = false; + /* * XXX-BZ TODO make sure there is a "_null" function to all ops * not initialized. @@ -4296,11 +4303,42 @@ void linuxkpi_ieee80211_iffree(struct ieee80211_hw *hw) { struct lkpi_hw *lhw; + struct mbuf *m; lhw = HW_TO_LHW(hw); free(lhw->ic, M_LKPI80211); lhw->ic = NULL; + /* + * Drain the deferred RX path. + */ + LKPI_80211_LHW_RXQ_LOCK(lhw); + lhw->rxq_stopped = true; + LKPI_80211_LHW_RXQ_UNLOCK(lhw); + + /* Drain taskq, won't be restarted due to rxq_stopped being set. */ + while (taskqueue_cancel(taskqueue_thread, &lhw->rxq_task, NULL) != 0) + taskqueue_drain(taskqueue_thread, &lhw->rxq_task); + + /* Flush mbufq (make sure to release ni refs!). */ + m = mbufq_dequeue(&lhw->rxq); + while (m != NULL) { + struct m_tag *mtag; + + mtag = m_tag_locate(m, MTAG_ABI_LKPI80211, LKPI80211_TAG_RXNI, NULL); + if (mtag != NULL) { + struct lkpi_80211_tag_rxni *rxni; + + rxni = (struct lkpi_80211_tag_rxni *)(mtag + 1); + ieee80211_free_node(rxni->ni); + } + m_freem(m); + m = mbufq_dequeue(&lhw->rxq); + } + KASSERT(mbufq_empty(&lhw->rxq), ("%s: lhw %p has rxq len %d != 0\n", + __func__, lhw, mbufq_len(&lhw->rxq))); + LKPI_80211_LHW_RXQ_LOCK_DESTROY(lhw); + /* Cleanup more of lhw here or in wiphy_free()? */ LKPI_80211_LHW_TXQ_LOCK_DESTROY(lhw); LKPI_80211_LHW_SCAN_LOCK_DESTROY(lhw); @@ -4795,6 +4833,66 @@ linuxkpi_ieee80211_scan_completed(struct ieee80211_hw *hw, return; } +static void +lkpi_80211_lhw_rxq_rx_one(struct lkpi_hw *lhw, struct mbuf *m) +{ + struct ieee80211_node *ni; + struct m_tag *mtag; + int ok; + + ni = NULL; + mtag = m_tag_locate(m, MTAG_ABI_LKPI80211, LKPI80211_TAG_RXNI, NULL); + if (mtag != NULL) { + struct lkpi_80211_tag_rxni *rxni; + + rxni = (struct lkpi_80211_tag_rxni *)(mtag + 1); + ni = rxni->ni; + } + + if (ni != NULL) { + ok = ieee80211_input_mimo(ni, m); + ieee80211_free_node(ni); /* Release the reference. */ + if (ok < 0) + m_freem(m); + } else { + ok = ieee80211_input_mimo_all(lhw->ic, m); + /* mbuf got consumed. */ + } + +#ifdef LINUXKPI_DEBUG_80211 + if (linuxkpi_debug_80211 & D80211_TRACE_RX) + printf("TRACE %s: handled frame type %#0x\n", __func__, ok); +#endif +} + +static void +lkpi_80211_lhw_rxq_task(void *ctx, int pending) +{ + struct lkpi_hw *lhw; + struct mbufq mq; + struct mbuf *m; + + lhw = ctx; + +#ifdef LINUXKPI_DEBUG_80211 + if (linuxkpi_debug_80211 & D80211_TRACE_RX) + printf("%s:%d lhw %p pending %d mbuf_qlen %d\n", + __func__, __LINE__, lhw, pending, mbufq_len(&lhw->rxq)); +#endif + + mbufq_init(&mq, IFQ_MAXLEN); + + LKPI_80211_LHW_RXQ_LOCK(lhw); + mbufq_concat(&mq, &lhw->rxq); + LKPI_80211_LHW_RXQ_UNLOCK(lhw); + + m = mbufq_dequeue(&mq); + while (m != NULL) { + lkpi_80211_lhw_rxq_rx_one(lhw, m); + m = mbufq_dequeue(&mq); + } +} + /* For %list see comment towards the end of the function. */ void linuxkpi_ieee80211_rx(struct ieee80211_hw *hw, struct sk_buff *skb, @@ -5018,20 +5116,34 @@ skip_device_ts: } #endif + /* + * Attach meta-information to the mbuf for the deferred RX path. + * Currently this is best-effort. Should we need to be hard, + * drop the frame and goto err; + */ if (ni != NULL) { - ok = ieee80211_input_mimo(ni, m); - ieee80211_free_node(ni); - if (ok < 0) - m_freem(m); - } else { - ok = ieee80211_input_mimo_all(ic, m); - /* mbuf got consumed. */ + struct m_tag *mtag; + struct lkpi_80211_tag_rxni *rxni; + + mtag = m_tag_alloc(MTAG_ABI_LKPI80211, LKPI80211_TAG_RXNI, + sizeof(*rxni), IEEE80211_M_NOWAIT); + if (mtag != NULL) { + rxni = (struct lkpi_80211_tag_rxni *)(mtag + 1); + rxni->ni = ni; /* We hold a reference. */ + m_tag_prepend(m, mtag); + } } -#ifdef LINUXKPI_DEBUG_80211 - if (linuxkpi_debug_80211 & D80211_TRACE_RX) - printf("TRACE %s: handled frame type %#0x\n", __func__, ok); -#endif + LKPI_80211_LHW_RXQ_LOCK(lhw); + if (lhw->rxq_stopped) { + LKPI_80211_LHW_RXQ_UNLOCK(lhw); + m_freem(m); + goto err; + } + + mbufq_enqueue(&lhw->rxq, m); + taskqueue_enqueue(taskqueue_thread, &lhw->rxq_task); + LKPI_80211_LHW_RXQ_UNLOCK(lhw); IMPROVE(); diff --git a/sys/compat/linuxkpi/common/src/linux_80211.h b/sys/compat/linuxkpi/common/src/linux_80211.h index d25614de56dc..b0156a5ade3f 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.h +++ b/sys/compat/linuxkpi/common/src/linux_80211.h @@ -76,6 +76,18 @@ if (linuxkpi_debug_80211 & D80211_TRACE_MODE_HT) \ printf("%s:%d: XXX LKPI80211 IMPROVE_HT\n", __func__, __LINE__) +#define MTAG_ABI_LKPI80211 1707696513 /* LinuxKPI 802.11 KBI */ + +/* + * Deferred RX path. + * We need to pass *ni along (and possibly more in the future so + * we use a struct right from the start. + */ +#define LKPI80211_TAG_RXNI 0 /* deferred RX path */ +struct lkpi_80211_tag_rxni { + struct ieee80211_node *ni; /* MUST hold a reference to it. */ +}; + struct lkpi_radiotap_tx_hdr { struct ieee80211_radiotap_header wt_ihdr; uint8_t wt_flags; @@ -192,6 +204,11 @@ struct lkpi_hw { /* name it mac80211_sc? */ uint32_t txq_generation[IEEE80211_NUM_ACS]; TAILQ_HEAD(, lkpi_txq) scheduled_txqs[IEEE80211_NUM_ACS]; + /* Deferred RX path. */ + struct task rxq_task; + struct mbufq rxq; + struct mtx rxq_mtx; + /* Scan functions we overload to handle depending on scan mode. */ void (*ic_scan_curchan)(struct ieee80211_scan_state *, unsigned long); @@ -240,6 +257,7 @@ struct lkpi_hw { /* name it mac80211_sc? */ bool update_mc; bool update_wme; + bool rxq_stopped; /* Must be last! */ struct ieee80211_hw hw __aligned(CACHE_LINE_SIZE); @@ -304,6 +322,19 @@ struct lkpi_wiphy { #define LKPI_80211_LHW_TXQ_UNLOCK_ASSERT(_lhw) \ mtx_assert(&(_lhw)->txq_mtx, MA_NOTOWNED) +#define LKPI_80211_LHW_RXQ_LOCK_INIT(_lhw) \ + mtx_init(&(_lhw)->rxq_mtx, "lhw-rxq", NULL, MTX_DEF | MTX_RECURSE); +#define LKPI_80211_LHW_RXQ_LOCK_DESTROY(_lhw) \ + mtx_destroy(&(_lhw)->rxq_mtx); +#define LKPI_80211_LHW_RXQ_LOCK(_lhw) \ + mtx_lock(&(_lhw)->rxq_mtx) +#define LKPI_80211_LHW_RXQ_UNLOCK(_lhw) \ + mtx_unlock(&(_lhw)->rxq_mtx) +#define LKPI_80211_LHW_RXQ_LOCK_ASSERT(_lhw) \ + mtx_assert(&(_lhw)->rxq_mtx, MA_OWNED) +#define LKPI_80211_LHW_RXQ_UNLOCK_ASSERT(_lhw) \ + mtx_assert(&(_lhw)->rxq_mtx, MA_NOTOWNED) + #define LKPI_80211_LHW_LVIF_LOCK(_lhw) sx_xlock(&(_lhw)->lvif_sx) #define LKPI_80211_LHW_LVIF_UNLOCK(_lhw) sx_xunlock(&(_lhw)->lvif_sx) From nobody Fri Feb 23 00:16:40 2024 X-Original-To: dev-commits-src-main@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 4TgrCs2fZ0z5Bjkc; Fri, 23 Feb 2024 00:16: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgrCs1lcNz4Mnh; Fri, 23 Feb 2024 00:16:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708647401; 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=Ol/zFcDyk1x4pllloPeWhxYCJmOzCyFzecu9RHsNOYc=; b=BAhtE05tGqzfZ6Opsmw819cGi+P1appejrFlJH0237nbXwNeujy8dhgA7zOqhxMqARlyEe Bw9HLOMO8HquVaP0PIsvUEtDMT0hMdGEN3KMRwVrkS6fK9GsZlZPJlr3QiU1U6eaw8ErDC RpTHV/UqEzMrAy17bJKWcWLaQypkY0qtbZ7Wnec5tOewD7UV+zEHeZ4Rs49KKxWDahVaWi Z3lYmefOGWs9bEgFRlr4R6oTICKtNvLM6b/czMN0uaMaHxQljK8Oivb+sL8BDzDQsaq+cz eOaWd6vXg3MVsv2XVlPB8t/R78CONXA9rgZA1ASZQ2hZRDKnk5lo5788+GSFlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708647401; 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=Ol/zFcDyk1x4pllloPeWhxYCJmOzCyFzecu9RHsNOYc=; b=hIArnRjN1YJ87vHESk5zuxqeiopm5yE/nCd9MdDnkhUNLS3m443rbHLLl9kwZgEm9JMVb5 Tq9fJKzDB8TU4oUmEOccPqNfK700V/U04YLMlGt8SMmhM750HYRFOP2d5pZ4s6QAv8Vbhx dvXke1O0E3U7Ggf/bcyVz45pLFQo/5a9NbmcsfR8qO5nlySj2jDP6TdKxI3GuhbTwuFn0G Lvh/T76rX3/SM+VB0y+PG+8/Wk8YcgXCAEbGjhGqjVZmo4hOVfxm3vNz3KwUhb9XuiySGm e8eXt9DQWgTUx1capf9M12gVsnayCe5rt9SkitQiZQ8M49BTnrhFCL7G5MgdiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708647401; a=rsa-sha256; cv=none; b=SDZ8dWwO316B9CzR84DfnN6e7tQufqu1wicImVBEDDk8fN/fwP8rbnu4dIIQNwsUUOKbm6 EI1twNd700IxbNLlS3NsM4uPHBmn0buQSL+WpdfrsmiipzT22Ed3LQDeU0G4AOUx01xYEm D9slgd36xd1/qMPjm7mpExDnYbH7atRR+btt2mvjvtey1DaqGcjKPMd6JYsa/dMA6MJer2 zD4cfI2Ak/5RwS5rAow/DNG4gDmRPgbTTeDmmfmX/6P3W7yb8ssTP8sMSQJ7j8KG4YGKqi lwCnmb2Uh3XTACBJNKJdFwBRT9e6Fi8l9/urz8RQOBAUOf6XzU61lbw4m/BvRg== 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 4TgrCs0htRzsnF; Fri, 23 Feb 2024 00:16:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41N0GeeY011631; Fri, 23 Feb 2024 00:16:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41N0GeSC011628; Fri, 23 Feb 2024 00:16:40 GMT (envelope-from git) Date: Fri, 23 Feb 2024 00:16:40 GMT Message-Id: <202402230016.41N0GeSC011628@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 04eca6932311 - main - gpiobus: Add missing DEVMETHOD for bus_get_rman List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 04eca69323111986b262eef3135d804361b60d17 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=04eca69323111986b262eef3135d804361b60d17 commit 04eca69323111986b262eef3135d804361b60d17 Author: John Baldwin AuthorDate: 2024-02-23 00:14:58 +0000 Commit: John Baldwin CommitDate: 2024-02-23 00:14:58 +0000 gpiobus: Add missing DEVMETHOD for bus_get_rman Reported by: andrew Fixes: 5bda26333a8e gpiobus: Use bus_generic_rman_* --- sys/dev/gpio/gpiobus.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c index 6d739597b759..c8fee7d400c1 100644 --- a/sys/dev/gpio/gpiobus.c +++ b/sys/dev/gpio/gpiobus.c @@ -1045,6 +1045,7 @@ static device_method_t gpiobus_methods[] = { DEVMETHOD(bus_activate_resource, bus_generic_rman_activate_resource), DEVMETHOD(bus_deactivate_resource, bus_generic_rman_deactivate_resource), DEVMETHOD(bus_get_resource_list, gpiobus_get_resource_list), + DEVMETHOD(bus_get_rman, gpiobus_get_rman), DEVMETHOD(bus_add_child, gpiobus_add_child), DEVMETHOD(bus_rescan, gpiobus_rescan), DEVMETHOD(bus_probe_nomatch, gpiobus_probe_nomatch), From nobody Fri Feb 23 02:37:12 2024 X-Original-To: dev-commits-src-main@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 4TgvL05L1Yz5BTMb; Fri, 23 Feb 2024 02:37:12 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TgvL04nRLz4Yyw; Fri, 23 Feb 2024 02:37:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708655832; 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=rGXpT9k09ca0osKR4skDG3jw/PxwyvX8FVPqwUUrcJA=; b=iJcMk53JKwCQbWrOHOAc7aW87AH9KUKWO6LhJSweZS/WuypEWdLKCsY3sqUQ5DXAeZlK2L wPUEtZPmNVYO48RKGFavlrM1sHA2t1bxqvxBvJlmSGh8zDVkc7xia7kxRf48RL7efGPchA gBlpr7fXx5kse8fss8Hvn9msE08QKmmCPL4zcfbQimKwBXkCzRc+I7XWvOh3hM77XBplad Kfihf+6whLOsjwwscMQ9JKkGMR3VmlGxkAReVPjddmKna6NedkJyFhWaDgJULmhYvQ36G2 OUphRLEa/STMHC5BRy3BPcgnB3DGmsX7VIxz3+rxBZzAm/MPj4ndqrgVehEhWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708655832; 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=rGXpT9k09ca0osKR4skDG3jw/PxwyvX8FVPqwUUrcJA=; b=jnKyU7VtRbcLqVwHrOEvo7jPADyD5SvJ1vJufGQaiD7B+eb/LEywQxL76CRrP4FYU7/dyA GljlANUCZXf9zRrrhfh9oxvF1C+GTOkmN5sWlMKkIbghVrTKoQ8GDBzmBKD8aQBv9bWfgL lywPATMQwVNWu+viToFMxXcDqU/rKL4F+rzhYaWG/acOOQ9Zq6+mtS1SpzVFusNJCLau8m R5zYGdMA4HkImOfD6FW/habCIwL+Lm2DTzBWH2kHQpyPZ0N+V45G6PYPkz9p+0msvjvHiV pkivPZTsY0aEyT6b8x/P5kKA+9w+0p7Vpt4vj8Vd9HJZ3iO2pbFee3EpUDSXnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708655832; a=rsa-sha256; cv=none; b=bWCTvIPdOLr09WyACja/nFKz44Jb4YTvPr0x2qSAw3YElRJHtYppcONJ3PKo7ZD8uL7OQQ TZx1weKbpTElASM0IeDxUxtFXgbCoyUHPawWbQQfDAh4EGR9998B63W16fhFLRxl5DJXWT fgto2gJxzDqc3+k93RW8XVu36Hh5RhSR9U9lmOFHkLAUayGmQyl2uzCTCM2evrVLSeEjvP bmOY4ywNxbugaKtmlRGGQniN+hbdob9HGsb3+R5mbeF5ZtaOBHw4ZnYxBSts6nudgTj8tM pjM5qymRKwXLFCV05xhhYcjhoIkMKmaNHLvXiS0u/lV0CcNzegVwEFMVALVq0A== 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 4TgvL03qn2zxyl; Fri, 23 Feb 2024 02:37:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41N2bCG5046115; Fri, 23 Feb 2024 02:37:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41N2bCB1046112; Fri, 23 Feb 2024 02:37:12 GMT (envelope-from git) Date: Fri, 23 Feb 2024 02:37:12 GMT Message-Id: <202402230237.41N2bCB1046112@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 09cb8031b43c - main - efibootmgr: Simplify make_next_boot_var_name and fix cnt == 0 case List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 09cb8031b43c8e98abb5ff9b43ff649031d1e808 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=09cb8031b43c8e98abb5ff9b43ff649031d1e808 commit 09cb8031b43c8e98abb5ff9b43ff649031d1e808 Author: Jessica Clarke AuthorDate: 2024-02-23 02:36:21 +0000 Commit: Jessica Clarke CommitDate: 2024-02-23 02:36:21 +0000 efibootmgr: Simplify make_next_boot_var_name and fix cnt == 0 case If cnt == 0 we access element 0 unconditionally, which is out of bounds, and then if that doesn't crash and happens to be 0 we will access element - 1, also out of bounds, and then if that doesn't crash will add 1 to whatever junk is there and use that for the variable. On CHERI, though, this does crash. This code is also overly complicated, with unnecessary special cases and tracking more state than needed. Rewrite it in a more general manner that doesn't need those special cases and naturally works for cnt == 0. Found by: CHERI Reviewed by: imp Fixes: 1285bcc833a3 ("Import Netflix's efibootmgr to help manage UEFI boot variables") MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D44029 --- usr.sbin/efibootmgr/efibootmgr.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/usr.sbin/efibootmgr/efibootmgr.c b/usr.sbin/efibootmgr/efibootmgr.c index 7bcb4674586b..2bc79ee26f51 100644 --- a/usr.sbin/efibootmgr/efibootmgr.c +++ b/usr.sbin/efibootmgr/efibootmgr.c @@ -561,7 +561,7 @@ static char * make_next_boot_var_name(void) { struct entry *v; - uint16_t *vals, next_free = 0; + uint16_t *vals; char *name; int cnt = 0; int i; @@ -579,21 +579,14 @@ make_next_boot_var_name(void) vals[i++] = v->idx; } qsort(vals, cnt, sizeof(uint16_t), compare); - /* if the hole is at the beginning, just return zero */ - if (vals[0] > 0) { - next_free = 0; - } else { - /* now just run the list looking for the first hole */ - for (i = 0; i < cnt - 1 && next_free == 0; i++) - if (vals[i] + 1 != vals[i + 1]) - next_free = vals[i] + 1; - if (next_free == 0) - next_free = vals[cnt - 1] + 1; - /* In theory we could have used all 65k slots -- what to do? */ - } + /* Find the first hole (could be at start or end) */ + for (i = 0; i < cnt; ++i) + if (vals[i] != i) + break; free(vals); + /* In theory we could have used all 65k slots -- what to do? */ - asprintf(&name, "%s%04X", "Boot", next_free); + asprintf(&name, "%s%04X", "Boot", i); if (name == NULL) err(1, "asprintf"); return name; From nobody Fri Feb 23 03:03:09 2024 X-Original-To: dev-commits-src-main@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 4Tgvvz6vqHz5BWYb; Fri, 23 Feb 2024 03:03:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tgvvz6NMMz4cTx; Fri, 23 Feb 2024 03:03:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708657391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OcB2M9ArEpaqembiDfA7urJAqb0nlxUPgejda14ZYd4=; b=dxtULVoiewuUTyIlzIob7/WZ0wDfCSZIx3uVNnKujBSqzOqzSVM+WapCuEL8q/aAZkl9JR gUJKqVorRjyrxcNkm5u6PS6rdpLueLdoIRScwyR/Cd6UOsG/BhaQZht5/MDuylY6PfKlR1 A3OnTOvKBF/0lMkqGLYabGer9Okt2uZlVKb8DnylRduYR5t8AtM9fjIcRWHxYdauUZ0equ 7km1iiEFJPV3RRcRDH5EHgVfi++TDqBC0vNNIlmykTobtsZ/ZmHnxhH014fhGyUxjzNW32 2E3yLCJ+GdgSMoHFs4T1OO5xnCUFfOR21XLD3RkRGTjq5T6haQXU95fvZY8QTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708657391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OcB2M9ArEpaqembiDfA7urJAqb0nlxUPgejda14ZYd4=; b=bXzl2ZyNtgbPHrvBDqlq8Ti8bWhVy8YXHzUHdz9HRWkHOFOKpQyMTuUnfrqd/w4Ct9ceKA LeGnsvSvGROOv3lsOJpJQ6sB9X9EO+xkedW/vAa2gjv3qm5VxoP5ToRr0KDhswizqfMkG+ 8+zZW83pXJuAtTe94jqIUqADoO80fALRcuOub8Sxv49QRATVHWGxjsQeZ3MWUX6XVZt6MJ CTlhH+jsPbXuput2bwkBsAVcT9ILbon22LOLvmEltw9zmLUtm2UnUa1BnywOpCOjO9OdXO yIEfNc2ddJPShKBzB+0XiVvQZ5KrC6YJ+hD0ydjUz9P2alJ87iTHfbd4bnzgLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708657391; a=rsa-sha256; cv=none; b=Nr0r6kJIIG+Pchs4Y3fskAqbKOrUZeBPMo4T21KJKzBCgxwVXMeAqRkbEgrbTrYDClFr91 KWrAFt3qL6os8wKimuiVZxDN9NcKfzALVNIlzTNbUWfXL7EmLqONTvPHB8Dh5qu4q0tJyQ 2yyM/n2cpKQd26zgWPlaXhiZqyUTFGCS/T7WQHCUs7ZLFM1kRUVKEBRDTWSVhSwg9YoewM HFNoEQNFmPxWncA/yvYRlZ/OJfM955zuvzr1y0ZQWzqOT5NZAljYGgnmOBS+fwD6KshPyz Np9ZnjS5AHb8DbWdoIS9Z84+qj+xcw2w1X2Wr+eQXj0hxOKtoZVA7B1mxgSZrA== Received: from [IPV6:2601:644:937f:4c50:9110:97a:5df4:795c] (unknown [IPv6:2601:644:937f:4c50:9110:97a:5df4:795c]) (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) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Tgvvz1r5wzTVj; Fri, 23 Feb 2024 03:03:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <7fb66c83-7382-4053-b6c6-27ee0ae03274@FreeBSD.org> Date: Thu, 22 Feb 2024 19:03:09 -0800 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 47e073941f4e - main - Import the kernel parts of bhyve/arm64 Content-Language: en-US To: Warner Losh Cc: Andrew Turner , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202402211855.41LItsm2033633@gitrepo.freebsd.org> <23101a96-4901-4086-bdbf-dfbab2b66e49@FreeBSD.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 2/22/24 12:10 PM, Warner Losh wrote: > On Thu, Feb 22, 2024 at 11:30 AM John Baldwin wrote: > >> On 2/21/24 10:55 AM, Andrew Turner wrote: >>> The branch main has been updated by andrew: >>> >>> URL: >> https://cgit.FreeBSD.org/src/commit/?id=47e073941f4e7ca6e9bde3fa65abbfcfed6bfa2b >>> >>> commit 47e073941f4e7ca6e9bde3fa65abbfcfed6bfa2b >>> Author: Andrew Turner >>> AuthorDate: 2024-01-09 15:22:27 +0000 >>> Commit: Andrew Turner >>> CommitDate: 2024-02-21 18:55:32 +0000 >>> >>> Import the kernel parts of bhyve/arm64 >>> >>> To support virtual machines on arm64 add the vmm code. This is >> based on >>> earlier work by Mihai Carabas and Alexandru Elisei at University >>> Politehnica of Bucharest, with further work by myself and Mark >> Johnston. >>> >>> All AArch64 CPUs should work, however only the GICv3 interrupt >>> controller is supported. There is initial support to allow the GICv2 >>> to be supported in the future. Only pure Armv8.0 virtualisation is >>> supported, the Virtualization Host Extensions are not currently >> used. >>> >>> With a separate userspace patch and U-Boot port FreeBSD guests are >> able >>> to boot to multiuser mode, and the hypervisor can be tested with the >>> kvm unit tests. Linux partially boots, but hangs before entering >>> userspace. Other operating systems are untested. >>> >>> Sponsored by: Arm Ltd >>> Sponsored by: Innovate UK >>> Sponsored by: The FreeBSD Foundation >>> Sponsored by: University Politehnica of Bucharest >>> Differential Revision: https://reviews.freebsd.org/D37428 >> >> FYI, sys/arm64/vmm/vmm.c shares a fair bit of code with sys/amd64/vmm/vmm.c >> and looks to be derived from the amd64 file, so I think it should preserve >> NetApp's copyright line in addition to Mihai's. >> > > In general, the advice I've been giving is that one should retain > copyrights when > there's at least 10%-20% remaining of the original work. And one should > hesitate to add > them unless you've contributed 10%-20% or more to the work (ideally more, > but sometimes > that's gets squishy because the underlying law is based on words like > substantial > and de-minimus, which don't translate well to line counts, and for large > works what > is substantial can be a bit subjective). > > If they share so much, maybe we should also look at sharing directly, > rather than by > cut and paste in the future. Jessica has already mentioned sharing some of the code in at least vmm_dev.c in the future so I think that will likely happen in some future refactoring. Several files that share code and were clearly derived from the amd64 bits already have NetApp, etc. copyrights in this commit, it's just vmm.c that I think needs updating. -- John Baldwin From nobody Fri Feb 23 09:48:41 2024 X-Original-To: dev-commits-src-main@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 4Th4vs5Vcvz5C8GH; Fri, 23 Feb 2024 09:48: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Th4vs4S0yz4Nm6; Fri, 23 Feb 2024 09:48:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708681721; 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=mzw4I2s679Ys9w5Clq1vwpvv4yQ0I6EL4V4llT8G3LI=; b=CTdFj1Nl3wtX4ipbZBkCrGQOHV+mS63r9unmo8JfyzgpBgD9nDLRk+cZF/Z56vJ/559x1v 0xVvI6uxFNq6b9CPBdr8EGOY17GuxTfx7hiuFQouFi7kuulI4OZT0hXwMCDopVpKtQnylO d2mu6+FfyB+lRyX1cPQr+huaWfZkRhOQs+oo2E+EVY/0jv3Dx4+qIpqpj1ORN+9VFbFEQL AgTUJ5Y1sVw6m9boRLwHp7yV9qENxhOwNx/Hhrjx4PhaZTlf3B+HsR9gqLr7PhX5PrbTml u1/4PpuPBRIHFrG3xruhhaKGwYP/CJ2dgMu7fUcR41tev212tWhbrBBQZV46TQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708681721; a=rsa-sha256; cv=none; b=FpC+rN2FAt95EsKmhDiaHOcRvu4AEmiXw8moyyJjtOVRTuI4r5KCtSdZiT0c25RQgKT3e5 TcHOeFZCwN5pVVOqiL8b7zycdhXB24kiK7xd73SqGgt8cENZ4Y0wVMQu3/b5UO2TwZz042 ZtOTp87xOvLJ6fPIWE3sl8Fg5buLcCyOXe/dSJpPKdmRyP4oq9dUaCySOtJXA+n3GCHlTz b7VkSQjLHfwPKwnKgEUixDwe227Eg4FLG3LcHCrngiv8xvs9SAUFXWeilp4misDAmNsn6j B95ev1/zRBi4Kf4Rihlg4u+nubqlAPqihIuxQxUo23cGyG0mMEtpdN4YerLDHA== 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=1708681721; 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=mzw4I2s679Ys9w5Clq1vwpvv4yQ0I6EL4V4llT8G3LI=; b=of+PWxORo/W0ONuGUbjlF1hvu5+lYhlvHRyx3Mwhuxh91AAo6OzOlX+q9XQ6JOqWgYMvBd S/pyFRTwSAcKGFeLdM1Ny9mCOjfD8VHyyYxn8ziNk+bRM61XUXBhC6WLEYLIjkJlVZR0Lb mgQ7lGiQLeHk6DqFpcLvTx1oGo5Y3BDARiMNwga2HbQhxRGTX9HYH/X7dJrgqGvZ+5dUa1 9klQF7Q12Ce7RyAzIt7s1+9X7tSgbtpnhhUcXGwBMYmsSAbdc4wo5Qe+Vo1ePQ8Sd7f1/s ONLNO6+29SC9JT09WyHhRrcn2M7/Uq+D3e0pYw3ZXXpfPEMkuVWAnSOZV3roUA== 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 4Th4vs3YJRz19g8; Fri, 23 Feb 2024 09:48:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41N9mfg6075193; Fri, 23 Feb 2024 09:48:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41N9mftI075190; Fri, 23 Feb 2024 09:48:41 GMT (envelope-from git) Date: Fri, 23 Feb 2024 09:48:41 GMT Message-Id: <202402230948.41N9mftI075190@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: bde7c606e9e0 - main - jail: skip sysctl_security_jail_children if jail binary missing List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bde7c606e9e03bd0dbab0d41f0c100d1ff9dd872 Auto-Submitted: auto-generated The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=bde7c606e9e03bd0dbab0d41f0c100d1ff9dd872 commit bde7c606e9e03bd0dbab0d41f0c100d1ff9dd872 Author: Olivier Cochard AuthorDate: 2024-02-23 09:43:54 +0000 Commit: Olivier Cochard CommitDate: 2024-02-23 09:43:54 +0000 jail: skip sysctl_security_jail_children if jail binary missing Approved by: lwhsu Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D44010 --- sys/kern/sysctl_security_jail_children.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/kern/sysctl_security_jail_children.sh b/sys/kern/sysctl_security_jail_children.sh index 0423cf1e8a59..6ac6aa904dbc 100644 --- a/sys/kern/sysctl_security_jail_children.sh +++ b/sys/kern/sysctl_security_jail_children.sh @@ -33,6 +33,9 @@ max_cur_head() { atf_set descr 'Test maximum and current number of child jails' atf_set require.user root + if ! which -s jail; then + atf_skip "This test requires jail" + fi } max_cur_body() { From nobody Fri Feb 23 09:48:42 2024 X-Original-To: dev-commits-src-main@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 4Th4vv0HtVz5C8GJ; Fri, 23 Feb 2024 09:48: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Th4vt5J5xz4NxB; Fri, 23 Feb 2024 09:48:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708681722; 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=70Yv2mRfqWIdoXlR9YT4qEHfLYROm2BJ2c4k8b3YHRs=; b=ApA53oO5XnorwDlZciwu/uwWEz1BkTVjadGc0UmNpEw/h0gHmo9nfquo+2fi5Lbph2Qdw8 KKhqbX+60bmVfJsuch9Ne5Xtj0Bmjeg1pMZYR0bF5nZaCJlXRJeRWRCjWM3g9Wi6qwpgqJ K5CHhX4quQlTVJKffsQRPAyuFLfBBsehWhlGl1jkVEGNvZ1Ft3IBg8sJ//0ZbBeJqjamzP OC4t/jjiy2zBHVcNJNrnalotAX12W4zUP2wJqfqa/ZmTM/yTWybho6CnTI0mT1tD948Nui zKoAtXPJ83ccU/WSZuzA8V9526dzLBrTjh8NtMOHE6/cbnT8bekXJfhha988GQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708681722; a=rsa-sha256; cv=none; b=f/H5brrzFE9wKrCz3COwpOn8RKCevLrA5MrQMkPfbYjGfVxJdcRiPoj7yrHLaFmHlgLvle 6SnpbtYmMzkRU+IDS4EepWMSJdTIzxh/auEWoy0Utngr81U/PA0pk0hSwTCfFs/30OTF0+ R2G7h6xZ3Zf7w1TkjpydJznBOUKpPOX3whRBCojhuG6yWiliVK2eFqlkfSQ5MWdUvc4YpB O6nrs603SqUfkxWbJm4w+ER6fjImPcoWh/fknA4TE5Gv90ZG7IoCtUase6SBznHhBusn3F AuO9Ed/tdCsZERgMdF107Hd7M+sHyUoUsgKnuPQSO0LlURvuI08xwVsXVpcHOw== 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=1708681722; 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=70Yv2mRfqWIdoXlR9YT4qEHfLYROm2BJ2c4k8b3YHRs=; b=C7DwaniHP5Ru2KYaJaOHOyT01XWi13bY7M2OCDwziV6Yi0y9sB4X35A2RR3pEBe3GKXSVx f4Zj4xXIMmshXncMdNaWBxpy8OV9Zgja3dHDr08HL8tdOMxrqHmUBbDF94HwqbFXVzmXJ9 FbsWdmxTyhzDCjUF8VGwsQbVxxGeYA49r3xqb4s0nfnSL3uovvDPsVr9rP2YxjHgGePD/S 0veJVs2IHvXu0ZicwpmZfVQg/tO1yLOgoSz8/TX1ZT1XL18ZKxXFd0KgMXciK51earXyCy lHb6T88tT4yJfWIaIrtDIFV7bi4+Ncgqv6Vup71oy6pcKXEJX/ur/2uWXJqx6A== 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 4Th4vt4Nkfz19L7; Fri, 23 Feb 2024 09:48:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41N9mgpu075247; Fri, 23 Feb 2024 09:48:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41N9mgYE075244; Fri, 23 Feb 2024 09:48:42 GMT (envelope-from git) Date: Fri, 23 Feb 2024 09:48:42 GMT Message-Id: <202402230948.41N9mgYE075244@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: 3562b7b1eb80 - main - hostname(1): skip test if jail binary is missing List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3562b7b1eb80107fe2832bf5a2bfa1a03888db1c Auto-Submitted: auto-generated The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=3562b7b1eb80107fe2832bf5a2bfa1a03888db1c commit 3562b7b1eb80107fe2832bf5a2bfa1a03888db1c Author: Olivier Cochard AuthorDate: 2024-02-23 09:46:34 +0000 Commit: Olivier Cochard CommitDate: 2024-02-23 09:46:34 +0000 hostname(1): skip test if jail binary is missing Approved by: lwhsu Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D44005 --- bin/hostname/tests/hostname_test.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/hostname/tests/hostname_test.sh b/bin/hostname/tests/hostname_test.sh index 57517821f7f1..2ad6a1a5c358 100644 --- a/bin/hostname/tests/hostname_test.sh +++ b/bin/hostname/tests/hostname_test.sh @@ -42,6 +42,9 @@ test_jail_conf='%%test_jail_name%% { init() { + if ! which -s jail; then + atf_skip "This test requires jail" + fi echo "${test_jail_conf}" | \ sed -e "s/%%test_jail_name%%/${test_jail_name}/" > "./jail.conf" jail -f "./jail.conf" -c ${test_jail_name} From nobody Fri Feb 23 12:11:21 2024 X-Original-To: dev-commits-src-main@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 4Th84V0B49z5CM6n; Fri, 23 Feb 2024 12:11:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Th84T4Q9rz4mrK; Fri, 23 Feb 2024 12:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708690281; 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=dD34J4Z5+JjMQBRd2d1tghx38rJsy/JtgaTFuVBoc5s=; b=a8oGqtnf/QLch6PT8DZh0KfTGwhHQ8c3RFxM6CvpIamm+iTQBgfzNBWwZuPPbCyDvn5Q6u cdumLfxhW4jrCEPQlo/EhTgrPIEYdTwwOhRKBbqY0A0zawcMTVmjHZB8M0FebJ2XA2PUg1 nP4GyaEo0Y/+5vXaWG4XiAbHQMSuh4JyU7CqD4FdV+RzhPRUPEsA0aHgHv0IgDz1sWGPHo vtyx3I2pEfcp/0umHi4JD2Y0op9oki1HGUY0J2FbmIX8IQaNAc9Mw9mHuVW1SYjEAWdrlJ vkHTcXz3cPTJntfTM9XHxRu+UHOm1S/nQnJNyE3n8ekMz2ZscFHzcE8dwj/z+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708690281; a=rsa-sha256; cv=none; b=L5kEF2tzs+g6gmaW7cYkvwogz6fdY3YAQ+i1pC2B7ekIWnp0zsmOSBjjYPGAKyGLbqzSgJ gRAr+eguD1td3p3FGMxkR56jLaxQjOs0nBCBOKxBgS8FsVu/qqNnGchOhHxlgTYmtvfqOF M2SYF5SUvuJ7Jx9zJfy6r3oQs9lq/BY3QkPaQ7HQfKqdNschM2rFYwO5XBgwDDW25Dk9Cc BtRdExNku7mab4gOkEWX9FjHtBpzdtBmNKOWn4/dpMDiXXeB/PEINhefSQat3xGHho1rFh vu/ys5y7c9vTyTcpKMAw8NgiKup8f3yz0fzF00FtLgmG5xVfXcbIhfEHOpNAsA== 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=1708690281; 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=dD34J4Z5+JjMQBRd2d1tghx38rJsy/JtgaTFuVBoc5s=; b=VpRhp2sA5ls/e2Ago7Gb9kgmwSRWNY6DUG1ZE+CPCo798DtH8qf3aI1bPuXw9hqfMs+pZJ 74r3MlGD7552lBxZbhXTAto35jTKQnbDD+Ndxqn61CRtdPYz+pZdoAqEfb1xzpC2XDP9Pw 9Kto6FjOeGLvR6b6ZfpAytDXQ1Z1aSUM0kFjVuAh5algV45em9hsJSR/dDMDa/EsSzkP0t q2+KRSYw3RskzcmTgFSEPPz4sjS4fd3IHaZtm98ChuDQvNB42/B/9mLmrcdkHrPhiipR1/ YcwJJUHCtONOsM4NOFHDutzKUOe6lwyma5jg1DDm13cyIvSZRJPq26oS9lR2bg== 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 4Th84T3NHZzFkV; Fri, 23 Feb 2024 12:11:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41NCBLAW030671; Fri, 23 Feb 2024 12:11:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41NCBLPw030667; Fri, 23 Feb 2024 12:11:21 GMT (envelope-from git) Date: Fri, 23 Feb 2024 12:11:21 GMT Message-Id: <202402231211.41NCBLPw030667@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Cochard Subject: git: 161984ade1fa - main - tests: Fixing incomplete atf_skip if missing jail condition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 161984ade1fa0638b732dc9c60bc9bb346e60be9 Auto-Submitted: auto-generated The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/src/commit/?id=161984ade1fa0638b732dc9c60bc9bb346e60be9 commit 161984ade1fa0638b732dc9c60bc9bb346e60be9 Author: Olivier Cochard AuthorDate: 2024-02-23 12:02:40 +0000 Commit: Olivier Cochard CommitDate: 2024-02-23 12:08:09 +0000 tests: Fixing incomplete atf_skip if missing jail condition Testing the scripts outside kyua(1) was a bad idea: It didn't allow me to detect that they were faulty. Sponsored by: Netflix --- bin/hostname/tests/hostname_test.sh | 3 +++ sys/kern/sysctl_security_jail_children.sh | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bin/hostname/tests/hostname_test.sh b/bin/hostname/tests/hostname_test.sh index 2ad6a1a5c358..a4d4d54bb052 100644 --- a/bin/hostname/tests/hostname_test.sh +++ b/bin/hostname/tests/hostname_test.sh @@ -81,6 +81,9 @@ basic_body() } basic_cleanup() { + if ! which -s jail; then + atf_skip "This test requires jail" + fi recycle } diff --git a/sys/kern/sysctl_security_jail_children.sh b/sys/kern/sysctl_security_jail_children.sh index 6ac6aa904dbc..d4c57915880f 100644 --- a/sys/kern/sysctl_security_jail_children.sh +++ b/sys/kern/sysctl_security_jail_children.sh @@ -33,12 +33,12 @@ max_cur_head() { atf_set descr 'Test maximum and current number of child jails' atf_set require.user root - if ! which -s jail; then - atf_skip "This test requires jail" - fi } max_cur_body() { + if ! which -s jail; then + atf_skip "This test requires jail" + fi origin_max=$(sysctl -n security.jail.children.max) origin_cur=$(sysctl -n security.jail.children.cur) From nobody Fri Feb 23 13:47:52 2024 X-Original-To: dev-commits-src-main@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 4ThBCr4j2Qz5CTtD; Fri, 23 Feb 2024 13:47: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThBCr44jZz42Lp; Fri, 23 Feb 2024 13:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708696072; 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=ElCn8S9Tz4aaTzHs0qL78yJwvPj147wSGk7mqs+KvqE=; b=yE5eIafB9AJtY5ucAO/IJv7y1t44MWshFP4oUVtuODLY2BNBVy7Kt8UI71goSPwT0mAtDz xHEkUfjGYTLeOI2pNEuU1CZ/LalD4tceZ4U2OqhCr4nh6pTLg+DTGQFnUPgfSZ+uGRLPXT N7pi6C/X5JCqyvv1ONWK0T4n/MIfexdrqn1PZLMwlCcdPyN3g1O7FPrf8iYvIHnERBQ1UM FhBt8T+EoVDsKCBGW34/6H6Gcp1j4eFpgExEvs9nqmsNH99ee8cyKdznTI+I9mcchLSqUs gbobQETo8ckE04tPsOpGBCHAg9hvMKCSCiuoursZVFa85Ihf91tc6YZrcO09EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708696072; a=rsa-sha256; cv=none; b=XvdpWmg23VoPcWd2MhPwcwW06Ox0TY0cw6A1tOcYFuOLMG/boFtZONLZmLKE3GbGTW02rL Helv0xU8JUVsren5g4SP5FpM2U7UrpTu2awD+W6AlYbqv7LQmZBLHKpPqOF3QAZ8UM9R7B Tu8p7pBf+dIjskBFj+u+UOZI2N9QahVDvW1ig4tywPzGAysrLiUg6sBcVm2sZ4IbrhzGJU bzhxtdZu4G1yDm1d+PyOj4s2HDuXfcrlgYAtvpShWY/fDCo/fFIArj2RcV783RMzftnJ9h bf3tFeZPDUQIXVWlbxK+PXvvF/zSMoDsqZf8y78CwLQk79U+y4TSlWX0pWYOTg== 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=1708696072; 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=ElCn8S9Tz4aaTzHs0qL78yJwvPj147wSGk7mqs+KvqE=; b=ewx1NhV470spMIn1/ieQa23VG1LEMnzWSUZaPAAN5ykgc4KvP64ZeH8WZYmw6e1sFc3wCP d6GtpdbQV5Q5HkAGSZ7VQ2m0yoDdJLv7hnvlNLih4RFtU1tM/riA9TxyftxoLsyGjA7+nX 8krjj3Y9RZ2Jd2qB36FBuLIGy3l04S+GDR55Oq3KTlXw/VSRNaGIJHn8yd7e3ijMQDfKIA gtz8906phCysjy0M+1fIVKJ6TnU8IcwnA8pKUdQD6SMr2TllfpdmWx7ELmVHr1jMzRPSa8 tlJEGdD4Gf5uuPSC9Mkxp09OK61bG4mqu3NOPloNsbFTBVn0bEkgEtgyENp5tQ== 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 4ThBCr2qxTzJ9P; Fri, 23 Feb 2024 13:47:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41NDlqnP088034; Fri, 23 Feb 2024 13:47:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41NDlqCv088031; Fri, 23 Feb 2024 13:47:52 GMT (envelope-from git) Date: Fri, 23 Feb 2024 13:47:52 GMT Message-Id: <202402231347.41NDlqCv088031@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: b9870ba93ea9 - main - pf: Add a TCP rdr test on IPv6 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9870ba93ea90a12f5a5727c80f7958b17f9afcc Auto-Submitted: auto-generated The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=b9870ba93ea90a12f5a5727c80f7958b17f9afcc commit b9870ba93ea90a12f5a5727c80f7958b17f9afcc Author: Tom Jones AuthorDate: 2023-10-06 13:19:31 +0000 Commit: Tom Jones CommitDate: 2024-02-23 13:47:35 +0000 pf: Add a TCP rdr test on IPv6 Reviewed by: kp Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D42105 --- tests/sys/netpfil/pf/Makefile | 1 + tests/sys/netpfil/pf/rdr.sh | 127 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+) diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index 30099fdc4c17..ce718c4ba900 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -29,6 +29,7 @@ ATF_TESTS_SH+= altq \ pfsync \ prio \ proxy \ + rdr \ ridentifier \ route_to \ rtable \ diff --git a/tests/sys/netpfil/pf/rdr.sh b/tests/sys/netpfil/pf/rdr.sh new file mode 100644 index 000000000000..efa3750e8f42 --- /dev/null +++ b/tests/sys/netpfil/pf/rdr.sh @@ -0,0 +1,127 @@ +# +# +# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# +# Copyright © 2023 Tom Jones +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +. $(atf_get_srcdir)/utils.subr + +atf_test_case "tcp_v6" "cleanup" +tcp_v6_head() +{ + atf_set descr 'TCP rdr with IPv6' + atf_set require.user root + atf_set require.progs scapy python3 +} + +# +# Test that rdr works for TCP with IPv6. +# +# a <-----> b <-----> c +# +# Test configures three jails (a, b and c) and connects them together with b as +# a router between a and c. +# +# TCP traffic to b on port 80 is redirected to c on port 8000 +# +# Test for incorrect checksums after the rewrite by looking at a packet capture (see bug 210860) +# +tcp_v6_body() +{ + pft_init + + j="rdr:tcp_v6" + epair_one=$(vnet_mkepair) + epair_two=$(vnet_mkepair) + + echo $epair_one + echo $epair_two + + vnet_mkjail ${j}a ${epair_one}b + vnet_mkjail ${j}b ${epair_one}a ${epair_two}a + vnet_mkjail ${j}c ${epair_two}b + + # configure addresses for b + jexec ${j}b ifconfig lo0 up + jexec ${j}b ifconfig ${epair_one}a inet6 2001:db8:a::1/64 up no_dad + jexec ${j}b ifconfig ${epair_two}a inet6 2001:db8:b::1/64 up no_dad + + # configure addresses for a + jexec ${j}a ifconfig lo0 up + jexec ${j}a ifconfig ${epair_one}b inet6 2001:db8:a::2/64 up no_dad + + # configure addresses for c + jexec ${j}c ifconfig lo0 up + jexec ${j}c ifconfig ${epair_two}b inet6 2001:db8:b::2/64 up no_dad + + # enable forwarding in the b jail + jexec ${j}b sysctl net.inet6.ip6.forwarding=1 + + # add routes so a and c can find each other + jexec ${j}a route add -inet6 2001:db8:b::0/64 2001:db8:a::1 + jexec ${j}c route add -inet6 2001:db8:a::0/64 2001:db8:b::1 + + jexec ${j}b pfctl -e + + pft_set_rules ${j}b \ + "rdr on ${epair_one}a proto tcp from any to any port 80 -> 2001:db8:b::2 port 8000" + + # Check that a can reach c over the router + atf_check -s exit:0 -o ignore \ + jexec ${j}a ping -6 -c 1 2001:db8:b::2 + + # capture packets on c so we can look for incorrect checksums + jexec ${j}c tcpdump --immediate-mode -w ${j}.pcap tcp and port 8000 & + tcpdumppid=$! + + # start a web server and give it a second to start + jexec ${j}c python3 -m http.server & + sleep 1 + + # http directly from a to c -> a ---> b + atf_check -s exit:0 -o ignore \ + jexec ${j}a fetch -T 1 -o /dev/null -q "http://[2001:db8:b::2]:8000" + + # http from a to b with a redirect -> a ---> b + atf_check -s exit:0 -o ignore \ + jexec ${j}a fetch -T 1 -o /dev/null -q "http://[2001:db8:a::1]:80" + + # ask tcpdump to stop so we can check the packet capture + jexec ${j}c kill -s SIGINT $tcpdumppid + + # Check for 'incorrect' in packet capture, this should tell us if + # checksums are bad with rdr rules + count=$(jexec ${j}c tcpdump -vvvv -r ${j}.pcap | grep incorrect | wc -l) + atf_check_equal " 0" "$count" +} + +tcp_v6_cleanup() +{ + pft_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case "tcp_v6" +} From nobody Fri Feb 23 15:59:22 2024 X-Original-To: dev-commits-src-main@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 4ThF7Z3SdNz5B0nP; Fri, 23 Feb 2024 15:59:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThF7Z2wTwz4RBq; Fri, 23 Feb 2024 15:59:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708703962; 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=dTNlYkHYpQM31xaDtb4pfA/zS9rtZqcATxI7PunM5sM=; b=F54bEwS0YSOBadx2TPCuGCWkbbDDDf9sOkNDB6GrMp7v00Y9rUP/o1Z4agsJo78xm1Bteo HX3MRRR7hChcjmHKsOp6BrxByMPLHlgzhpbjSNm380bkbvhtSN5A/63sByb+TFnzDUBBuJ DZPl8VeVEQ17x2x4b9wA8ikGr3lAelr3DNRtYIP77LZQ9POsi+glZTAf9/I1VF2rA3pC2b nthqnkDWZ4FSAlHKOQq84Fix3xoc2WMqHWM75spi6Z/62138+VHkSOucdBJ7aVYN6Erd2g t146tdGyUI0a167wcWOT551ozETpnZCA+PW/Cqmyml9MOzsEl/bJwBM/k4jgow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708703962; a=rsa-sha256; cv=none; b=M7DVzk4zwkUtJzBRD8Cf0iRZSu0gspiUzLEu50WeHcdvu7biLqGjSGYJ0qfpw5aTkAY6A8 ZDXEHlN/2drxq+INKTZPFEGdcWk8J5FQnOe6j5RwDAFUktqtz0CjDGJkleu7jTlPanpKpy yGgHHlBVejhNcKzC5REH8P5dZf/yuDmpNQEfZGHDTPLGP8TUTJmPoBisZKCswHCu4OC4bk 1TCW192ZGE/U3AFcARxYMhPmWN1CloI3/qKDgY8uuras10SMtGhTcV7V1y9UWJZ5sMF3cM ccSeWRzXtp5zvYn3l2+XTdoG5UpAMhUb8bXbVxqpZyg95sDWcC7G4c1AE4G5Uw== 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=1708703962; 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=dTNlYkHYpQM31xaDtb4pfA/zS9rtZqcATxI7PunM5sM=; b=VeNAeUNY6oGhS2hESpTI1jYQcR2JngT2N5NgvpcmpaYb1v21JdHtA69s/O0o/HHanwrOFF H9/NCf1NDfZAL9vWP6gMrhVZEi1oE4xVw67HRea7lgOWXyusv0/dQKzaRbIEbbYmKYXLkn Q1zA3gtodmNNrf9CtrIoe35YWi83KABRJtZ44h/FramCzojK5x+1mxvIZlmoYhp+c4YyPz prXbT3Bu00jIznBNzG2CpvPmsl9+EJciIfE50BLzTGj9QozQb5JCUbioJXJ2T7IUR4nEI0 ORzwzBMIAuJrKX7Q/d9mN0GS4kcvV/J46jZTxuWo9PJS9V+OqqxOpZhBq1okng== 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 4ThF7Z1z9jzMGK; Fri, 23 Feb 2024 15:59:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41NFxMUL012684; Fri, 23 Feb 2024 15:59:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41NFxMho012681; Fri, 23 Feb 2024 15:59:22 GMT (envelope-from git) Date: Fri, 23 Feb 2024 15:59:22 GMT Message-Id: <202402231559.41NFxMho012681@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Tom Jones Subject: git: 3db693f7da8a - main - pf: Correct SPDX identifier List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3db693f7da8a1aaf0a8887e7791ebb5d67c7a2d9 Auto-Submitted: auto-generated The branch main has been updated by thj: URL: https://cgit.FreeBSD.org/src/commit/?id=3db693f7da8a1aaf0a8887e7791ebb5d67c7a2d9 commit 3db693f7da8a1aaf0a8887e7791ebb5d67c7a2d9 Author: Tom Jones AuthorDate: 2024-02-23 15:58:38 +0000 Commit: Tom Jones CommitDate: 2024-02-23 15:58:38 +0000 pf: Correct SPDX identifier Pointed out by: Mike Karels --- tests/sys/netpfil/pf/rdr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/sys/netpfil/pf/rdr.sh b/tests/sys/netpfil/pf/rdr.sh index efa3750e8f42..5e60b97c653b 100644 --- a/tests/sys/netpfil/pf/rdr.sh +++ b/tests/sys/netpfil/pf/rdr.sh @@ -1,6 +1,6 @@ # # -# SPDX-License-Identifier: BSD-2-Clause-FreeBSD +# SPDX-License-Identifier: BSD-2-Clause # # Copyright © 2023 Tom Jones # From nobody Fri Feb 23 17:38:00 2024 X-Original-To: dev-commits-src-main@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 4ThHKN5ZKvz5B9l6; Fri, 23 Feb 2024 17:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThHKN50JVz4hpw; Fri, 23 Feb 2024 17:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708709880; 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=xac9xJnrWYcre02Fa6p7ErCuUaVpUv4gxbWeI3mztzE=; b=AANF3ud/DFfQ4zz5sOmYDl7B6WykR68n0Ywjny97RQju5RPboeBF6ztz+IWLbimXQfThKC odfUkZxVwko91EV2s26uMbEHHqXhDwIN39t8bhuqUZZwn0iMHL41WBGuQAx64k/CyFpaLu SIEWHasEWB3IcldsDWKFvrQrAA4/Stsn8LatJyxcgdCltql8OOd3LD6rNsI8p/K7xgbpqs c7RU5EpVZ7WMuvJHza9MjtHQaWj6umWsgDJbixGdkqRDB923f75/FfbAJkV0OLjx2TXFXV xaA/wFXEWu84IbiL2TCXVa6wTxEPRNgO8sD1fpN/kvwF6X6FMEF0R3dlevAKnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708709880; a=rsa-sha256; cv=none; b=qivZ9QocEcxnKYuLemDAlxTL2OwHNyqz0e3MyEAFsqWzhahFb/R/VS+MrpIn4uAceKYMRO ZGlN5bXmWwdCoptLNA+QZNGOXSbaEGyQjQN0AKLcigWBvEsTBBxuU/MP3bk9c5iFumFzG+ M1MSV6Y4/Dy+ec3Hk4WbKk+SPTHYNfTaKV2DFUwxQXXq35260NdBq/0msnyrs3xGxsaPnp NowarAwtCEEiNbJxaUCEleGDtYjMp9xRHxcvbqsvgy0sbM3RN+g15TfAWj47tom7N6bd1c RO3aNLxbRRm/7vgJGQoBvH4TA7w7Kocnr0yd/tCR9PdyXuR4kjNsH40/OImCpQ== 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=1708709880; 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=xac9xJnrWYcre02Fa6p7ErCuUaVpUv4gxbWeI3mztzE=; b=mJVeeC1ARwEgvlqaXR8S67UoSSJ8fWCmohCc1MgjY8mxHMbmmjpmPB2IdsXO3Sa34Hhh86 J0z6MuJO5fey1iswp5bHUBeJKNMtIGuH5VO9BhOyA8gu4EQlH0AfGganRqkCr8ZsgwxI1W 5xUfMY+UAUiOe9JBghMvuLJWbGWA3B0pkspKz+sEBDWvbzLFGfRaUFOf2Mt/Wpa2Ztrc1U dHYsO/nomx4WhhvW8kGkyVL/v1IC+LQoDNppT8JBFfmHnr90wUafdPIhMXcmU8to86by/r DkHjw7tYpPicTm60DtdnH0JYP1yYb0ohUvQn95LV3M7IIJAc9sM4PfxP4z5BQw== 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 4ThHKN43NqzPsF; Fri, 23 Feb 2024 17:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41NHc0cx084415; Fri, 23 Feb 2024 17:38:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41NHc098084412; Fri, 23 Feb 2024 17:38:00 GMT (envelope-from git) Date: Fri, 23 Feb 2024 17:38:00 GMT Message-Id: <202402231738.41NHc098084412@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 0085afdceb17 - main - fs/msdosfs fatblock: use ulmin() rather than min() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 0085afdceb17cb7d4e41f9073299f688372c6a0f Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0085afdceb17cb7d4e41f9073299f688372c6a0f commit 0085afdceb17cb7d4e41f9073299f688372c6a0f Author: Konstantin Belousov AuthorDate: 2024-02-23 17:30:10 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-23 17:37:52 +0000 fs/msdosfs fatblock: use ulmin() rather than min() to avoid truncation of pmp->pm_FATsecs. Submitted by: Robert Morris PR: 277237 MFC after: 1 week --- sys/fs/msdosfs/msdosfs_fat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/msdosfs/msdosfs_fat.c b/sys/fs/msdosfs/msdosfs_fat.c index 4a7faa9e1f05..bfaff417f677 100644 --- a/sys/fs/msdosfs/msdosfs_fat.c +++ b/sys/fs/msdosfs/msdosfs_fat.c @@ -97,7 +97,7 @@ fatblock(struct msdosfsmount *pmp, u_long ofs, u_long *bnp, u_long *sizep, fatblocksec /= 2; } bn = ofs / pmp->pm_fatblocksize * pmp->pm_fatblocksec; - size = roundup(min(fatblocksec, pmp->pm_FATsecs - bn) * DEV_BSIZE, + size = roundup(ulmin(fatblocksec, pmp->pm_FATsecs - bn) * DEV_BSIZE, pmp->pm_BlkPerSec * DEV_BSIZE); bn += pmp->pm_fatblk + pmp->pm_curfat * pmp->pm_FATsecs; From nobody Fri Feb 23 17:57:57 2024 X-Original-To: dev-commits-src-main@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 4ThHmP4Nk0z5BCMj; Fri, 23 Feb 2024 17:57:57 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThHmP2gl0z4pMD; Fri, 23 Feb 2024 17:57:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708711077; 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=bnNRv6++mGGHG97VbepaU+oml8dGMsA7OoW80JmI1FM=; b=SRV05U3UVjBIXZbamroKxjPm0jP+h/mZ4MWteAvsCIgneRj33Xcli5fjQYR5z2QFDuP2Cc vWnjHKShA19t1tkaK6PldIIzaDWUzJZpdKzQJdMn6oBcdhiGUgiC+UMAiNPPt9hqMWAyKH FTsSZUQLi4erk0bw4PyrMDrBB5uOAo0mJb74KWRSCwsZeGWYqIdJDWBVaZAd64yBZpcvCZ xRmUoPjI5LYPwVj5hZz4RBowMtvm7X0qiDzzh2BTYzt0qgDWHaPT3Aw/z6/1NiDRNQ1Jkv 1GvhA0T9lTOdWjkeo4RHcHsEDsA65RnwABlGBBs/LM51ojgrYfs4Jly3AOCMWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708711077; a=rsa-sha256; cv=none; b=KcaPawaH91DbvVfAC3AYMPr+6Q2z8uTKv7v7/Xkggs/LodIUO63Lslq5+SrEgHaO0w4JJV YbQgdYvEiyMFC6fouN8nNphFD5js+eU348kflg7Awuv41J1djEtuhG9/deUEBm11cVt14u xtjheKW+taqm4h57BDxNsxs7KRVHPi1qDPWdbo/DRG7rDy5nomB6esZU65/Ia2hnxkgyiI ENTB5+rRSU5Li2jZs+CLIE1VZc+vhhTv7OPrZoyljnBoyH/AlFN8QqBKffQL45EWqZDlnL 7rutGS6WPIzgel6OgpOtnE4aCRL2oYcgilXJT5AiQoXE01lnEs0b5NBVrKzvaw== 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=1708711077; 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=bnNRv6++mGGHG97VbepaU+oml8dGMsA7OoW80JmI1FM=; b=sTADLkA2p3bBR/t4i6JktrjHsU/kzIKRliJK0u/0n5S56pI2xI4yqB2jy+jajkbGFhQjFS +GJ3HBsL/Sl/07uljbHwEShJcizQdJj7ct0p9wK1MW0XE70OVO5aDsxCY9lSFrMkKoHn3D R0P6gBt7NcbtlQKPfnB+54Kl/rnSWOCQ8BBaJPnwuHV/IO4lBtnDutHOo/2VCjP0AQD24R VUzk4Opm8Voh3zwCeBc8VzpEWjqzAti2RAeoVPJNpsgIoFg56S0KLa3yLfHsMTW07nzZVT JpWJXsCM8KaFQNwZNuBo95puomCDOG2zalg0dFqj3qp5TBJQ8ZzDl1GZNLZc9g== 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 4ThHmP1nNXzQgb; Fri, 23 Feb 2024 17:57:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41NHvvWd018216; Fri, 23 Feb 2024 17:57:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41NHvvVs018213; Fri, 23 Feb 2024 17:57:57 GMT (envelope-from git) Date: Fri, 23 Feb 2024 17:57:57 GMT Message-Id: <202402231757.41NHvvVs018213@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: baa7d0741b9a - main - libsys: link symbolic List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: baa7d0741b9a2117410d558c6715906980723eed Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=baa7d0741b9a2117410d558c6715906980723eed commit baa7d0741b9a2117410d558c6715906980723eed Author: Konstantin Belousov AuthorDate: 2024-02-22 21:13:02 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-23 17:39:42 +0000 libsys: link symbolic so that libc/libthr do not preempt libsys symbols, esp. errno-related. The issue is, if libsys is linked with DT_BIND_NOW flag, and then loaded as filter, rtld tries to relocate its PLT symbols immediately, not as filter. There, during symbol lookup, rtld finds filtering symbols in libc, and since libc is in loading filters mode, the resolution stops there. The end result is that libsys links to libc. Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D44027 --- lib/libsys/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libsys/Makefile b/lib/libsys/Makefile index 5e8c39deb463..aefa19f35193 100644 --- a/lib/libsys/Makefile +++ b/lib/libsys/Makefile @@ -43,6 +43,7 @@ CFLAGS+= -ftls-model=initial-exec # Link with static libcompiler_rt.a. # LDFLAGS+= -nodefaultlibs +LDFLAGS+= -Wl,-Bsymbolic LIBADD+= compiler_rt .if ${MK_SSP} != "no" && \ From nobody Fri Feb 23 17:57:58 2024 X-Original-To: dev-commits-src-main@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 4ThHmQ5dm9z5BCMl; Fri, 23 Feb 2024 17:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThHmQ3hlhz4pD7; Fri, 23 Feb 2024 17:57:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708711078; 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=ppOMLu93omniTqSvJjTuEKy8JMa0NRyVCJxxL0FqHwQ=; b=HX7BtQ3koaDNA6KLT3f4RhfIDC3k6lxm5xXzK+i/L0q4xZnuC6rXv2tDGchNmnn8lmfA1y WfiByDLIAESjm0V67d+QKqRVFPNn6m72nUCUbdlIG7A8ztWwuphYoHTZdpGFKHo/RLTqTJ /q0CcjcR2TnVmSIsSMRUt1gX1QNNRFFt25fT/KbDnn2u25nw/uFRpH4yzWrFfW6NZ1C9U9 +TdPosREntRmvqMd3cFVGXFqT8IxgC+YwlXkClRVHBSL96L1/2pb+7JKOnaNVWtqo7gAFi o3BHFXUkH9EzoOmexr/1bydUzQOY3RSVKWm2QP7SdtiS+8/ZcPcINd7pglLa8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708711078; a=rsa-sha256; cv=none; b=JanWIvTKM7gSdZ6Fs0E/M51B58PiIzwP9CPjSh+xGrjgVx3DQauiP069Pe9IWvkrcdLM2+ 2sSSexS+zpuvW7EGFK+Bf8nQ2sZ+K2ezPjPhgZ9W+Tq2xjfi960urJ+PoNYBEPg00v2rja xVWOyShFFtQ+J+m0TrY5Iwumge5h8BaUNKFtLdlrJ/tCiIh2fG4HEZsAUa5e4G9XnWurgR aqS0/A7NtCuZDsaUFQDtSusia5rUrkuE9YoATJg/9ACQC32FO4D4oNs2cDGWTqqNoaAZvf eGJFUKYhtyVU4em252sG68KCmZqgBq+mENGtNnSo2v80AinoZUVSShITGWhu2w== 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=1708711078; 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=ppOMLu93omniTqSvJjTuEKy8JMa0NRyVCJxxL0FqHwQ=; b=Xc3DDRcV4THydEo9SfFIKeFifG+E1dxOJas1UtKnVRIMspVxYn3ZgF1g5ys0FastA9c/Th UuJ1Ih4Yj9eF/C4q3VV0KPI3tjnkfMdkI2ZE8N3bFRSqMF0BO79b/NZUXaQw4/xs2+mmNo 6pdmEaSG7jbO/CzVwh5aKADF2o/aMgzWx9F/iu4NBOSpaHgPge05EI2Ssxx2+QIVT7qdu2 fffWHLY3nCMJ94tAY7pBbcgStCul9qTCRE6CYRxg9uTU/T15nQDj4CU23jcfEtAGLfHz7R NLiaxAA+wxhUcPaabhbvOXM34AZyvhJ6DTDkVr+dzWQ3dt3hj2IN6RmSqT+9xg== 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 4ThHmQ2SktzQmT; Fri, 23 Feb 2024 17:57:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41NHvwfx018265; Fri, 23 Feb 2024 17:57:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41NHvw1Y018262; Fri, 23 Feb 2024 17:57:58 GMT (envelope-from git) Date: Fri, 23 Feb 2024 17:57:58 GMT Message-Id: <202402231757.41NHvw1Y018262@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 7d233b2220cd - main - libsys: fix sleep(3)/usleep(3) cancel behavior List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 7d233b2220cd3d23c028bdac7eb3b6b7b2025125 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7d233b2220cd3d23c028bdac7eb3b6b7b2025125 commit 7d233b2220cd3d23c028bdac7eb3b6b7b2025125 Author: Konstantin Belousov AuthorDate: 2024-02-23 14:53:10 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-23 17:39:44 +0000 libsys: fix sleep(3)/usleep(3) cancel behavior Move functions back to libc/gen sources; they are only versioned from libc and not libsys. Access libsys interposing slots using __libsys_interposing_slot() instead of direct __libsys_interposing array dereference, which cannot work from libc. Reported by: glebius Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D44042 --- lib/libc/gen/Makefile.inc | 2 ++ lib/{libsys => libc/gen}/sleep.c | 2 +- lib/{libsys => libc/gen}/usleep.c | 3 ++- lib/libsys/Makefile.sys | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 648ddc76e056..3a8b4e57420a 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -137,6 +137,7 @@ SRCS+= \ siglist.c \ signal.c \ sigsetops.c \ + sleep.c \ srand48.c \ statvfs.c \ stringlist.c \ @@ -160,6 +161,7 @@ SRCS+= \ ulimit.c \ uname.c \ unvis-compat.c \ + usleep.c \ utime.c \ utxdb.c \ valloc.c \ diff --git a/lib/libsys/sleep.c b/lib/libc/gen/sleep.c similarity index 97% rename from lib/libsys/sleep.c rename to lib/libc/gen/sleep.c index 7d0fa5332ecc..46a7dcc4dbca 100644 --- a/lib/libsys/sleep.c +++ b/lib/libc/gen/sleep.c @@ -56,7 +56,7 @@ __sleep(unsigned int seconds) time_to_sleep.tv_sec = seconds; time_to_sleep.tv_nsec = 0; if (((int (*)(const struct timespec *, struct timespec *)) - __libsys_interposing[INTERPOS_nanosleep])( + (*__libsys_interposing_slot(INTERPOS_nanosleep)))( &time_to_sleep, &time_remaining) != -1) return (0); if (errno != EINTR) diff --git a/lib/libsys/usleep.c b/lib/libc/gen/usleep.c similarity index 96% rename from lib/libsys/usleep.c rename to lib/libc/gen/usleep.c index efd5ee0d1667..e312e55c6541 100644 --- a/lib/libsys/usleep.c +++ b/lib/libc/gen/usleep.c @@ -46,7 +46,8 @@ __usleep(useconds_t useconds) time_to_sleep.tv_nsec = (useconds % 1000000) * 1000; time_to_sleep.tv_sec = useconds / 1000000; return (((int (*)(const struct timespec *, struct timespec *)) - __libsys_interposing[INTERPOS_nanosleep])(&time_to_sleep, NULL)); + (*__libsys_interposing_slot(INTERPOS_nanosleep)))(&time_to_sleep, + NULL)); } __weak_reference(__usleep, usleep); diff --git a/lib/libsys/Makefile.sys b/lib/libsys/Makefile.sys index e33a11bacb57..6b83e5812f76 100644 --- a/lib/libsys/Makefile.sys +++ b/lib/libsys/Makefile.sys @@ -40,7 +40,7 @@ SRCS+= \ SRCS+= getdents.c lstat.c mknod.c stat.c SRCS+= creat.c -SRCS+= lockf.c sleep.c usleep.c wait.c wait3.c waitpid.c waitid.c +SRCS+= lockf.c wait.c wait3.c waitpid.c waitid.c SRCS+= recv.c recvmmsg.c send.c sendmmsg.c NOASM+= sched_getcpu.o From nobody Fri Feb 23 19:33:05 2024 X-Original-To: dev-commits-src-main@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 4ThKt92WPBz5BN6m; Fri, 23 Feb 2024 19:33: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThKt91zpXz54KM; Fri, 23 Feb 2024 19:33:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708716785; 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=lC6z4xtsHjqPA5+fP1CeRsuOI7Ed8Vgz+sJVAjrR9KA=; b=rk4lZvNhdvm+Nzf4y7xyiFk8+dcGmd92hVR3APtlZpqbbmQrudpxe4rYqWRaTYcUgA5vtg o8qSduhjI2wJFDrguSCK3e3rt/N+280QYv4QdOJ4R5+QgWhhAuXoQHxAFEYpSNN0chx1KO IVjmRPtcZEQ7mwfMToHTprf+GcDIU/9ko1T+59zAeZQcyqFCxhHF5hclbqHVLKIhGQ62Hn A53NMaFsQS6kgiEOCwkCJ0DvmeVQjyNGWITg4eTNW5DVv2bIuFQL2mZch5nZPRWfr0pk42 lcRRWoX9AxuzY8/NexpslIcDlDGB9lrVlO8hLHVsw8TJPMrw/e1R/xob9JxiFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708716785; a=rsa-sha256; cv=none; b=LJ5dBXpBDNVQ/A9KeJwbEgmiXTXChauEU3bmQg9wGqCt6aRKUEkD3a5a5EVt7VQ8mdAiqI 8WUxhNeFpoI6CFp4CepznvWXHK4o+wkkZrTCcQLSymb7QN8+LSySPEZWWjKcrNFoILjPXy mRK+AGiulVIt3axzW5M6wSFmVCjjiXE6Tt6MKmMIWleNfqgsyNYlkyOMgM6LbhlyKolh9n HtavtRADVEa0qzThTjsKSpkECgKMRQuHl2/jzdmKxmIVGWJsHAmLjjB/9zKk0wdgjseRza QN2XxJcuCYQE8xyXk2h5+l9Fej6ZqzhvdfwrP9nti6C/ABq71GwroIG05Li/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=1708716785; 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=lC6z4xtsHjqPA5+fP1CeRsuOI7Ed8Vgz+sJVAjrR9KA=; b=ebrJ33tePdwzh8pi0+k8LR3bCK0WInUQpBAkNb8htA+GB1RpMvkMKVTlGLV748ECmFr2Gc lytGdplHTrzPiM2fBx8809o6sC5rRoaFMsYgnQABLWLusYJKHN1Z94GXDfk/QQf6H88HNc XuabWiwH6PPEgpCJawAw1kMNqxGXiRm7ds+yPvZwN5ckcBrVcgfaOUoEcu/UEaVMNTn04T KIopkSjomzIlbC0U8hdvhxCr6ItwyL/8QvNrqMMXo2AF8n0AelLJQCTrM9JWohLyKckpko udIA/MXj8SezbX+17YlIpDlYLdBXsQEEPvvniRjCUjAiGPKcI/RNk3Btym17dw== 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 4ThKt912WbzTQM; Fri, 23 Feb 2024 19:33:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41NJX50A089288; Fri, 23 Feb 2024 19:33:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41NJX5UF089285; Fri, 23 Feb 2024 19:33:05 GMT (envelope-from git) Date: Fri, 23 Feb 2024 19:33:05 GMT Message-Id: <202402231933.41NJX5UF089285@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 89189224adb5 - main - snd_hda: add 32-bit memory quirk for Creative Sound Blaster Audigy FX List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89189224adb560af6de2bb2e13a2b1831b89101d Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=89189224adb560af6de2bb2e13a2b1831b89101d commit 89189224adb560af6de2bb2e13a2b1831b89101d Author: Gleb Smirnoff AuthorDate: 2024-02-23 19:30:13 +0000 Commit: Gleb Smirnoff CommitDate: 2024-02-23 19:30:13 +0000 snd_hda: add 32-bit memory quirk for Creative Sound Blaster Audigy FX Despite still being in production the device appeared not able to use memory above BUS_SPACE_MAXADDR_32BIT, and if your desktop has a lot of memory there is a high chance driver would allocate inaccessible memory. Submitted by: wulf Reviewed by: mav --- sys/dev/sound/pci/hda/hdac.c | 1 + sys/dev/sound/pci/hda/hdac.h | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c index 1f06692ba36e..704bcad3822c 100644 --- a/sys/dev/sound/pci/hda/hdac.c +++ b/sys/dev/sound/pci/hda/hdac.c @@ -201,6 +201,7 @@ static const struct { { HDA_VMWARE, "VMware", 0, 0 }, { HDA_SIS_966, "SiS 966/968", 0, 0 }, { HDA_ULI_M5461, "ULI M5461", 0, 0 }, + { HDA_CREATIVE_SB1570, "Creative SB Audigy FX", 0, HDAC_QUIRK_64BIT }, /* Unknown */ { HDA_INTEL_ALL, "Intel", 0, 0 }, { HDA_NVIDIA_ALL, "NVIDIA", 0, 0 }, diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index 31bdc9130d9b..53c101f3119b 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -192,6 +192,7 @@ /* Creative */ #define CREATIVE_VENDORID 0x1102 +#define HDA_CREATIVE_SB1570 HDA_MODEL_CONSTRUCT(CREATIVE, 0x0012) #define HDA_CREATIVE_ALL HDA_MODEL_CONSTRUCT(CREATIVE, 0xffff) /* VIA */ From nobody Fri Feb 23 20:42:57 2024 X-Original-To: dev-commits-src-main@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 4ThMQp1tt9z5BTXW; Fri, 23 Feb 2024 20:42: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThMQp1MC7z3xpn; Fri, 23 Feb 2024 20:42:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708720978; 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=l5/gum6HeftRYj3EeKUPStADhCpNJ3Sgd9xBGPFHGhs=; b=Qc+PbOOKh5HZmXzCWYhIYIqUJFw9vjfTeruBhpOUbraBo+5Yxzn0mBh630lAGos7Gtj7vp 9uq8cCApssujKdkmnubpa9xO1rA2T2bSAvHRypHUuGXVwxHFM9WfKRv4D+mhjym253+wSe v53Omhg8SnUSloRFEB4pk/J8G09FtPJsmNuoJngrc7IiiSTVfI9l7O0LUA0KYY8/hv1/mg NLBBqR/sQmwoDCAh0jc0w1fh3NJRMUZxv+Br3Y+LOafddAZEX6vWcK6DaBGAzBYTqvf3c1 giPsOmVqAfmapQRcJJBEg0WRjOb9xUavje2HO2Wo46RxXTQYccWVy3Xw6ySr9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708720978; a=rsa-sha256; cv=none; b=rWC1lF0pnVVLa28nW8FHVDPfYV9RrFLCo3ORnIv2PZTzf2CqSBJyLMt2Orv1Zv4I18CIsc R3m4W94vOoV7I2NE5mnsLddt+RXS4V4UaImYuGyORklP+HntckjeRgm4q1opgPd/p9XS6k AOOF5NO8+AT5kUI4pHH5a4E5T70EMZrge8Dkrji8sGCjqqUZT2S7yUo4wBaZB4zuw421Zh vJtMw5tTxjVO60SguzDDnfEt1EbhhspZy315FHc9xl4zlDQ98+jocQRL0bcd+2DzjBXDoW fRwI11ymJDMWvuhqW6lFwo9pkQpvzvALFS5+br11YxxonZCX0YJfmhycPyuLRg== 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=1708720978; 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=l5/gum6HeftRYj3EeKUPStADhCpNJ3Sgd9xBGPFHGhs=; b=mXcFXbuVQ7RzLsixrF+GN4OhOuzWNv6Z5VQT0qMjLv4t7InSDEHbfRSoyXuOsRpt7cPpk9 01GvaQCyHuR8MhIMp7BAmkdXCuwUeB2+hsepPgZgYq0uShyCSjlQNXqWohqrSp+IRCSd7q BaKon/xfq+yko8fKSlo9uFFzcijspvRA0LCfdc1Fi+91aOx7zmo8KsXd71zC0U5rE+apLF WOqTvAElvY29vCKP8KmmL6oFZolcJfNiJIAywwqFDXzmU7akQkyURGnzFMCosuxUM+Ww3b hlWn4PfajNbpfUn3vyHD4fJEeJAuh1Z1q/w/xtlDjHk7ucT7udp899lkYbnCLA== 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 4ThMQp0PyGzX8D; Fri, 23 Feb 2024 20:42:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41NKgvoh006956; Fri, 23 Feb 2024 20:42:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41NKgvUN006953; Fri, 23 Feb 2024 20:42:57 GMT (envelope-from git) Date: Fri, 23 Feb 2024 20:42:57 GMT Message-Id: <202402232042.41NKgvUN006953@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 533faf21c19d - main - sctp: improve consistency List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 533faf21c19d0fa4bc3c0a986c67667991f90883 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=533faf21c19d0fa4bc3c0a986c67667991f90883 commit 533faf21c19d0fa4bc3c0a986c67667991f90883 Author: Michael Tuexen AuthorDate: 2024-02-23 20:40:46 +0000 Commit: Michael Tuexen CommitDate: 2024-02-23 20:40:46 +0000 sctp: improve consistency MFC after: 1 week --- sys/netinet/sctp_output.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index d7742222a3bf..c988a8426fe8 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -5039,11 +5039,16 @@ sctp_arethere_unrecognized_parameters(struct mbuf *in_initpkt, at += padded_size; break; case SCTP_HAS_NAT_SUPPORT: + if (padded_size != sizeof(struct sctp_paramhdr)) { + SCTPDBG(SCTP_DEBUG_OUTPUT1, "Invalid size - error nat support %d\n", plen); + goto invalid_size; + } *nat_friendly = 1; - /* FALLTHROUGH */ + at += padded_size; + break; case SCTP_PRSCTP_SUPPORTED: if (padded_size != sizeof(struct sctp_paramhdr)) { - SCTPDBG(SCTP_DEBUG_OUTPUT1, "Invalid size - error prsctp/nat support %d\n", plen); + SCTPDBG(SCTP_DEBUG_OUTPUT1, "Invalid size - error prsctp %d\n", plen); goto invalid_size; } at += padded_size; From nobody Fri Feb 23 22:26:49 2024 X-Original-To: dev-commits-src-main@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 4ThPkd4NHbz5Bdjj; Fri, 23 Feb 2024 22:26:49 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThPkd3712z4BHJ; Fri, 23 Feb 2024 22:26:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708727209; 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=qu0yPeswvSzcLNSIF/b4a3SfO32pE58mnbByYQwP/sA=; b=H+EMWcvsjminUFY/homMgKWHlC5p5vcYCKXMsueRyzHBkety5P/5vc/FwEOzpfdiHlEN6+ Gj4az1ZIPlc7jnKwQr9ayAHKuRL5hCeBtxFvuzzkzXXjpymeSkjzR/xJMzXp1CIMX9rZ++ EHLXEHfoeZR1hZHfOjv07cfVia6jcJsHkEd73IozTfDIU9aiK+4NJP6oxfrx+fvh8sPFk6 QnbSdT8pmlPWofmbYRQ97lDj2MtwNrOurvGLN9fTYb9CHk7LZi5QNT+ZsUD3Cyww34OhrY Z/UT2fo4wxLCz/TqzAXdxGcY//TarU/6kKjI0DohNDNGa39YIBix0KW/VA4Y9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708727209; a=rsa-sha256; cv=none; b=PXQm0mZvoRmZZXyqmAAtPdj+pXrKVEw6qrmmB3cjSTI6n/aRp68JPsi1DxFu8YhkmVG4I+ 5HY+N0bsT0aVEYIvPfroh360/bslTb74MsIbx0ngX2OAkjBwWlkNrCXPYeT7xZtSV7NhDv 5JPoiXLI8b7m5FDoIQyEgn8Q/lgS6H0YkcNsxtcL4dkISY/RGbVjjW7suKmoOT5pmSZU1p +ueGF4RCm4q31mt6VSaQW1xEImgoXJCwkMXDpQRtM1PVHin2mJiLk3g82OlKShJhvso+Q/ PDhhWyR1ggUC3V25YcRqyGxwNmZv0S+HhCmqaQB3guRtGgeAV7cZFyxm6ihxiA== 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=1708727209; 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=qu0yPeswvSzcLNSIF/b4a3SfO32pE58mnbByYQwP/sA=; b=Un/UQpMv+QsFQ8eKwTEX/tcIVqlXwAyVNv8jupW+ObpMmZthpUeL0QtGz8EWKK5KCZnofO Xjyv1cRuDhFdvEd1jQUkuXbH76008cijHyhcHoHQUiFeWSewHxdIDGfvW4gsTwLZuIBG5O KdqVeO59SPV7B7a8m42xsKPdUUjoGVBNzjsC6Q8RtJ64rX5gj89Ao5MZhxC5UXcjdgxklx 9pOKNX+dZbmqwc8KhvtO01PWc+KfF1KRsemIVs/uMT4cDTgIDMZVlYLzoi8uTONLQyff6E 9Zfh2CEgUagVSjYnONjRSk1umABWlZLN+2I+Kvvi35aD684ZjKheTe0+9PLLEg== 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 4ThPkd2C9LzZl3; Fri, 23 Feb 2024 22:26:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41NMQnX8077546; Fri, 23 Feb 2024 22:26:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41NMQnWH077543; Fri, 23 Feb 2024 22:26:49 GMT (envelope-from git) Date: Fri, 23 Feb 2024 22:26:49 GMT Message-Id: <202402232226.41NMQnWH077543@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: c5698afcd58b - main - libsys: remove duplicate, commented out code List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5698afcd58b6610f7ad022a7bff9debf3ff8b66 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=c5698afcd58b6610f7ad022a7bff9debf3ff8b66 commit c5698afcd58b6610f7ad022a7bff9debf3ff8b66 Author: Brooks Davis AuthorDate: 2024-02-23 18:01:18 +0000 Commit: Brooks Davis CommitDate: 2024-02-23 22:25:35 +0000 libsys: remove duplicate, commented out code --- lib/libsys/Makefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/libsys/Makefile b/lib/libsys/Makefile index aefa19f35193..a1c6a64194d0 100644 --- a/lib/libsys/Makefile +++ b/lib/libsys/Makefile @@ -51,11 +51,6 @@ LIBADD+= compiler_rt LIBADD+= ssp_nonshared .endif -#.if ${MK_SSP} != "no" && \ -# (${LIBC_ARCH} == "i386" || ${LIBC_ARCH:Mpowerpc*} != "") -#LIBADD+= ssp_nonshared -#.endif - # Define (empty) variables so that make doesn't give substitution # errors if the included makefiles don't change these: MDASM= From nobody Fri Feb 23 23:54:44 2024 X-Original-To: dev-commits-src-main@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 4ThRh43RXPz5Bmfb; Fri, 23 Feb 2024 23:54:44 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThRh43F5Dz4ND6; Fri, 23 Feb 2024 23:54:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708732484; 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=LM3Dr18qsg0lS4HWbN3mR9y3Mj4unlzTD3E8qroOIPc=; b=JGQwCtPGdHPGxA84gSZNG+neah11ekJPjSChra6RjjdGqOzOOQTIu3ggWxosgftBa6ydJY wWVhn5btkuqmKZCbYu+rK4IpqEE6BhQ4bnTQrUy3j+Ui76XlXxAs2+MkAJzx1SeDQep5+s 4Pr+K/34MjxdP6MfHpBJp9l/z36i6nQXtRf7xXjIYATTg3JoppxwBFAIvfb3WcgLp3dLbk mSjK8dB74oZ18n6EPrA7lBnSaYEumT3uGYMyDPIYtQWkFJMStuMOzWwuhDAhmDcx7LLOUI 0IQqHnQJ47roDyIN7lqeigwyY6HU8UAg6CzAVfa+ZwVEXoIQ5CVU03aFGTXvng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708732484; a=rsa-sha256; cv=none; b=IgGuA0RcAQ9qx2XOM/bz8G6HnW42A/kguAeuI5yftHxM5rjIbmQa1msCG7anVuUI6EwqMc xcCqtH3VGmb7vqnl1fJ8GUjMTiK/3S1orRQ3G7ADfjaIpPbbV9HjkL1rEgwcQ49XUByKAl CCFmnuZv4noIAKd2UopDqNbSrpo+3cPLAEWnVwaYrWZ/gN/KtRLG+8F1g47cM/ONjppLoz 10j9ktPdFcOLZNaQkB7ARLT7LtOJ6WkFKz4maxDBYGCI5UqXnePWMMAi1pDJsJxYD5ZbYh NfnkhzfUVBndBdX55Qc8lRUuXSep2M9uSuHOqUD5MbcM/SqEjM6oxVwkTm37jA== 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=1708732484; 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=LM3Dr18qsg0lS4HWbN3mR9y3Mj4unlzTD3E8qroOIPc=; b=P3keKJGMQXAaM0ZptLIXhycKG61Uj4T+jIzs5NvFpSks+dTAwEJ02auaat5H1R3TVUwixC Ex+Wxsa/7V5TLLf/aaO37jcWvYRDe9JjO25rp9cFBv16Sy8OHNxwJx/inXRoSbQc0xgTlH bii4BWKbrs3jn9oIuTrSnZyzCnf2tuyk9vzRjAmrAY7t0SnAdNZ5iRUUYnvmVf92tPystT VBWT5WQCdNEMeOrF3oxPL+Nd1IULNeACKmfx0jS+PXPwSunX+jjeCbymRe7chF47+oxKJM oJlIxSTtsPzMtLdCg6pOHhYvtBjFXOHs8PJ9q6IPOIqAhMDOO/5OofvnrZXwSw== 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 4ThRh42KMhzd3h; Fri, 23 Feb 2024 23:54:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41NNsiUI029399; Fri, 23 Feb 2024 23:54:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41NNsiDD029396; Fri, 23 Feb 2024 23:54:44 GMT (envelope-from git) Date: Fri, 23 Feb 2024 23:54:44 GMT Message-Id: <202402232354.41NNsiDD029396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 0112f8c4a88e - main - posixmqcontrol(1): manage posix message queues List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 0112f8c4a88e75342bdb6b9815fa220c5f645aa0 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0112f8c4a88e75342bdb6b9815fa220c5f645aa0 commit 0112f8c4a88e75342bdb6b9815fa220c5f645aa0 Author: Rick Parrish AuthorDate: 2024-02-22 12:33:12 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-23 23:08:48 +0000 posixmqcontrol(1): manage posix message queues Reviewed by: kib, paumma MFC after: 1 week Differential revision: https://reviews.freebsd.org/D43845 --- usr.bin/Makefile | 1 + usr.bin/posixmqcontrol/Makefile | 4 + usr.bin/posixmqcontrol/posixmqcontrol.1 | 180 +++++ usr.bin/posixmqcontrol/posixmqcontrol.c | 924 +++++++++++++++++++++++ usr.bin/posixmqcontrol/posixmqcontroltest8qs.sh | 50 ++ usr.bin/posixmqcontrol/posixmqcontroltest8x64.sh | 99 +++ usr.bin/posixmqcontrol/posixmqcontroltestsane.sh | 28 + 7 files changed, 1286 insertions(+) diff --git a/usr.bin/Makefile b/usr.bin/Makefile index 5cccf1903471..84b7c4dc4dec 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -110,6 +110,7 @@ SUBDIR= alias \ patch \ pathchk \ perror \ + posixmqcontrol \ posixshmcontrol \ pr \ printenv \ diff --git a/usr.bin/posixmqcontrol/Makefile b/usr.bin/posixmqcontrol/Makefile new file mode 100644 index 000000000000..3cbfa8557625 --- /dev/null +++ b/usr.bin/posixmqcontrol/Makefile @@ -0,0 +1,4 @@ +PROG= posixmqcontrol +LIBADD= rt + +.include diff --git a/usr.bin/posixmqcontrol/posixmqcontrol.1 b/usr.bin/posixmqcontrol/posixmqcontrol.1 new file mode 100644 index 000000000000..ec60230aac6e --- /dev/null +++ b/usr.bin/posixmqcontrol/posixmqcontrol.1 @@ -0,0 +1,180 @@ +.\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2024 Rick Parrish . +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.Dd February 19, 2024 +.Dt POSIXMQCONTROL 1 +.Os +.Sh NAME +.Nm posixmqcontrol +.Nd Control POSIX mqueuefs message queues +.Sh SYNOPSIS +.Nm +.Ar create +.Fl q Ar queue +.Fl s Ar size +.Fl d Ar depth +.Op Fl m Ar mode +.Op Fl g Ar group +.Op Fl u Ar user +.Nm +.Ar info +.Fl q Ar queue +.Nm +.Ar recv +.Fl q Ar queue +.Nm +.Ar rm +.Fl q Ar queue +.Nm +.Ar send +.Fl q Ar queue +.Fl c Ar content +.Op Fl p Ar priority +.Sh DESCRIPTION +The +.Nm +command allows separating POSIX message queue administration from application +stack. +Defining and adjusting queue attributes can be done without touching +application code. +It allows creating queues, inspecting queue metadata, altering group and user +access to queues, dumping queue contents, and unlinking queues. +.Pp +Unlinking removes the name from the system and frees underlying memory. +.Pp +The maximum message size, maximum queue size, and current queue size are +displayed by the +.Ic info +subcommand. This output is similar to running +.Ic cat +on a mqueuefs queue mounted under a mount point. +This utility requires the +.Ic mqueuefs +kernel module to be loaded but does not require +.Ic mqueuefs +to be mounted as a file system. +.Pp +The following subcommands are provided: +.Bl -tag -width truncate +.It Ic create +Create the named queues, if they do not already exist. +More than one queue name may be created. The same maximum queue depth and +maximum message size are used to create all queues. +If a queue exists, then depth and size are optional. +.Pp +The required +.Ar size +and +.Ar depth +arguments specify the maximum message size (bytes per message) and maximum queue +size (depth or number of messages in the queue). +The optional numerical +.Ar mode +argument specifies the initial access mode. +If the queue exists but does not match the requested size and depth, this +utility will attempt to recreate the queue by first unlinking and then creating +it. +This will fail if the queue is not empty or is opened by other processes. +.It Ic rm +Unlink the queues specified - one attempt per queue. +Failure to unlink one queue does not stop this sub-command from attempting to +unlink the others. +.It Ic info +For each named queue, dispay the maximum message size, maximum queue size, +current queue depth, user owner id, group owner id, and mode permission bits. +.It Ic recv +Wait for a message from a single named queue and display the message to +standard output. +.It Ic send +Send messages to one or more named queues. +If multiple messages and multiple queues are specified, the utility attempts to +send all messages to all queues. +The optional -p priority, if omitted, defaults to MQ_PRIO_MAX / 2 or medium +priority. +.El +.Sh NOTES +A change of queue geometry (maximum message size and/or maximum number of +messages) requires destroying and re-creating the queue. +As a safety feature, +the create subcommand refuses to destroy a non-empty queue. +If you use the rm subcommand to destroy a queue, any queued messages are lost. +To avoid down-time when altering queue attributes, consider creating a new +queue and configure reading applications to drain both new and old queues. +Retire the old queue once all writers have been updated to write to the new +queue. +.Sh EXIT STATUS +.Ex -std +.Bl -bullet +.It +EX_NOTAVAILABLE usually means the mqueuefs kernel module is not loaded. +.It +EX_USAGE reports one or more incorrect parameters. +.El +.Sh EXAMPLES +.Bl -bullet +.It +To retrieve the current message from a named queue, +.Pa /1 , +use the command +.Dl "posixmqcontrol recv -q /1" +.It +To create a queue with the name +.Pa /2 +with maximum message size 100 and maximum queue depth 10, +use the command +.Dl "posixmqcontrol create -q /2 -s 100 -d 10" +.It +To send a message to a queue with the name +.Pa /3 +use the command +.Dl "posixmqcontrol send -q /3 -c 'some choice words.'" +.It +To examine attributes of a queue named +.Pa /4 +use the command +.Dl "posixmqcontrol info -q /4" +.El +.Sh SEE ALSO +.Xr mq_open 2 , +.Xr mq_getattr 2 , +.Xr mq_receive 2 , +.Xr mq_send 2 , +.Xr mq_setattr 2 , +.Xr mq_unlink 2 , +.Xr mqueuefs 5 +.Sh BUGS +mq_timedsend and mq_timedrecv are not implemented. +info reports a worst-case estimate for QSIZE. +.Sh HISTORY +The +.Nm +command appeared in +.Fx 15.0 . +.Sh AUTHORS +The +.Nm +command and this manual page were written by +.An Rick Parrish Aq Mt unitrunker@unitrunker.net. diff --git a/usr.bin/posixmqcontrol/posixmqcontrol.c b/usr.bin/posixmqcontrol/posixmqcontrol.c new file mode 100644 index 000000000000..c965b41a1dfb --- /dev/null +++ b/usr.bin/posixmqcontrol/posixmqcontrol.c @@ -0,0 +1,924 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024 Rick Parrish . + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +struct Creation { + /* true if the queue exists. */ + bool exists; + /* true if a mode value was specified. */ + bool set_mode; + /* access mode with rwx permission bits. */ + mode_t mode; + /* maximum queue depth. default to an invalid depth. */ + long depth; + /* maximum message size. default to an invalid size. */ + long size; + /* true for blocking I/O and false for non-blocking I/O. */ + bool block; + /* true if a group ID was specified. */ + bool set_group; + /* group ID. */ + gid_t group; + /* true if a user ID was specified. */ + bool set_user; + /* user ID. */ + uid_t user; +}; + +struct element { + STAILQ_ENTRY(element) links; + const char *text; +}; + +static struct element * +malloc_element(const char *context) +{ + struct element *item = malloc(sizeof(struct element)); + + if (item == NULL) + /* the only non-EX_* prefixed exit code. */ + err(1, "malloc(%s)", context); + return (item); +} + +static STAILQ_HEAD(tqh, element) + queues = STAILQ_HEAD_INITIALIZER(queues), + contents = STAILQ_HEAD_INITIALIZER(contents); +/* send defaults to medium priority. */ +static long priority = MQ_PRIO_MAX / 2; +static struct Creation creation = { + .exists = false, + .set_mode = false, + .mode = 0755, + .depth = -1, + .size = -1, + .block = true, + .set_group = false, + .group = 0, + .set_user = false, + .user = 0 +}; +static const mqd_t fail = (mqd_t)-1; +static const mode_t accepted_mode_bits = + S_IRWXU | S_IRWXG | S_IRWXO | S_ISUID | S_ISGID | S_ISTXT; + +/* OPTIONS parsing utilitarian */ + +static void +parse_long(const char *text, long *capture, const char *knob, const char *name) +{ + char *cursor = NULL; + long value = strtol(text, &cursor, 10); + + if (cursor > text && *cursor == 0) { + *capture = value; + } else { + warnx("%s %s invalid format [%s].", knob, name, text); + } +} + +static void +parse_unsigned(const char *text, bool *set, + unsigned *capture, const char *knob, const char *name) +{ + char *cursor = NULL; + unsigned value = strtoul(text, &cursor, 8); + + if (cursor > text && *cursor == 0) { + *set = true; + *capture = value; + } else { + warnx("%s %s format [%s] ignored.", knob, name, text); + } +} + +static bool +sane_queue(const char *queue) +{ + int size = 0; + + if (queue[size] != '/') { + warnx("queue name [%-.*s] must start with '/'.", NAME_MAX, queue); + return (false); + } + + for (size++; queue[size] != 0 && size < NAME_MAX; size++) { + if (queue[size] == '/') { + warnx("queue name [%-.*s] - only one '/' permitted.", + NAME_MAX, queue); + return (false); + } + } + + if (size == NAME_MAX && queue[size] != 0) { + warnx("queue name [%-.*s...] may not be longer than %d.", + NAME_MAX, queue, NAME_MAX); + return (false); + } + return (true); +} + +/* OPTIONS parsers */ + +static void +parse_block(const char *text) +{ + if (strcmp(text, "true") == 0 || strcmp(text, "yes") == 0) { + creation.block = true; + } else if (strcmp(text, "false") == 0 || strcmp(text, "no") == 0) { + creation.block = false; + } else { + char *cursor = NULL; + long value = strtol(text, &cursor, 10); + if (cursor > text) { + creation.block = value != 0; + } else { + warnx("bad -b block format [%s] ignored.", text); + } + } +} + +static void +parse_content(const char *content) +{ + struct element *n1 = malloc_element("content"); + + n1->text = content; + STAILQ_INSERT_TAIL(&contents, n1, links); +} + +static void +parse_depth(const char *text) +{ + parse_long(text, &creation.depth, "-d", "depth"); +} + +static void +parse_group(const char *text) +{ + struct group *entry = getgrnam(text); + + if (entry == NULL) { + parse_unsigned(text, &creation.set_group, + &creation.group, "-g", "group"); + } else { + creation.set_group = true; + creation.group = entry->gr_gid; + } +} + +static void +parse_mode(const char *text) +{ + char *cursor = NULL; + long value = strtol(text, &cursor, 8); + + // verify only accepted mode bits are set. + if (cursor > text && *cursor == 0 && (value & accepted_mode_bits) == value) { + creation.set_mode = true; + creation.mode = (mode_t)value; + } else { + warnx("impossible -m mode value [%s] ignored.", text); + } +} + +static void +parse_priority(const char *text) +{ + char *cursor = NULL; + long value = strtol(text, &cursor, 10); + + if (cursor > text && *cursor == 0) { + if (value >= 0 && value < MQ_PRIO_MAX) { + priority = value; + } else { + warnx("bad -p priority range [%s] ignored.", text); + } + } else { + warnx("bad -p priority format [%s] ignored.", text); + } +} + +static void +parse_queue(const char *queue) +{ + if (sane_queue(queue)) { + struct element *n1 = malloc_element("queue name"); + + n1->text = queue; + STAILQ_INSERT_TAIL(&queues, n1, links); + } +} + +static void +parse_single_queue(const char *queue) +{ + if (sane_queue(queue)) { + if (STAILQ_EMPTY(&queues)) { + struct element *n1 = malloc_element("queue name"); + + n1->text = queue; + STAILQ_INSERT_TAIL(&queues, n1, links); + } else + warnx("ignoring extra -q queue [%s].", queue); + } +} + +static void +parse_size(const char *text) +{ + parse_long(text, &creation.size, "-s", "size"); +} + +static void +parse_user(const char *text) +{ + struct passwd *entry = getpwnam(text); + if (entry == NULL) { + parse_unsigned(text, &creation.set_user, + &creation.user, "-u", "user"); + } else { + creation.set_user = true; + creation.user = entry->pw_uid; + } +} + +/* OPTIONS validators */ + +static bool +validate_always_true(void) +{ + return (true); +} + +static bool +validate_content(void) +{ + bool valid = !STAILQ_EMPTY(&contents); + + if (!valid) + warnx("no content to send."); + return (valid); +} + +static bool +validate_depth(void) +{ + bool valid = creation.exists || creation.depth > 0; + + if (!valid) + warnx("-d maximum queue depth not provided."); + return (valid); +} + +static bool +validate_queue(void) +{ + bool valid = !STAILQ_EMPTY(&queues); + + if (!valid) + warnx("missing -q, or no sane queue name given."); + return (valid); +} + +static bool +validate_single_queue(void) +{ + bool valid = !STAILQ_EMPTY(&queues) && + STAILQ_NEXT(STAILQ_FIRST(&queues), links) == NULL; + + if (!valid) + warnx("expected one queue."); + return (valid); +} + +static bool +validate_size(void) +{ + bool valid = creation.exists || creation.size > 0; + + if (!valid) + warnx("-s maximum message size not provided."); + return (valid); +} + +/* OPTIONS table handling. */ + +struct Option { + /* points to array of string pointers terminated by a null pointer. */ + const char **pattern; + /* parse argument. */ + void (*parse)(const char *); + /* + * displays an error and returns false if this parameter is not valid. + * returns true otherwise. + */ + bool (*validate)(void); +}; + +/* + * parse options by table. + * index - current index into argv list. + * argc, argv - command line parameters. + * options - null terminated list of pointers to options. + */ +static void +parse_options(int index, int argc, + const char *argv[], const struct Option **options) +{ + while ((index + 1) < argc) { + const struct Option **cursor = options; + bool match = false; + while (*cursor != NULL && !match) { + const struct Option *option = cursor[0]; + const char **pattern = option->pattern; + + while (*pattern != NULL && !match) { + const char *knob = *pattern; + + match = strcmp(knob, argv[index]) == 0; + if (!match) + pattern++; + } + + if (match) { + option->parse(argv[index + 1]); + index += 2; + break; + } + cursor++; + } + + if (!match && index < argc) { + warnx("skipping [%s].", argv[index]); + index++; + } + } + + if (index < argc) { + warnx("skipping [%s].", argv[index]); + } +} + +/* options - null terminated list of pointers to options. */ +static bool +validate_options(const struct Option **options) +{ + bool valid = true; + + while (*options != NULL) { + const struct Option *option = options[0]; + + if (!option->validate()) + valid = false; + options++; + } + return (valid); +} + +/* SUBCOMMANDS */ + +/* + * queue: name of queue to be created. + * q_creation: creation parameters (copied by value). + */ +static int +create(const char *queue, struct Creation q_creation) +{ + int flags = O_RDWR; + struct mq_attr stuff = { + .mq_curmsgs = 0, + .mq_maxmsg = q_creation.depth, + .mq_msgsize = q_creation.size, + .mq_flags = 0 + }; + + if (!q_creation.block) { + flags |= O_NONBLOCK; + stuff.mq_flags |= O_NONBLOCK; + } + + mqd_t handle = mq_open(queue, flags); + q_creation.exists = handle != fail; + if (!q_creation.exists) { + /* + * apply size and depth checks here. + * if queue exists, we can default to existing depth and size. + * but for a new queue, we require that input. + */ + if (validate_size() && validate_depth()) { + /* no need to re-apply mode. */ + q_creation.set_mode = false; + flags |= O_CREAT; + handle = mq_open(queue, flags, q_creation.mode, &stuff); + } + } + + if (handle == fail) { + errno_t what = errno; + + warnc(what, "mq_open(create)"); + return (what); + } + +#ifdef __FreeBSD__ + /* + * undocumented. + * See https://bugs.freebsd.org/bugzilla//show_bug.cgi?id=273230 + */ + int fd = mq_getfd_np(handle); + + if (fd < 0) { + errno_t what = errno; + + warnc(what, "mq_getfd_np(create)"); + mq_close(handle); + return (what); + } + struct stat status = {0}; + int result = fstat(fd, &status); + if (result != 0) { + errno_t what = errno; + + warnc(what, "fstat(create)"); + mq_close(handle); + return (what); + } + + /* do this only if group and / or user given. */ + if (q_creation.set_group || q_creation.set_user) { + q_creation.user = + q_creation.set_user ? q_creation.user : status.st_uid; + q_creation.group = + q_creation.set_group ? q_creation.group : status.st_gid; + result = fchown(fd, q_creation.user, q_creation.group); + if (result != 0) { + errno_t what = errno; + + warnc(what, "fchown(create)"); + mq_close(handle); + return (what); + } + } + + /* do this only if altering mode of an existing queue. */ + if (q_creation.exists && q_creation.set_mode && + q_creation.mode != (status.st_mode & accepted_mode_bits)) { + result = fchmod(fd, q_creation.mode); + if (result != 0) { + errno_t what = errno; + + warnc(what, "fchmod(create)"); + mq_close(handle); + return (what); + } + } +#endif /* __FreeBSD__ */ + + return (mq_close(handle)); +} + +/* queue: name of queue to be removed. */ +static int +rm(const char *queue) +{ + int result = mq_unlink(queue); + + if (result != 0) { + errno_t what = errno; + + warnc(what, "mq_unlink"); + return (what); + } + + return (result); +} + +/* Return the display character for non-zero mode. */ +static char +dual(mode_t mode, char display) +{ + return (mode != 0 ? display : '-'); +} + +/* Select one of four display characters based on mode and modifier. */ +static char +quad(mode_t mode, mode_t modifier) +{ + static const char display[] = "-xSs"; + unsigned index = 0; + if (mode != 0) + index += 1; + if (modifier) + index += 2; + return (display[index]); +} + +/* queue: name of queue to be inspected. */ +static int +info(const char *queue) +{ + mqd_t handle = mq_open(queue, O_RDONLY); + + if (handle == fail) { + errno_t what = errno; + + warnc(what, "mq_open(info)"); + return (what); + } + + struct mq_attr actual; + + int result = mq_getattr(handle, &actual); + if (result != 0) { + errno_t what = errno; + + warnc(what, "mq_getattr(info)"); + return (what); + } + + fprintf(stdout, + "queue: '%s'\nQSIZE: %lu\nMSGSIZE: %ld\nMAXMSG: %ld\n" + "CURMSG: %ld\nflags: %03ld\n", + queue, actual.mq_msgsize * actual.mq_curmsgs, actual.mq_msgsize, + actual.mq_maxmsg, actual.mq_curmsgs, actual.mq_flags); +#ifdef __FreeBSD__ + + int fd = mq_getfd_np(handle); + struct stat status; + + result = fstat(fd, &status); + if (result != 0) { + warn("fstat(info)"); + } else { + mode_t mode = status.st_mode; + + fprintf(stdout, "UID: %u\nGID: %u\n", status.st_uid, status.st_gid); + fprintf(stdout, "MODE: %c%c%c%c%c%c%c%c%c%c\n", + dual(mode & S_ISVTX, 's'), + dual(mode & S_IRUSR, 'r'), + dual(mode & S_IWUSR, 'w'), + quad(mode & S_IXUSR, mode & S_ISUID), + dual(mode & S_IRGRP, 'r'), + dual(mode & S_IWGRP, 'w'), + quad(mode & S_IXGRP, mode & S_ISGID), + dual(mode & S_IROTH, 'r'), + dual(mode & S_IWOTH, 'w'), + dual(mode & S_IXOTH, 'x')); + } +#endif /* __FreeBSD__ */ + + return (mq_close(handle)); +} + +/* queue: name of queue to drain one message. */ +static int +recv(const char *queue) +{ + mqd_t handle = mq_open(queue, O_RDONLY); + + if (handle == fail) { + errno_t what = errno; + + warnc(what, "mq_open(recv)"); + return (what); + } + + struct mq_attr actual; + + int result = mq_getattr(handle, &actual); + + if (result != 0) { + errno_t what = errno; + + warnc(what, "mq_attr(recv)"); + mq_close(handle); + return (what); + } + + char *text = malloc(actual.mq_msgsize + 1); + unsigned q_priority = 0; + + memset(text, 0, actual.mq_msgsize + 1); + result = mq_receive(handle, text, actual.mq_msgsize, &q_priority); + if (result < 0) { + errno_t what = errno; + + warnc(what, "mq_receive"); + mq_close(handle); + return (what); + } + + fprintf(stdout, "[%u]: %-*.*s\n", q_priority, result, result, text); + return (mq_close(handle)); +} + +/* + * queue: name of queue to send one message. + * text: message text. + * q_priority: message priority in range of 0 to 63. + */ +static int +send(const char *queue, const char *text, unsigned q_priority) +{ + mqd_t handle = mq_open(queue, O_WRONLY); + + if (handle == fail) { + errno_t what = errno; + + warnc(what, "mq_open(send)"); + return (what); + } + + struct mq_attr actual; + + int result = mq_getattr(handle, &actual); + + if (result != 0) { + errno_t what = errno; + + warnc(what, "mq_attr(send)"); + mq_close(handle); + return (what); + } + + int size = strlen(text); + + if (size > actual.mq_msgsize) { + warnx("truncating message to %ld characters.\n", actual.mq_msgsize); + size = actual.mq_msgsize; + } + + result = mq_send(handle, text, size, q_priority); + + if (result != 0) { + errno_t what = errno; + + warnc(what, "mq_send"); + mq_close(handle); + return (what); + } + + return (mq_close(handle)); +} + +static void +usage(FILE *file) +{ + fprintf(file, + "usage:\n\tposixmqcontrol [rm|info|recv] -q \n" + "\tposixmqcontrol create -q -s -d " + "[ -m ] [ -b ] [-u ] [ -g ]\n" + "\tposixmqcontrol send -q -c " + "[-p ]\n"); +} + +/* end of SUBCOMMANDS */ + +#define _countof(arg) ((sizeof(arg)) / (sizeof((arg)[0]))) + +/* convert an errno style error code to a sysexits code. */ +static int +grace(int err_number) +{ + static const int xlat[][2] = { + /* generally means the mqueuefs driver is not loaded. */ + {ENOSYS, EX_UNAVAILABLE}, + /* no such queue name. */ + {ENOENT, EX_OSFILE}, + {EIO, EX_IOERR}, + {ENODEV, EX_IOERR}, + {ENOTSUP, EX_TEMPFAIL}, + {EAGAIN, EX_IOERR}, + {EPERM, EX_NOPERM}, + {EACCES, EX_NOPERM}, + {0, EX_OK} + }; + + for (unsigned i = 0; i < _countof(xlat); i++) { + if (xlat[i][0] == err_number) + return (xlat[i][1]); + } + + return (EX_OSERR); +} + +/* OPTIONS tables */ + +/* careful: these 'names' arrays must be terminated by a null pointer. */ *** 372 LINES SKIPPED *** From nobody Sat Feb 24 01:54:06 2024 X-Original-To: dev-commits-src-main@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 4ThVKp3FJ9z5BjWM; Sat, 24 Feb 2024 01:54: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThVKp2lYPz4b3j; Sat, 24 Feb 2024 01:54:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708739646; 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=hMKvH2OliKSXiDZkUXwz0QzVRUeqCsQpJ+Ajgrrh1p4=; b=v4zPN4vTEm6lbnyDNL08OPPlPpFf7DNNxPESyCcHbWGlSTiFRz3Uhj705DSEHKQ5pKQNZ8 jBD+wjgo6S9cduLNPQJzbwmkTmLx6tOPiEdS0N7lWhDPpEVjUTw/qI65n2pLQDOtielTvq DhT5zoEJWgT33IgiUk0hlFZZzALiPshqHJiCrAyjPnF22zs6x2bXfca32Ob8oHczdBES5Z 5WKPdT+BAsc2Umf9p0bL0OP0XIVB1Hyznq61TE7oy9ROdoirie7HyePBuS5wPsdTt9Us21 h+rPe6zaYZ4gyOeLknU4qrlC5S71aFKfBtWnhyzciAKEIz9jovy90GFcq5kzpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708739646; a=rsa-sha256; cv=none; b=Ky6aJDfCLHSmlC/fK6D0GpjMUlQYDKVlbPd//+BlhPTmyMaaZK6WScGc0nGL9t5HJYDcbK aVyrTr+k4wslHmmqOtdMdmHbliIFJXGJwAVVdPbOLCp5NRzEQycNRy2KTxP8vYXQPxD4vl wQhW8YtSMQy4HDlvr0o0sunl+mte6F4NGwKRSTt3oe74zUaNagsX657gl9+/klDGpEepws tsDCpylwev7Me2ZzJZ6jUgH6mXP5pwGFXERqyNTYp/VBmeojCtpHUSzxgXo/xxFrJtL8zv KLFPMPDKa3+6JZBG98cVddT1vJBKuzNzj7xmtFS+nGRfTM9RCDNpwT/qiwobyA== 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=1708739646; 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=hMKvH2OliKSXiDZkUXwz0QzVRUeqCsQpJ+Ajgrrh1p4=; b=ubq/REiF9lKLnM/+dmpY8vg+6UZ8Gq91lAkvPnnXR2ovJsqpARGSiP8mc0ly4DiTi5iAuB mjXqykAanB5wiVrBv3lfz+UPqkJB+Wnm8FSzRWFdWMKDushaPxG3Fe7hSIpoZ/5xmvq7vs AS9wb0Jcp/122E1Vztb8wJJWtlb273g8mudw6zyydkz8m0/phn8A8+d/b6/1MRRhgSp2jr t1PHSMqu80j+jZYMzWRFQfer5EuSP/kL0936vTnRW8V9rhDb9fg9cP7BEKhXLNBDcomr8t 0HjOObkRNzDi4UODSjnDF+XEUzmnUAdB5dCrQwH53znUuRIVG/RU0CAox3/ttw== 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 4ThVKp1qLczgy2; Sat, 24 Feb 2024 01:54:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41O1s6ZT030786; Sat, 24 Feb 2024 01:54:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41O1s6RQ030783; Sat, 24 Feb 2024 01:54:06 GMT (envelope-from git) Date: Sat, 24 Feb 2024 01:54:06 GMT Message-Id: <202402240154.41O1s6RQ030783@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 98ef51d54906 - main - Revert "tests/fdgrowtable: open more files in the threaded case" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98ef51d549064318c1cdc9cbea7cf499b9a1d34b Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=98ef51d549064318c1cdc9cbea7cf499b9a1d34b commit 98ef51d549064318c1cdc9cbea7cf499b9a1d34b Author: Gleb Smirnoff AuthorDate: 2024-02-24 01:47:29 +0000 Commit: Gleb Smirnoff CommitDate: 2024-02-24 01:47:29 +0000 Revert "tests/fdgrowtable: open more files in the threaded case" This reverts commit fa6a02f50e65c47540f51b3177f5080bc6af168e. It makes the test less probable to fail, but it doesn't fix the root issue - that on entry the parent process may have already a large file descriptor table. --- tests/sys/kern/fdgrowtable_test.c | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/sys/kern/fdgrowtable_test.c b/tests/sys/kern/fdgrowtable_test.c index 2eea274a64ee..826599ecf836 100644 --- a/tests/sys/kern/fdgrowtable_test.c +++ b/tests/sys/kern/fdgrowtable_test.c @@ -151,7 +151,6 @@ ATF_TC_BODY(free_oldtables, tc) static _Noreturn void * exec_thread(void *args) { - openfiles(128); for (;;) sleep(1); } From nobody Sat Feb 24 01:54:07 2024 X-Original-To: dev-commits-src-main@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 4ThVKq5sc6z5Bjrn; Sat, 24 Feb 2024 01:54: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThVKq3lk5z4Zxk; Sat, 24 Feb 2024 01:54:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708739647; 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=HG1V0Z8BBBaURFqZ8LnoUOEA4//THKns1xju0AKZr4U=; b=ConizeJX2k9vFwX5l/Sr3ZOZWdMQ/aunqtvQxVpMb22TLy1fm9o/8HH8A4G7Jr5IaAvhVH LBZBtYKsw3Fc6iolh8gcR6cfSdPZfj/buQyJ5275mgXzESPPNWqrYjdNSbDvRVLG6hvszB 1x3qGpI5Xm4U7A5skw5vbMHfOCnrjZRo6x+ueF4/a8KK4veU2A1Lg9YEKhdg5FtV6bXEYB j3d6hmh2JP+T5VZYGLwcmCq5BTcPJ9fDEo6tNgNvHinWZ4e+bYb2UAga5L9ggCYloo+cdP JRavqUp00FeZX/lNAB8g6YcjldlTtlD2syFWolMrC3c1k5opCcd+oMUVLgQSnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708739647; a=rsa-sha256; cv=none; b=cdKZEvQ1ZkLJd9ZgrC321hDkvxgsMfpOieGapF4UnPMZyLHDEjJG8ZmjLaC4LAKeV3l80B 2rc7d5Q2YMbdwMEE9n7haJjobrHyPSCanMGNtKU/MmLFKF8HNvZJO/0sPGbiHCgge17X6+ WDSmm88mRZQatY3VpwdDG/XHgXlkOrasR56x41hgPOVX4mIqzMPGkkZsZvnWZ09oIPw7os 2296nGOFidsug581N0pw+yGo54sHI99ynV3BuXe2kV8C3n2EUI+aqZAOYKQRBA9hyJw/rz jgy6841o1QR8PA6H2XJCNYKJPJEbFXHKhPqdckScpbNMDEqIpSJI5inx/F4xsw== 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=1708739647; 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=HG1V0Z8BBBaURFqZ8LnoUOEA4//THKns1xju0AKZr4U=; b=ws+Ep/132RM48ZQFm6nvuh6Q12K4w8taoZd4ULN9gyW9skzrxJsvGapwGtWubwhqxRqbub JPabpxBFcJwVuKJe5PoikK8wVKE0/svmoSRsG5JnO2V3pFFlGca9M1QvYeY2BaiiY4ThA7 fbmeAuX6KzETdkJ3aPzZDDROvAXivhlJil9nw9lo5iBPlmbzgPbkKZBC085EvT0u7mn2Lw zPjgYwrJSvdz5fhwisdWv03iy5Nq7N+uSBXJDCT3BkYD91dfJpD05rPcTo0J/cQ1UC3vwC 4a+TY8LNjDthC3sk7UKC1fZZ/WsKiQoUO0yy+E/1UumH+OH31c+ABva7Yk5/Nw== 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 4ThVKq2rzjzh1D; Sat, 24 Feb 2024 01:54:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41O1s7A7030842; Sat, 24 Feb 2024 01:54:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41O1s7dT030839; Sat, 24 Feb 2024 01:54:07 GMT (envelope-from git) Date: Sat, 24 Feb 2024 01:54:07 GMT Message-Id: <202402240154.41O1s7dT030839@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 4c6ceca9cc44 - main - tests/fdgrowtable: perform the threaded test in a child process List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4c6ceca9cc44fc9b02dc39e80713f2ad3ab8eeb6 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=4c6ceca9cc44fc9b02dc39e80713f2ad3ab8eeb6 commit 4c6ceca9cc44fc9b02dc39e80713f2ad3ab8eeb6 Author: Gleb Smirnoff AuthorDate: 2024-02-24 01:49:53 +0000 Commit: Gleb Smirnoff CommitDate: 2024-02-24 01:49:53 +0000 tests/fdgrowtable: perform the threaded test in a child process The test needs to be performed in a new process that was forked with RFCFDG flag. The will guarantee that the table will start to grow from 20 file descriptors, no matter what kyua(1) or a bare shell was doing before executing this test. This should fix repetitive test runs from a shell as well as failures with kyua(1) in some environments. --- tests/sys/kern/fdgrowtable_test.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/tests/sys/kern/fdgrowtable_test.c b/tests/sys/kern/fdgrowtable_test.c index 826599ecf836..ecab72ff09aa 100644 --- a/tests/sys/kern/fdgrowtable_test.c +++ b/tests/sys/kern/fdgrowtable_test.c @@ -167,21 +167,43 @@ ATF_TC_HEAD(oldtables_shared_via_threads, tc) ATF_TC_BODY(oldtables_shared_via_threads, tc) { + pid_t child; kvm_t *kd; struct kinfo_proc *kp; pthread_t thread; - ATF_REQUIRE((kd = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL)) != NULL); - ATF_REQUIRE(pthread_create(&thread, NULL, exec_thread, NULL) == 0); + if ((child = rfork(RFPROC | RFCFDG)) > 0) { + pid_t wpid; + int status; + + wpid = waitpid(child, &status, 0); + ATF_REQUIRE(wpid == child); + ATF_REQUIRE(WIFEXITED(status)); + ATF_REQUIRE(WEXITSTATUS(status) == EXIT_SUCCESS); + return; + } + +#define REQUIRE(expression) do { \ + if (!(expression)) \ + exit(EXIT_FAILURE); \ + } while (0) + + REQUIRE(child == 0); + + REQUIRE((kd = kvm_open(NULL, NULL, NULL, O_RDONLY, NULL)) != NULL); + REQUIRE(pthread_create(&thread, NULL, exec_thread, NULL) == 0); openfiles(128); kp = read_kinfo(kd); - ATF_CHECK(kp->ki_numthreads > 1); - ATF_CHECK(old_tables(kd,kp) > 1); + REQUIRE(kp->ki_numthreads > 1); + REQUIRE(old_tables(kd,kp) > 1); + + REQUIRE(pthread_cancel(thread) == 0); + REQUIRE(pthread_join(thread, NULL) == 0); +#undef REQUIRE - ATF_REQUIRE(pthread_cancel(thread) == 0); - ATF_REQUIRE(pthread_join(thread, NULL) == 0); + exit(EXIT_SUCCESS); } /* From nobody Sat Feb 24 01:57:14 2024 X-Original-To: dev-commits-src-main@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 4ThVPQ6XVQz5BjsR; Sat, 24 Feb 2024 01:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThVPQ5pwPz4bYN; Sat, 24 Feb 2024 01:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708739834; 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=/EEopkio0xXXk6dOp96XodGfRKAfE/fRU8HZoc9V30g=; b=Fsx8gbcmxG4vNeq/x1nCC3SRrJKffxSlQANlY+ON/NZnj0BRiho/3qFBWYhuXQZF5N1fvQ Vl8eDMzhCW0qanbXVOeJr7rhO3fSMX210dn+a8aAx07cHkrOAXQlH4/tOueWTG3EInGsp3 8VTScSXeM67NwxJ2sfHW95iJLFBCQs27tBXJuAWWn2zYzFiiKnex+VVdf/QeQVKPWL3eFE KHIFEEoULsuGFEUL2k7GB/5KLte8/DcHGyaGU8mmvIoVhzr9wjBXSsMnEMiRn6yNPV8UEg iewxiyTqPuj6+RujSdTrdDZ96FNP+pZVS9poBLKQ9ucrDRVKOQH9eV3arKCdxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708739834; a=rsa-sha256; cv=none; b=AopDKfhFfpwRn6nf6fu2DH/KWFOp3o9lZA07AIj8PX0P+xvKRlkqAcyxOsVftV2M7dLBsz rZAXxOdhEoGLR8mTFrgMiiTmMH8u07hgv/ZlVmz1+zB1vTvNH9y5nwwR7j177DBqPgrBQl KM3Fm06ut7rB2NfFoaqcNSnd1E3BnrevL0JRX8fCamwdjQd+2Owgr9vhDrzOew77t7VuMx YmqIebzYuNSPY2/3uuzwnmTRQQ0l0RSwxTxk6GFBIedpe6HJ7lw0rtigLWHq0lMbqmqijb dFYGgFIhBD69zgxzgt1RXOw4fQAUFxSd6pNY3IjG9xtb3BW4LCNhClnEha0CgA== 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=1708739834; 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=/EEopkio0xXXk6dOp96XodGfRKAfE/fRU8HZoc9V30g=; b=ljKUhlk3PCClQCY79v7aqqRyKAcEbSNqcdFUbakZV9JSZVUuLbi7gnVLXz/2zRGdcWXDz3 N91jA4qzHz9QgwIWn33hX4sHYdtLzo2TbvRduu3l8vtOqgH2I9Zk+iiOcFrJH2ayXjN0oO RpIlLzpikIjtuZCKWcGz01TuY9zyqA8vaBXtb/zeLxhfuremyRAWcypk7BNfrSoxrmFNFt 7bRqYXTSkfILluziXyUNySvg4/IFWBjkejdOt19ZPP6Gf0SxhPtMnmsNM4TJCiB/Qcds/i Eu3hpYmKr0vaf5LHYpUFQeT9KjxaUXQhwBbXnahp2P/J6d+sIdGd+57MyqQcRw== 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 4ThVPQ4sV6zgLq; Sat, 24 Feb 2024 01:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41O1vECU031415; Sat, 24 Feb 2024 01:57:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41O1vEAk031412; Sat, 24 Feb 2024 01:57:14 GMT (envelope-from git) Date: Sat, 24 Feb 2024 01:57:14 GMT Message-Id: <202402240157.41O1vEAk031412@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 48698ead6ff0 - main - lagg: wrap lagg_port2req() into LAGG_SLOCK() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 48698ead6ff0640098e6aecdd5cbf6ea8f5ac177 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=48698ead6ff0640098e6aecdd5cbf6ea8f5ac177 commit 48698ead6ff0640098e6aecdd5cbf6ea8f5ac177 Author: Gleb Smirnoff AuthorDate: 2024-02-24 01:56:46 +0000 Commit: Gleb Smirnoff CommitDate: 2024-02-24 01:56:46 +0000 lagg: wrap lagg_port2req() into LAGG_SLOCK() Although a port addition is coded in a sequence where first all softc information is fulfilled and only then it is attached to the lagg, we still need a locking primitive to guarantee cache invalidation. Panic observed in the wild shows that lacp_portreq() called via lagg_port_ioctl(SIOCGLAGGPORT) immediately after port creation may see lp->lp_psc as NULL and panic. In the core file we will see valid data all around. A race via lagg_ioctl() wasn't observed but potentially is possible. Differential Revision: https://reviews.freebsd.org/D43501 --- sys/net/if_lagg.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/net/if_lagg.c b/sys/net/if_lagg.c index 9746d4115bc6..554d8c2c1bcb 100644 --- a/sys/net/if_lagg.c +++ b/sys/net/if_lagg.c @@ -83,8 +83,10 @@ MODULE_DEPEND(if_lagg, netmap, 1, 1, 1); #define LAGG_SX_DESTROY(_sc) sx_destroy(&(_sc)->sc_sx) #define LAGG_XLOCK(_sc) sx_xlock(&(_sc)->sc_sx) #define LAGG_XUNLOCK(_sc) sx_xunlock(&(_sc)->sc_sx) -#define LAGG_SXLOCK_ASSERT(_sc) sx_assert(&(_sc)->sc_sx, SA_LOCKED) #define LAGG_XLOCK_ASSERT(_sc) sx_assert(&(_sc)->sc_sx, SA_XLOCKED) +#define LAGG_SLOCK(_sc) sx_slock(&(_sc)->sc_sx) +#define LAGG_SUNLOCK(_sc) sx_sunlock(&(_sc)->sc_sx) +#define LAGG_SXLOCK_ASSERT(_sc) sx_assert(&(_sc)->sc_sx, SA_LOCKED) /* Special flags we should propagate to the lagg ports. */ static struct { @@ -1044,7 +1046,9 @@ lagg_port_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) break; } + LAGG_SLOCK(sc); lagg_port2req(lp, rp); + LAGG_SUNLOCK(sc); NET_EPOCH_EXIT(et); break; @@ -1581,7 +1585,9 @@ lagg_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) break; } + LAGG_SLOCK(sc); lagg_port2req(lp, rp); + LAGG_SUNLOCK(sc); NET_EPOCH_EXIT(et); if_rele(tpif); break; From nobody Sat Feb 24 04:52:08 2024 X-Original-To: dev-commits-src-main@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 4ThZHF5JGJz5C0RB; Sat, 24 Feb 2024 04:52: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThZHD6rJdz4tkJ; Sat, 24 Feb 2024 04:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708750329; 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=0z7Yg0Popd5tgsK/+TPKqNwjHbMW34nSlKG1P+vwmlE=; b=Oc0RNHgsFdEBVJPY3FPUr+qA9hZ4ruZCLc9AjhMZ668b79WD7y48OXyOifI4+qlvILlmCn hQMeY4sitY0yB87PVnOEBQHIFa/xd6q6JgjzZQUyi9qXNXRP73goOhEdZTtwiG5QJi7D+h s58UuDtS60tCW2Y3AHmNuonhiEfwxXYoaCP8c4loyyZrxG/G1rEcLerIGhWQYLb4P7R5Zv r7/QfS/8AP3cy4H+z36EGvL+CL+8Wjoj9vImGlejRWGYcd9SYUpFMlcWAYyHPWBX1dsbl0 29LAQ8GheW5wcgz8nk1mpw/5Tz5GvCbW7yjez/LmZKfXAj3dz3DeJcHmLHn4dQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708750329; a=rsa-sha256; cv=none; b=RL6NLReIfI8PdJuDRy94qVW+ff0QN8Y33FxNh0dm2i0g5m17ogBZKf1fmO8qUU+bFvu8+1 Ul7w2YI1TIhbhudXDx3yGolqkZTIxY5O6NAkYiryDH2AEQg+DHWFYDnRtvSuopikZBMoKW dL9abp1Zj/d3eeVxgR7cl96jZPsNRdKPYVFprQ5Z5Ar95eNBSS5DiMzuhP9MLOuJDk5b53 dj6e3MsmvMHKart+6q20sT9O5t2CwKJLltcTxGhe8zwDCFrn5gG2J/3Ui16ux+RPhxlqkV MwW9VLFaB+KqQhX9zvKMBi2U2M1aScenn3siIm6/oWBddO9kSplnfiYBQy9MHg== 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=1708750329; 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=0z7Yg0Popd5tgsK/+TPKqNwjHbMW34nSlKG1P+vwmlE=; b=IODs4sCO+ulVfgc0z10r5xcEMakyTnpcrNSzKEyeM+Sae/Be6Wui7JZkMYYCH/a5UsVzHu zzF6gMxxrQezQ6QhF32EpuXnYsIOtu1FXZO9TXXAdroDhAXXWfx/QydR9A+nViXC9+7J7I KrXy/a3W4aynhTma7RDA04DQJ4phWPhUQ4ZkHlQSRZBqoBw+sYqoBiTCGeyxcNS2ZRT26o 6FlsbNG02bgVV65I5LchLztWEhIFsIfPG4qppS3MWRl8cqPBtwVKeO+P55QL6Vas9y3r/S Hrnjej1FZB0vuuikW7cO+6sKEk8m0N+g+rhFCSMkswO8GF+y01j7IoKFCek14w== 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 4ThZHD5vbJzmPV; Sat, 24 Feb 2024 04:52:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41O4q8Zm031289; Sat, 24 Feb 2024 04:52:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41O4q8NY031286; Sat, 24 Feb 2024 04:52:08 GMT (envelope-from git) Date: Sat, 24 Feb 2024 04:52:08 GMT Message-Id: <202402240452.41O4q8NY031286@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 6faf55c86d9b - main - loader: rename gfx_interp_md to gfx_interp_ref List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 6faf55c86d9b86f40de8d19970e42cb42a892c47 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6faf55c86d9b86f40de8d19970e42cb42a892c47 commit 6faf55c86d9b86f40de8d19970e42cb42a892c47 Author: Warner Losh AuthorDate: 2024-02-24 04:22:08 +0000 Commit: Warner Losh CommitDate: 2024-02-24 04:22:08 +0000 loader: rename gfx_interp_md to gfx_interp_ref We have the call to gfx_interp_ref to bring in the .o so that we get the linker set item to add the language bindings at the right time. Where we call it is not the right time... So the _ref name is better. Change it before we have too many others like it. Sponsored by: Netflix --- stand/common/gfx_fb.c | 2 +- stand/common/gfx_fb.h | 2 +- stand/common/interp_simple.c | 2 +- stand/ficl/gfx_loader.c | 2 +- stand/liblua/gfx_utils.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stand/common/gfx_fb.c b/stand/common/gfx_fb.c index 3a5b851915e0..0a88a166089b 100644 --- a/stand/common/gfx_fb.c +++ b/stand/common/gfx_fb.c @@ -181,7 +181,7 @@ gfx_framework_init(void) * Setup font list to have builtin font. */ (void) insert_font(NULL, FONT_BUILTIN); - gfx_interp_md(); /* Draw in the gfx interpreter for this thing */ + gfx_interp_ref(); /* Draw in the gfx interpreter for this thing */ } static uint8_t * diff --git a/stand/common/gfx_fb.h b/stand/common/gfx_fb.h index 84062864c57f..17e419d8ffd3 100644 --- a/stand/common/gfx_fb.h +++ b/stand/common/gfx_fb.h @@ -281,7 +281,7 @@ void term_image_display(teken_gfx_t *, const teken_rect_t *); void reset_font_flags(void); -void gfx_interp_md(void); +void gfx_interp_ref(void); #ifdef __cplusplus } diff --git a/stand/common/interp_simple.c b/stand/common/interp_simple.c index d64c0d27b97f..d675da0aa61e 100644 --- a/stand/common/interp_simple.c +++ b/stand/common/interp_simple.c @@ -202,6 +202,6 @@ interp_include(const char *filename) * There's no graphics commands for the simple interpreter. */ void -gfx_interp_md(void) +gfx_interp_ref(void) { } diff --git a/stand/ficl/gfx_loader.c b/stand/ficl/gfx_loader.c index a4501a7d3c39..4ac69e3c9895 100644 --- a/stand/ficl/gfx_loader.c +++ b/stand/ficl/gfx_loader.c @@ -254,6 +254,6 @@ static void ficlCompileGfx(FICL_SYSTEM *pSys) FICL_COMPILE_SET(ficlCompileGfx); void -gfx_interp_md(void) +gfx_interp_ref(void) { } diff --git a/stand/liblua/gfx_utils.c b/stand/liblua/gfx_utils.c index 8d2aaacbd688..301cd9cb8610 100644 --- a/stand/liblua/gfx_utils.c +++ b/stand/liblua/gfx_utils.c @@ -242,7 +242,7 @@ luaopen_gfx(lua_State *L) } void -gfx_interp_md(void) +gfx_interp_ref(void) { } From nobody Sat Feb 24 05:47:58 2024 X-Original-To: dev-commits-src-main@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 4ThbWf6pKsz5C4qh; Sat, 24 Feb 2024 05:47: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThbWf63k2z41Sq; Sat, 24 Feb 2024 05:47:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708753678; 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=elTYegsiNX03cE/nxi8lbEzWdiiphVzB2kmyeEVG87s=; b=ea+F3K5SDvGLu/ak4xpLjqjWMtcrEAjek5mEj6zPIl4OV1YxLCikB4+VTX7r40B8UewQ0I dBwDbewopzOrr8lrBO7gApx6YJw5eRrKC1NKgWHbhBNza+bFyp+jiiK0UZmjwYpl8S+CXW +2KlPwZlfmop8gMXdzJOWCcL56n0qdo+NFExDPWGSZvbpdvQ4xm7tQla+XucIGXdJMJico HslGnPcH8OaC92lD4dxeqHiGG8jOE9oVznEBjF1VzZvqB7zM5nbH3XyWWqMpaNIS1F6ACQ EoOnrM4IhMvO50F32SwRVDQdq7I4SgdQtgX+yJN34IaK2Bd/IH+Yh5kkcD6rpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708753678; a=rsa-sha256; cv=none; b=JevwXi1A+k5jRQtUltAGAQVKyhPBn5ipM3i9TGNOopx7uA67VK6uDv0NKE+HbOs4WohqjS Ka9UmtoeLEKaS4g/mGs+RigiCFQQorCMD+DhQwaKhOEgKrfJP1uW9dW+NIkR4AmKsCKCRm fadG0QOKYh7t++EjvtJgKI8XUkPPV98YUQs8X8uVvROsCRfIRHNK99wROcfR+e1cFOvtVW 9h9pArtHekhB09UeuayE9Q3vQb0LnM6Fdrz9ewoHnx547Tg39jMicwEH8znv4nLn83QVwR zG2S1OFK+34syTWuJY1X5cFYEuhub+SalSjI+gSgOYxfnVjlKQu64FhTZmdHFg== 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=1708753678; 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=elTYegsiNX03cE/nxi8lbEzWdiiphVzB2kmyeEVG87s=; b=HIx4VxNCgr1NqeJZwEFeDZXhFQkfugQcnOd2gDG3+pt5//wHfLoITj4pFxt1m/kjJc23Kd vEeTzLkeNCZQEQE0bbF6m1s2f+efn118UTApsAUQyeZjug06DhG1NNyr6I1cM2PW2n9yvR 8dw8L7NAQXAcTjO/GOhfh1MS7Vb5IlWDUTZUdBrd0suOOvrzTqEJlRZkkl5KduUCp9kRM0 dhoLLs54AyaZsf/mRoywQlGRJ+zkkJHDsgG6IHaTkybOJHLEZkBIay7uIV568JsS7aMZIy 9H+jU/VOqt5uZ9e59zBSgfb47p/XDXXynBuEhbT5xpSbOz1UdPe/vqv+owg0ng== 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 4ThbWf54bbzns2; Sat, 24 Feb 2024 05:47:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41O5lwe6020742; Sat, 24 Feb 2024 05:47:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41O5lwiT020739; Sat, 24 Feb 2024 05:47:58 GMT (envelope-from git) Date: Sat, 24 Feb 2024 05:47:58 GMT Message-Id: <202402240547.41O5lwiT020739@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: 1ec33855a82b - main - stress2: Added a new NFS test scenario List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ec33855a82b6e937bcb5412f5b5ea971b3df375 Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=1ec33855a82b6e937bcb5412f5b5ea971b3df375 commit 1ec33855a82b6e937bcb5412f5b5ea971b3df375 Author: Peter Holm AuthorDate: 2024-02-24 05:47:12 +0000 Commit: Peter Holm CommitDate: 2024-02-24 05:47:12 +0000 stress2: Added a new NFS test scenario --- tools/test/stress2/misc/mmap44.sh | 255 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 255 insertions(+) diff --git a/tools/test/stress2/misc/mmap44.sh b/tools/test/stress2/misc/mmap44.sh new file mode 100755 index 000000000000..5865491e1dea --- /dev/null +++ b/tools/test/stress2/misc/mmap44.sh @@ -0,0 +1,255 @@ +#!/bin/sh + +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 Peter Holm +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# + +# Demonstrate issue described in: +# [Bug 276002] nfscl: data corruption using both copy_file_range and mmap'd I/O + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +. ../default.cfg +set -u +prog=$(basename "$0" .sh) +log=/tmp/$prog.log +grep -q $mntpoint /etc/exports || + { echo "$mntpoint missing from /etc/exports"; exit 0; } + +cat > /tmp/$prog.c < +#include + +#include +#include +#include +#include +#include +#include +#include + +static off_t siz; +static pthread_mutex_t write_mutex; +static int fd, go; +static char *cp; + +static void * +memread(void *arg __unused) +{ + int i; + char c; + + while (go == 1) { + i = arc4random() % siz; + c = cp[i]; + if (c != 0x77) /* No unused vars here */ + usleep(arc4random() % 400); + } + return (0); +} + +static void * +memwrite(void *arg __unused) +{ + int i; + char c; + + while (go == 1) { + i = arc4random() % siz; + pthread_mutex_lock(&write_mutex); + c = cp[i]; + cp[i] = 0xee; /* This value seems to linger with NFS */ + cp[i] = c; + pthread_mutex_unlock(&write_mutex); + usleep(arc4random() % 400); + } + return (0); +} + +static void * +wr(void *arg __unused) +{ + off_t pos; + int r, s; + char buf[1024]; + + while (go == 1) { + s = arc4random() % sizeof(buf) + 1; + pos = arc4random() % (siz - s); + pthread_mutex_lock(&write_mutex); + if (lseek(fd, pos, SEEK_SET) == -1) + err(1, "lseek(%d)", (int)pos); + if ((r = read(fd, buf, s)) != s) { + fprintf(stderr, "r = %d, s = %d, pos = %d\n", r, s, (int)pos); + err(1, "read():2"); + } + if (lseek(fd, pos, SEEK_SET) == -1) + err(1, "lseek(%d)", (int)pos); + if (write(fd, buf, s) != s) + err(1, "write()"); + pthread_mutex_unlock(&write_mutex); + usleep(arc4random() % 400); + } + return (0); +} + +static void * +s1(void *arg __unused) +{ + + while (go == 1) { + if (fdatasync(fd) == -1) + err(1, "fdatasync()"); + usleep(arc4random() % 1000); + } + return (0); +} + +static void * +s2(void *arg __unused) +{ + + while (go == 1) { + if (fsync(fd) == -1) + err(1, "fdatasync()"); + usleep(arc4random() % 1000); + } + return (0); +} + +static void * +tr(void *arg __unused) +{ + int i, s; + char buf[1024]; + + memset(buf, 0x5a, sizeof(buf)); + while (go == 1) { + pthread_mutex_lock(&write_mutex); + if (lseek(fd, arc4random() % siz, SEEK_END) == -1) + err(1, "lseek() END"); + s = sizeof(buf); + for (i = 0; i < 50; i++) { + if (write(fd, buf, s) != s) + warn("write()"); + } + if (ftruncate(fd, siz) == -1) + err(1, "truncate()"); + pthread_mutex_unlock(&write_mutex); + usleep(arc4random() % 400); + } + return (0); +} + +int +main(int argc, char *argv[]) +{ + struct stat st; + pthread_t tp[6]; + int e, i; + + if (argc != 2) { + fprintf(stderr, "Usage: %s \n", argv[0]); + exit(1); + } + if ((fd = open(argv[1], O_RDWR)) == -1) + err(1, "open(%s)", argv[1]); + if (fstat(fd, &st) == -1) + err(1, "stat(%s)", argv[1]); + siz = st.st_size; + cp = mmap(NULL, st.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + if (cp == MAP_FAILED) + err(1, "mmap()"); + + go = 1; + pthread_mutex_init(&write_mutex, NULL); + if ((e = pthread_create(&tp[0], NULL, memwrite, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[1], NULL, memread, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[2], NULL, wr, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[3], NULL, s1, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[4], NULL, s2, NULL)) != 0) + errc(1, e, "pthread_create"); + if ((e = pthread_create(&tp[5], NULL, tr, NULL)) != 0) + errc(1, e, "pthread_create"); + + sleep(60); + go = 0; + for (i = 0; i < (int)(sizeof(tp) / sizeof(tp[0])); i++) + pthread_join(tp[i], NULL); + if (munmap(cp, siz) == -1) + err(1, "munmap()"); + close(fd); +} +EOF +mycc -o /tmp/$prog -Wall -Wextra -O0 /tmp/$prog.c -lpthread || exit 1 + +mycc -o /tmp/serial -Wall -Wextra -O2 ../tools/serial.c || exit 1 +mount | grep -q "on $mntpoint " && umount -f $mntpoint +mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart +mdconfig -s 5g -u $mdstart +newfs -n $newfs_flags /dev/md$mdstart > /dev/null +mount /dev/md$mdstart $mntpoint + +mp2=${mntpoint}2 +mkdir -p $mp2 +mount | grep -q "on $mp2 " && umount -f $mp2 +mount -t nfs 127.0.0.1:$mntpoint $mp2; s=$? +sleep .2 + +here=`pwd` +mount | grep $mntpoint +cd $mp2 +$here/../testcases/swap/swap -t 5m -i 20 > /dev/null & +sleep 2 + +size=262144 +/tmp/serial file $size +cp file file.orig + +s=0 +/tmp/$prog file || s=1 + +while pgrep -q swap; do pkill swap; done +wait +if ! cmp -s file.orig file; then + od -t x1 file.orig > /var/tmp/$prog.file1 + od -t x1 file > /var/tmp/$prog.file2 + diff /var/tmp/$prog.file1 /var/tmp/$prog.file2 > $log + head -20 $log + rm /var/tmp/$prog.file1 /var/tmp/$prog.file2 + ls -ls file.orig file + s=2 +fi + +cd $here +umount $mp2 +umount $mntpoint +mdconfig -d -u $mdstart +rm -f /tmp/serial /tmp/$prog /tmp/$prog.c $log +exit $s From nobody Sat Feb 24 06:26:43 2024 X-Original-To: dev-commits-src-main@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 4ThcNN09TCz5C7cY; Sat, 24 Feb 2024 06:26:44 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThcNM6QPXz44KS; Sat, 24 Feb 2024 06:26:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708756003; 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=SWbObpOEGtOmCBUnSzeUNvOko4g7moATDBYpZi2pPIY=; b=uP0Hj1kokUQSCu2XI8dxKhibuHxPDFuqbdYz4wiiJloPcBEbC8buQSH4sEACJrMzphd0Kz TmLOAtQsrxv1p9u5hjBmsUmyub1u0VvWkZ17EqO+rDvSIVzhtBKu8/Y5GLnIvi0vjDSwS0 Ka9aYWO329OLwUU1Uk5w1xKcrrE885QJ5++JFPzuYPpncZibHBc/GbEQcxV39qHRQg7v+I B8UvsFhMIiNhjSH+N24zZc1AD08GkBnIqtySTBgg712nS569AlbZCQpIgO8hE72EPEmtuP 0Bprm8HtY9BgcS7blXWZ1mOhSjHhGK/Z/QcZExsYzpXUBz4d40W9p3SKG/Wt0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708756003; a=rsa-sha256; cv=none; b=Hfr+q7BlZNECmxwO+LonYagn1VDDMao307ep9209JmrTGH/K0RuulR7o8K6l6zmx31YP0M k8AD/I7V+23LqTnloWkIc+LEphUWDO9m3wDFjbJxprWB9jX82OdRBQ9b+LurvuvV5XHFiK XEdbCkKxKD4K35qcGqSRg/n7JY7eNZlzzYuNfIjxZ4DOPX5eI1Bi/Sfmx1JWtDy2dhmjP0 OE05Km6h6Q3IAg1E5e1bDScenmOjkP8z2L1wlXMgKnua/hwW13l85k4C5y/KvoO+t0DUYL mkk4ldZjodQbk16B5CArHIr/KY1UjnnHS5OFN6gab70OiOj+xh17XzOmVcfg5A== 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=1708756003; 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=SWbObpOEGtOmCBUnSzeUNvOko4g7moATDBYpZi2pPIY=; b=BcLIIIKv31+vq/vwdlXFW2kEaTVlHCYrYCQ10ds11D0ib1ghub7n37Nbh5JYhvz08qyu43 8BLezjFUOOvHj0PAzP3dfW15onOmufd+NnhMD7Bf29QMX9WgxfW1zte73RZX709dSPIETQ CmqBqvS7JjxI8tm2Oqc5C/Cuow32d6VHfJS2s1fk4SvvmrZbkVZO8wKLg6tvYbZkxpAel2 tdUnd4euY65uTmWi9AxiTiobKHqlAtwXqVBFpDx1R/Rgc+qtred19bTw3L3s71tKthP241 eluPKGMPHN3UmPoPMWWqTkJZ5tWD44RST4nbij0MxjwvCgXxbFtAStFjztWD+w== 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 4ThcNM5HgyzpnH; Sat, 24 Feb 2024 06:26:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41O6QhfM088345; Sat, 24 Feb 2024 06:26:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41O6QhqQ088342; Sat, 24 Feb 2024 06:26:43 GMT (envelope-from git) Date: Sat, 24 Feb 2024 06:26:43 GMT Message-Id: <202402240626.41O6QhqQ088342@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: d19f34821d66 - main - stress2: Add a helper tool List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d19f34821d661468486bdf4cacc9be795ac58780 Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=d19f34821d661468486bdf4cacc9be795ac58780 commit d19f34821d661468486bdf4cacc9be795ac58780 Author: Peter Holm AuthorDate: 2024-02-24 06:26:16 +0000 Commit: Peter Holm CommitDate: 2024-02-24 06:26:16 +0000 stress2: Add a helper tool --- tools/test/stress2/tools/serial.c | 44 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/tools/test/stress2/tools/serial.c b/tools/test/stress2/tools/serial.c new file mode 100644 index 000000000000..8dcf9c5da3a8 --- /dev/null +++ b/tools/test/stress2/tools/serial.c @@ -0,0 +1,44 @@ +/* Fill a file with a sequence of byte values from 0 - 0xff */ + +#include +#include +#include +#include +#include +#include +#include + +int +main(int argc, char *argv[]) +{ + size_t i, size; + int fd; + char *cp, *file; + + if (argc != 3) { + fprintf(stderr, "Usage: %s \n", argv[0]); + exit(1); + } + file = argv[1]; + size = atol(argv[2]); + + if ((fd = open(file, O_RDWR | O_CREAT | O_TRUNC, 0600)) < 0) + err(1, "%s", file); + + if (lseek(fd, size - 1, SEEK_SET) == -1) + err(1, "lseek error"); + + /* write a dummy byte at the last location */ + if (write(fd, "\0", 1) != 1) + err(1, "write error"); + + if ((cp = mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0)) == MAP_FAILED) + err(1, "mmap()"); + + for (i = 0; i < size; i++) + cp[i] = i & 0xff; + + if (munmap(cp, size) == -1) + err(1, "munmap"); + close(fd); +} From nobody Sat Feb 24 09:14:05 2024 X-Original-To: dev-commits-src-main@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 4Thh5T5jKYz5CP6Z; Sat, 24 Feb 2024 09:14: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Thh5T4txLz4T29; Sat, 24 Feb 2024 09:14:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708766045; 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=gNuYhafbnzQPvOFABiTGeiQ+34iDlI+zdjXkq0vAZKM=; b=KwRKE1ZiQmADet6wlUtJa1RIp2pRcJU1yiSgpBBvq+tV7onkILh9auaZ13xfxu2WmdzKql LxrnDvrM4xnyy9vLi1oIc1Lx1TlXlwztqtKlsXbLr8ZtFuELtVyVifFfuRgXsebV4O7i31 oYbGFypheUzwQlHRtFxQ72mMIzk2614IVNZHTgRErDh7Wk5GhykB9xWDTRQADe7GONIl7Q 13y1QbMNtO3EnueWe4684KtJ8X2NDJ+j/dhT6W/po/F8u/ye/WK1JObgpvVYxDIKoOue2r uWMHGNrhFOLmMIjaJPjaHq0rZw9zbKhH6TKIfb2xABZu/veLa4IOGrguK5RF1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708766045; a=rsa-sha256; cv=none; b=RcjG8zkRQn0kldACfKu69ssycQHN0xpHQrqe+d+8kVdM7B99gkx5yiw/wXxnO6oDt2pbCY f7FfA4G/5Ir9vnI5wQJmHTgENIBJjusUEP/Cvk/hDyvnR84txSer9h6OfYkZlHZfBA48If VEF4sI9zE9Jyzt0sUE66BxnXNV7lT6tMxuWUmhIf5SoH9h4clGBZrFcDoBJNM09NtJxmAU jeIF+3FK3U8Yo87wt2GzIhOHaiC8kZESp5py5WdeZS4ywt0i1VdApkHxUwY1t775CAqsKo aMVMaGfLebYIewy1X0GvfeQJGP4sDzNrP6cTKp8BhNnbmgiwTcAP4f8QyHAo4Q== 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=1708766045; 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=gNuYhafbnzQPvOFABiTGeiQ+34iDlI+zdjXkq0vAZKM=; b=d2G1ecIsQshUq02DFQLqC5xxcv4Bqwk7KQHpxvbrW0I/7negptjLJ+N/qOCfoay3Se0YRZ uoDFWbccLaK/gIqaKkSEddkuLmOeQuoHP5MBLlvTd4qegaCYiLzRDcwMVLt75qPmr7U0dZ UfZkt9mKVF/DiUGQCRhb0VO1aNnpQZ57wIcxlQi+Aas5uKgdpVbfO3ulgFWul+N/Eg7wmo Y1RMhrEtjDOyhT02Ian0OaKpqHee4ekPDJgY0wRi+DNY2dXAnOuyOLXJcPzndbHB3GyZs9 Ek/r8QrkS8Tud6qDLrFVl8WoLfYsJdcv/J+8gziw//j0WJ4LFFUGuRikiwNl4A== 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 4Thh5T3xK1zv3Q; Sat, 24 Feb 2024 09:14:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41O9E5ve078863; Sat, 24 Feb 2024 09:14:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41O9E5Rl078860; Sat, 24 Feb 2024 09:14:05 GMT (envelope-from git) Date: Sat, 24 Feb 2024 09:14:05 GMT Message-Id: <202402240914.41O9E5Rl078860@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 61b88a230bac - main - if_hn: Fix two typos in source code comments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 61b88a230bac766f55984d8d33b98845d2b0d1a9 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=61b88a230bac766f55984d8d33b98845d2b0d1a9 commit 61b88a230bac766f55984d8d33b98845d2b0d1a9 Author: Gordon Bergling AuthorDate: 2024-02-24 09:13:44 +0000 Commit: Gordon Bergling CommitDate: 2024-02-24 09:13:44 +0000 if_hn: Fix two typos in source code comments - s/managment/management/ - s/transacion/transaction/ Obtained from: NetBSD MFC after: 3 days --- sys/dev/hyperv/netvsc/if_hn.c | 2 +- sys/dev/hyperv/netvsc/if_hnreg.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/hyperv/netvsc/if_hn.c b/sys/dev/hyperv/netvsc/if_hn.c index f6f885873a79..9949e0a16ab1 100644 --- a/sys/dev/hyperv/netvsc/if_hn.c +++ b/sys/dev/hyperv/netvsc/if_hn.c @@ -2523,7 +2523,7 @@ hn_detach(device_t dev) hn_stop(sc, true); /* * NOTE: - * hn_stop() only suspends data, so managment + * hn_stop() only suspends data, so management * stuffs have to be suspended manually here. */ hn_suspend_mgmt(sc); diff --git a/sys/dev/hyperv/netvsc/if_hnreg.h b/sys/dev/hyperv/netvsc/if_hnreg.h index 59ed38b71c72..bc6256bb375b 100644 --- a/sys/dev/hyperv/netvsc/if_hnreg.h +++ b/sys/dev/hyperv/netvsc/if_hnreg.h @@ -58,7 +58,7 @@ #define HN_NVS_RNDIS_MTYPE_CTRL 1 /* - * NVS message transacion status codes. + * NVS message transaction status codes. */ #define HN_NVS_STATUS_OK 1 #define HN_NVS_STATUS_FAILED 2 From nobody Sat Feb 24 16:15:37 2024 X-Original-To: dev-commits-src-main@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 4ThsRs5LHyz5B4gQ; Sat, 24 Feb 2024 16:15: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThsRs4lGnz4Ywq; Sat, 24 Feb 2024 16:15:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708791337; 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=g97UULcpeodiyPAFev4CrIvSJaN9laTeHAUb4xcdn0w=; b=aDbnqdSribOIWU48DyvOO6PJzVHJ/li7oAe02VOayV0mrkgFogGR9lqyqOwrRqbthDfL8r VJkuHYqLZqnWAaRCqF4eh3Bc6hCh7/pU3G8C7gwFC2smwJmyy+ritaCtiNJ9/icRjET+WD Lqiclaz1BE2Huefq5P2gDp+2aquIudGahAwSPCh5Lt3iUPHqqX5sS72jpPz86uHlVx2Iu3 c8vOp63fmgzDJesNia9oKbbJP83K9zBUrNR/FCeP5O+Y5Y8EP8EOguYloNpPj3o0KQPr1O ZcfNf7FgbPJy9sly6zSmpnBoQS3XA5eO0uth9gDDCzlP1S+AYjTuZE2WB/3Eig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708791337; a=rsa-sha256; cv=none; b=Hpn9TXq5px7fktYnYsGPvlWi9zZw0YQR1mtaAtJgO+yMAb0XQEdCyjC3ns2Brk6Cuip+0C /XGUK781fE7++QXT5jTj50ldvwHqr2ffZvsgW7Pzsqq9k8xYH/Mf2qhKj/tCKEyAYqEQIu D69zC9qK8p/h12G8nLyWlSBUI4ahNwrfuVsMFQaLGgkWkw3fF233pD7mOM2Nj4QYucGDiQ Ou8SMJwk3qjGH+UObjruz/NXdo4EtxHe3PNBwO/nIOZCd+T7jdkM6J4lwK9SJ89apfBNxO Qa5V8rf2Qeai8PGgPmJ3i7r3Vfaeo/BeFXVRR+Lne2PmjVA8D/tcyP0NM3rakw== 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=1708791337; 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=g97UULcpeodiyPAFev4CrIvSJaN9laTeHAUb4xcdn0w=; b=JRZ00cFB4UYAN3t7je1crci8zyHujFb31xXlPufZYpqVY767ks/8OUw29p1UxkUIVW++Uk 0bntAD20J9gDL92YUnqgtZsJJXGk4DoVc5JHgEvnmcACzWdrWH52h88V9WadsIKru7ge+A J40CmEhnpq8lTePanGRqVn0r9NJ5dH6frR5S4LispH6oZqJZ211vQRf2MCqR+z3czSUkwB SlsYIjCh1gFDsAyV+Yff9QOJBkxYAvpSxlMZ2pOQnBrmwsj0KyfrLBX2IogEyGRG86wLZp Z0NBBKvJfrGRKXBjhfGwDOhe2R/FNexWXQWW+0tV67iPSj/W24YyBJ/iwCvbwg== 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 4ThsRs3p5Fz167y; Sat, 24 Feb 2024 16:15:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41OGFbxk091701; Sat, 24 Feb 2024 16:15:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41OGFbeI091698; Sat, 24 Feb 2024 16:15:37 GMT (envelope-from git) Date: Sat, 24 Feb 2024 16:15:37 GMT Message-Id: <202402241615.41OGFbeI091698@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 38983d40c18e - main - tcp: prevent div by zero in cc_htcp List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38983d40c18ec5705dcba19ac320b86c5efe8e7e Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=38983d40c18ec5705dcba19ac320b86c5efe8e7e commit 38983d40c18ec5705dcba19ac320b86c5efe8e7e Author: Richard Scheffenegger AuthorDate: 2024-02-24 15:35:23 +0000 Commit: Richard Scheffenegger CommitDate: 2024-02-24 15:35:59 +0000 tcp: prevent div by zero in cc_htcp Make sure the divident is at least one. While cwnd should never be smaller than t_maxseg, this can happen during Path MTU Discovery, or when TCP options are considered in other parts of the stack. PR: 276674 MFC after: 3 days Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D43797 --- sys/netinet/cc/cc_htcp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netinet/cc/cc_htcp.c b/sys/netinet/cc/cc_htcp.c index 949715a69c67..43224446fd84 100644 --- a/sys/netinet/cc/cc_htcp.c +++ b/sys/netinet/cc/cc_htcp.c @@ -229,9 +229,9 @@ htcp_ack_received(struct cc_var *ccv, uint16_t type) * per RTT. */ CCV(ccv, snd_cwnd) += (((htcp_data->alpha << - HTCP_SHIFT) / (CCV(ccv, snd_cwnd) / - CCV(ccv, t_maxseg))) * CCV(ccv, t_maxseg)) - >> HTCP_SHIFT; + HTCP_SHIFT) / (max(1, + CCV(ccv, snd_cwnd) / CCV(ccv, t_maxseg)))) * + CCV(ccv, t_maxseg)) >> HTCP_SHIFT; } } } From nobody Sat Feb 24 16:15:38 2024 X-Original-To: dev-commits-src-main@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 4ThsRt61J3z5B524; Sat, 24 Feb 2024 16:15: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThsRt5kBcz4Yh0; Sat, 24 Feb 2024 16:15:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708791338; 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=H8iPjnpipwLeLU+M1OAN3dXJXkdqh0Bf8eCWtHDQqqc=; b=VW7gWb1IaqgK6PMKXPuGTafAO6m1VUpVOCt5Mdrx6bJ+DWWYc1PuAsE/X1Xk0dwXrnNSni HSciOOJmXUg7+vc06VD5q4L8WKpdFT95Qi7Atqle0Sf7E37b9tFs5kBPgybDh9bGGUQT2J CbiqfCepUA8nXfjCCLFYvd0XyYJ+9c4Snut9oc3vBfkJT5uMCFD+O3AEcqJCPOJW1k5i1K +2IeTWVT82S6zl3H1+cdsHaeLzDhPbKgXszfqysvX/SxW5uhWOXk87XeaRzK6CmN6HaaZF NsDqWke0e07zyjBxUwjnHRX+nFxRKWXh8DVyx47dRNS5OEVaAEBQ8yK+5HY6kQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708791338; a=rsa-sha256; cv=none; b=Tet5Lg2uPobQsBKU73m2zR/pIz6/4s2DIqQuVlpn8E0lUkdqPXNo94HTqimFODThlutUKh pZI0e/b9DtmjNY4JNX3K/SbmmC96IOL8ROb62T14RRFBlBgO7Y/Gr7dflRZvBS0rZJIYte QkrRVc8vhOlvbUjK9EBuB5fkJxH0vIpAJ0KuFkxLNK+JyPa9E779dDlIDFXQ4bUAR0bnWo I3g9a+vtDebhSa1V6P1zhyPwWvJxpjg6BAcvvhGA+cuv75iSo3Ub7VqJ1NnyG8N7MnqxxD n8Nj7DNHsJvxapNq4n2aYF7zIOG7nQHxwJyBTU/ASBAl4f0PPSKBAgFzMAgYwA== 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=1708791338; 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=H8iPjnpipwLeLU+M1OAN3dXJXkdqh0Bf8eCWtHDQqqc=; b=gX4xsJ6OlMGyk09pyTdULrovAIoL55zsZ15WiiRVabsINsF6iDHyLdUYRrLWGcbuWwZtpV w6RgJq0WZPImzwh2BD1t8OTJxYg1iK9C4uLbY7AfV/I6pXgPG3OTonXNDIcpwW9g+mFbQD ssIC/kn3mFTOxayDRujkjy5MJZFG5vWhWw6U4KMlo0keqiBtHvh4oSz+G5q0pTgsbkwEdM bsPPXPxNlvMYc6gM/9cJKyNjkNA1xu9Xe7cP1W420ZkvwlaOvGy8srGA1Ywi9swzfXJ80x 94R2P2JnydMKlXeysvTLAthyvCtDybGPzc5hLUyRsEZwenGdEoBRJB3JEYGGWg== 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 4ThsRt4p8gz1680; Sat, 24 Feb 2024 16:15:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41OGFcM3091759; Sat, 24 Feb 2024 16:15:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41OGFcg7091756; Sat, 24 Feb 2024 16:15:38 GMT (envelope-from git) Date: Sat, 24 Feb 2024 16:15:38 GMT Message-Id: <202402241615.41OGFcg7091756@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: f74352fbcf15 - main - tcp: use enum for all congestion control signals List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f74352fbcf15341accaf5a92240871f98323215d Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=f74352fbcf15341accaf5a92240871f98323215d commit f74352fbcf15341accaf5a92240871f98323215d Author: Richard Scheffenegger AuthorDate: 2024-02-24 15:41:31 +0000 Commit: Richard Scheffenegger CommitDate: 2024-02-24 15:41:48 +0000 tcp: use enum for all congestion control signals Facilitate easier troubleshooting by enumerating all congestion control signals. Typecast the enum to int, when a congestion control module uses private signals. No external change. Reviewed By: glebius, tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D43838 --- sys/netinet/cc/cc.c | 2 +- sys/netinet/cc/cc.h | 42 +++++++++++++++++++++--------------------- sys/netinet/cc/cc_cdg.c | 10 +++++----- sys/netinet/cc/cc_chd.c | 11 ++++++----- sys/netinet/cc/cc_cubic.c | 10 ++++++---- sys/netinet/cc/cc_dctcp.c | 10 ++++++---- sys/netinet/cc/cc_hd.c | 4 ++-- sys/netinet/cc/cc_htcp.c | 10 ++++++---- sys/netinet/cc/cc_newreno.c | 10 ++++++---- sys/netinet/cc/cc_vegas.c | 13 +++++++------ 10 files changed, 66 insertions(+), 56 deletions(-) diff --git a/sys/netinet/cc/cc.c b/sys/netinet/cc/cc.c index c2965b1e6a48..9308b5f8d764 100644 --- a/sys/netinet/cc/cc.c +++ b/sys/netinet/cc/cc.c @@ -505,7 +505,7 @@ newreno_cc_cong_signal(struct cc_var *ccv, uint32_t type) } void -newreno_cc_ack_received(struct cc_var *ccv, uint16_t type) +newreno_cc_ack_received(struct cc_var *ccv, ccsignal_t type) { if (type == CC_ACK && !IN_RECOVERY(CCV(ccv, t_flags)) && (ccv->flags & CCF_CWND_LIMITED)) { diff --git a/sys/netinet/cc/cc.h b/sys/netinet/cc/cc.h index 9571da50b2c7..5b2cb58a24a0 100644 --- a/sys/netinet/cc/cc.h +++ b/sys/netinet/cc/cc.h @@ -121,25 +121,25 @@ struct cc_var { #define CCF_HYSTART_CAN_SH_CWND 0x0800 /* Can hystart when going CSS -> CA slam the cwnd */ #define CCF_HYSTART_CONS_SSTH 0x1000 /* Should hystart use the more conservative ssthresh */ -/* ACK types passed to the ack_received() hook. */ -#define CC_ACK 0x0001 /* Regular in sequence ACK. */ -#define CC_DUPACK 0x0002 /* Duplicate ACK. */ -#define CC_PARTIALACK 0x0004 /* Not yet. */ -#define CC_SACK 0x0008 /* Not yet. */ +typedef enum { + /* ACK types passed to the ack_received() hook. */ + CC_ACK = 0x0001, /* Regular in sequence ACK. */ + CC_DUPACK = 0x0002, /* Duplicate ACK. */ + CC_PARTIALACK = 0x0004, /* Not yet. */ + CC_SACK = 0x0008, /* Not yet. */ + /* Congestion signal types passed to the cong_signal() hook. */ + CC_ECN = 0x0100, /* ECN marked packet received. */ + CC_RTO = 0x0200, /* RTO fired. */ + CC_RTO_ERR = 0x0400, /* RTO fired in error. */ + CC_NDUPACK = 0x0800, /* Threshold of dupack's reached. */ + /* + * The highest order 8 bits (0x01000000 - 0x80000000) are reserved + * for CC algos to declare their own congestion signal types. + */ + CC_SIGPRIVMASK = 0xFF000000 /* Mask to check if sig is private. */ +} ccsignal_t; #endif /* defined(_KERNEL) || defined(_WANT_TCPCB) */ -/* - * Congestion signal types passed to the cong_signal() hook. The highest order 8 - * bits (0x01000000 - 0x80000000) are reserved for CC algos to declare their own - * congestion signal types. - */ -#define CC_ECN 0x00000001 /* ECN marked packet received. */ -#define CC_RTO 0x00000002 /* RTO fired. */ -#define CC_RTO_ERR 0x00000004 /* RTO fired in error. */ -#define CC_NDUPACK 0x00000008 /* Threshold of dupack's reached. */ - -#define CC_SIGPRIVMASK 0xFF000000 /* Mask to check if sig is private. */ - #ifdef _KERNEL /* * Structure to hold data and function pointers that together represent a @@ -175,10 +175,10 @@ struct cc_algo { void (*conn_init)(struct cc_var *ccv); /* Called on receipt of an ack. */ - void (*ack_received)(struct cc_var *ccv, uint16_t type); + void (*ack_received)(struct cc_var *ccv, ccsignal_t type); /* Called on detection of a congestion signal. */ - void (*cong_signal)(struct cc_var *ccv, uint32_t type); + void (*cong_signal)(struct cc_var *ccv, ccsignal_t type); /* Called after exiting congestion recovery. */ void (*post_recovery)(struct cc_var *ccv); @@ -236,8 +236,8 @@ extern struct rwlock cc_list_lock; */ void newreno_cc_post_recovery(struct cc_var *); void newreno_cc_after_idle(struct cc_var *); -void newreno_cc_cong_signal(struct cc_var *, uint32_t ); -void newreno_cc_ack_received(struct cc_var *, uint16_t); +void newreno_cc_cong_signal(struct cc_var *, ccsignal_t); +void newreno_cc_ack_received(struct cc_var *, ccsignal_t); /* Called to temporarily keep an algo from going away during change */ void cc_refer(struct cc_algo *algo); diff --git a/sys/netinet/cc/cc_cdg.c b/sys/netinet/cc/cc_cdg.c index 3f23c4091170..1e9236f878d4 100644 --- a/sys/netinet/cc/cc_cdg.c +++ b/sys/netinet/cc/cc_cdg.c @@ -221,8 +221,8 @@ static int cdg_mod_destroy(void); static void cdg_conn_init(struct cc_var *ccv); static int cdg_cb_init(struct cc_var *ccv, void *ptr); static void cdg_cb_destroy(struct cc_var *ccv); -static void cdg_cong_signal(struct cc_var *ccv, uint32_t signal_type); -static void cdg_ack_received(struct cc_var *ccv, uint16_t ack_type); +static void cdg_cong_signal(struct cc_var *ccv, ccsignal_t signal_type); +static void cdg_ack_received(struct cc_var *ccv, ccsignal_t ack_type); static size_t cdg_data_sz(void); struct cc_algo cdg_cc_algo = { @@ -450,11 +450,11 @@ cdg_window_increase(struct cc_var *ccv, int new_measurement) } static void -cdg_cong_signal(struct cc_var *ccv, uint32_t signal_type) +cdg_cong_signal(struct cc_var *ccv, ccsignal_t signal_type) { struct cdg *cdg_data = ccv->cc_data; - switch(signal_type) { + switch((int)signal_type) { case CC_CDG_DELAY: CCV(ccv, snd_ssthresh) = cdg_window_decrease(ccv, CCV(ccv, snd_cwnd), V_cdg_beta_delay); @@ -571,7 +571,7 @@ calc_moving_average(struct cdg *cdg_data, long qdiff_max, long qdiff_min) } static void -cdg_ack_received(struct cc_var *ccv, uint16_t ack_type) +cdg_ack_received(struct cc_var *ccv, ccsignal_t ack_type) { struct cdg *cdg_data; struct ertt *e_t; diff --git a/sys/netinet/cc/cc_chd.c b/sys/netinet/cc/cc_chd.c index c644d9b2cdb8..52048a7c05ae 100644 --- a/sys/netinet/cc/cc_chd.c +++ b/sys/netinet/cc/cc_chd.c @@ -88,10 +88,10 @@ /* Largest possible number returned by random(). */ #define RANDOM_MAX INT_MAX -static void chd_ack_received(struct cc_var *ccv, uint16_t ack_type); +static void chd_ack_received(struct cc_var *ccv, ccsignal_t ack_type); static void chd_cb_destroy(struct cc_var *ccv); static int chd_cb_init(struct cc_var *ccv, void *ptr); -static void chd_cong_signal(struct cc_var *ccv, uint32_t signal_type); +static void chd_cong_signal(struct cc_var *ccv, ccsignal_t signal_type); static void chd_conn_init(struct cc_var *ccv); static int chd_mod_init(void); static size_t chd_data_sz(void); @@ -235,7 +235,7 @@ chd_window_increase(struct cc_var *ccv, int new_measurement) * ack_type == CC_ACK. */ static void -chd_ack_received(struct cc_var *ccv, uint16_t ack_type) +chd_ack_received(struct cc_var *ccv, ccsignal_t ack_type) { struct chd *chd_data; struct ertt *e_t; @@ -336,7 +336,7 @@ chd_cb_init(struct cc_var *ccv, void *ptr) } static void -chd_cong_signal(struct cc_var *ccv, uint32_t signal_type) +chd_cong_signal(struct cc_var *ccv, ccsignal_t signal_type) { struct ertt *e_t; struct chd *chd_data; @@ -346,7 +346,7 @@ chd_cong_signal(struct cc_var *ccv, uint32_t signal_type) chd_data = ccv->cc_data; qdly = imax(e_t->rtt, chd_data->maxrtt_in_rtt) - e_t->minrtt; - switch(signal_type) { + switch((int)signal_type) { case CC_CHD_DELAY: chd_window_decrease(ccv); /* Set new ssthresh. */ CCV(ccv, snd_cwnd) = CCV(ccv, snd_ssthresh); @@ -387,6 +387,7 @@ chd_cong_signal(struct cc_var *ccv, uint32_t signal_type) default: newreno_cc_cong_signal(ccv, signal_type); + break; } } diff --git a/sys/netinet/cc/cc_cubic.c b/sys/netinet/cc/cc_cubic.c index eb1587d44427..a9c7592b80ca 100644 --- a/sys/netinet/cc/cc_cubic.c +++ b/sys/netinet/cc/cc_cubic.c @@ -73,10 +73,10 @@ #include #include -static void cubic_ack_received(struct cc_var *ccv, uint16_t type); +static void cubic_ack_received(struct cc_var *ccv, ccsignal_t type); static void cubic_cb_destroy(struct cc_var *ccv); static int cubic_cb_init(struct cc_var *ccv, void *ptr); -static void cubic_cong_signal(struct cc_var *ccv, uint32_t type); +static void cubic_cong_signal(struct cc_var *ccv, ccsignal_t type); static void cubic_conn_init(struct cc_var *ccv); static int cubic_mod_init(void); static void cubic_post_recovery(struct cc_var *ccv); @@ -233,7 +233,7 @@ cubic_does_slow_start(struct cc_var *ccv, struct cubic *cubicd) } static void -cubic_ack_received(struct cc_var *ccv, uint16_t type) +cubic_ack_received(struct cc_var *ccv, ccsignal_t type) { struct cubic *cubic_data; unsigned long W_est, W_cubic; @@ -417,7 +417,7 @@ cubic_cb_init(struct cc_var *ccv, void *ptr) * Perform any necessary tasks before we enter congestion recovery. */ static void -cubic_cong_signal(struct cc_var *ccv, uint32_t type) +cubic_cong_signal(struct cc_var *ccv, ccsignal_t type) { struct cubic *cubic_data; uint32_t mss, pipe; @@ -503,6 +503,8 @@ cubic_cong_signal(struct cc_var *ccv, uint32_t type) cubic_data->cwnd_epoch = cubic_data->undo_cwnd_epoch; cubic_data->t_epoch = cubic_data->undo_t_epoch; break; + default: + break; } } diff --git a/sys/netinet/cc/cc_dctcp.c b/sys/netinet/cc/cc_dctcp.c index ae0a56839449..374db98c5e60 100644 --- a/sys/netinet/cc/cc_dctcp.c +++ b/sys/netinet/cc/cc_dctcp.c @@ -79,11 +79,11 @@ struct dctcp { uint32_t num_cong_events; /* # of congestion events */ }; -static void dctcp_ack_received(struct cc_var *ccv, uint16_t type); +static void dctcp_ack_received(struct cc_var *ccv, ccsignal_t type); static void dctcp_after_idle(struct cc_var *ccv); static void dctcp_cb_destroy(struct cc_var *ccv); static int dctcp_cb_init(struct cc_var *ccv, void *ptr); -static void dctcp_cong_signal(struct cc_var *ccv, uint32_t type); +static void dctcp_cong_signal(struct cc_var *ccv, ccsignal_t type); static void dctcp_conn_init(struct cc_var *ccv); static void dctcp_post_recovery(struct cc_var *ccv); static void dctcp_ecnpkt_handler(struct cc_var *ccv); @@ -104,7 +104,7 @@ struct cc_algo dctcp_cc_algo = { }; static void -dctcp_ack_received(struct cc_var *ccv, uint16_t type) +dctcp_ack_received(struct cc_var *ccv, ccsignal_t type) { struct dctcp *dctcp_data; int bytes_acked = 0; @@ -237,7 +237,7 @@ dctcp_cb_init(struct cc_var *ccv, void *ptr) * Perform any necessary tasks before we enter congestion recovery. */ static void -dctcp_cong_signal(struct cc_var *ccv, uint32_t type) +dctcp_cong_signal(struct cc_var *ccv, ccsignal_t type) { struct dctcp *dctcp_data; uint32_t cwin, mss, pipe; @@ -308,6 +308,8 @@ dctcp_cong_signal(struct cc_var *ccv, uint32_t type) dctcp_data->save_sndnxt += CCV(ccv, t_maxseg); dctcp_data->num_cong_events++; break; + default: + break; } } else newreno_cc_cong_signal(ccv, type); diff --git a/sys/netinet/cc/cc_hd.c b/sys/netinet/cc/cc_hd.c index 1a8b62ccf426..82486563f97e 100644 --- a/sys/netinet/cc/cc_hd.c +++ b/sys/netinet/cc/cc_hd.c @@ -80,7 +80,7 @@ /* Largest possible number returned by random(). */ #define RANDOM_MAX INT_MAX -static void hd_ack_received(struct cc_var *ccv, uint16_t ack_type); +static void hd_ack_received(struct cc_var *ccv, ccsignal_t ack_type); static int hd_mod_init(void); static size_t hd_data_sz(void); @@ -138,7 +138,7 @@ should_backoff(int qdly, int maxqdly) * as NewReno in all other circumstances. */ static void -hd_ack_received(struct cc_var *ccv, uint16_t ack_type) +hd_ack_received(struct cc_var *ccv, ccsignal_t ack_type) { struct ertt *e_t; int qdly; diff --git a/sys/netinet/cc/cc_htcp.c b/sys/netinet/cc/cc_htcp.c index 43224446fd84..41c552a3bfa0 100644 --- a/sys/netinet/cc/cc_htcp.c +++ b/sys/netinet/cc/cc_htcp.c @@ -136,10 +136,10 @@ (((diff) / hz) * (((diff) << HTCP_ALPHA_INC_SHIFT) / (4 * hz))) \ ) >> HTCP_ALPHA_INC_SHIFT) -static void htcp_ack_received(struct cc_var *ccv, uint16_t type); +static void htcp_ack_received(struct cc_var *ccv, ccsignal_t type); static void htcp_cb_destroy(struct cc_var *ccv); static int htcp_cb_init(struct cc_var *ccv, void *ptr); -static void htcp_cong_signal(struct cc_var *ccv, uint32_t type); +static void htcp_cong_signal(struct cc_var *ccv, ccsignal_t type); static int htcp_mod_init(void); static void htcp_post_recovery(struct cc_var *ccv); static void htcp_recalc_alpha(struct cc_var *ccv); @@ -190,7 +190,7 @@ struct cc_algo htcp_cc_algo = { }; static void -htcp_ack_received(struct cc_var *ccv, uint16_t type) +htcp_ack_received(struct cc_var *ccv, ccsignal_t type) { struct htcp *htcp_data; @@ -278,7 +278,7 @@ htcp_cb_init(struct cc_var *ccv, void *ptr) * Perform any necessary tasks before we enter congestion recovery. */ static void -htcp_cong_signal(struct cc_var *ccv, uint32_t type) +htcp_cong_signal(struct cc_var *ccv, ccsignal_t type) { struct htcp *htcp_data; uint32_t mss, pipe; @@ -345,6 +345,8 @@ htcp_cong_signal(struct cc_var *ccv, uint32_t type) if (CCV(ccv, t_rxtshift) >= 2) htcp_data->t_last_cong = ticks; break; + default: + break; } } diff --git a/sys/netinet/cc/cc_newreno.c b/sys/netinet/cc/cc_newreno.c index 71f2764ef4bc..aa20e2c64f7d 100644 --- a/sys/netinet/cc/cc_newreno.c +++ b/sys/netinet/cc/cc_newreno.c @@ -84,9 +84,9 @@ #include static void newreno_cb_destroy(struct cc_var *ccv); -static void newreno_ack_received(struct cc_var *ccv, uint16_t type); +static void newreno_ack_received(struct cc_var *ccv, ccsignal_t type); static void newreno_after_idle(struct cc_var *ccv); -static void newreno_cong_signal(struct cc_var *ccv, uint32_t type); +static void newreno_cong_signal(struct cc_var *ccv, ccsignal_t type); static int newreno_ctl_output(struct cc_var *ccv, struct sockopt *sopt, void *buf); static void newreno_newround(struct cc_var *ccv, uint32_t round_cnt); static void newreno_rttsample(struct cc_var *ccv, uint32_t usec_rtt, uint32_t rxtcnt, uint32_t fas); @@ -212,7 +212,7 @@ newreno_cb_destroy(struct cc_var *ccv) } static void -newreno_ack_received(struct cc_var *ccv, uint16_t type) +newreno_ack_received(struct cc_var *ccv, ccsignal_t type) { struct newreno *nreno; @@ -363,7 +363,7 @@ newreno_after_idle(struct cc_var *ccv) * Perform any necessary tasks before we enter congestion recovery. */ static void -newreno_cong_signal(struct cc_var *ccv, uint32_t type) +newreno_cong_signal(struct cc_var *ccv, ccsignal_t type) { struct newreno *nreno; uint32_t beta, beta_ecn, cwin, factor, mss, pipe; @@ -442,6 +442,8 @@ newreno_cong_signal(struct cc_var *ccv, uint32_t type) } CCV(ccv, snd_cwnd) = mss; break; + default: + break; } } diff --git a/sys/netinet/cc/cc_vegas.c b/sys/netinet/cc/cc_vegas.c index aac9c9ce77ff..ecd42c1a0f53 100644 --- a/sys/netinet/cc/cc_vegas.c +++ b/sys/netinet/cc/cc_vegas.c @@ -84,12 +84,12 @@ * Private signal type for rate based congestion signal. * See for appropriate bit-range to use for private signals. */ -#define CC_VEGAS_RATE 0x01000000 +#define CC_VEGAS_RATE 0x04000000 -static void vegas_ack_received(struct cc_var *ccv, uint16_t ack_type); +static void vegas_ack_received(struct cc_var *ccv, ccsignal_t ack_type); static void vegas_cb_destroy(struct cc_var *ccv); static int vegas_cb_init(struct cc_var *ccv, void *ptr); -static void vegas_cong_signal(struct cc_var *ccv, uint32_t signal_type); +static void vegas_cong_signal(struct cc_var *ccv, ccsignal_t signal_type); static void vegas_conn_init(struct cc_var *ccv); static int vegas_mod_init(void); static size_t vegas_data_sz(void); @@ -124,7 +124,7 @@ struct cc_algo vegas_cc_algo = { * has been used. */ static void -vegas_ack_received(struct cc_var *ccv, uint16_t ack_type) +vegas_ack_received(struct cc_var *ccv, ccsignal_t ack_type) { struct ertt *e_t; struct vegas *vegas_data; @@ -203,7 +203,7 @@ vegas_cb_init(struct cc_var *ccv, void *ptr) * handled here, otherwise it falls back to newreno's congestion handling. */ static void -vegas_cong_signal(struct cc_var *ccv, uint32_t signal_type) +vegas_cong_signal(struct cc_var *ccv, ccsignal_t signal_type) { struct vegas *vegas_data; int presignalrecov; @@ -215,7 +215,7 @@ vegas_cong_signal(struct cc_var *ccv, uint32_t signal_type) else presignalrecov = 0; - switch(signal_type) { + switch((int)signal_type) { case CC_VEGAS_RATE: if (!IN_RECOVERY(CCV(ccv, t_flags))) { CCV(ccv, snd_cwnd) = max(2 * CCV(ccv, t_maxseg), @@ -228,6 +228,7 @@ vegas_cong_signal(struct cc_var *ccv, uint32_t signal_type) default: newreno_cc_cong_signal(ccv, signal_type); + break; } if (IN_RECOVERY(CCV(ccv, t_flags)) && !presignalrecov) From nobody Sat Feb 24 16:15:39 2024 X-Original-To: dev-commits-src-main@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 4ThsRw1zvgz5B53q; Sat, 24 Feb 2024 16:15: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThsRv6V5Yz4YpV; Sat, 24 Feb 2024 16:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708791339; 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=wn1+lMCVdjWkc4i0PI1qbqQ4c4niARwLjMgSXO1osYU=; b=g5jB4GKLBeejmmDMZcnuVJTBpxveQaoPgsFdaYhN1rxDxKBUsE38ANvIvCFg22Rr5Yd2gx wQBYMgAyWLXRSvIRPipMRxMnUaPQRCgdHepwL8UkFiPQD6GemqAc3xWcILg7KAmIEcOjUm icZljm7756Um50UVBLBGS7KOghJarQBC8tXgcfe9Ys1DHc6ZEnf3eItSqaGQiM3+pierEc ABU3C0971viC64SwyULtSDIHVpaDz5k+WdUk9wCrLRicIZPDBLlyPzWDOBD/Bil0wM4jE6 1dV4D48xhWZ7NltKmR5nysi+JDPjeeH0Gj8b1rMJ3CVigqawynYgdFQ4qjBVSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708791339; a=rsa-sha256; cv=none; b=pmuX4y2Y7hjcTSZDpjvPdQIrmBP7llk+OmfMw0IzX+CuzVjI5v+6eUELhMs+apg0zX0C39 04iDHt6PouN6t/IQfmBqkE4Lo6606ESEEkCy8ZEvoghf8qfiu9R6t0R3XZpF5XP95pj46r ohxdFVTFTfcygQ3/PBZVrH2CLJop9FF67GDTIO1NkwW/2veguwx4EwHqBfdtBbVui48SJW JYw/2EZFp2SPGRlhdcFUbywNh8vDBL57QCqNgXBKBM0yq+JiMa4prnktIpyOkqfweT1kyA vZcZJDsLtWGsdv8IIr7U0TGjwtEeRNvYmANK2+kODgrYU6ZfZ1LQsU1I+BVQpg== 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=1708791339; 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=wn1+lMCVdjWkc4i0PI1qbqQ4c4niARwLjMgSXO1osYU=; b=jvsTwwKVoxEnIzK3F5VfqRH7/00/PVhnVi0C3JYikfTzHDaarodBk0fAAsH143VSfweXnM gDyXlGzkDdgsfL5SAuVm2nNIXSTgO+3ubRGhQoomN9KEPwkm6TtZYTV6krEPK+hgaXfXSp z3YJUJmCsKI/x1Ct3m0svTOKbfsdtXY8gXcapb7rlOZ/TqMndVV3WbQ1bouSr2ExocD4gJ nJwkA+YXtA4EpfNlS7QVCQcH2djrhkPgiU2PXdHRFYdHR6xNVQd9w73d8dQCKiYoN3AfII khTZcreEdblC460sW9QoiEKCNgAVFEeCGusQCxjF2eZf0/RlKt18mpWCqi02Cg== 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 4ThsRv5bYcz15c9; Sat, 24 Feb 2024 16:15:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41OGFdoQ091804; Sat, 24 Feb 2024 16:15:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41OGFd22091801; Sat, 24 Feb 2024 16:15:39 GMT (envelope-from git) Date: Sat, 24 Feb 2024 16:15:39 GMT Message-Id: <202402241615.41OGFd22091801@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 40fdc6d25f01 - main - tcp: provide correct snd_fack on post_recovery List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 40fdc6d25f01eea7767f1ba21efcde0e8e26b5eb Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=40fdc6d25f01eea7767f1ba21efcde0e8e26b5eb commit 40fdc6d25f01eea7767f1ba21efcde0e8e26b5eb Author: Richard Scheffenegger AuthorDate: 2024-02-24 15:53:32 +0000 Commit: Richard Scheffenegger CommitDate: 2024-02-24 15:55:31 +0000 tcp: provide correct snd_fack on post_recovery Ensure that snd_fack holds a valid value when doing the post_recovery CC processing, for preparation of the cc_cubic update, so that local pipe calculations can correctly refer to snd_fack during and after CC events. Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D43957 --- sys/netinet/tcp_input.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index f023d7477790..8df975bcee54 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -479,6 +479,10 @@ cc_post_recovery(struct tcpcb *tp, struct tcphdr *th) INP_WLOCK_ASSERT(tptoinpcb(tp)); if (CC_ALGO(tp)->post_recovery != NULL) { + if (SEQ_LT(tp->snd_fack, th->th_ack) || + SEQ_GT(tp->snd_fack, tp->snd_max)) { + tp->snd_fack = th->th_ack; + } tp->t_ccv.curack = th->th_ack; CC_ALGO(tp)->post_recovery(&tp->t_ccv); } From nobody Sat Feb 24 16:15:40 2024 X-Original-To: dev-commits-src-main@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 4ThsRx3t0vz5B541; Sat, 24 Feb 2024 16:15: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThsRx0gDZz4Z0Q; Sat, 24 Feb 2024 16:15:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708791341; 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=DsQArroa97APqVUYrk0GLiz4dzA5+yDN30UTwwv2PEo=; b=DqJ/xYwq6H8ZbsBn8vsZTNg9Na1rKGz4By/14ltcf23b30mtgBgTHpqbQCLtjRrbzYNDJf LHyMsMw4MD5TdJwJlP5v/Z6Px31W1xM8vclkVZaUTYnBafSJm+j5Sh7bwB2zuClK+oEtTk GIZR13W5PrlA9STcJRfNQUmd9McgdFMX6FxkfDZt6u4yERPebR0AcbSv8NlD5uBrzCEjfO Fbnlm/owW6ua+Dm5Tw8vF+bijpRURixcQWS1rg5Jt/m0Y4fYSmVBvrFKbEXaehCgGbxWGt 1L3HmfUiS1YPXTofS9W6PHjGRgVoZTiO/xBRvsTno/UISDbW5FoADpTITsw22A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708791341; a=rsa-sha256; cv=none; b=k1yhhdIfUVesjOQMSi7VlOq5v8J/LEsdJAaz9l1CwYxe+a0YT8e04T2UOMx1dOvl2Fp3Zh e3gI72T52MNTVnDnAGYJHJP2j9+oEGeyCGWfWmloiR5Mp+YcRW13X2Q/UasLQM3cEomEUk 6CGGocwHGkOPYeLsvSOPO7UkudzzC78YL1VmgyKmYmBm7hdWzOehBnlO1Ud/ozkEBsaj6e k+vY+E7n8Xl1Q1NQlkDBAqaHYaRPmlgT8Q7I4sjidmCIQAlDrMvbhIFnCLGPVaXbvA7xvM DSYL1DfGDqyPhNaQ1xZ2ELWL5Wtns07m+Vz7vf38GVR0NIE6FTFUDhX5CrisfQ== 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=1708791341; 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=DsQArroa97APqVUYrk0GLiz4dzA5+yDN30UTwwv2PEo=; b=td3wZunyhA0UlG/3CTVJ8dfhWNwOGZmhtofTzZxpw9H8qZLIUw/hGhaaxWea+4hCaRgJZ5 48Crx8yP0yvarYJn5bMHzW0YQLKnBkjCIC27UgbG8WscEiOYTfRMKKvzjJYs0M9/odQeM4 hLI39GnsFfKtOkK/Yp9YvutAOefxByJTNByrbzbHeiILuHwgN4i8MFDFzj/Nsfy+CRbczc bSnV7ZbxL+vio+2jssj22BjSSdQlzGkLqsH2bIPvBETJ+ANF3+q2KUhAAapEorrdIEVC/s 2CCidmIpGfpxU55jZWNk8fvEk/npe3U/PkqwMDaGNmTctCKwTgvzErYv8yjaCw== 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 4ThsRw6t2Fz15cB; Sat, 24 Feb 2024 16:15:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41OGFeIo091852; Sat, 24 Feb 2024 16:15:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41OGFeid091849; Sat, 24 Feb 2024 16:15:40 GMT (envelope-from git) Date: Sat, 24 Feb 2024 16:15:40 GMT Message-Id: <202402241615.41OGFeid091849@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 038699a8f18a - main - tcp: cubic - restart epoch after RTO List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 038699a8f18a0a651ee06b85fa1dbbee1eab56f1 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=038699a8f18a0a651ee06b85fa1dbbee1eab56f1 commit 038699a8f18a0a651ee06b85fa1dbbee1eab56f1 Author: Richard Scheffenegger AuthorDate: 2024-02-24 16:07:25 +0000 Commit: Richard Scheffenegger CommitDate: 2024-02-24 16:07:46 +0000 tcp: cubic - restart epoch after RTO This is a migitation to avoid sudden extreme jumps in cwnd, as t_epoch can be very out of date after an RTO. Per RFC9438, sec 4.8, t_epoch is to be reset whenever cwnd grows beyond ssthresh (CC phase transitions from slow start to congestion avoidance), to be fixed with the upcoming cc_cubic changes. MFC after: 3 days Reviewed By: cc, #transport Sponsored by: NetApp, Inc Differential Revision: https://reviews.freebsd.org/D44023 --- sys/netinet/cc/cc_cubic.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netinet/cc/cc_cubic.c b/sys/netinet/cc/cc_cubic.c index a9c7592b80ca..b4050326ae31 100644 --- a/sys/netinet/cc/cc_cubic.c +++ b/sys/netinet/cc/cc_cubic.c @@ -270,6 +270,7 @@ cubic_ack_received(struct cc_var *ccv, ccsignal_t type) cubic_data->flags &= ~(CUBICFLAG_RTO_EVENT | CUBICFLAG_IN_SLOWSTART); cubic_data->W_max = CCV(ccv, snd_cwnd); + cubic_data->t_epoch = ticks; cubic_data->K = 0; } else if (cubic_data->flags & (CUBICFLAG_IN_SLOWSTART | CUBICFLAG_IN_APPLIMIT)) { From nobody Sat Feb 24 18:20:03 2024 X-Original-To: dev-commits-src-main@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 4ThwCR2tC1z5BJsH; Sat, 24 Feb 2024 18:20: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThwCR2MF6z4qh1; Sat, 24 Feb 2024 18:20:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708798803; 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=QsOKlI0/85/Vc6WPeY3FixGoLlXwMs3Iw+xHIQsxwhQ=; b=jbfZqQY9qOF24jEZe8aBn1mAoAu71oVk7LfVuwAAt7DieNBZxIyFxq1MgSohjbjeCQ+lep 1xfQQuhEFtqeQSAuA4dV1RejEgzzG5jNWPTBSXttXlwMuPBu8dnn24/JG869TIik4p8BBw 5BClyji7GIi7RVmnuTLb6rmiFMqHsiSSZdNLtKmGtLl6rrLCTZ3IHUqTIrWdIv0zYaTSjq 9R4Yp65tliJ5QxalvRP7yT4qH2sgoiKUZb1anrdrLwPcIqbjjZpSW/JIPFu3mVHzhgNfbS nC54icb5LgCx4byO2IhzHYEYjnVphxBgZws13PLLmkK84nXCRP6jzJ/RbgzlcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708798803; a=rsa-sha256; cv=none; b=o8N51RoXYTljD+1ZWIdM5BYEv5216I0wfSxFMDkaH8U2d4FeB8iNiGshL2XIyLXa5GENpJ f/7CXRDn6Hgnv0Rk55pBkt00P7gkRz64poYCexTehfW2DhcvPnscMOy8gGQPGRU78WF55e 4FR9B579UVt0/ji3vHcgToi29PTPeWGPO6whXyRatO8066TB4ypDLuoaH0JKYCYR8Cgtvv WnVsbSr2Ina8C+Z6AXUCrGBIzCYwljJHXlfjvYFVNfjVgtyQw85yL6iUruSEIPWGW9Ks5Z ILE2FTy7dNCykd1WotMNc0oR2lctYDE2TMa30SF3/Ufq9sMFJL6KUTnMR7+0aA== 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=1708798803; 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=QsOKlI0/85/Vc6WPeY3FixGoLlXwMs3Iw+xHIQsxwhQ=; b=MXYC70vqDdFvG/IAnc9glmq9H3GZovr7OXccUDNLESfkWf15MlbAU19fe25SDe8k8IQ9Tt nqyYQTlF44vKYRnUDaOOS3QE5gaLY4mM1XjHaIGYuuCemWfrWZBAHO1tFMGayWXA4XVQqB mbZuHmQ5nO1aCF8bSQ2AHCwYMj26iG1nagyHFp4GpNqkljS0LZWlLcKEFcdZkvy2av4y9k FSX3bdjLGQqmPX/zsyAOthGlK39DERKHoBCy8xID7vi9FcmHkr8ALyXGJNuL/rYuRwHTAp wgcdyvWR/khqYcRpN15t6/XLXmGyQg3oq91ktQXp7Vrev2L+WhJtNQD/Ld+hrQ== 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 4ThwCR1RGqz19QM; Sat, 24 Feb 2024 18:20:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41OIK3Ri099773; Sat, 24 Feb 2024 18:20:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41OIK3hY099766; Sat, 24 Feb 2024 18:20:03 GMT (envelope-from git) Date: Sat, 24 Feb 2024 18:20:03 GMT Message-Id: <202402241820.41OIK3hY099766@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 644cffe67f61 - main - sctp: improve sending of packets containing an INIT ACK chunk List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 644cffe67f61ad5b36b60d621d1c630ff2a50412 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=644cffe67f61ad5b36b60d621d1c630ff2a50412 commit 644cffe67f61ad5b36b60d621d1c630ff2a50412 Author: Michael Tuexen AuthorDate: 2024-02-24 18:16:36 +0000 Commit: Michael Tuexen CommitDate: 2024-02-24 18:16:36 +0000 sctp: improve sending of packets containing an INIT ACK chunk If the peer announced support of zero checksums, do so when sending packets containing an INIT ACK chunk. MFC after: 1 week --- sys/netinet/sctp_input.c | 2 +- sys/netinet/sctp_output.c | 36 ++++++++++++++++++++++++++++++++---- sys/netinet/sctp_output.h | 4 +++- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c index 6937f8a2a43f..a55ef5ac1eab 100644 --- a/sys/netinet/sctp_input.c +++ b/sys/netinet/sctp_input.c @@ -406,7 +406,7 @@ sctp_process_init_ack(struct mbuf *m, int iphlen, int offset, op_err = sctp_arethere_unrecognized_parameters(m, (offset + sizeof(struct sctp_init_chunk)), &abort_flag, (struct sctp_chunkhdr *)cp, - &nat_friendly, &cookie_found); + &nat_friendly, &cookie_found, NULL); if (abort_flag) { /* Send an abort and notify peer */ sctp_abort_association(stcb->sctp_ep, stcb, m, iphlen, diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index c988a8426fe8..a8facff6b917 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -4918,7 +4918,8 @@ sctp_arethere_unrecognized_parameters(struct mbuf *in_initpkt, int param_offset, int *abort_processing, struct sctp_chunkhdr *cp, int *nat_friendly, - int *cookie_found) + int *cookie_found, + uint32_t *edmid) { /* * Given a mbuf containing an INIT or INIT-ACK with the param_offset @@ -4934,8 +4935,8 @@ sctp_arethere_unrecognized_parameters(struct mbuf *in_initpkt, * hoped that this routine may be reused in the future by new * features. */ + struct sctp_zero_checksum_acceptable zero_chksum, *zero_chksum_p; struct sctp_paramhdr *phdr, params; - struct mbuf *mat, *m_tmp, *op_err, *op_err_last; int at, limit, pad_needed; uint16_t ptype, plen, padded_size; @@ -4944,6 +4945,9 @@ sctp_arethere_unrecognized_parameters(struct mbuf *in_initpkt, if (cookie_found != NULL) { *cookie_found = 0; } + if (edmid != NULL) { + *edmid = SCTP_EDMID_NONE; + } mat = in_initpkt; limit = ntohs(cp->chunk_length) - sizeof(struct sctp_init_chunk); at = param_offset; @@ -4999,6 +5003,22 @@ sctp_arethere_unrecognized_parameters(struct mbuf *in_initpkt, } at += padded_size; break; + case SCTP_ZERO_CHECKSUM_ACCEPTABLE: + if (padded_size != sizeof(struct sctp_zero_checksum_acceptable)) { + SCTPDBG(SCTP_DEBUG_OUTPUT1, "Invalid size - error checksum acceptable %d\n", plen); + goto invalid_size; + } + if (edmid != NULL) { + phdr = sctp_get_next_param(mat, at, + (struct sctp_paramhdr *)&zero_chksum, + sizeof(struct sctp_zero_checksum_acceptable)); + if (phdr != NULL) { + zero_chksum_p = (struct sctp_zero_checksum_acceptable *)phdr; + *edmid = ntohl(zero_chksum_p->edmid); + } + } + at += padded_size; + break; case SCTP_RANDOM: if (padded_size > (sizeof(struct sctp_auth_random) + SCTP_RANDOM_MAX_SIZE)) { SCTPDBG(SCTP_DEBUG_OUTPUT1, "Invalid size - error random %d\n", plen); @@ -5513,7 +5533,9 @@ sctp_send_initiate_ack(struct sctp_inpcb *inp, struct sctp_tcb *stcb, int nat_friendly = 0; int error; struct socket *so; + uint32_t edmid; uint16_t num_ext, chunk_len, padding_len, parameter_len; + bool use_zero_crc; if (stcb) { asoc = &stcb->asoc; @@ -5554,7 +5576,7 @@ sctp_send_initiate_ack(struct sctp_inpcb *inp, struct sctp_tcb *stcb, (offset + sizeof(struct sctp_init_chunk)), &abort_flag, (struct sctp_chunkhdr *)init_chk, - &nat_friendly, NULL); + &nat_friendly, NULL, &edmid); if (abort_flag) { do_a_abort: if (op_err == NULL) { @@ -6155,12 +6177,18 @@ do_a_abort: over_addr = NULL; } + if (asoc != NULL) { + use_zero_crc = (asoc->rcv_edmid != SCTP_EDMID_NONE) && (asoc->rcv_edmid == edmid); + } else { + use_zero_crc = (inp->rcv_edmid != SCTP_EDMID_NONE) && (inp->rcv_edmid == edmid); + } + if ((error = sctp_lowlevel_chunk_output(inp, NULL, NULL, to, m, 0, NULL, 0, 0, 0, 0, inp->sctp_lport, sh->src_port, init_chk->init.initiate_tag, port, over_addr, mflowtype, mflowid, - false, /* XXXMT: Improve this! */ + use_zero_crc, SCTP_SO_NOT_LOCKED))) { SCTPDBG(SCTP_DEBUG_OUTPUT4, "Gak send error %d\n", error); if (error == ENOBUFS) { diff --git a/sys/netinet/sctp_output.h b/sys/netinet/sctp_output.h index 1a1d17221b02..88c12367346a 100644 --- a/sys/netinet/sctp_output.h +++ b/sys/netinet/sctp_output.h @@ -80,7 +80,9 @@ sctp_send_initiate_ack(struct sctp_inpcb *, struct sctp_tcb *, struct mbuf * sctp_arethere_unrecognized_parameters(struct mbuf *, int, int *, - struct sctp_chunkhdr *, int *, int *); + struct sctp_chunkhdr *, int *, int *, + uint32_t *); + void sctp_queue_op_err(struct sctp_tcb *, struct mbuf *); int From nobody Sat Feb 24 18:24:01 2024 X-Original-To: dev-commits-src-main@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 4ThwJ43Bc6z5BK8l; Sat, 24 Feb 2024 18:24:04 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThwJ40dNvz4t5J; Sat, 24 Feb 2024 18:24:04 +0000 (UTC) (envelope-from bapt@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708799044; 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: in-reply-to:in-reply-to:references:references; bh=lnNWorn/EbcT2+wQv3U2m8eGn/hgKqnV0qFIKleNXGw=; b=OyTkXusOQMMqAP9OlNwzBWqkyrPtalBsLebaa4BvSIm8u+LdbgkSHQkwAGtxCzejh/VFbF ebHrIW6GVen4eTIg679YsfHo7cd1Cluay2bpDaNxrxGl3n5HUsw8gZsb/la+D1lx0S1D/x wTdvd5mhyUtpUTcdPiMxii07Nf3I+pk9cmNrkgWuHqNKqJ71JWvfNxy47CDWiZCZO4ktf5 itzrss29o6zI4yedv/4lQQyywp0UM/H6ddVXVKssCWCiUzeWkVAgXxxtL99yXHSJlxl6fg fQVxe1wIO7uwyWj8fs2o8pa47A/BiDLCTTb2l09b0jTmDj+H1EhYk2SDYiPsPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708799044; a=rsa-sha256; cv=none; b=VqvhTKbejXqDLp1OZWqOAZvPbl9U37EewL+M0Kc75YiLbI/j6qSRDxRvXyyvaGc1RjP+vg y+vPZD6j7oBSbMYbOB59r3k4uWFUV//I3gHBiUSbT+nwdP/JR4m6Nt1ADCH5wU4p5oFdI8 PbrPHpRKzjxbU5UftlIQydZhyyntP0V7MyHGwaX3xQ4kRQzWTtlNsHnZSfpWB8/OD6aJ4s QPuupi4ZrS8E2iLzyq9XkwiZI297dmMLvZ58g3ohfNo1nTSExR3ptij7Vtesvc6g+y2YfE Dv/iy6tHxJxLyLMz0MEMEL74qGzCNbyRGPSxp2NiMT6yTTrp1fQvF+5BOoTB/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=1708799044; 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: in-reply-to:in-reply-to:references:references; bh=lnNWorn/EbcT2+wQv3U2m8eGn/hgKqnV0qFIKleNXGw=; b=h+5XmG2NawLewjEMNMiYmxft5ct3Td2bjOK24OPzTX/x+iSmU0t6wRftZrndPMJP7k1pgi S5R4hjvbgacZ5KCI4VKZeWfy2Ae5nHapkV5GvP+CTvqrSvQwG1f4ZO0gZy9Qbeh0zE214h OvowdI5kYio3pBuftzYAxiYtdFyVtJSuTa7uehKkjgRINm3IP/QZ/FjTF9rnRVfXo7lkqt bQ4WFGSv9Znr1LiZZqKGWp1qyXsbLwcGB+5oSU4zYM/vZVlO29RwOKqskaHLcCOot9Ii2W FGTYtN4hfYGtv6uNnOPgIA66ntb3KNbSXAZCqN5VCJJlGEv6GR6D0nK2BH4+nA== Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (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) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ThwJ34prsz1X1F; Sat, 24 Feb 2024 18:24:03 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from [IPv6:::1] (2a02-8428-078f-2201-b872-d62a-3058-d3fb.rev.sfr.net [IPv6:2a02:8428:78f:2201:b872:d62a:3058:d3fb]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aniel.nours.eu (Postfix) with ESMTPSA id 4CF6CF24E6; Sat, 24 Feb 2024 19:24:01 +0100 (CET) Date: Sat, 24 Feb 2024 19:24:01 +0100 From: Baptiste Daroussin To: Richard Scheffenegger , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: =?US-ASCII?Q?Re=3A_git=3A_f74352fbcf15_-_main_-_tcp=3A_use_?= =?US-ASCII?Q?enum_for_all_congestion__control_signals?= User-Agent: K-9 Mail for Android In-Reply-To: <202402241615.41OGFcg7091756@gitrepo.freebsd.org> References: <202402241615.41OGFcg7091756@gitrepo.freebsd.org> Message-ID: List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary=----T877TB56UDSFUDD4AKM6Z78MQX4HAZ Content-Transfer-Encoding: 7bit ------T877TB56UDSFUDD4AKM6Z78MQX4HAZ Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Le 24 f=C3=A9vrier 2024 17:15:38 GMT+01:00, Richard Scheffenegger a =C3=A9crit=C2=A0: >The branch main has been updated by rscheff: > >URL: https://cgit=2EFreeBSD=2Eorg/src/commit/?id=3Df74352fbcf15341accaf5a= 92240871f98323215d > >commit f74352fbcf15341accaf5a92240871f98323215d >Author: Richard Scheffenegger >AuthorDate: 2024-02-24 15:41:31 +0000 >Commit: Richard Scheffenegger >CommitDate: 2024-02-24 15:41:48 +0000 > > tcp: use enum for all congestion control signals > =20 > Facilitate easier troubleshooting by enumerating > all congestion control signals=2E Typecast the > enum to int, when a congestion control module uses > private signals=2E > =20 > No external change=2E > =20 > Reviewed By: glebius, tuexen, #transport > Sponsored by: NetApp, Inc=2E > Differential Revision: https://reviews=2Efreebsd=2Eorg/D43838 >--- > sys/netinet/cc/cc=2Ec | 2 +- > sys/netinet/cc/cc=2Eh | 42 +++++++++++++++++++++----------------= ----- > sys/netinet/cc/cc_cdg=2Ec | 10 +++++----- > sys/netinet/cc/cc_chd=2Ec | 11 ++++++----- > sys/netinet/cc/cc_cubic=2Ec | 10 ++++++---- > sys/netinet/cc/cc_dctcp=2Ec | 10 ++++++---- > sys/netinet/cc/cc_hd=2Ec | 4 ++-- > sys/netinet/cc/cc_htcp=2Ec | 10 ++++++---- > sys/netinet/cc/cc_newreno=2Ec | 10 ++++++---- > sys/netinet/cc/cc_vegas=2Ec | 13 +++++++------ > 10 files changed, 66 insertions(+), 56 deletions(-) > >diff --git a/sys/netinet/cc/cc=2Ec b/sys/netinet/cc/cc=2Ec >index c2965b1e6a48=2E=2E9308b5f8d764 100644 >--- a/sys/netinet/cc/cc=2Ec >+++ b/sys/netinet/cc/cc=2Ec >@@ -505,7 +505,7 @@ newreno_cc_cong_signal(struct cc_var *ccv, uint32_t t= ype) > } >=20 > void >-newreno_cc_ack_received(struct cc_var *ccv, uint16_t type) >+newreno_cc_ack_received(struct cc_var *ccv, ccsignal_t type) > { > if (type =3D=3D CC_ACK && !IN_RECOVERY(CCV(ccv, t_flags)) && > (ccv->flags & CCF_CWND_LIMITED)) { >diff --git a/sys/netinet/cc/cc=2Eh b/sys/netinet/cc/cc=2Eh >index 9571da50b2c7=2E=2E5b2cb58a24a0 100644 >--- a/sys/netinet/cc/cc=2Eh >+++ b/sys/netinet/cc/cc=2Eh >@@ -121,25 +121,25 @@ struct cc_var { > #define CCF_HYSTART_CAN_SH_CWND 0x0800 /* Can hystart when going CSS ->= CA slam the cwnd */ > #define CCF_HYSTART_CONS_SSTH 0x1000 /* Should hystart use the more cons= ervative ssthresh */ >=20 >-/* ACK types passed to the ack_received() hook=2E */ >-#define CC_ACK 0x0001 /* Regular in sequence ACK=2E */ >-#define CC_DUPACK 0x0002 /* Duplicate ACK=2E */ >-#define CC_PARTIALACK 0x0004 /* Not yet=2E */ >-#define CC_SACK 0x0008 /* Not yet=2E */ >+typedef enum { >+ /* ACK types passed to the ack_received() hook=2E */ >+ CC_ACK =3D 0x0001, /* Regular in sequence ACK=2E */ >+ CC_DUPACK =3D 0x0002, /* Duplicate ACK=2E */ >+ CC_PARTIALACK =3D 0x0004, /* Not yet=2E */ >+ CC_SACK =3D 0x0008, /* Not yet=2E */ >+ /* Congestion signal types passed to the cong_signal() hook=2E */ >+ CC_ECN =3D 0x0100, /* ECN marked packet received=2E */ >+ CC_RTO =3D 0x0200, /* RTO fired=2E */ >+ CC_RTO_ERR =3D 0x0400, /* RTO fired in error=2E */ >+ CC_NDUPACK =3D 0x0800, /* Threshold of dupack's reached=2E */ >+ /* >+ * The highest order 8 bits (0x01000000 - 0x80000000) are reserved >+ * for CC algos to declare their own congestion signal types=2E >+ */ >+ CC_SIGPRIVMASK =3D 0xFF000000 /* Mask to check if sig is private=2E */ >+} ccsignal_t; > #endif /* defined(_KERNEL) || defined(_WANT_TCPCB) */ >=20 >-/* >- * Congestion signal types passed to the cong_signal() hook=2E The highe= st order 8 >- * bits (0x01000000 - 0x80000000) are reserved for CC algos to declare t= heir own >- * congestion signal types=2E >- */ >-#define CC_ECN 0x00000001 /* ECN marked packet received=2E */ >-#define CC_RTO 0x00000002 /* RTO fired=2E */ >-#define CC_RTO_ERR 0x00000004 /* RTO fired in error=2E */ >-#define CC_NDUPACK 0x00000008 /* Threshold of dupack's reached=2E */ >- >-#define CC_SIGPRIVMASK 0xFF000000 /* Mask to check if sig is private=2E = */ >- > #ifdef _KERNEL > /* > * Structure to hold data and function pointers that together represent = a >@@ -175,10 +175,10 @@ struct cc_algo { > void (*conn_init)(struct cc_var *ccv); >=20 > /* Called on receipt of an ack=2E */ >- void (*ack_received)(struct cc_var *ccv, uint16_t type); >+ void (*ack_received)(struct cc_var *ccv, ccsignal_t type); >=20 > /* Called on detection of a congestion signal=2E */ >- void (*cong_signal)(struct cc_var *ccv, uint32_t type); >+ void (*cong_signal)(struct cc_var *ccv, ccsignal_t type); >=20 > /* Called after exiting congestion recovery=2E */ > void (*post_recovery)(struct cc_var *ccv); >@@ -236,8 +236,8 @@ extern struct rwlock cc_list_lock; > */ > void newreno_cc_post_recovery(struct cc_var *); > void newreno_cc_after_idle(struct cc_var *); >-void newreno_cc_cong_signal(struct cc_var *, uint32_t ); >-void newreno_cc_ack_received(struct cc_var *, uint16_t); >+void newreno_cc_cong_signal(struct cc_var *, ccsignal_t); >+void newreno_cc_ack_received(struct cc_var *, ccsignal_t); >=20 > /* Called to temporarily keep an algo from going away during change */ > void cc_refer(struct cc_algo *algo); >diff --git a/sys/netinet/cc/cc_cdg=2Ec b/sys/netinet/cc/cc_cdg=2Ec >index 3f23c4091170=2E=2E1e9236f878d4 100644 >--- a/sys/netinet/cc/cc_cdg=2Ec >+++ b/sys/netinet/cc/cc_cdg=2Ec >@@ -221,8 +221,8 @@ static int cdg_mod_destroy(void); > static void cdg_conn_init(struct cc_var *ccv); > static int cdg_cb_init(struct cc_var *ccv, void *ptr); > static void cdg_cb_destroy(struct cc_var *ccv); >-static void cdg_cong_signal(struct cc_var *ccv, uint32_t signal_type); >-static void cdg_ack_received(struct cc_var *ccv, uint16_t ack_type); >+static void cdg_cong_signal(struct cc_var *ccv, ccsignal_t signal_type); >+static void cdg_ack_received(struct cc_var *ccv, ccsignal_t ack_type); > static size_t cdg_data_sz(void); >=20 > struct cc_algo cdg_cc_algo =3D { >@@ -450,11 +450,11 @@ cdg_window_increase(struct cc_var *ccv, int new_mea= surement) > } >=20 > static void >-cdg_cong_signal(struct cc_var *ccv, uint32_t signal_type) >+cdg_cong_signal(struct cc_var *ccv, ccsignal_t signal_type) > { > struct cdg *cdg_data =3D ccv->cc_data; >=20 >- switch(signal_type) { >+ switch((int)signal_type) { > case CC_CDG_DELAY: > CCV(ccv, snd_ssthresh) =3D cdg_window_decrease(ccv, > CCV(ccv, snd_cwnd), V_cdg_beta_delay); >@@ -571,7 +571,7 @@ calc_moving_average(struct cdg *cdg_data, long qdiff_= max, long qdiff_min) > } >=20 > static void >-cdg_ack_received(struct cc_var *ccv, uint16_t ack_type) >+cdg_ack_received(struct cc_var *ccv, ccsignal_t ack_type) > { > struct cdg *cdg_data; > struct ertt *e_t; >diff --git a/sys/netinet/cc/cc_chd=2Ec b/sys/netinet/cc/cc_chd=2Ec >index c644d9b2cdb8=2E=2E52048a7c05ae 100644 >--- a/sys/netinet/cc/cc_chd=2Ec >+++ b/sys/netinet/cc/cc_chd=2Ec >@@ -88,10 +88,10 @@ > /* Largest possible number returned by random()=2E */ > #define RANDOM_MAX INT_MAX >=20 >-static void chd_ack_received(struct cc_var *ccv, uint16_t ack_type); >+static void chd_ack_received(struct cc_var *ccv, ccsignal_t ack_type); > static void chd_cb_destroy(struct cc_var *ccv); > static int chd_cb_init(struct cc_var *ccv, void *ptr); >-static void chd_cong_signal(struct cc_var *ccv, uint32_t signal_type); >+static void chd_cong_signal(struct cc_var *ccv, ccsignal_t signal_type); > static void chd_conn_init(struct cc_var *ccv); > static int chd_mod_init(void); > static size_t chd_data_sz(void); >@@ -235,7 +235,7 @@ chd_window_increase(struct cc_var *ccv, int new_measu= rement) > * ack_type =3D=3D CC_ACK=2E > */ > static void >-chd_ack_received(struct cc_var *ccv, uint16_t ack_type) >+chd_ack_received(struct cc_var *ccv, ccsignal_t ack_type) > { > struct chd *chd_data; > struct ertt *e_t; >@@ -336,7 +336,7 @@ chd_cb_init(struct cc_var *ccv, void *ptr) > } >=20 > static void >-chd_cong_signal(struct cc_var *ccv, uint32_t signal_type) >+chd_cong_signal(struct cc_var *ccv, ccsignal_t signal_type) > { > struct ertt *e_t; > struct chd *chd_data; >@@ -346,7 +346,7 @@ chd_cong_signal(struct cc_var *ccv, uint32_t signal_t= ype) > chd_data =3D ccv->cc_data; > qdly =3D imax(e_t->rtt, chd_data->maxrtt_in_rtt) - e_t->minrtt; >=20 >- switch(signal_type) { >+ switch((int)signal_type) { > case CC_CHD_DELAY: > chd_window_decrease(ccv); /* Set new ssthresh=2E */ > CCV(ccv, snd_cwnd) =3D CCV(ccv, snd_ssthresh); >@@ -387,6 +387,7 @@ chd_cong_signal(struct cc_var *ccv, uint32_t signal_t= ype) >=20 > default: > newreno_cc_cong_signal(ccv, signal_type); >+ break; > } > } >=20 >diff --git a/sys/netinet/cc/cc_cubic=2Ec b/sys/netinet/cc/cc_cubic=2Ec >index eb1587d44427=2E=2Ea9c7592b80ca 100644 >--- a/sys/netinet/cc/cc_cubic=2Ec >+++ b/sys/netinet/cc/cc_cubic=2Ec >@@ -73,10 +73,10 @@ > #include > #include >=20 >-static void cubic_ack_received(struct cc_var *ccv, uint16_t type); >+static void cubic_ack_received(struct cc_var *ccv, ccsignal_t type); > static void cubic_cb_destroy(struct cc_var *ccv); > static int cubic_cb_init(struct cc_var *ccv, void *ptr); >-static void cubic_cong_signal(struct cc_var *ccv, uint32_t type); >+static void cubic_cong_signal(struct cc_var *ccv, ccsignal_t type); > static void cubic_conn_init(struct cc_var *ccv); > static int cubic_mod_init(void); > static void cubic_post_recovery(struct cc_var *ccv); >@@ -233,7 +233,7 @@ cubic_does_slow_start(struct cc_var *ccv, struct cubi= c *cubicd) > } >=20 > static void >-cubic_ack_received(struct cc_var *ccv, uint16_t type) >+cubic_ack_received(struct cc_var *ccv, ccsignal_t type) > { > struct cubic *cubic_data; > unsigned long W_est, W_cubic; >@@ -417,7 +417,7 @@ cubic_cb_init(struct cc_var *ccv, void *ptr) > * Perform any necessary tasks before we enter congestion recovery=2E > */ > static void >-cubic_cong_signal(struct cc_var *ccv, uint32_t type) >+cubic_cong_signal(struct cc_var *ccv, ccsignal_t type) > { > struct cubic *cubic_data; > uint32_t mss, pipe; >@@ -503,6 +503,8 @@ cubic_cong_signal(struct cc_var *ccv, uint32_t type) > cubic_data->cwnd_epoch =3D cubic_data->undo_cwnd_epoch; > cubic_data->t_epoch =3D cubic_data->undo_t_epoch; > break; >+ default: >+ break; > } > } >=20 >diff --git a/sys/netinet/cc/cc_dctcp=2Ec b/sys/netinet/cc/cc_dctcp=2Ec >index ae0a56839449=2E=2E374db98c5e60 100644 >--- a/sys/netinet/cc/cc_dctcp=2Ec >+++ b/sys/netinet/cc/cc_dctcp=2Ec >@@ -79,11 +79,11 @@ struct dctcp { > uint32_t num_cong_events; /* # of congestion events */ > }; >=20 >-static void dctcp_ack_received(struct cc_var *ccv, uint16_t type); >+static void dctcp_ack_received(struct cc_var *ccv, ccsignal_t type); > static void dctcp_after_idle(struct cc_var *ccv); > static void dctcp_cb_destroy(struct cc_var *ccv); > static int dctcp_cb_init(struct cc_var *ccv, void *ptr); >-static void dctcp_cong_signal(struct cc_var *ccv, uint32_t type); >+static void dctcp_cong_signal(struct cc_var *ccv, ccsignal_t type); > static void dctcp_conn_init(struct cc_var *ccv); > static void dctcp_post_recovery(struct cc_var *ccv); > static void dctcp_ecnpkt_handler(struct cc_var *ccv); >@@ -104,7 +104,7 @@ struct cc_algo dctcp_cc_algo =3D { > }; >=20 > static void >-dctcp_ack_received(struct cc_var *ccv, uint16_t type) >+dctcp_ack_received(struct cc_var *ccv, ccsignal_t type) > { > struct dctcp *dctcp_data; > int bytes_acked =3D 0; >@@ -237,7 +237,7 @@ dctcp_cb_init(struct cc_var *ccv, void *ptr) > * Perform any necessary tasks before we enter congestion recovery=2E > */ > static void >-dctcp_cong_signal(struct cc_var *ccv, uint32_t type) >+dctcp_cong_signal(struct cc_var *ccv, ccsignal_t type) > { > struct dctcp *dctcp_data; > uint32_t cwin, mss, pipe; >@@ -308,6 +308,8 @@ dctcp_cong_signal(struct cc_var *ccv, uint32_t type) > dctcp_data->save_sndnxt +=3D CCV(ccv, t_maxseg); > dctcp_data->num_cong_events++; > break; >+ default: >+ break; > } > } else > newreno_cc_cong_signal(ccv, type); >diff --git a/sys/netinet/cc/cc_hd=2Ec b/sys/netinet/cc/cc_hd=2Ec >index 1a8b62ccf426=2E=2E82486563f97e 100644 >--- a/sys/netinet/cc/cc_hd=2Ec >+++ b/sys/netinet/cc/cc_hd=2Ec >@@ -80,7 +80,7 @@ > /* Largest possible number returned by random()=2E */ > #define RANDOM_MAX INT_MAX >=20 >-static void hd_ack_received(struct cc_var *ccv, uint16_t ack_type); >+static void hd_ack_received(struct cc_var *ccv, ccsignal_t ack_type); > static int hd_mod_init(void); > static size_t hd_data_sz(void); >=20 >@@ -138,7 +138,7 @@ should_backoff(int qdly, int maxqdly) > * as NewReno in all other circumstances=2E > */ > static void >-hd_ack_received(struct cc_var *ccv, uint16_t ack_type) >+hd_ack_received(struct cc_var *ccv, ccsignal_t ack_type) > { > struct ertt *e_t; > int qdly; >diff --git a/sys/netinet/cc/cc_htcp=2Ec b/sys/netinet/cc/cc_htcp=2Ec >index 43224446fd84=2E=2E41c552a3bfa0 100644 >--- a/sys/netinet/cc/cc_htcp=2Ec >+++ b/sys/netinet/cc/cc_htcp=2Ec >@@ -136,10 +136,10 @@ > (((diff) / hz) * (((diff) << HTCP_ALPHA_INC_SHIFT) / (4 * hz))) \ > ) >> HTCP_ALPHA_INC_SHIFT) >=20 >-static void htcp_ack_received(struct cc_var *ccv, uint16_t type); >+static void htcp_ack_received(struct cc_var *ccv, ccsignal_t type); > static void htcp_cb_destroy(struct cc_var *ccv); > static int htcp_cb_init(struct cc_var *ccv, void *ptr); >-static void htcp_cong_signal(struct cc_var *ccv, uint32_t type); >+static void htcp_cong_signal(struct cc_var *ccv, ccsignal_t type); > static int htcp_mod_init(void); > static void htcp_post_recovery(struct cc_var *ccv); > static void htcp_recalc_alpha(struct cc_var *ccv); >@@ -190,7 +190,7 @@ struct cc_algo htcp_cc_algo =3D { > }; >=20 > static void >-htcp_ack_received(struct cc_var *ccv, uint16_t type) >+htcp_ack_received(struct cc_var *ccv, ccsignal_t type) > { > struct htcp *htcp_data; >=20 >@@ -278,7 +278,7 @@ htcp_cb_init(struct cc_var *ccv, void *ptr) > * Perform any necessary tasks before we enter congestion recovery=2E > */ > static void >-htcp_cong_signal(struct cc_var *ccv, uint32_t type) >+htcp_cong_signal(struct cc_var *ccv, ccsignal_t type) > { > struct htcp *htcp_data; > uint32_t mss, pipe; >@@ -345,6 +345,8 @@ htcp_cong_signal(struct cc_var *ccv, uint32_t type) > if (CCV(ccv, t_rxtshift) >=3D 2) > htcp_data->t_last_cong =3D ticks; > break; >+ default: >+ break; > } > } >=20 >diff --git a/sys/netinet/cc/cc_newreno=2Ec b/sys/netinet/cc/cc_newreno=2E= c >index 71f2764ef4bc=2E=2Eaa20e2c64f7d 100644 >--- a/sys/netinet/cc/cc_newreno=2Ec >+++ b/sys/netinet/cc/cc_newreno=2Ec >@@ -84,9 +84,9 @@ > #include >=20 > static void newreno_cb_destroy(struct cc_var *ccv); >-static void newreno_ack_received(struct cc_var *ccv, uint16_t type); >+static void newreno_ack_received(struct cc_var *ccv, ccsignal_t type); > static void newreno_after_idle(struct cc_var *ccv); >-static void newreno_cong_signal(struct cc_var *ccv, uint32_t type); >+static void newreno_cong_signal(struct cc_var *ccv, ccsignal_t type); > static int newreno_ctl_output(struct cc_var *ccv, struct sockopt *sopt, = void *buf); > static void newreno_newround(struct cc_var *ccv, uint32_t round_cnt); > static void newreno_rttsample(struct cc_var *ccv, uint32_t usec_rtt, uin= t32_t rxtcnt, uint32_t fas); >@@ -212,7 +212,7 @@ newreno_cb_destroy(struct cc_var *ccv) > } >=20 > static void >-newreno_ack_received(struct cc_var *ccv, uint16_t type) >+newreno_ack_received(struct cc_var *ccv, ccsignal_t type) > { > struct newreno *nreno; >=20 >@@ -363,7 +363,7 @@ newreno_after_idle(struct cc_var *ccv) > * Perform any necessary tasks before we enter congestion recovery=2E > */ > static void >-newreno_cong_signal(struct cc_var *ccv, uint32_t type) >+newreno_cong_signal(struct cc_var *ccv, ccsignal_t type) > { > struct newreno *nreno; > uint32_t beta, beta_ecn, cwin, factor, mss, pipe; >@@ -442,6 +442,8 @@ newreno_cong_signal(struct cc_var *ccv, uint32_t type= ) > } > CCV(ccv, snd_cwnd) =3D mss; > break; >+ default: >+ break; > } > } >=20 >diff --git a/sys/netinet/cc/cc_vegas=2Ec b/sys/netinet/cc/cc_vegas=2Ec >index aac9c9ce77ff=2E=2Eecd42c1a0f53 100644 >--- a/sys/netinet/cc/cc_vegas=2Ec >+++ b/sys/netinet/cc/cc_vegas=2Ec >@@ -84,12 +84,12 @@ > * Private signal type for rate based congestion signal=2E > * See for appropriate bit-range to use for private sig= nals=2E > */ >-#define CC_VEGAS_RATE 0x01000000 >+#define CC_VEGAS_RATE 0x04000000 >=20 >-static void vegas_ack_received(struct cc_var *ccv, uint16_t ack_type); >+static void vegas_ack_received(struct cc_var *ccv, ccsignal_t ack_type); > static void vegas_cb_destroy(struct cc_var *ccv); > static int vegas_cb_init(struct cc_var *ccv, void *ptr); >-static void vegas_cong_signal(struct cc_var *ccv, uint32_t signal_type); >+static void vegas_cong_signal(struct cc_var *ccv, ccsignal_t signal_type= ); > static void vegas_conn_init(struct cc_var *ccv); > static int vegas_mod_init(void); > static size_t vegas_data_sz(void); >@@ -124,7 +124,7 @@ struct cc_algo vegas_cc_algo =3D { > * has been used=2E > */ > static void >-vegas_ack_received(struct cc_var *ccv, uint16_t ack_type) >+vegas_ack_received(struct cc_var *ccv, ccsignal_t ack_type) > { > struct ertt *e_t; > struct vegas *vegas_data; >@@ -203,7 +203,7 @@ vegas_cb_init(struct cc_var *ccv, void *ptr) > * handled here, otherwise it falls back to newreno's congestion handlin= g=2E > */ > static void >-vegas_cong_signal(struct cc_var *ccv, uint32_t signal_type) >+vegas_cong_signal(struct cc_var *ccv, ccsignal_t signal_type) > { > struct vegas *vegas_data; > int presignalrecov; >@@ -215,7 +215,7 @@ vegas_cong_signal(struct cc_var *ccv, uint32_t signal= _type) > else > presignalrecov =3D 0; >=20 >- switch(signal_type) { >+ switch((int)signal_type) { > case CC_VEGAS_RATE: > if (!IN_RECOVERY(CCV(ccv, t_flags))) { > CCV(ccv, snd_cwnd) =3D max(2 * CCV(ccv, t_maxseg), >@@ -228,6 +228,7 @@ vegas_cong_signal(struct cc_var *ccv, uint32_t signal= _type) >=20 > default: > newreno_cc_cong_signal(ccv, signal_type); >+ break; > } >=20 > if (IN_RECOVERY(CCV(ccv, t_flags)) && !presignalrecov) Buildworld is now broken for all arches (at least incremental build) Among the errors /home/bapt/worktrees/main/lib/libstats/=2E=2E/=2E=2E/sys/netinet/tcp_stats= =2Ec:138:32: error: use of undeclared identifier 'CC_NDUPACK' ------T877TB56UDSFUDD4AKM6Z78MQX4HAZ Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable
Le 24= f=C3=A9vrier 2024 17:15:38 GMT+01:00, Richard Scheffenegger <rscheff@Fr= eeBSD=2Eorg> a =C3=A9crit=C2=A0:
The branch main has been updated b=
y rscheff:

URL: https://cgit=2EFreeBSD=2Eorg=
/src/commit/?id=3Df74352fbcf15341accaf5a92240871f98323215d

commi=
t f74352fbcf15341accaf5a92240871f98323215d
Author:     Richard Scheffene=
gger <rscheff@FreeBSD=2Eorg>
AuthorDate: 2024-02-24 15:41:31 +0000=

Commit:     Richard Scheffenegger <rscheff@FreeBSD=2Eorg>
Comm=
itDate: 2024-02-24 15:41:48 +0000

    tcp: use enum for all congesti=
on control signals
    
    Facilitate easier troubleshooting by enum=
erating
    all congestion control signals=2E Typecast the
    enum t=
o int, when a congestion control module uses
    private signals=2E
 =
   
    No external change=2E
    
    Reviewed By:            gle=
bius, tuexen, #transport
    Sponsored by:           NetApp, Inc=2E
 =
   Differential Revision:  https://reviews=2Efreebsd=2Eorg/D43838
 sys/netinet/cc/cc=2Ec    =
     |  2 +-
 sys/netinet/cc/cc=2Eh         | 42 +++++++++++++++++++++--=
-------------------
 sys/netinet/cc/cc_cdg=2Ec     | 10 +++++-----
 s=
ys/netinet/cc/cc_chd=2Ec     | 11 ++++++-----
 sys/netinet/cc/cc_cubic=
=2Ec   | 10 ++++++----
 sys/netinet/cc/cc_dctcp=2Ec   | 10 ++++++---- sys/netinet/cc/cc_hd=2Ec      |  4 ++--
 sys/netinet/cc/cc_htcp=2Ec   =
 | 10 ++++++----
 sys/netinet/cc/cc_newreno=2Ec | 10 ++++++----
 sys/=
netinet/cc/cc_vegas=2Ec   | 13 +++++++------
 10 files changed, 66 inser=
tions(+), 56 deletions(-)

diff --git a/sys/netinet/cc/cc=2Ec b/sys/n=
etinet/cc/cc=2Ec
index c2965b1e6a48=2E=2E9308b5f8d764 100644
--- a/sy=
s/netinet/cc/cc=2Ec
+++ b/sys/netinet/cc/cc=2Ec
@@ -505,7 +505,7 @@ n=
ewreno_cc_cong_signal(struct cc_var *ccv, uint32_t type)
 }
 
 voi=
d
-newreno_cc_ack_received(struct cc_var *ccv, uint16_t type)
+newren=
o_cc_ack_received(struct cc_var *ccv, ccsignal_t type)
 {
 	if (type =
=3D=3D CC_ACK && !IN_RECOVERY(CCV(ccv, t_flags)) &&
 	  =
  (ccv->flags & CCF_CWND_LIMITED)) {
diff --git a/sys/netinet/cc/=
cc=2Eh b/sys/netinet/cc/cc=2Eh
index 9571da50b2c7=2E=2E5b2cb58a24a0 1006=
44
--- a/sys/netinet/cc/cc=2Eh
+++ b/sys/netinet/cc/cc=2Eh
@@ -121=
,25 +121,25 @@ struct cc_var {
 #define CCF_HYSTART_CAN_SH_CWND	0x0800  =
/* Can hystart when going CSS -> CA slam the cwnd */
 #define CCF_HYS=
TART_CONS_SSTH	0x1000	/* Should hystart use the more conservative ssthresh =
*/
 
-/* ACK types passed to the ack_received() hook=2E */
-#defin=
e	CC_ACK		0x0001	/* Regular in sequence ACK=2E */
-#define	CC_DUPACK	0x0=
002	/* Duplicate ACK=2E */
-#define	CC_PARTIALACK	0x0004	/* Not yet=2E *=
/
-#define	CC_SACK		0x0008	/* Not yet=2E */
+typedef enum {
+	/* A=
CK types passed to the ack_received() hook=2E */
+	CC_ACK =3D	0x0001,	/*=
 Regular in sequence ACK=2E */
+	CC_DUPACK =3D	0x0002,	/* Duplicate ACK=
=2E */
+	CC_PARTIALACK =3D	0x0004,	/* Not yet=2E */
+	CC_SACK =3D	0x0=
008,	/* Not yet=2E */
+	/* Congestion signal types passed to the cong_si=
gnal() hook=2E */
+	CC_ECN =3D	0x0100,	/* ECN marked packet received=2E =
*/
+	CC_RTO =3D	0x0200,	/* RTO fired=2E */
+	CC_RTO_ERR =3D	0x0400,	/=
* RTO fired in error=2E */
+	CC_NDUPACK =3D	0x0800,	/* Threshold of dupa=
ck's reached=2E */
+	/*
+	 * The highest order 8 bits (0x01000000 - 0=
x80000000) are reserved
+	 * for CC algos to declare their own congestio=
n signal types=2E
+	 */
+	CC_SIGPRIVMASK =3D 0xFF000000	/* Mask to ch=
eck if sig is private=2E */
+} ccsignal_t;
 #endif /* defined(_KERNEL=
) || defined(_WANT_TCPCB) */
 
-/*
- * Congestion signal types pas=
sed to the cong_signal() hook=2E The highest order 8
- * bits (0x0100000=
0 - 0x80000000) are reserved for CC algos to declare their own
- * conge=
stion signal types=2E
- */
-#define	CC_ECN		0x00000001	/* ECN marked =
packet received=2E */
-#define	CC_RTO		0x00000002	/* RTO fired=2E */
=
-#define	CC_RTO_ERR	0x00000004	/* RTO fired in error=2E */
-#define	CC_N=
DUPACK	0x00000008	/* Threshold of dupack's reached=2E */
-
-#define	C=
C_SIGPRIVMASK	0xFF000000	/* Mask to check if sig is private=2E */
-
 =
#ifdef _KERNEL
 /*
  * Structure to hold data and function pointers t=
hat together represent a
@@ -175,10 +175,10 @@ struct cc_algo {
 	voi=
d	(*conn_init)(struct cc_var *ccv);
 
 	/* Called on receipt of an ac=
k=2E */
-	void	(*ack_received)(struct cc_var *ccv, uint16_t type);
+	=
void	(*ack_received)(struct cc_var *ccv, ccsignal_t type);
 
 	/* Cal=
led on detection of a congestion signal=2E */
-	void	(*cong_signal)(stru=
ct cc_var *ccv, uint32_t type);
+	void	(*cong_signal)(struct cc_var *ccv=
, ccsignal_t type);
 
 	/* Called after exiting congestion recovery=
=2E */
 	void	(*post_recovery)(struct cc_var *ccv);
@@ -236,8 +236,8 =
@@ extern struct rwlock cc_list_lock;
  */
 void newreno_cc_post_reco=
very(struct cc_var *);
 void newreno_cc_after_idle(struct cc_var *);
=
-void newreno_cc_cong_signal(struct cc_var *, uint32_t );
-void newreno_=
cc_ack_received(struct cc_var *, uint16_t);
+void newreno_cc_cong_signal=
(struct cc_var *, ccsignal_t);
+void newreno_cc_ack_received(struct cc_v=
ar *, ccsignal_t);
 
 /* Called to temporarily keep an algo from goin=
g away during change */
 void cc_refer(struct cc_algo *algo);
diff --=
git a/sys/netinet/cc/cc_cdg=2Ec b/sys/netinet/cc/cc_cdg=2Ec
index 3f23c4=
091170=2E=2E1e9236f878d4 100644
--- a/sys/netinet/cc/cc_cdg=2Ec
+++ b=
/sys/netinet/cc/cc_cdg=2Ec
@@ -221,8 +221,8 @@ static int cdg_mod_destro=
y(void);
 static void cdg_conn_init(struct cc_var *ccv);
 static int =
cdg_cb_init(struct cc_var *ccv, void *ptr);
 static void cdg_cb_destroy(=
struct cc_var *ccv);
-static void cdg_cong_signal(struct cc_var *ccv, ui=
nt32_t signal_type);
-static void cdg_ack_received(struct cc_var *ccv, u=
int16_t ack_type);
+static void cdg_cong_signal(struct cc_var *ccv, ccsi=
gnal_t signal_type);
+static void cdg_ack_received(struct cc_var *ccv, c=
csignal_t ack_type);
 static size_t cdg_data_sz(void);
 
 struct c=
c_algo cdg_cc_algo =3D {
@@ -450,11 +450,11 @@ cdg_window_increase(struc=
t cc_var *ccv, int new_measurement)
 }
 
 static void
-cdg_cong=
_signal(struct cc_var *ccv, uint32_t signal_type)
+cdg_cong_signal(struc=
t cc_var *ccv, ccsignal_t signal_type)
 {
 	struct cdg *cdg_data =3D =
ccv->cc_data;
 
-	switch(signal_type) {
+	switch((int)signal_ty=
pe) {
 	case CC_CDG_DELAY:
 		CCV(ccv, snd_ssthresh) =3D cdg_window_d=
ecrease(ccv,
 		    CCV(ccv, snd_cwnd), V_cdg_beta_delay);
@@ -571,7 =
+571,7 @@ calc_moving_average(struct cdg *cdg_data, long qdiff_max, long qd=
iff_min)
 }
 
 static void
-cdg_ack_received(struct cc_var *ccv=
, uint16_t ack_type)
+cdg_ack_received(struct cc_var *ccv, ccsignal_t ac=
k_type)
 {
 	struct cdg *cdg_data;
 	struct ertt *e_t;
diff --g=
it a/sys/netinet/cc/cc_chd=2Ec b/sys/netinet/cc/cc_chd=2Ec
index c644d9b=
2cdb8=2E=2E52048a7c05ae 100644
--- a/sys/netinet/cc/cc_chd=2Ec
+++ b/=
sys/netinet/cc/cc_chd=2Ec
@@ -88,10 +88,10 @@
 /* Largest possible nu=
mber returned by random()=2E */
 #define	RANDOM_MAX	INT_MAX
 
-sta=
tic void	chd_ack_received(struct cc_var *ccv, uint16_t ack_type);
+stati=
c void	chd_ack_received(struct cc_var *ccv, ccsignal_t ack_type);
 stati=
c void	chd_cb_destroy(struct cc_var *ccv);
 static int	chd_cb_init(struc=
t cc_var *ccv, void *ptr);
-static void	chd_cong_signal(struct cc_var *c=
cv, uint32_t signal_type);
+static void	chd_cong_signal(struct cc_var *c=
cv, ccsignal_t signal_type);
 static void	chd_conn_init(struct cc_var *c=
cv);
 static int	chd_mod_init(void);
 static size_t	chd_data_sz(void)=
;
@@ -235,7 +235,7 @@ chd_window_increase(struct cc_var *ccv, int new_me=
asurement)
  * ack_type =3D=3D CC_ACK=2E
  */
 static void
-chd=
_ack_received(struct cc_var *ccv, uint16_t ack_type)
+chd_ack_received(s=
truct cc_var *ccv, ccsignal_t ack_type)
 {
 	struct chd *chd_data; 	struct ertt *e_t;
@@ -336,7 +336,7 @@ chd_cb_init(struct cc_var *ccv,=
 void *ptr)
 }
 
 static void
-chd_cong_signal(struct cc_var *c=
cv, uint32_t signal_type)
+chd_cong_signal(struct cc_var *ccv, ccsignal_=
t signal_type)
 {
 	struct ertt *e_t;
 	struct chd *chd_data;
@=
@ -346,7 +346,7 @@ chd_cong_signal(struct cc_var *ccv, uint32_t signal_type=
)
 	chd_data =3D ccv->cc_data;
 	qdly =3D imax(e_t->rtt, chd_da=
ta->maxrtt_in_rtt) - e_t->minrtt;
 
-	switch(signal_type) {
=
+	switch((int)signal_type) {
 	case CC_CHD_DELAY:
 		chd_window_decre=
ase(ccv); /* Set new ssthresh=2E */
 		CCV(ccv, snd_cwnd) =3D CCV(ccv, s=
nd_ssthresh);
@@ -387,6 +387,7 @@ chd_cong_signal(struct cc_var *ccv, ui=
nt32_t signal_type)
 
 	default:
 		newreno_cc_cong_signal(ccv, si=
gnal_type);
+		break;
 	}
 }
 
diff --git a/sys/netinet/cc/c=
c_cubic=2Ec b/sys/netinet/cc/cc_cubic=2Ec
index eb1587d44427=2E=2Ea9c759=
2b80ca 100644
--- a/sys/netinet/cc/cc_cubic=2Ec
+++ b/sys/netinet/cc/=
cc_cubic=2Ec
@@ -73,10 +73,10 @@
 #include <netinet/cc/cc_cubic=2E=
h>
 #include <netinet/cc/cc_module=2Eh>
 
-static void	cu=
bic_ack_received(struct cc_var *ccv, uint16_t type);
+static void	cubic_=
ack_received(struct cc_var *ccv, ccsignal_t type);
 static void	cubic_cb=
_destroy(struct cc_var *ccv);
 static int	cubic_cb_init(struct cc_var *c=
cv, void *ptr);
-static void	cubic_cong_signal(struct cc_var *ccv, uint3=
2_t type);
+static void	cubic_cong_signal(struct cc_var *ccv, ccsignal_t=
 type);
 static void	cubic_conn_init(struct cc_var *ccv);
 static int=
	cubic_mod_init(void);
 static void	cubic_post_recovery(struct cc_var *c=
cv);
@@ -233,7 +233,7 @@ cubic_does_slow_start(struct cc_var *ccv, struc=
t cubic *cubicd)
 }
 
 static void
-cubic_ack_received(struct c=
c_var *ccv, uint16_t type)
+cubic_ack_received(struct cc_var *ccv, ccsig=
nal_t type)
 {
 	struct cubic *cubic_data;
 	unsigned long W_est, =
W_cubic;
@@ -417,7 +417,7 @@ cubic_cb_init(struct cc_var *ccv, void *ptr=
)
  * Perform any necessary tasks before we enter congestion recovery=2E=

  */
 static void
-cubic_cong_signal(struct cc_var *ccv, uint32_t=
 type)
+cubic_cong_signal(struct cc_var *ccv, ccsignal_t type)
 {
=
 	struct cubic *cubic_data;
 	uint32_t mss, pipe;
@@ -503,6 +503,8 @@=
 cubic_cong_signal(struct cc_var *ccv, uint32_t type)
 		cubic_data->=
cwnd_epoch =3D cubic_data->undo_cwnd_epoch;
 		cubic_data->t_epoch=
 =3D cubic_data->undo_t_epoch;
 		break;
+	default:
+		break; 	}
 }
 
diff --git a/sys/netinet/cc/cc_dctcp=2Ec b/sys/netinet/=
cc/cc_dctcp=2Ec
index ae0a56839449=2E=2E374db98c5e60 100644
--- a/sys=
/netinet/cc/cc_dctcp=2Ec
+++ b/sys/netinet/cc/cc_dctcp=2Ec
@@ -79,11 =
+79,11 @@ struct dctcp {
 	uint32_t num_cong_events; /* # of congestion =
events */
 };
 
-static void	dctcp_ack_received(struct cc_var *ccv=
, uint16_t type);
+static void	dctcp_ack_received(struct cc_var *ccv, cc=
signal_t type);
 static void	dctcp_after_idle(struct cc_var *ccv);
 s=
tatic void	dctcp_cb_destroy(struct cc_var *ccv);
 static int	dctcp_cb_in=
it(struct cc_var *ccv, void *ptr);
-static void	dctcp_cong_signal(struct=
 cc_var *ccv, uint32_t type);
+static void	dctcp_cong_signal(struct cc_v=
ar *ccv, ccsignal_t type);
 static void	dctcp_conn_init(struct cc_var *c=
cv);
 static void	dctcp_post_recovery(struct cc_var *ccv);
 static vo=
id	dctcp_ecnpkt_handler(struct cc_var *ccv);
@@ -104,7 +104,7 @@ struct =
cc_algo dctcp_cc_algo =3D {
 };
 
 static void
-dctcp_ack_recei=
ved(struct cc_var *ccv, uint16_t type)
+dctcp_ack_received(struct cc_var=
 *ccv, ccsignal_t type)
 {
 	struct dctcp *dctcp_data;
 	int bytes=
_acked =3D 0;
@@ -237,7 +237,7 @@ dctcp_cb_init(struct cc_var *ccv, void=
 *ptr)
  * Perform any necessary tasks before we enter congestion recove=
ry=2E
  */
 static void
-dctcp_cong_signal(struct cc_var *ccv, uin=
t32_t type)
+dctcp_cong_signal(struct cc_var *ccv, ccsignal_t type)
 =
{
 	struct dctcp *dctcp_data;
 	uint32_t cwin, mss, pipe;
@@ -308,=
6 +308,8 @@ dctcp_cong_signal(struct cc_var *ccv, uint32_t type)
 			dct=
cp_data->save_sndnxt +=3D CCV(ccv, t_maxseg);
 			dctcp_data->num_=
cong_events++;
 			break;
+		default:
+			break;
 		}
 	} el=
se
 		newreno_cc_cong_signal(ccv, type);
diff --git a/sys/netinet/cc/=
cc_hd=2Ec b/sys/netinet/cc/cc_hd=2Ec
index 1a8b62ccf426=2E=2E82486563f97=
e 100644
--- a/sys/netinet/cc/cc_hd=2Ec
+++ b/sys/netinet/cc/cc_hd=2E=
c
@@ -80,7 +80,7 @@
 /* Largest possible number returned by random()=
=2E */
 #define	RANDOM_MAX	INT_MAX
 
-static void	hd_ack_received(=
struct cc_var *ccv, uint16_t ack_type);
+static void	hd_ack_received(str=
uct cc_var *ccv, ccsignal_t ack_type);
 static int	hd_mod_init(void); static size_t	hd_data_sz(void);
 
@@ -138,7 +138,7 @@ should_backof=
f(int qdly, int maxqdly)
  * as NewReno in all other circumstances=2E  */
 static void
-hd_ack_received(struct cc_var *ccv, uint16_t ack_=
type)
+hd_ack_received(struct cc_var *ccv, ccsignal_t ack_type)
 { 	struct ertt *e_t;
 	int qdly;
diff --git a/sys/netinet/cc/cc_htcp=
=2Ec b/sys/netinet/cc/cc_htcp=2Ec
index 43224446fd84=2E=2E41c552a3bfa0 1=
00644
--- a/sys/netinet/cc/cc_htcp=2Ec
+++ b/sys/netinet/cc/cc_htcp=
=2Ec
@@ -136,10 +136,10 @@
 	(((diff) / hz) * (((diff) << HTCP_=
ALPHA_INC_SHIFT) / (4 * hz))) \
 ) >> HTCP_ALPHA_INC_SHIFT)
 -static void	htcp_ack_received(struct cc_var *ccv, uint16_t type);
+st=
atic void	htcp_ack_received(struct cc_var *ccv, ccsignal_t type);
 stati=
c void	htcp_cb_destroy(struct cc_var *ccv);
 static int	htcp_cb_init(str=
uct cc_var *ccv, void *ptr);
-static void	htcp_cong_signal(struct cc_var=
 *ccv, uint32_t type);
+static void	htcp_cong_signal(struct cc_var *ccv,=
 ccsignal_t type);
 static int	htcp_mod_init(void);
 static void	htcp=
_post_recovery(struct cc_var *ccv);
 static void	htcp_recalc_alpha(struc=
t cc_var *ccv);
@@ -190,7 +190,7 @@ struct cc_algo htcp_cc_algo =3D { };
 
 static void
-htcp_ack_received(struct cc_var *ccv, uint16_=
t type)
+htcp_ack_received(struct cc_var *ccv, ccsignal_t type)
 { 	struct htcp *htcp_data;
 
@@ -278,7 +278,7 @@ htcp_cb_init(struct =
cc_var *ccv, void *ptr)
  * Perform any necessary tasks before we enter =
congestion recovery=2E
  */
 static void
-htcp_cong_signal(struct =
cc_var *ccv, uint32_t type)
+htcp_cong_signal(struct cc_var *ccv, ccsign=
al_t type)
 {
 	struct htcp *htcp_data;
 	uint32_t mss, pipe;
@=
@ -345,6 +345,8 @@ htcp_cong_signal(struct cc_var *ccv, uint32_t type)
 =
		if (CCV(ccv, t_rxtshift) >=3D 2)
 			htcp_data->t_last_cong =3D =
ticks;
 		break;
+	default:
+		break;
 	}
 }
 
diff --=
git a/sys/netinet/cc/cc_newreno=2Ec b/sys/netinet/cc/cc_newreno=2Ec
inde=
x 71f2764ef4bc=2E=2Eaa20e2c64f7d 100644
--- a/sys/netinet/cc/cc_newreno=
=2Ec
+++ b/sys/netinet/cc/cc_newreno=2Ec
@@ -84,9 +84,9 @@
 #inclu=
de <netinet/cc/cc_newreno=2Eh>
 
 static void	newreno_cb_destro=
y(struct cc_var *ccv);
-static void	newreno_ack_received(struct cc_var *=
ccv, uint16_t type);
+static void	newreno_ack_received(struct cc_var *cc=
v, ccsignal_t type);
 static void	newreno_after_idle(struct cc_var *ccv)=
;
-static void	newreno_cong_signal(struct cc_var *ccv, uint32_t type);+static void	newreno_cong_signal(struct cc_var *ccv, ccsignal_t type); static int newreno_ctl_output(struct cc_var *ccv, struct sockopt *sopt, v=
oid *buf);
 static void	newreno_newround(struct cc_var *ccv, uint32_t ro=
und_cnt);
 static void	newreno_rttsample(struct cc_var *ccv, uint32_t us=
ec_rtt, uint32_t rxtcnt, uint32_t fas);
@@ -212,7 +212,7 @@ newreno_cb_d=
estroy(struct cc_var *ccv)
 }
 
 static void
-newreno_ack_recei=
ved(struct cc_var *ccv, uint16_t type)
+newreno_ack_received(struct cc_v=
ar *ccv, ccsignal_t type)
 {
 	struct newreno *nreno;
 
@@ -363=
,7 +363,7 @@ newreno_after_idle(struct cc_var *ccv)
  * Perform any nece=
ssary tasks before we enter congestion recovery=2E
  */
 static void<=
br>-newreno_cong_signal(struct cc_var *ccv, uint32_t type)
+newreno_cong=
_signal(struct cc_var *ccv, ccsignal_t type)
 {
 	struct newreno *nre=
no;
 	uint32_t beta, beta_ecn, cwin, factor, mss, pipe;
@@ -442,6 +44=
2,8 @@ newreno_cong_signal(struct cc_var *ccv, uint32_t type)
 		}
 	=
	CCV(ccv, snd_cwnd) =3D mss;
 		break;
+	default:
+		break;
 	}=

 }
 
diff --git a/sys/netinet/cc/cc_vegas=2Ec b/sys/netinet/cc/cc=
_vegas=2Ec
index aac9c9ce77ff=2E=2Eecd42c1a0f53 100644
--- a/sys/neti=
net/cc/cc_vegas=2Ec
+++ b/sys/netinet/cc/cc_vegas=2Ec
@@ -84,12 +84,1=
2 @@
  * Private signal type for rate based congestion signal=2E
  * =
See <netinet/cc=2Eh> for appropriate bit-range to use for private sig=
nals=2E
  */
-#define	CC_VEGAS_RATE	0x01000000
+#define	CC_VEGAS_R=
ATE	0x04000000
 
-static void	vegas_ack_received(struct cc_var *ccv, =
uint16_t ack_type);
+static void	vegas_ack_received(struct cc_var *ccv, =
ccsignal_t ack_type);
 static void	vegas_cb_destroy(struct cc_var *ccv);=

 static int	vegas_cb_init(struct cc_var *ccv, void *ptr);
-static vo=
id	vegas_cong_signal(struct cc_var *ccv, uint32_t signal_type);
+static =
void	vegas_cong_signal(struct cc_var *ccv, ccsignal_t signal_type);
 sta=
tic void	vegas_conn_init(struct cc_var *ccv);
 static int	vegas_mod_init=
(void);
 static size_t	vegas_data_sz(void);
@@ -124,7 +124,7 @@ struc=
t cc_algo vegas_cc_algo =3D {
  * has been used=2E
  */
 static vo=
id
-vegas_ack_received(struct cc_var *ccv, uint16_t ack_type)
+vegas_=
ack_received(struct cc_var *ccv, ccsignal_t ack_type)
 {
 	struct ert=
t *e_t;
 	struct vegas *vegas_data;
@@ -203,7 +203,7 @@ vegas_cb_init=
(struct cc_var *ccv, void *ptr)
  * handled here, otherwise it falls bac=
k to newreno's congestion handling=2E
  */
 static void
-vegas_con=
g_signal(struct cc_var *ccv, uint32_t signal_type)
+vegas_cong_signal(st=
ruct cc_var *ccv, ccsignal_t signal_type)
 {
 	struct vegas *vegas_da=
ta;
 	int presignalrecov;
@@ -215,7 +215,7 @@ vegas_cong_signal(struc=
t cc_var *ccv, uint32_t signal_type)
 	else
 		presignalrecov =3D 0;<=
br> 
-	switch(signal_type) {
+	switch((int)signal_type) {
 	case C=
C_VEGAS_RATE:
 		if (!IN_RECOVERY(CCV(ccv, t_flags))) {
 			CCV(ccv, =
snd_cwnd) =3D max(2 * CCV(ccv, t_maxseg),
@@ -228,6 +228,7 @@ vegas_cong=
_signal(struct cc_var *ccv, uint32_t signal_type)
 
 	default:
 		=
newreno_cc_cong_signal(ccv, signal_type);
+		break;
 	}
 
 	if =
(IN_RECOVERY(CCV(ccv, t_flags)) && !presignalrecov)
=

Buildworld is now br= oken for all arches (at least incremental build)

Among the errors
/home/bapt/worktrees/main/lib/libstats/=2E=2E/=2E=2E/sys/netinet/tcp_s= tats=2Ec:138:32: error: use of undeclared identifier 'CC_NDUPACK'

------T877TB56UDSFUDD4AKM6Z78MQX4HAZ-- From nobody Sat Feb 24 20:02:27 2024 X-Original-To: dev-commits-src-main@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 4ThyTc2YcDz5BVQq; Sat, 24 Feb 2024 20:02:28 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThyTc1c4qz4Cyj; Sat, 24 Feb 2024 20:02:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708804948; 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=VfiUabsJvD9uwUIGxIvRl5AaqKpnHtlgTI4JowT74bw=; b=N+/9MLJTAQTqlFRHGzdD+TB31y4RBW0SmmasVwUXY9uxhdP1SByZZm2dg8mSfrM2KRlHr3 HQijA3EeE7UweA384XD04ReoAxBSEo4n/ETubLGePcVxfQV1yQbR6ImBneHDn1mEiNMkbT /70lgL4H67QG3BjMfnxynKM7e6VKm0uTXcVrwipIVgG6aee+dsvvqpr6mf1xxNoRgYKG/m LieguT31wiNV2FJ1r/GhHfhrnivRQ3fOdwr+vrbpClMntGcsDks8D2QX5Vn7rv1m6IsSTe SY7TRuTQvwGE9XxEu8Ak/XvWzziZLVOoYzMcYhvWWVdgWV9H70UXM5IVIxvg1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708804948; a=rsa-sha256; cv=none; b=KVQJtJUQihvRTc0/ReJi2zFbks+hxjFOkkIoabdnNgK31PaYX/TnLfFxcVG+wlnvVZJVKB w8s0e2BR2CQtPwr22GvURclk/H/H1zfXi3yJJp4FGxrHVnieOSKHygR2dFveswbSjCwKfP +YvaEZJFN1Iqsip2h/jO+umRfzMyCdkgYPcB7vtiRCTkjNT77S2aNYqiXk8e4wiScSoime CMIBCN0Nl7XrUd6oHHBjJiAq0gNvdgSskI8/l9RgRWr3mOVj2Z8VUo+sYQCuPE8GBkFbGR /TxoA5sJV7Xr8ZCfgB8ivwup4L2gDFLBPRmSoKEh8zFq9SwRhcMB+l5iPQkoLw== 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=1708804948; 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=VfiUabsJvD9uwUIGxIvRl5AaqKpnHtlgTI4JowT74bw=; b=w8BMEtJrtTJjmPYZcR3KhIZlPnZmCTBW1LigiCbqfJcHI6wvISyC6h3EjQWGZHGxjF2GHo aJn057/TGXHeMFhhkUW9NTcmoJg1MwYgljKggjPAm6pkZ9p1x3aPKpt2F6lyCcsufijvBn fjLGGXWmT7XVUQjAbC93QWgVDLYciqogE9iP3Wu6BaTuDauMw5uylYJhHIa+O0VOeKDLqZ zRcaatK7H9+U6Dpxv+ku9fv/MkJFwinAKNW72TCC1C4aXCp4TdjCClkZMmzZiKrS35JF1p 2Z8vi9qXWdOSic9+7H8vx6DaeMqFFx07XLUjsietZ0yxR2b0X3bSi6HMquHk7Q== 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 4ThyTc0gSdz1CvQ; Sat, 24 Feb 2024 20:02:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41OK2Rv2085092; Sat, 24 Feb 2024 20:02:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41OK2Rs0085089; Sat, 24 Feb 2024 20:02:27 GMT (envelope-from git) Date: Sat, 24 Feb 2024 20:02:27 GMT Message-Id: <202402242002.41OK2Rs0085089@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 5e248c23d995 - main - tcp: retain some CC signals outside of kernel scope List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5e248c23d995a059d24f4784d5a256cddd42e557 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=5e248c23d995a059d24f4784d5a256cddd42e557 commit 5e248c23d995a059d24f4784d5a256cddd42e557 Author: Richard Scheffenegger AuthorDate: 2024-02-24 20:01:54 +0000 Commit: Richard Scheffenegger CommitDate: 2024-02-24 20:01:54 +0000 tcp: retain some CC signals outside of kernel scope Summary: fix build error after f74352fbcf15341accaf5a92240871f98323215d Reviewers: #transport! Subscribers: imp, melifaro, glebius Differential Revision: https://reviews.freebsd.org/D44066 --- sys/netinet/cc/cc.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/netinet/cc/cc.h b/sys/netinet/cc/cc.h index 5b2cb58a24a0..aac0825e5fe1 100644 --- a/sys/netinet/cc/cc.h +++ b/sys/netinet/cc/cc.h @@ -121,12 +121,15 @@ struct cc_var { #define CCF_HYSTART_CAN_SH_CWND 0x0800 /* Can hystart when going CSS -> CA slam the cwnd */ #define CCF_HYSTART_CONS_SSTH 0x1000 /* Should hystart use the more conservative ssthresh */ +#endif /* defined(_KERNEL) || defined(_WANT_TCPCB) */ typedef enum { +#if defined(_KERNEL) || defined(_WANT_TCPCB) /* ACK types passed to the ack_received() hook. */ CC_ACK = 0x0001, /* Regular in sequence ACK. */ CC_DUPACK = 0x0002, /* Duplicate ACK. */ CC_PARTIALACK = 0x0004, /* Not yet. */ CC_SACK = 0x0008, /* Not yet. */ +#endif /* defined(_KERNEL) || defined(_WANT_TCPCB) */ /* Congestion signal types passed to the cong_signal() hook. */ CC_ECN = 0x0100, /* ECN marked packet received. */ CC_RTO = 0x0200, /* RTO fired. */ @@ -138,7 +141,6 @@ typedef enum { */ CC_SIGPRIVMASK = 0xFF000000 /* Mask to check if sig is private. */ } ccsignal_t; -#endif /* defined(_KERNEL) || defined(_WANT_TCPCB) */ #ifdef _KERNEL /* From nobody Sat Feb 24 20:30:43 2024 X-Original-To: dev-commits-src-main@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 4Thz6Q1Z8Lz5BXxX; Sat, 24 Feb 2024 20:30:54 +0000 (UTC) (envelope-from Richard.Scheffenegger@netapp.com) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2075.outbound.protection.outlook.com [40.107.223.75]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "DigiCert Cloud Services CA-1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Thz6P68f7z4KBk; Sat, 24 Feb 2024 20:30:53 +0000 (UTC) (envelope-from Richard.Scheffenegger@netapp.com) Authentication-Results: mx1.freebsd.org; none ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=g1c6I5WYTC2r5j3d3eYk+ipThX8j2q0Aob4xSxdrnW67gtF9CQPg1GAqbSnb0fqq5m+0g0z7Hyw8aYhYsP1dHEm8I5v9AOtlrYCr5GKKqKnKpGJgK9zNLLdJvDRSkwkCnqnQ/L9n2kEtvKzWGplpXhqAlh+zAaeFl8ejKGj4U9Us0ZcHZgGQVXA1gWCt2dMa1zO0Gw9oz/iJHZeZ2CJEOWenGg3sMwQHr7LFqIMdVJi+eE2J+mKHomKubSfkz3lIFWDyWIiUvB6ecXnyJfLzhHQMOAAJPswSs8q5CQrKc9iM0kad0WL64ZxQ0Vyey8lbeSBsQ0I2Cg4M6EZ40BMR0A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=q9ZR46hkcVx/OhUUI2/X2oFE8gfR/yfKWpPAx+X1Mss=; b=HZuwKRvWldTbiOqcxt+IGNKhe+RQDSFXF1BJA8dPIKrPu62IytfYcCDFBx+zubZ9QP94y5k/aiHOpiWjHd06SU3N2a7ctlZWuymLkzhkBdl4PLXJSn5c04a/ZaBSmmmM5lx5NV6ixDmLOxWuaId31l+zudCl1G9cWL8jMA3fk7i5JOciHYfBavaZIEi74SMcUpWlsDPgL1P6i7XoMDmKVglVFdyQh8tUyDa9mT30yDJXOli1PkfOSgkyPz/iYZbEJJmJ5t6vb2KW6WjD2wiPX/OP03cyO8XnXlnkIKenWyLWazPFl2mdaPkFDDCVeA/LQBTZD24dIg5gjN4luCPaYg== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=fail (sender ip is 52.8.140.255) smtp.rcpttodomain=freebsd.org smtp.mailfrom=netapp.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=netapp.com; dkim=pass (signature was verified) header.d=netapp.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=netapp.com] dkim=[1,1,header.d=netapp.com] dmarc=[1,1,header.from=netapp.com]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netapp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=q9ZR46hkcVx/OhUUI2/X2oFE8gfR/yfKWpPAx+X1Mss=; b=sK7QAvDfb2LPvJoZyW2Py9aHklF5ombIVOjYgQs13xuOn5TVHMR7mE6s2M8a72yfRdm0zK4Z1uQ3nYtkJmWLNZu8scdJGWzif3kQ83A9nIM1LqstdKIOIGUiF68s3pLLFdXyg9f5t2onBVxwdA3NZ+O3ekEJqhxb6gDHJ3ypj51ZBNJLSHMk2BQGt0FLQtoA/KLxQmheBdu0qv1/TXwo87vDJeRCaWU7oNtP/mp3sHY9EnKUua9H2cRKMYlA2oKze+mKWHF2kFlKzQBlNPW6IPBUX9SLEteGBCWWNHxBh1jfjzgrEYSMBdV4xNZnGhkp/aUgVx+xs2ovpLqxUXivLg== Received: from MW2PR2101CA0028.namprd21.prod.outlook.com (2603:10b6:302:1::41) by SA2PR06MB7497.namprd06.prod.outlook.com (2603:10b6:806:148::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.33; Sat, 24 Feb 2024 20:30:49 +0000 Received: from CO1PEPF000044F6.namprd21.prod.outlook.com (2603:10b6:302:1:cafe::3) by MW2PR2101CA0028.outlook.office365.com (2603:10b6:302:1::41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.20 via Frontend Transport; Sat, 24 Feb 2024 20:30:49 +0000 X-MS-Exchange-Authentication-Results: spf=fail (sender IP is 52.8.140.255) smtp.mailfrom=netapp.com; dkim=pass (signature was verified) header.d=netapp.com;dmarc=pass action=none header.from=netapp.com; Received-SPF: Fail (protection.outlook.com: domain of netapp.com does not designate 52.8.140.255 as permitted sender) receiver=protection.outlook.com; client-ip=52.8.140.255; helo=haraka01-inline-api-pop.vpc-50c51735.usw1.shn; Received: from haraka01-inline-api-pop.vpc-50c51735.usw1.shn (52.8.140.255) by CO1PEPF000044F6.mail.protection.outlook.com (10.167.241.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.0 via Frontend Transport; Sat, 24 Feb 2024 20:30:48 +0000 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11lp2169.outbound.protection.outlook.com [104.47.58.169]) by haraka01-inline-api-pop.vpc-50c51735.usw1.shn (Haraka/2.8.24) with ESMTPS id F67751D5-C917-4897-8C29-94805B6B42B1.1 envelope-from (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 verify=FAIL); Sat, 24 Feb 2024 20:30:47 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bqt60Bkn+gjM/i174jfBliJh8tTCf/oBDfu5fOcNQHuIFTdHkZLQ+LjxkQs294C7Y0mNY6UJFJYA229y5WpEN4VGgZsW56scWFgQLMT1BxN22K7Kw8OPyyr997oWlhQTi6/CGUWzhauhbxUBBhwArsnfPqocmqwnK4ufZ6JCUOCELgF65NGMjRHzo8TCdsYI2wY1N1VRkuLNN48Ol0++AjnIJaBRP0a/jnc892/VoIEHFr/caLuFAPp4oWB2swzpQk44F3UR1ySmTmMeeydIrWP3VxIUTHwHLHggU8oa1OOYCulsqMfeDLH5JlGeXLFAnhi0VkvcfJXr/aCETHszTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=q9ZR46hkcVx/OhUUI2/X2oFE8gfR/yfKWpPAx+X1Mss=; b=mO0G/f/4reBal57dBkH67T4tukLASR7NhkzQYg5EDqdwnZdJqqy0dyTCZ4Z96noqQI43MA591MezbTsYV+RqZDm1WfoHsU4mRRjGIXc3Z2h2+tbwglRiSHhXCxgoXr4hlrMgTZVh1X7U//F5gDETo7fv96ZiI2a3v754Mkn3TSuFWhM9Zafq6MkgLgUB/c05ELFojzKpCbxlt7X8ipcPLe/e6rXP191XzbwWNo2dYCnCPU3zvD2z0yHYhTKNLkj3p/154OVTWtGRHUk9Qw3PgnA3LIXzI4BbiRUiSrL1RJalUurnLNb296df4HatE5BDAd6GYJ/Vse1MGmec7nMXLA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=netapp.com; dmarc=pass action=none header.from=netapp.com; dkim=pass header.d=netapp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netapp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=q9ZR46hkcVx/OhUUI2/X2oFE8gfR/yfKWpPAx+X1Mss=; b=sK7QAvDfb2LPvJoZyW2Py9aHklF5ombIVOjYgQs13xuOn5TVHMR7mE6s2M8a72yfRdm0zK4Z1uQ3nYtkJmWLNZu8scdJGWzif3kQ83A9nIM1LqstdKIOIGUiF68s3pLLFdXyg9f5t2onBVxwdA3NZ+O3ekEJqhxb6gDHJ3ypj51ZBNJLSHMk2BQGt0FLQtoA/KLxQmheBdu0qv1/TXwo87vDJeRCaWU7oNtP/mp3sHY9EnKUua9H2cRKMYlA2oKze+mKWHF2kFlKzQBlNPW6IPBUX9SLEteGBCWWNHxBh1jfjzgrEYSMBdV4xNZnGhkp/aUgVx+xs2ovpLqxUXivLg== Received: from PH0PR06MB7639.namprd06.prod.outlook.com (2603:10b6:510:4e::18) by SA1PR06MB8322.namprd06.prod.outlook.com (2603:10b6:806:1c9::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.33; Sat, 24 Feb 2024 20:30:44 +0000 Received: from PH0PR06MB7639.namprd06.prod.outlook.com ([fe80::f6cc:4a63:a807:2e54]) by PH0PR06MB7639.namprd06.prod.outlook.com ([fe80::f6cc:4a63:a807:2e54%7]) with mapi id 15.20.7316.031; Sat, 24 Feb 2024 20:30:44 +0000 From: "Scheffenegger, Richard" To: Baptiste Daroussin , Richard Scheffenegger , "src-committers@FreeBSD.org" , "dev-commits-src-all@FreeBSD.org" , "dev-commits-src-main@FreeBSD.org" Subject: RE: git: f74352fbcf15 - main - tcp: use enum for all congestion control signals Thread-Topic: git: f74352fbcf15 - main - tcp: use enum for all congestion control signals Thread-Index: AQHaZzy4kAnu3vgPIk2dI13NyA+8hbEZzs2AgAAjHvA= Date: Sat, 24 Feb 2024 20:30:43 +0000 Message-ID: References: <202402241615.41OGFcg7091756@gitrepo.freebsd.org> In-Reply-To: Accept-Language: de-AT, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.10.200.16 dlp-reaction: no-action Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=netapp.com; x-ms-traffictypediagnostic: PH0PR06MB7639:EE_|SA1PR06MB8322:EE_|CO1PEPF000044F6:EE_|SA2PR06MB7497:EE_ X-MS-Office365-Filtering-Correlation-Id: a59ea36f-d762-4e89-74e9-08dc35777c8e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: aqTdovREAsD8UmeGcQIbQ90Q/KAZEgdvcfrJsUPq8tZ7f03wjG2te6OGQdpOvCj4iEshrO9+r1VX4AcLVdqB7W4/G+DFqf5CGD7qs4jXC1YPjI6nniUvmVAz/mdH3yTAq+IU5zAiUpygNs01RKsP+DKNTmMxfdY1r3cXsoQlCBvATPtsejv+zR+KBao/qxkJpX+S8gx+Ct7u4IL7t7PWXk8rkaoXCEVedvKRl9PLJHSl3daErwsVezW93SgUOUwS5d4qn3Wf09RoehmGOWSAgMjMnH/PuGCsD1FD5lmiJTUhBe4o25t9sEWHGBF6b9vUsQm7yZUbnkTpsjzqxIzgbCS7AlT6UYTw/SwPAWrPWk9miobpzzvYC5879dUSKFW7sYhtSmdacf06LADC9oPuva6ylz/tiU0b7CNGVnO2Me7hJm7xRXMUg2h0NbGc4W+msPmyOvTc8xX8q1cffysyQct16ZED0wWQ6nbADdy3Zg+P33VR8yeYTNP9omELp5ZW31Fzto2cvuvDgn1rT60fi6K5OAqIwdgMpZBXH9AbY3u9AUd19gjnDriGb2DfwaWwLx4LOWXfnlKQqggrYyUrO6E89jaVpDEMF4nkzSDfMJ0= X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR06MB7639.namprd06.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(230273577357003)(38070700009);DIR:OUT;SFP:1101; Content-Type: multipart/alternative; boundary="_000_PH0PR06MB7639163516643B8783C1DB5186542PH0PR06MB7639namp_" List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR06MB8322 Original-Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=netapp.com; X-SHN-DLP-SCAN: success X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: CO1PEPF000044F6.namprd21.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 63d4f49e-405f-49a7-58c7-08dc357779c2 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HkyMB5WR8gquxvikNuyin+YL/Pz5cTG1NDi9WMwJ9udiMayI9BLC2kM3iDI0AZiJZFq/NeTV8Z6DLJVXY0xmF5dTgMxw6STwWIyo+CDwpRr5IkiTCgQMEpC1UUnjWcHkP8M7SSUjvGToKpl5hIYGwoF68vtPiy7uQWytO74s04QbqxJxrXEwCtshELYfZyQBjwuOTMsgLl0ztaNc1QQ6Wsq7w7bp/Ta0HsvpBdbopxGKKrSVNDM9shfG9pNm5w9ViDUxGZPORehVx085anYyB+3ySyezpreRD5YsQoSXeBYYQJrt5EsuqZVePW25yIIGPsjE8XN+57eJU50PfCgNxbVdGNTq0DT/E10zGjW3Wr0AevnHOXYsDBx622ngC1rpVkI1JHeKue53xyptiXFaYltV9l69FWhNNskYu8UkroMMaZodvxwNs9fztqJB/F58HfFhBdoCEvIkpar4zuNSmcBNk58DG0i4GCeCfPf3gqMMbftBlN1MKYvytNzrer2fisJl1Kq3JLBhV3XB/uGlmmg6UJo6TNlylpovDhdoU396IQzf+TCcV9Tiq4SS0d7OxcASVbSLFyMeK8/880a/hUd9fTfVbvcxFQ+GMw5JKc6THRhGcfn+iXry84osVzV5Zw32IIqzTPVeODrRiEIfQQ== X-Forefront-Antispam-Report: CIP:52.8.140.255;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:haraka01-inline-api-pop.vpc-50c51735.usw1.shn;PTR:send1.mail.prod.i-shn.net;CAT:NONE;SFS:(13230031)(230273577357003)(36860700004)(40470700004)(46966006);DIR:OUT;SFP:1101; X-OriginatorOrg: netapp.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2024 20:30:48.4671 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a59ea36f-d762-4e89-74e9-08dc35777c8e X-MS-Exchange-CrossTenant-Id: 4b0911a0-929b-4715-944b-c03745165b3a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=4b0911a0-929b-4715-944b-c03745165b3a;Ip=[52.8.140.255];Helo=[haraka01-inline-api-pop.vpc-50c51735.usw1.shn] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044F6.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR06MB7497 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:8075, ipnet:40.104.0.0/14, country:US] X-Rspamd-Queue-Id: 4Thz6P68f7z4KBk --_000_PH0PR06MB7639163516643B8783C1DB5186542PH0PR06MB7639namp_ Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 VGhhbmtzIGZvciB0aGUgaGVhZHMtdXAuIElzIGZpeGVkIHdpdGggNWUyNDhjMjNkOTk1YTA1OWQy NGY0Nzg0ZDVhMjU2Y2RkZDQyZTU1Nw0KDQoNClJpY2hhcmQNCg0KRnJvbTogQmFwdGlzdGUgRGFy b3Vzc2luIDxiYXB0QEZyZWVCU0Qub3JnPg0KU2VudDogU2Ftc3RhZywgMjQuIEZlYnJ1YXIgMjAy NCAxOToyNA0KVG86IFJpY2hhcmQgU2NoZWZmZW5lZ2dlciA8cnNjaGVmZkBGcmVlQlNELm9yZz47 IHNyYy1jb21taXR0ZXJzQEZyZWVCU0Qub3JnOyBkZXYtY29tbWl0cy1zcmMtYWxsQEZyZWVCU0Qu b3JnOyBkZXYtY29tbWl0cy1zcmMtbWFpbkBGcmVlQlNELm9yZw0KU3ViamVjdDogUmU6IGdpdDog Zjc0MzUyZmJjZjE1IC0gbWFpbiAtIHRjcDogdXNlIGVudW0gZm9yIGFsbCBjb25nZXN0aW9uIGNv bnRyb2wgc2lnbmFscw0KDQpFWFRFUk5BTCBFTUFJTCAtIFVTRSBDQVVUSU9OIHdoZW4gY2xpY2tp bmcgbGlua3Mgb3IgYXR0YWNobWVudHMNCg0KDQpMZSAyNCBmw6l2cmllciAyMDI0IDE3OjE1OjM4 IEdNVCswMTowMCwgUmljaGFyZCBTY2hlZmZlbmVnZ2VyIDxyc2NoZWZmQEZyZWVCU0Qub3JnPG1h aWx0bzpyc2NoZWZmQEZyZWVCU0Qub3JnPj4gYSDDqWNyaXQgOg0KDQpUaGUgYnJhbmNoIG1haW4g aGFzIGJlZW4gdXBkYXRlZCBieSByc2NoZWZmOg0KDQpVUkw6IGh0dHBzOi8vY2dpdC5GcmVlQlNE Lm9yZy9zcmMvY29tbWl0Lz9pZD1mNzQzNTJmYmNmMTUzNDFhY2NhZjVhOTIyNDA4NzFmOTgzMjMy MTVkPGh0dHBzOi8vY2dpdC5mcmVlYnNkLm9yZy9zcmMvY29tbWl0Lz9pZD1mNzQzNTJmYmNmMTUz NDFhY2NhZjVhOTIyNDA4NzFmOTgzMjMyMTVkPg0KDQpjb21taXQgZjc0MzUyZmJjZjE1MzQxYWNj YWY1YTkyMjQwODcxZjk4MzIzMjE1ZA0KQXV0aG9yOiAgICAgUmljaGFyZCBTY2hlZmZlbmVnZ2Vy IDxyc2NoZWZmQEZyZWVCU0Qub3JnPG1haWx0bzpyc2NoZWZmQEZyZWVCU0Qub3JnPj4NCkF1dGhv ckRhdGU6IDIwMjQtMDItMjQgMTU6NDE6MzEgKzAwMDANCkNvbW1pdDogICAgIFJpY2hhcmQgU2No ZWZmZW5lZ2dlciA8cnNjaGVmZkBGcmVlQlNELm9yZzxtYWlsdG86cnNjaGVmZkBGcmVlQlNELm9y Zz4+DQpDb21taXREYXRlOiAyMDI0LTAyLTI0IDE1OjQxOjQ4ICswMDAwDQoNCiAgICB0Y3A6IHVz ZSBlbnVtIGZvciBhbGwgY29uZ2VzdGlvbiBjb250cm9sIHNpZ25hbHMNCg0KICAgIEZhY2lsaXRh dGUgZWFzaWVyIHRyb3VibGVzaG9vdGluZyBieSBlbnVtZXJhdGluZw0KICAgIGFsbCBjb25nZXN0 aW9uIGNvbnRyb2wgc2lnbmFscy4gVHlwZWNhc3QgdGhlDQogICAgZW51bSB0byBpbnQsIHdoZW4g YSBjb25nZXN0aW9uIGNvbnRyb2wgbW9kdWxlIHVzZXMNCiAgICBwcml2YXRlIHNpZ25hbHMuDQoN CiAgICBObyBleHRlcm5hbCBjaGFuZ2UuDQoNCiAgICBSZXZpZXdlZCBCeTogICAgICAgICAgICBn bGViaXVzLCB0dWV4ZW4sICN0cmFuc3BvcnQNCiAgICBTcG9uc29yZWQgYnk6ICAgICAgICAgICBO ZXRBcHAsIEluYy4NCiAgICBEaWZmZXJlbnRpYWwgUmV2aXNpb246ICBodHRwczovL3Jldmlld3Mu ZnJlZWJzZC5vcmcvRDQzODM4DQoNCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fDQoN CiBzeXMvbmV0aW5ldC9jYy9jYy5jICAgICAgICAgfCAgMiArLQ0KIHN5cy9uZXRpbmV0L2NjL2Nj LmggICAgICAgICB8IDQyICsrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0t LQ0KIHN5cy9uZXRpbmV0L2NjL2NjX2NkZy5jICAgICB8IDEwICsrKysrLS0tLS0NCiBzeXMvbmV0 aW5ldC9jYy9jY19jaGQuYyAgICAgfCAxMSArKysrKystLS0tLQ0KIHN5cy9uZXRpbmV0L2NjL2Nj X2N1YmljLmMgICB8IDEwICsrKysrKy0tLS0NCiBzeXMvbmV0aW5ldC9jYy9jY19kY3RjcC5jICAg fCAxMCArKysrKystLS0tDQogc3lzL25ldGluZXQvY2MvY2NfaGQuYyAgICAgIHwgIDQgKystLQ0K IHN5cy9uZXRpbmV0L2NjL2NjX2h0Y3AuYyAgICB8IDEwICsrKysrKy0tLS0NCiBzeXMvbmV0aW5l dC9jYy9jY19uZXdyZW5vLmMgfCAxMCArKysrKystLS0tDQogc3lzL25ldGluZXQvY2MvY2NfdmVn YXMuYyAgIHwgMTMgKysrKysrKy0tLS0tLQ0KIDEwIGZpbGVzIGNoYW5nZWQsIDY2IGluc2VydGlv bnMoKyksIDU2IGRlbGV0aW9ucygtKQ0KDQpkaWZmIC0tZ2l0IGEvc3lzL25ldGluZXQvY2MvY2Mu YyBiL3N5cy9uZXRpbmV0L2NjL2NjLmMNCmluZGV4IGMyOTY1YjFlNmE0OC4uOTMwOGI1ZjhkNzY0 IDEwMDY0NA0KLS0tIGEvc3lzL25ldGluZXQvY2MvY2MuYw0KKysrIGIvc3lzL25ldGluZXQvY2Mv Y2MuYw0KQEAgLTUwNSw3ICs1MDUsNyBAQCBuZXdyZW5vX2NjX2Nvbmdfc2lnbmFsKHN0cnVjdCBj Y192YXIgKmNjdiwgdWludDMyX3QgdHlwZSkNCiB9DQoNCiB2b2lkDQotbmV3cmVub19jY19hY2tf cmVjZWl2ZWQoc3RydWN0IGNjX3ZhciAqY2N2LCB1aW50MTZfdCB0eXBlKQ0KK25ld3Jlbm9fY2Nf YWNrX3JlY2VpdmVkKHN0cnVjdCBjY192YXIgKmNjdiwgY2NzaWduYWxfdCB0eXBlKQ0KIHsNCiAg ICAgIGlmICh0eXBlID09IENDX0FDSyAmJiAhSU5fUkVDT1ZFUlkoQ0NWKGNjdiwgdF9mbGFncykp ICYmDQogICAgICAgICAgKGNjdi0+ZmxhZ3MgJiBDQ0ZfQ1dORF9MSU1JVEVEKSkgew0KZGlmZiAt LWdpdCBhL3N5cy9uZXRpbmV0L2NjL2NjLmggYi9zeXMvbmV0aW5ldC9jYy9jYy5oDQppbmRleCA5 NTcxZGE1MGIyYzcuLjViMmNiNThhMjRhMCAxMDA2NDQNCi0tLSBhL3N5cy9uZXRpbmV0L2NjL2Nj LmgNCisrKyBiL3N5cy9uZXRpbmV0L2NjL2NjLmgNCkBAIC0xMjEsMjUgKzEyMSwyNSBAQCBzdHJ1 Y3QgY2NfdmFyIHsNCiAjZGVmaW5lIENDRl9IWVNUQVJUX0NBTl9TSF9DV05EICAgIDB4MDgwMCAg LyogQ2FuIGh5c3RhcnQgd2hlbiBnb2luZyBDU1MgLT4gQ0Egc2xhbSB0aGUgY3duZCAqLw0KICNk ZWZpbmUgQ0NGX0hZU1RBUlRfQ09OU19TU1RIICAgICAgMHgxMDAwICAvKiBTaG91bGQgaHlzdGFy dCB1c2UgdGhlIG1vcmUgY29uc2VydmF0aXZlIHNzdGhyZXNoICovDQoNCi0vKiBBQ0sgdHlwZXMg cGFzc2VkIHRvIHRoZSBhY2tfcmVjZWl2ZWQoKSBob29rLiAqLw0KLSNkZWZpbmUgICAgIENDX0FD SyAgICAgICAgIDB4MDAwMSAgLyogUmVndWxhciBpbiBzZXF1ZW5jZSBBQ0suICovDQotI2RlZmlu ZSAgICAgQ0NfRFVQQUNLICAgICAgMHgwMDAyICAvKiBEdXBsaWNhdGUgQUNLLiAqLw0KLSNkZWZp bmUgICAgIENDX1BBUlRJQUxBQ0sgIDB4MDAwNCAgLyogTm90IHlldC4gKi8NCi0jZGVmaW5lICAg ICBDQ19TQUNLICAgICAgICAweDAwMDggIC8qIE5vdCB5ZXQuICovDQordHlwZWRlZiBlbnVtIHsN CisgICAgIC8qIEFDSyB0eXBlcyBwYXNzZWQgdG8gdGhlIGFja19yZWNlaXZlZCgpIGhvb2suICov DQorICAgICBDQ19BQ0sgPSAgICAgICAweDAwMDEsIC8qIFJlZ3VsYXIgaW4gc2VxdWVuY2UgQUNL LiAqLw0KKyAgICAgQ0NfRFVQQUNLID0gICAgMHgwMDAyLCAvKiBEdXBsaWNhdGUgQUNLLiAqLw0K KyAgICAgQ0NfUEFSVElBTEFDSyA9IDB4MDAwNCwgLyogTm90IHlldC4gKi8NCisgICAgIENDX1NB Q0sgPSAgICAgIDB4MDAwOCwgLyogTm90IHlldC4gKi8NCisgICAgIC8qIENvbmdlc3Rpb24gc2ln bmFsIHR5cGVzIHBhc3NlZCB0byB0aGUgY29uZ19zaWduYWwoKSBob29rLiAqLw0KKyAgICAgQ0Nf RUNOID0gICAgICAgMHgwMTAwLCAvKiBFQ04gbWFya2VkIHBhY2tldCByZWNlaXZlZC4gKi8NCisg ICAgIENDX1JUTyA9ICAgICAgIDB4MDIwMCwgLyogUlRPIGZpcmVkLiAqLw0KKyAgICAgQ0NfUlRP X0VSUiA9ICAgMHgwNDAwLCAvKiBSVE8gZmlyZWQgaW4gZXJyb3IuICovDQorICAgICBDQ19ORFVQ QUNLID0gICAweDA4MDAsIC8qIFRocmVzaG9sZCBvZiBkdXBhY2sncyByZWFjaGVkLiAqLw0KKyAg ICAgLyoNCisgICAgICAqIFRoZSBoaWdoZXN0IG9yZGVyIDggYml0cyAoMHgwMTAwMDAwMCAtIDB4 ODAwMDAwMDApIGFyZSByZXNlcnZlZA0KKyAgICAgICogZm9yIENDIGFsZ29zIHRvIGRlY2xhcmUg dGhlaXIgb3duIGNvbmdlc3Rpb24gc2lnbmFsIHR5cGVzLg0KKyAgICAgICovDQorICAgICBDQ19T SUdQUklWTUFTSyA9IDB4RkYwMDAwMDAgICAgLyogTWFzayB0byBjaGVjayBpZiBzaWcgaXMgcHJp dmF0ZS4gKi8NCit9IGNjc2lnbmFsX3Q7DQogI2VuZGlmIC8qIGRlZmluZWQoX0tFUk5FTCkgfHwg ZGVmaW5lZChfV0FOVF9UQ1BDQikgKi8NCg0KLS8qDQotICogQ29uZ2VzdGlvbiBzaWduYWwgdHlw ZXMgcGFzc2VkIHRvIHRoZSBjb25nX3NpZ25hbCgpIGhvb2suIFRoZSBoaWdoZXN0IG9yZGVyIDgN Ci0gKiBiaXRzICgweDAxMDAwMDAwIC0gMHg4MDAwMDAwMCkgYXJlIHJlc2VydmVkIGZvciBDQyBh bGdvcyB0byBkZWNsYXJlIHRoZWlyIG93bg0KLSAqIGNvbmdlc3Rpb24gc2lnbmFsIHR5cGVzLg0K LSAqLw0KLSNkZWZpbmUgICAgIENDX0VDTiAgICAgICAgIDB4MDAwMDAwMDEgICAgIC8qIEVDTiBt YXJrZWQgcGFja2V0IHJlY2VpdmVkLiAqLw0KLSNkZWZpbmUgICAgIENDX1JUTyAgICAgICAgIDB4 MDAwMDAwMDIgICAgIC8qIFJUTyBmaXJlZC4gKi8NCi0jZGVmaW5lICAgICBDQ19SVE9fRVJSICAg ICAweDAwMDAwMDA0ICAgICAvKiBSVE8gZmlyZWQgaW4gZXJyb3IuICovDQotI2RlZmluZSAgICAg Q0NfTkRVUEFDSyAgICAgMHgwMDAwMDAwOCAgICAgLyogVGhyZXNob2xkIG9mIGR1cGFjaydzIHJl YWNoZWQuICovDQotDQotI2RlZmluZSAgICAgQ0NfU0lHUFJJVk1BU0sgMHhGRjAwMDAwMCAgICAg LyogTWFzayB0byBjaGVjayBpZiBzaWcgaXMgcHJpdmF0ZS4gKi8NCi0NCiAjaWZkZWYgX0tFUk5F TA0KIC8qDQogICogU3RydWN0dXJlIHRvIGhvbGQgZGF0YSBhbmQgZnVuY3Rpb24gcG9pbnRlcnMg dGhhdCB0b2dldGhlciByZXByZXNlbnQgYQ0KQEAgLTE3NSwxMCArMTc1LDEwIEBAIHN0cnVjdCBj Y19hbGdvIHsNCiAgICAgIHZvaWQgICAgKCpjb25uX2luaXQpKHN0cnVjdCBjY192YXIgKmNjdik7 DQoNCiAgICAgIC8qIENhbGxlZCBvbiByZWNlaXB0IG9mIGFuIGFjay4gKi8NCi0gICAgIHZvaWQg ICAgKCphY2tfcmVjZWl2ZWQpKHN0cnVjdCBjY192YXIgKmNjdiwgdWludDE2X3QgdHlwZSk7DQor ICAgICB2b2lkICAgICgqYWNrX3JlY2VpdmVkKShzdHJ1Y3QgY2NfdmFyICpjY3YsIGNjc2lnbmFs X3QgdHlwZSk7DQoNCiAgICAgIC8qIENhbGxlZCBvbiBkZXRlY3Rpb24gb2YgYSBjb25nZXN0aW9u IHNpZ25hbC4gKi8NCi0gICAgIHZvaWQgICAgKCpjb25nX3NpZ25hbCkoc3RydWN0IGNjX3ZhciAq Y2N2LCB1aW50MzJfdCB0eXBlKTsNCisgICAgIHZvaWQgICAgKCpjb25nX3NpZ25hbCkoc3RydWN0 IGNjX3ZhciAqY2N2LCBjY3NpZ25hbF90IHR5cGUpOw0KDQogICAgICAvKiBDYWxsZWQgYWZ0ZXIg ZXhpdGluZyBjb25nZXN0aW9uIHJlY292ZXJ5LiAqLw0KICAgICAgdm9pZCAgICAoKnBvc3RfcmVj b3ZlcnkpKHN0cnVjdCBjY192YXIgKmNjdik7DQpAQCAtMjM2LDggKzIzNiw4IEBAIGV4dGVybiBz dHJ1Y3Qgcndsb2NrIGNjX2xpc3RfbG9jazsNCiAgKi8NCiB2b2lkIG5ld3Jlbm9fY2NfcG9zdF9y ZWNvdmVyeShzdHJ1Y3QgY2NfdmFyICopOw0KIHZvaWQgbmV3cmVub19jY19hZnRlcl9pZGxlKHN0 cnVjdCBjY192YXIgKik7DQotdm9pZCBuZXdyZW5vX2NjX2Nvbmdfc2lnbmFsKHN0cnVjdCBjY192 YXIgKiwgdWludDMyX3QgKTsNCi12b2lkIG5ld3Jlbm9fY2NfYWNrX3JlY2VpdmVkKHN0cnVjdCBj Y192YXIgKiwgdWludDE2X3QpOw0KK3ZvaWQgbmV3cmVub19jY19jb25nX3NpZ25hbChzdHJ1Y3Qg Y2NfdmFyICosIGNjc2lnbmFsX3QpOw0KK3ZvaWQgbmV3cmVub19jY19hY2tfcmVjZWl2ZWQoc3Ry dWN0IGNjX3ZhciAqLCBjY3NpZ25hbF90KTsNCg0KIC8qIENhbGxlZCB0byB0ZW1wb3JhcmlseSBr ZWVwIGFuIGFsZ28gZnJvbSBnb2luZyBhd2F5IGR1cmluZyBjaGFuZ2UgKi8NCiB2b2lkIGNjX3Jl ZmVyKHN0cnVjdCBjY19hbGdvICphbGdvKTsNCmRpZmYgLS1naXQgYS9zeXMvbmV0aW5ldC9jYy9j Y19jZGcuYyBiL3N5cy9uZXRpbmV0L2NjL2NjX2NkZy5jDQppbmRleCAzZjIzYzQwOTExNzAuLjFl OTIzNmY4NzhkNCAxMDA2NDQNCi0tLSBhL3N5cy9uZXRpbmV0L2NjL2NjX2NkZy5jDQorKysgYi9z eXMvbmV0aW5ldC9jYy9jY19jZGcuYw0KQEAgLTIyMSw4ICsyMjEsOCBAQCBzdGF0aWMgaW50IGNk Z19tb2RfZGVzdHJveSh2b2lkKTsNCiBzdGF0aWMgdm9pZCBjZGdfY29ubl9pbml0KHN0cnVjdCBj Y192YXIgKmNjdik7DQogc3RhdGljIGludCBjZGdfY2JfaW5pdChzdHJ1Y3QgY2NfdmFyICpjY3Ys IHZvaWQgKnB0cik7DQogc3RhdGljIHZvaWQgY2RnX2NiX2Rlc3Ryb3koc3RydWN0IGNjX3ZhciAq Y2N2KTsNCi1zdGF0aWMgdm9pZCBjZGdfY29uZ19zaWduYWwoc3RydWN0IGNjX3ZhciAqY2N2LCB1 aW50MzJfdCBzaWduYWxfdHlwZSk7DQotc3RhdGljIHZvaWQgY2RnX2Fja19yZWNlaXZlZChzdHJ1 Y3QgY2NfdmFyICpjY3YsIHVpbnQxNl90IGFja190eXBlKTsNCitzdGF0aWMgdm9pZCBjZGdfY29u Z19zaWduYWwoc3RydWN0IGNjX3ZhciAqY2N2LCBjY3NpZ25hbF90IHNpZ25hbF90eXBlKTsNCitz dGF0aWMgdm9pZCBjZGdfYWNrX3JlY2VpdmVkKHN0cnVjdCBjY192YXIgKmNjdiwgY2NzaWduYWxf dCBhY2tfdHlwZSk7DQogc3RhdGljIHNpemVfdCBjZGdfZGF0YV9zeih2b2lkKTsNCg0KIHN0cnVj dCBjY19hbGdvIGNkZ19jY19hbGdvID0gew0KQEAgLTQ1MCwxMSArNDUwLDExIEBAIGNkZ193aW5k b3dfaW5jcmVhc2Uoc3RydWN0IGNjX3ZhciAqY2N2LCBpbnQgbmV3X21lYXN1cmVtZW50KQ0KIH0N Cg0KIHN0YXRpYyB2b2lkDQotY2RnX2Nvbmdfc2lnbmFsKHN0cnVjdCBjY192YXIgKmNjdiwgdWlu dDMyX3Qgc2lnbmFsX3R5cGUpDQorY2RnX2Nvbmdfc2lnbmFsKHN0cnVjdCBjY192YXIgKmNjdiwg Y2NzaWduYWxfdCBzaWduYWxfdHlwZSkNCiB7DQogICAgICBzdHJ1Y3QgY2RnICpjZGdfZGF0YSA9 IGNjdi0+Y2NfZGF0YTsNCg0KLSAgICAgc3dpdGNoKHNpZ25hbF90eXBlKSB7DQorICAgICBzd2l0 Y2goKGludClzaWduYWxfdHlwZSkgew0KICAgICAgY2FzZSBDQ19DREdfREVMQVk6DQogICAgICAg ICAgICAgQ0NWKGNjdiwgc25kX3NzdGhyZXNoKSA9IGNkZ193aW5kb3dfZGVjcmVhc2UoY2N2LA0K ICAgICAgICAgICAgICAgICBDQ1YoY2N2LCBzbmRfY3duZCksIFZfY2RnX2JldGFfZGVsYXkpOw0K QEAgLTU3MSw3ICs1NzEsNyBAQCBjYWxjX21vdmluZ19hdmVyYWdlKHN0cnVjdCBjZGcgKmNkZ19k YXRhLCBsb25nIHFkaWZmX21heCwgbG9uZyBxZGlmZl9taW4pDQogfQ0KDQogc3RhdGljIHZvaWQN Ci1jZGdfYWNrX3JlY2VpdmVkKHN0cnVjdCBjY192YXIgKmNjdiwgdWludDE2X3QgYWNrX3R5cGUp DQorY2RnX2Fja19yZWNlaXZlZChzdHJ1Y3QgY2NfdmFyICpjY3YsIGNjc2lnbmFsX3QgYWNrX3R5 cGUpDQogew0KICAgICAgc3RydWN0IGNkZyAqY2RnX2RhdGE7DQogICAgICBzdHJ1Y3QgZXJ0dCAq ZV90Ow0KZGlmZiAtLWdpdCBhL3N5cy9uZXRpbmV0L2NjL2NjX2NoZC5jIGIvc3lzL25ldGluZXQv Y2MvY2NfY2hkLmMNCmluZGV4IGM2NDRkOWIyY2RiOC4uNTIwNDhhN2MwNWFlIDEwMDY0NA0KLS0t IGEvc3lzL25ldGluZXQvY2MvY2NfY2hkLmMNCisrKyBiL3N5cy9uZXRpbmV0L2NjL2NjX2NoZC5j DQpAQCAtODgsMTAgKzg4LDEwIEBADQogLyogTGFyZ2VzdCBwb3NzaWJsZSBudW1iZXIgcmV0dXJu ZWQgYnkgcmFuZG9tKCkuICovDQogI2RlZmluZSAgICAgUkFORE9NX01BWCAgICAgSU5UX01BWA0K DQotc3RhdGljIHZvaWQgY2hkX2Fja19yZWNlaXZlZChzdHJ1Y3QgY2NfdmFyICpjY3YsIHVpbnQx Nl90IGFja190eXBlKTsNCitzdGF0aWMgdm9pZCBjaGRfYWNrX3JlY2VpdmVkKHN0cnVjdCBjY192 YXIgKmNjdiwgY2NzaWduYWxfdCBhY2tfdHlwZSk7DQogc3RhdGljIHZvaWQgY2hkX2NiX2Rlc3Ry b3koc3RydWN0IGNjX3ZhciAqY2N2KTsNCiBzdGF0aWMgaW50ICBjaGRfY2JfaW5pdChzdHJ1Y3Qg Y2NfdmFyICpjY3YsIHZvaWQgKnB0cik7DQotc3RhdGljIHZvaWQgY2hkX2Nvbmdfc2lnbmFsKHN0 cnVjdCBjY192YXIgKmNjdiwgdWludDMyX3Qgc2lnbmFsX3R5cGUpOw0KK3N0YXRpYyB2b2lkIGNo ZF9jb25nX3NpZ25hbChzdHJ1Y3QgY2NfdmFyICpjY3YsIGNjc2lnbmFsX3Qgc2lnbmFsX3R5cGUp Ow0KIHN0YXRpYyB2b2lkIGNoZF9jb25uX2luaXQoc3RydWN0IGNjX3ZhciAqY2N2KTsNCiBzdGF0 aWMgaW50ICBjaGRfbW9kX2luaXQodm9pZCk7DQogc3RhdGljIHNpemVfdCAgICAgICBjaGRfZGF0 YV9zeih2b2lkKTsNCkBAIC0yMzUsNyArMjM1LDcgQEAgY2hkX3dpbmRvd19pbmNyZWFzZShzdHJ1 Y3QgY2NfdmFyICpjY3YsIGludCBuZXdfbWVhc3VyZW1lbnQpDQogICogYWNrX3R5cGUgPT0gQ0Nf QUNLLg0KICAqLw0KIHN0YXRpYyB2b2lkDQotY2hkX2Fja19yZWNlaXZlZChzdHJ1Y3QgY2NfdmFy ICpjY3YsIHVpbnQxNl90IGFja190eXBlKQ0KK2NoZF9hY2tfcmVjZWl2ZWQoc3RydWN0IGNjX3Zh ciAqY2N2LCBjY3NpZ25hbF90IGFja190eXBlKQ0KIHsNCiAgICAgIHN0cnVjdCBjaGQgKmNoZF9k YXRhOw0KICAgICAgc3RydWN0IGVydHQgKmVfdDsNCkBAIC0zMzYsNyArMzM2LDcgQEAgY2hkX2Ni X2luaXQoc3RydWN0IGNjX3ZhciAqY2N2LCB2b2lkICpwdHIpDQogfQ0KDQogc3RhdGljIHZvaWQN Ci1jaGRfY29uZ19zaWduYWwoc3RydWN0IGNjX3ZhciAqY2N2LCB1aW50MzJfdCBzaWduYWxfdHlw ZSkNCitjaGRfY29uZ19zaWduYWwoc3RydWN0IGNjX3ZhciAqY2N2LCBjY3NpZ25hbF90IHNpZ25h bF90eXBlKQ0KIHsNCiAgICAgIHN0cnVjdCBlcnR0ICplX3Q7DQogICAgICBzdHJ1Y3QgY2hkICpj aGRfZGF0YTsNCkBAIC0zNDYsNyArMzQ2LDcgQEAgY2hkX2Nvbmdfc2lnbmFsKHN0cnVjdCBjY192 YXIgKmNjdiwgdWludDMyX3Qgc2lnbmFsX3R5cGUpDQogICAgICBjaGRfZGF0YSA9IGNjdi0+Y2Nf ZGF0YTsNCiAgICAgIHFkbHkgPSBpbWF4KGVfdC0+cnR0LCBjaGRfZGF0YS0+bWF4cnR0X2luX3J0 dCkgLSBlX3QtPm1pbnJ0dDsNCg0KLSAgICAgc3dpdGNoKHNpZ25hbF90eXBlKSB7DQorICAgICBz d2l0Y2goKGludClzaWduYWxfdHlwZSkgew0KICAgICAgY2FzZSBDQ19DSERfREVMQVk6DQogICAg ICAgICAgICAgY2hkX3dpbmRvd19kZWNyZWFzZShjY3YpOyAvKiBTZXQgbmV3IHNzdGhyZXNoLiAq Lw0KICAgICAgICAgICAgIENDVihjY3YsIHNuZF9jd25kKSA9IENDVihjY3YsIHNuZF9zc3RocmVz aCk7DQpAQCAtMzg3LDYgKzM4Nyw3IEBAIGNoZF9jb25nX3NpZ25hbChzdHJ1Y3QgY2NfdmFyICpj Y3YsIHVpbnQzMl90IHNpZ25hbF90eXBlKQ0KDQogICAgICBkZWZhdWx0Og0KICAgICAgICAgICAg IG5ld3Jlbm9fY2NfY29uZ19zaWduYWwoY2N2LCBzaWduYWxfdHlwZSk7DQorICAgICAgICAgICAg YnJlYWs7DQogICAgICB9DQogfQ0KDQpkaWZmIC0tZ2l0IGEvc3lzL25ldGluZXQvY2MvY2NfY3Vi aWMuYyBiL3N5cy9uZXRpbmV0L2NjL2NjX2N1YmljLmMNCmluZGV4IGViMTU4N2Q0NDQyNy4uYTlj NzU5MmI4MGNhIDEwMDY0NA0KLS0tIGEvc3lzL25ldGluZXQvY2MvY2NfY3ViaWMuYw0KKysrIGIv c3lzL25ldGluZXQvY2MvY2NfY3ViaWMuYw0KQEAgLTczLDEwICs3MywxMCBAQA0KICNpbmNsdWRl IDxuZXRpbmV0L2NjL2NjX2N1YmljLmg+DQogI2luY2x1ZGUgPG5ldGluZXQvY2MvY2NfbW9kdWxl Lmg+DQoNCi1zdGF0aWMgdm9pZCBjdWJpY19hY2tfcmVjZWl2ZWQoc3RydWN0IGNjX3ZhciAqY2N2 LCB1aW50MTZfdCB0eXBlKTsNCitzdGF0aWMgdm9pZCBjdWJpY19hY2tfcmVjZWl2ZWQoc3RydWN0 IGNjX3ZhciAqY2N2LCBjY3NpZ25hbF90IHR5cGUpOw0KIHN0YXRpYyB2b2lkIGN1YmljX2NiX2Rl c3Ryb3koc3RydWN0IGNjX3ZhciAqY2N2KTsNCiBzdGF0aWMgaW50ICBjdWJpY19jYl9pbml0KHN0 cnVjdCBjY192YXIgKmNjdiwgdm9pZCAqcHRyKTsNCi1zdGF0aWMgdm9pZCBjdWJpY19jb25nX3Np Z25hbChzdHJ1Y3QgY2NfdmFyICpjY3YsIHVpbnQzMl90IHR5cGUpOw0KK3N0YXRpYyB2b2lkIGN1 YmljX2Nvbmdfc2lnbmFsKHN0cnVjdCBjY192YXIgKmNjdiwgY2NzaWduYWxfdCB0eXBlKTsNCiBz dGF0aWMgdm9pZCBjdWJpY19jb25uX2luaXQoc3RydWN0IGNjX3ZhciAqY2N2KTsNCiBzdGF0aWMg aW50ICBjdWJpY19tb2RfaW5pdCh2b2lkKTsNCiBzdGF0aWMgdm9pZCBjdWJpY19wb3N0X3JlY292 ZXJ5KHN0cnVjdCBjY192YXIgKmNjdik7DQpAQCAtMjMzLDcgKzIzMyw3IEBAIGN1YmljX2RvZXNf c2xvd19zdGFydChzdHJ1Y3QgY2NfdmFyICpjY3YsIHN0cnVjdCBjdWJpYyAqY3ViaWNkKQ0KIH0N Cg0KIHN0YXRpYyB2b2lkDQotY3ViaWNfYWNrX3JlY2VpdmVkKHN0cnVjdCBjY192YXIgKmNjdiwg dWludDE2X3QgdHlwZSkNCitjdWJpY19hY2tfcmVjZWl2ZWQoc3RydWN0IGNjX3ZhciAqY2N2LCBj Y3NpZ25hbF90IHR5cGUpDQogew0KICAgICAgc3RydWN0IGN1YmljICpjdWJpY19kYXRhOw0KICAg ICAgdW5zaWduZWQgbG9uZyBXX2VzdCwgV19jdWJpYzsNCkBAIC00MTcsNyArNDE3LDcgQEAgY3Vi aWNfY2JfaW5pdChzdHJ1Y3QgY2NfdmFyICpjY3YsIHZvaWQgKnB0cikNCiAgKiBQZXJmb3JtIGFu eSBuZWNlc3NhcnkgdGFza3MgYmVmb3JlIHdlIGVudGVyIGNvbmdlc3Rpb24gcmVjb3ZlcnkuDQog ICovDQogc3RhdGljIHZvaWQNCi1jdWJpY19jb25nX3NpZ25hbChzdHJ1Y3QgY2NfdmFyICpjY3Ys IHVpbnQzMl90IHR5cGUpDQorY3ViaWNfY29uZ19zaWduYWwoc3RydWN0IGNjX3ZhciAqY2N2LCBj Y3NpZ25hbF90IHR5cGUpDQogew0KICAgICAgc3RydWN0IGN1YmljICpjdWJpY19kYXRhOw0KICAg ICAgdWludDMyX3QgbXNzLCBwaXBlOw0KQEAgLTUwMyw2ICs1MDMsOCBAQCBjdWJpY19jb25nX3Np Z25hbChzdHJ1Y3QgY2NfdmFyICpjY3YsIHVpbnQzMl90IHR5cGUpDQogICAgICAgICAgICAgY3Vi aWNfZGF0YS0+Y3duZF9lcG9jaCA9IGN1YmljX2RhdGEtPnVuZG9fY3duZF9lcG9jaDsNCiAgICAg ICAgICAgICBjdWJpY19kYXRhLT50X2Vwb2NoID0gY3ViaWNfZGF0YS0+dW5kb190X2Vwb2NoOw0K ICAgICAgICAgICAgIGJyZWFrOw0KKyAgICAgZGVmYXVsdDoNCisgICAgICAgICAgICBicmVhazsN CiAgICAgIH0NCiB9DQoNCmRpZmYgLS1naXQgYS9zeXMvbmV0aW5ldC9jYy9jY19kY3RjcC5jIGIv c3lzL25ldGluZXQvY2MvY2NfZGN0Y3AuYw0KaW5kZXggYWUwYTU2ODM5NDQ5Li4zNzRkYjk4YzVl NjAgMTAwNjQ0DQotLS0gYS9zeXMvbmV0aW5ldC9jYy9jY19kY3RjcC5jDQorKysgYi9zeXMvbmV0 aW5ldC9jYy9jY19kY3RjcC5jDQpAQCAtNzksMTEgKzc5LDExIEBAIHN0cnVjdCBkY3RjcCB7DQog ICAgICB1aW50MzJfdCBudW1fY29uZ19ldmVudHM7IC8qICMgb2YgY29uZ2VzdGlvbiBldmVudHMg Ki8NCiB9Ow0KDQotc3RhdGljIHZvaWQgZGN0Y3BfYWNrX3JlY2VpdmVkKHN0cnVjdCBjY192YXIg KmNjdiwgdWludDE2X3QgdHlwZSk7DQorc3RhdGljIHZvaWQgZGN0Y3BfYWNrX3JlY2VpdmVkKHN0 cnVjdCBjY192YXIgKmNjdiwgY2NzaWduYWxfdCB0eXBlKTsNCiBzdGF0aWMgdm9pZCBkY3RjcF9h ZnRlcl9pZGxlKHN0cnVjdCBjY192YXIgKmNjdik7DQogc3RhdGljIHZvaWQgZGN0Y3BfY2JfZGVz dHJveShzdHJ1Y3QgY2NfdmFyICpjY3YpOw0KIHN0YXRpYyBpbnQgIGRjdGNwX2NiX2luaXQoc3Ry dWN0IGNjX3ZhciAqY2N2LCB2b2lkICpwdHIpOw0KLXN0YXRpYyB2b2lkIGRjdGNwX2Nvbmdfc2ln bmFsKHN0cnVjdCBjY192YXIgKmNjdiwgdWludDMyX3QgdHlwZSk7DQorc3RhdGljIHZvaWQgZGN0 Y3BfY29uZ19zaWduYWwoc3RydWN0IGNjX3ZhciAqY2N2LCBjY3NpZ25hbF90IHR5cGUpOw0KIHN0 YXRpYyB2b2lkIGRjdGNwX2Nvbm5faW5pdChzdHJ1Y3QgY2NfdmFyICpjY3YpOw0KIHN0YXRpYyB2 b2lkIGRjdGNwX3Bvc3RfcmVjb3Zlcnkoc3RydWN0IGNjX3ZhciAqY2N2KTsNCiBzdGF0aWMgdm9p ZCBkY3RjcF9lY25wa3RfaGFuZGxlcihzdHJ1Y3QgY2NfdmFyICpjY3YpOw0KQEAgLTEwNCw3ICsx MDQsNyBAQCBzdHJ1Y3QgY2NfYWxnbyBkY3RjcF9jY19hbGdvID0gew0KIH07DQoNCiBzdGF0aWMg dm9pZA0KLWRjdGNwX2Fja19yZWNlaXZlZChzdHJ1Y3QgY2NfdmFyICpjY3YsIHVpbnQxNl90IHR5 cGUpDQorZGN0Y3BfYWNrX3JlY2VpdmVkKHN0cnVjdCBjY192YXIgKmNjdiwgY2NzaWduYWxfdCB0 eXBlKQ0KIHsNCiAgICAgIHN0cnVjdCBkY3RjcCAqZGN0Y3BfZGF0YTsNCiAgICAgIGludCBieXRl c19hY2tlZCA9IDA7DQpAQCAtMjM3LDcgKzIzNyw3IEBAIGRjdGNwX2NiX2luaXQoc3RydWN0IGNj X3ZhciAqY2N2LCB2b2lkICpwdHIpDQogICogUGVyZm9ybSBhbnkgbmVjZXNzYXJ5IHRhc2tzIGJl Zm9yZSB3ZSBlbnRlciBjb25nZXN0aW9uIHJlY292ZXJ5Lg0KICAqLw0KIHN0YXRpYyB2b2lkDQot ZGN0Y3BfY29uZ19zaWduYWwoc3RydWN0IGNjX3ZhciAqY2N2LCB1aW50MzJfdCB0eXBlKQ0KK2Rj dGNwX2Nvbmdfc2lnbmFsKHN0cnVjdCBjY192YXIgKmNjdiwgY2NzaWduYWxfdCB0eXBlKQ0KIHsN CiAgICAgIHN0cnVjdCBkY3RjcCAqZGN0Y3BfZGF0YTsNCiAgICAgIHVpbnQzMl90IGN3aW4sIG1z cywgcGlwZTsNCkBAIC0zMDgsNiArMzA4LDggQEAgZGN0Y3BfY29uZ19zaWduYWwoc3RydWN0IGNj X3ZhciAqY2N2LCB1aW50MzJfdCB0eXBlKQ0KICAgICAgICAgICAgICAgICAgICAgZGN0Y3BfZGF0 YS0+c2F2ZV9zbmRueHQgKz0gQ0NWKGNjdiwgdF9tYXhzZWcpOw0KICAgICAgICAgICAgICAgICAg ICAgZGN0Y3BfZGF0YS0+bnVtX2NvbmdfZXZlbnRzKys7DQogICAgICAgICAgICAgICAgICAgICBi cmVhazsNCisgICAgICAgICAgICBkZWZhdWx0Og0KKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7 DQogICAgICAgICAgICAgfQ0KICAgICAgfSBlbHNlDQogICAgICAgICAgICAgbmV3cmVub19jY19j b25nX3NpZ25hbChjY3YsIHR5cGUpOw0KZGlmZiAtLWdpdCBhL3N5cy9uZXRpbmV0L2NjL2NjX2hk LmMgYi9zeXMvbmV0aW5ldC9jYy9jY19oZC5jDQppbmRleCAxYThiNjJjY2Y0MjYuLjgyNDg2NTYz Zjk3ZSAxMDA2NDQNCi0tLSBhL3N5cy9uZXRpbmV0L2NjL2NjX2hkLmMNCisrKyBiL3N5cy9uZXRp bmV0L2NjL2NjX2hkLmMNCkBAIC04MCw3ICs4MCw3IEBADQogLyogTGFyZ2VzdCBwb3NzaWJsZSBu dW1iZXIgcmV0dXJuZWQgYnkgcmFuZG9tKCkuICovDQogI2RlZmluZSAgICAgUkFORE9NX01BWCAg ICAgSU5UX01BWA0KDQotc3RhdGljIHZvaWQgaGRfYWNrX3JlY2VpdmVkKHN0cnVjdCBjY192YXIg KmNjdiwgdWludDE2X3QgYWNrX3R5cGUpOw0KK3N0YXRpYyB2b2lkIGhkX2Fja19yZWNlaXZlZChz dHJ1Y3QgY2NfdmFyICpjY3YsIGNjc2lnbmFsX3QgYWNrX3R5cGUpOw0KIHN0YXRpYyBpbnQgIGhk X21vZF9pbml0KHZvaWQpOw0KIHN0YXRpYyBzaXplX3QgICAgICAgaGRfZGF0YV9zeih2b2lkKTsN Cg0KQEAgLTEzOCw3ICsxMzgsNyBAQCBzaG91bGRfYmFja29mZihpbnQgcWRseSwgaW50IG1heHFk bHkpDQogICogYXMgTmV3UmVubyBpbiBhbGwgb3RoZXIgY2lyY3Vtc3RhbmNlcy4NCiAgKi8NCiBz dGF0aWMgdm9pZA0KLWhkX2Fja19yZWNlaXZlZChzdHJ1Y3QgY2NfdmFyICpjY3YsIHVpbnQxNl90 IGFja190eXBlKQ0KK2hkX2Fja19yZWNlaXZlZChzdHJ1Y3QgY2NfdmFyICpjY3YsIGNjc2lnbmFs X3QgYWNrX3R5cGUpDQogew0KICAgICAgc3RydWN0IGVydHQgKmVfdDsNCiAgICAgIGludCBxZGx5 Ow0KZGlmZiAtLWdpdCBhL3N5cy9uZXRpbmV0L2NjL2NjX2h0Y3AuYyBiL3N5cy9uZXRpbmV0L2Nj L2NjX2h0Y3AuYw0KaW5kZXggNDMyMjQ0NDZmZDg0Li40MWM1NTJhM2JmYTAgMTAwNjQ0DQotLS0g YS9zeXMvbmV0aW5ldC9jYy9jY19odGNwLmMNCisrKyBiL3N5cy9uZXRpbmV0L2NjL2NjX2h0Y3Au Yw0KQEAgLTEzNiwxMCArMTM2LDEwIEBADQogICAgICAoKChkaWZmKSAvIGh6KSAqICgoKGRpZmYp IDw8IEhUQ1BfQUxQSEFfSU5DX1NISUZUKSAvICg0ICogaHopKSkgXA0KICkgPj4gSFRDUF9BTFBI QV9JTkNfU0hJRlQpDQoNCi1zdGF0aWMgdm9pZCBodGNwX2Fja19yZWNlaXZlZChzdHJ1Y3QgY2Nf dmFyICpjY3YsIHVpbnQxNl90IHR5cGUpOw0KK3N0YXRpYyB2b2lkIGh0Y3BfYWNrX3JlY2VpdmVk KHN0cnVjdCBjY192YXIgKmNjdiwgY2NzaWduYWxfdCB0eXBlKTsNCiBzdGF0aWMgdm9pZCBodGNw X2NiX2Rlc3Ryb3koc3RydWN0IGNjX3ZhciAqY2N2KTsNCiBzdGF0aWMgaW50ICBodGNwX2NiX2lu aXQoc3RydWN0IGNjX3ZhciAqY2N2LCB2b2lkICpwdHIpOw0KLXN0YXRpYyB2b2lkIGh0Y3BfY29u Z19zaWduYWwoc3RydWN0IGNjX3ZhciAqY2N2LCB1aW50MzJfdCB0eXBlKTsNCitzdGF0aWMgdm9p ZCBodGNwX2Nvbmdfc2lnbmFsKHN0cnVjdCBjY192YXIgKmNjdiwgY2NzaWduYWxfdCB0eXBlKTsN CiBzdGF0aWMgaW50ICBodGNwX21vZF9pbml0KHZvaWQpOw0KIHN0YXRpYyB2b2lkIGh0Y3BfcG9z dF9yZWNvdmVyeShzdHJ1Y3QgY2NfdmFyICpjY3YpOw0KIHN0YXRpYyB2b2lkIGh0Y3BfcmVjYWxj X2FscGhhKHN0cnVjdCBjY192YXIgKmNjdik7DQpAQCAtMTkwLDcgKzE5MCw3IEBAIHN0cnVjdCBj Y19hbGdvIGh0Y3BfY2NfYWxnbyA9IHsNCiB9Ow0KDQogc3RhdGljIHZvaWQNCi1odGNwX2Fja19y ZWNlaXZlZChzdHJ1Y3QgY2NfdmFyICpjY3YsIHVpbnQxNl90IHR5cGUpDQoraHRjcF9hY2tfcmVj ZWl2ZWQoc3RydWN0IGNjX3ZhciAqY2N2LCBjY3NpZ25hbF90IHR5cGUpDQogew0KICAgICAgc3Ry dWN0IGh0Y3AgKmh0Y3BfZGF0YTsNCg0KQEAgLTI3OCw3ICsyNzgsNyBAQCBodGNwX2NiX2luaXQo c3RydWN0IGNjX3ZhciAqY2N2LCB2b2lkICpwdHIpDQogICogUGVyZm9ybSBhbnkgbmVjZXNzYXJ5 IHRhc2tzIGJlZm9yZSB3ZSBlbnRlciBjb25nZXN0aW9uIHJlY292ZXJ5Lg0KICAqLw0KIHN0YXRp YyB2b2lkDQotaHRjcF9jb25nX3NpZ25hbChzdHJ1Y3QgY2NfdmFyICpjY3YsIHVpbnQzMl90IHR5 cGUpDQoraHRjcF9jb25nX3NpZ25hbChzdHJ1Y3QgY2NfdmFyICpjY3YsIGNjc2lnbmFsX3QgdHlw ZSkNCiB7DQogICAgICBzdHJ1Y3QgaHRjcCAqaHRjcF9kYXRhOw0KICAgICAgdWludDMyX3QgbXNz LCBwaXBlOw0KQEAgLTM0NSw2ICszNDUsOCBAQCBodGNwX2Nvbmdfc2lnbmFsKHN0cnVjdCBjY192 YXIgKmNjdiwgdWludDMyX3QgdHlwZSkNCiAgICAgICAgICAgICBpZiAoQ0NWKGNjdiwgdF9yeHRz aGlmdCkgPj0gMikNCiAgICAgICAgICAgICAgICAgICAgIGh0Y3BfZGF0YS0+dF9sYXN0X2Nvbmcg PSB0aWNrczsNCiAgICAgICAgICAgICBicmVhazsNCisgICAgIGRlZmF1bHQ6DQorICAgICAgICAg ICAgYnJlYWs7DQogICAgICB9DQogfQ0KDQpkaWZmIC0tZ2l0IGEvc3lzL25ldGluZXQvY2MvY2Nf bmV3cmVuby5jIGIvc3lzL25ldGluZXQvY2MvY2NfbmV3cmVuby5jDQppbmRleCA3MWYyNzY0ZWY0 YmMuLmFhMjBlMmM2NGY3ZCAxMDA2NDQNCi0tLSBhL3N5cy9uZXRpbmV0L2NjL2NjX25ld3Jlbm8u Yw0KKysrIGIvc3lzL25ldGluZXQvY2MvY2NfbmV3cmVuby5jDQpAQCAtODQsOSArODQsOSBAQA0K ICNpbmNsdWRlIDxuZXRpbmV0L2NjL2NjX25ld3Jlbm8uaD4NCg0KIHN0YXRpYyB2b2lkIG5ld3Jl bm9fY2JfZGVzdHJveShzdHJ1Y3QgY2NfdmFyICpjY3YpOw0KLXN0YXRpYyB2b2lkIG5ld3Jlbm9f YWNrX3JlY2VpdmVkKHN0cnVjdCBjY192YXIgKmNjdiwgdWludDE2X3QgdHlwZSk7DQorc3RhdGlj IHZvaWQgbmV3cmVub19hY2tfcmVjZWl2ZWQoc3RydWN0IGNjX3ZhciAqY2N2LCBjY3NpZ25hbF90 IHR5cGUpOw0KIHN0YXRpYyB2b2lkIG5ld3Jlbm9fYWZ0ZXJfaWRsZShzdHJ1Y3QgY2NfdmFyICpj Y3YpOw0KLXN0YXRpYyB2b2lkIG5ld3Jlbm9fY29uZ19zaWduYWwoc3RydWN0IGNjX3ZhciAqY2N2 LCB1aW50MzJfdCB0eXBlKTsNCitzdGF0aWMgdm9pZCBuZXdyZW5vX2Nvbmdfc2lnbmFsKHN0cnVj dCBjY192YXIgKmNjdiwgY2NzaWduYWxfdCB0eXBlKTsNCiBzdGF0aWMgaW50IG5ld3Jlbm9fY3Rs X291dHB1dChzdHJ1Y3QgY2NfdmFyICpjY3YsIHN0cnVjdCBzb2Nrb3B0ICpzb3B0LCB2b2lkICpi dWYpOw0KIHN0YXRpYyB2b2lkIG5ld3Jlbm9fbmV3cm91bmQoc3RydWN0IGNjX3ZhciAqY2N2LCB1 aW50MzJfdCByb3VuZF9jbnQpOw0KIHN0YXRpYyB2b2lkIG5ld3Jlbm9fcnR0c2FtcGxlKHN0cnVj dCBjY192YXIgKmNjdiwgdWludDMyX3QgdXNlY19ydHQsIHVpbnQzMl90IHJ4dGNudCwgdWludDMy X3QgZmFzKTsNCkBAIC0yMTIsNyArMjEyLDcgQEAgbmV3cmVub19jYl9kZXN0cm95KHN0cnVjdCBj Y192YXIgKmNjdikNCiB9DQoNCiBzdGF0aWMgdm9pZA0KLW5ld3Jlbm9fYWNrX3JlY2VpdmVkKHN0 cnVjdCBjY192YXIgKmNjdiwgdWludDE2X3QgdHlwZSkNCituZXdyZW5vX2Fja19yZWNlaXZlZChz dHJ1Y3QgY2NfdmFyICpjY3YsIGNjc2lnbmFsX3QgdHlwZSkNCiB7DQogICAgICBzdHJ1Y3QgbmV3 cmVubyAqbnJlbm87DQoNCkBAIC0zNjMsNyArMzYzLDcgQEAgbmV3cmVub19hZnRlcl9pZGxlKHN0 cnVjdCBjY192YXIgKmNjdikNCiAgKiBQZXJmb3JtIGFueSBuZWNlc3NhcnkgdGFza3MgYmVmb3Jl IHdlIGVudGVyIGNvbmdlc3Rpb24gcmVjb3ZlcnkuDQogICovDQogc3RhdGljIHZvaWQNCi1uZXdy ZW5vX2Nvbmdfc2lnbmFsKHN0cnVjdCBjY192YXIgKmNjdiwgdWludDMyX3QgdHlwZSkNCituZXdy ZW5vX2Nvbmdfc2lnbmFsKHN0cnVjdCBjY192YXIgKmNjdiwgY2NzaWduYWxfdCB0eXBlKQ0KIHsN CiAgICAgIHN0cnVjdCBuZXdyZW5vICpucmVubzsNCiAgICAgIHVpbnQzMl90IGJldGEsIGJldGFf ZWNuLCBjd2luLCBmYWN0b3IsIG1zcywgcGlwZTsNCkBAIC00NDIsNiArNDQyLDggQEAgbmV3cmVu b19jb25nX3NpZ25hbChzdHJ1Y3QgY2NfdmFyICpjY3YsIHVpbnQzMl90IHR5cGUpDQogICAgICAg ICAgICAgfQ0KICAgICAgICAgICAgIENDVihjY3YsIHNuZF9jd25kKSA9IG1zczsNCiAgICAgICAg ICAgICBicmVhazsNCisgICAgIGRlZmF1bHQ6DQorICAgICAgICAgICAgYnJlYWs7DQogICAgICB9 DQogfQ0KDQpkaWZmIC0tZ2l0IGEvc3lzL25ldGluZXQvY2MvY2NfdmVnYXMuYyBiL3N5cy9uZXRp bmV0L2NjL2NjX3ZlZ2FzLmMNCmluZGV4IGFhYzljOWNlNzdmZi4uZWNkNDJjMWEwZjUzIDEwMDY0 NA0KLS0tIGEvc3lzL25ldGluZXQvY2MvY2NfdmVnYXMuYw0KKysrIGIvc3lzL25ldGluZXQvY2Mv Y2NfdmVnYXMuYw0KQEAgLTg0LDEyICs4NCwxMiBAQA0KICAqIFByaXZhdGUgc2lnbmFsIHR5cGUg Zm9yIHJhdGUgYmFzZWQgY29uZ2VzdGlvbiBzaWduYWwuDQogICogU2VlIDxuZXRpbmV0L2NjLmg+ IGZvciBhcHByb3ByaWF0ZSBiaXQtcmFuZ2UgdG8gdXNlIGZvciBwcml2YXRlIHNpZ25hbHMuDQog ICovDQotI2RlZmluZSAgICAgQ0NfVkVHQVNfUkFURSAgMHgwMTAwMDAwMA0KKyNkZWZpbmUgICAg IENDX1ZFR0FTX1JBVEUgIDB4MDQwMDAwMDANCg0KLXN0YXRpYyB2b2lkIHZlZ2FzX2Fja19yZWNl aXZlZChzdHJ1Y3QgY2NfdmFyICpjY3YsIHVpbnQxNl90IGFja190eXBlKTsNCitzdGF0aWMgdm9p ZCB2ZWdhc19hY2tfcmVjZWl2ZWQoc3RydWN0IGNjX3ZhciAqY2N2LCBjY3NpZ25hbF90IGFja190 eXBlKTsNCiBzdGF0aWMgdm9pZCB2ZWdhc19jYl9kZXN0cm95KHN0cnVjdCBjY192YXIgKmNjdik7 DQogc3RhdGljIGludCAgdmVnYXNfY2JfaW5pdChzdHJ1Y3QgY2NfdmFyICpjY3YsIHZvaWQgKnB0 cik7DQotc3RhdGljIHZvaWQgdmVnYXNfY29uZ19zaWduYWwoc3RydWN0IGNjX3ZhciAqY2N2LCB1 aW50MzJfdCBzaWduYWxfdHlwZSk7DQorc3RhdGljIHZvaWQgdmVnYXNfY29uZ19zaWduYWwoc3Ry dWN0IGNjX3ZhciAqY2N2LCBjY3NpZ25hbF90IHNpZ25hbF90eXBlKTsNCiBzdGF0aWMgdm9pZCB2 ZWdhc19jb25uX2luaXQoc3RydWN0IGNjX3ZhciAqY2N2KTsNCiBzdGF0aWMgaW50ICB2ZWdhc19t b2RfaW5pdCh2b2lkKTsNCiBzdGF0aWMgc2l6ZV90ICAgICAgIHZlZ2FzX2RhdGFfc3oodm9pZCk7 DQpAQCAtMTI0LDcgKzEyNCw3IEBAIHN0cnVjdCBjY19hbGdvIHZlZ2FzX2NjX2FsZ28gPSB7DQog ICogaGFzIGJlZW4gdXNlZC4NCiAgKi8NCiBzdGF0aWMgdm9pZA0KLXZlZ2FzX2Fja19yZWNlaXZl ZChzdHJ1Y3QgY2NfdmFyICpjY3YsIHVpbnQxNl90IGFja190eXBlKQ0KK3ZlZ2FzX2Fja19yZWNl aXZlZChzdHJ1Y3QgY2NfdmFyICpjY3YsIGNjc2lnbmFsX3QgYWNrX3R5cGUpDQogew0KICAgICAg c3RydWN0IGVydHQgKmVfdDsNCiAgICAgIHN0cnVjdCB2ZWdhcyAqdmVnYXNfZGF0YTsNCkBAIC0y MDMsNyArMjAzLDcgQEAgdmVnYXNfY2JfaW5pdChzdHJ1Y3QgY2NfdmFyICpjY3YsIHZvaWQgKnB0 cikNCiAgKiBoYW5kbGVkIGhlcmUsIG90aGVyd2lzZSBpdCBmYWxscyBiYWNrIHRvIG5ld3Jlbm8n cyBjb25nZXN0aW9uIGhhbmRsaW5nLg0KICAqLw0KIHN0YXRpYyB2b2lkDQotdmVnYXNfY29uZ19z aWduYWwoc3RydWN0IGNjX3ZhciAqY2N2LCB1aW50MzJfdCBzaWduYWxfdHlwZSkNCit2ZWdhc19j b25nX3NpZ25hbChzdHJ1Y3QgY2NfdmFyICpjY3YsIGNjc2lnbmFsX3Qgc2lnbmFsX3R5cGUpDQog ew0KICAgICAgc3RydWN0IHZlZ2FzICp2ZWdhc19kYXRhOw0KICAgICAgaW50IHByZXNpZ25hbHJl Y292Ow0KQEAgLTIxNSw3ICsyMTUsNyBAQCB2ZWdhc19jb25nX3NpZ25hbChzdHJ1Y3QgY2NfdmFy ICpjY3YsIHVpbnQzMl90IHNpZ25hbF90eXBlKQ0KICAgICAgZWxzZQ0KICAgICAgICAgICAgIHBy ZXNpZ25hbHJlY292ID0gMDsNCg0KLSAgICAgc3dpdGNoKHNpZ25hbF90eXBlKSB7DQorICAgICBz d2l0Y2goKGludClzaWduYWxfdHlwZSkgew0KICAgICAgY2FzZSBDQ19WRUdBU19SQVRFOg0KICAg ICAgICAgICAgIGlmICghSU5fUkVDT1ZFUlkoQ0NWKGNjdiwgdF9mbGFncykpKSB7DQogICAgICAg ICAgICAgICAgICAgICBDQ1YoY2N2LCBzbmRfY3duZCkgPSBtYXgoMiAqIENDVihjY3YsIHRfbWF4 c2VnKSwNCkBAIC0yMjgsNiArMjI4LDcgQEAgdmVnYXNfY29uZ19zaWduYWwoc3RydWN0IGNjX3Zh ciAqY2N2LCB1aW50MzJfdCBzaWduYWxfdHlwZSkNCg0KICAgICAgZGVmYXVsdDoNCiAgICAgICAg ICAgICBuZXdyZW5vX2NjX2Nvbmdfc2lnbmFsKGNjdiwgc2lnbmFsX3R5cGUpOw0KKyAgICAgICAg ICAgIGJyZWFrOw0KICAgICAgfQ0KDQogICAgICBpZiAoSU5fUkVDT1ZFUlkoQ0NWKGNjdiwgdF9m bGFncykpICYmICFwcmVzaWduYWxyZWNvdikNCg0KQnVpbGR3b3JsZCBpcyBub3cgYnJva2VuIGZv ciBhbGwgYXJjaGVzIChhdCBsZWFzdCBpbmNyZW1lbnRhbCBidWlsZCkNCg0KQW1vbmcgdGhlIGVy cm9ycw0KDQovaG9tZS9iYXB0L3dvcmt0cmVlcy9tYWluL2xpYi9saWJzdGF0cy8uLi8uLi9zeXMv bmV0aW5ldC90Y3Bfc3RhdHMuYzoxMzg6MzI6IGVycm9yOiB1c2Ugb2YgdW5kZWNsYXJlZCBpZGVu dGlmaWVyICdDQ19ORFVQQUNLJw0K --_000_PH0PR06MB7639163516643B8783C1DB5186542PH0PR06MB7639namp_ Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: base64 PGh0bWw+DQo8aGVhZD4NCjxtZXRhIGh0dHAtZXF1aXY9IkNvbnRlbnQtVHlwZSIgY29udGVudD0i dGV4dC9odG1sOyBjaGFyc2V0PXV0Zi04Ij4NCjxtZXRhIG5hbWU9IkdlbmVyYXRvciIgY29udGVu dD0iTWljcm9zb2Z0IFdvcmQgMTUgKGZpbHRlcmVkIG1lZGl1bSkiPg0KPCEtLVtpZiAhbXNvXT48 c3R5bGU+dlw6KiB7YmVoYXZpb3I6dXJsKCNkZWZhdWx0I1ZNTCk7fQ0Kb1w6KiB7YmVoYXZpb3I6 dXJsKCNkZWZhdWx0I1ZNTCk7fQ0Kd1w6KiB7YmVoYXZpb3I6dXJsKCNkZWZhdWx0I1ZNTCk7fQ0K LnNoYXBlIHtiZWhhdmlvcjp1cmwoI2RlZmF1bHQjVk1MKTt9DQo8L3N0eWxlPjwhW2VuZGlmXS0t PjxzdHlsZT48IS0tDQovKiBGb250IERlZmluaXRpb25zICovDQpAZm9udC1mYWNlDQoJe2ZvbnQt ZmFtaWx5OiJDYW1icmlhIE1hdGgiOw0KCXBhbm9zZS0xOjIgNCA1IDMgNSA0IDYgMyAyIDQ7fQ0K QGZvbnQtZmFjZQ0KCXtmb250LWZhbWlseTpDYWxpYnJpOw0KCXBhbm9zZS0xOjIgMTUgNSAyIDIg MiA0IDMgMiA0O30NCkBmb250LWZhY2UNCgl7Zm9udC1mYW1pbHk6Q29uc29sYXM7DQoJcGFub3Nl LTE6MiAxMSA2IDkgMiAyIDQgMyAyIDQ7fQ0KLyogU3R5bGUgRGVmaW5pdGlvbnMgKi8NCnAuTXNv Tm9ybWFsLCBsaS5Nc29Ob3JtYWwsIGRpdi5Nc29Ob3JtYWwNCgl7bWFyZ2luOjBjbTsNCglmb250 LXNpemU6MTEuMHB0Ow0KCWZvbnQtZmFtaWx5OiJDYWxpYnJpIixzYW5zLXNlcmlmO30NCmE6bGlu aywgc3Bhbi5Nc29IeXBlcmxpbmsNCgl7bXNvLXN0eWxlLXByaW9yaXR5Ojk5Ow0KCWNvbG9yOmJs dWU7DQoJdGV4dC1kZWNvcmF0aW9uOnVuZGVybGluZTt9DQpwcmUNCgl7bXNvLXN0eWxlLXByaW9y aXR5Ojk5Ow0KCW1zby1zdHlsZS1saW5rOiJIVE1MIFByZWZvcm1hdHRlZCBDaGFyIjsNCgltYXJn aW46MGNtOw0KCW1hcmdpbi1ib3R0b206LjAwMDFwdDsNCglmb250LXNpemU6MTAuMHB0Ow0KCWZv bnQtZmFtaWx5OiJDb3VyaWVyIE5ldyI7fQ0Kc3Bhbi5IVE1MUHJlZm9ybWF0dGVkQ2hhcg0KCXtt c28tc3R5bGUtbmFtZToiSFRNTCBQcmVmb3JtYXR0ZWQgQ2hhciI7DQoJbXNvLXN0eWxlLXByaW9y aXR5Ojk5Ow0KCW1zby1zdHlsZS1saW5rOiJIVE1MIFByZWZvcm1hdHRlZCI7DQoJZm9udC1mYW1p bHk6IkNvbnNvbGFzIixzZXJpZjt9DQouTXNvQ2hwRGVmYXVsdA0KCXttc28tc3R5bGUtdHlwZTpl eHBvcnQtb25seTsNCglmb250LXNpemU6MTAuMHB0Ow0KCW1zby1saWdhdHVyZXM6bm9uZTt9DQpA cGFnZSBXb3JkU2VjdGlvbjENCgl7c2l6ZTo2MTIuMHB0IDc5Mi4wcHQ7DQoJbWFyZ2luOjcyLjBw dCA3Mi4wcHQgNzIuMHB0IDcyLjBwdDt9DQpkaXYuV29yZFNlY3Rpb24xDQoJe3BhZ2U6V29yZFNl Y3Rpb24xO30NCi0tPjwvc3R5bGU+PCEtLVtpZiBndGUgbXNvIDldPjx4bWw+DQo8bzpzaGFwZWRl ZmF1bHRzIHY6ZXh0PSJlZGl0IiBzcGlkbWF4PSIxMDI2IiAvPg0KPC94bWw+PCFbZW5kaWZdLS0+ PCEtLVtpZiBndGUgbXNvIDldPjx4bWw+DQo8bzpzaGFwZWxheW91dCB2OmV4dD0iZWRpdCI+DQo8 bzppZG1hcCB2OmV4dD0iZWRpdCIgZGF0YT0iMSIgLz4NCjwvbzpzaGFwZWxheW91dD48L3htbD48 IVtlbmRpZl0tLT4NCjwvaGVhZD4NCjxib2R5IGxhbmc9ImVuLUFUIiBsaW5rPSJibHVlIiB2bGlu az0icHVycGxlIiBzdHlsZT0id29yZC13cmFwOmJyZWFrLXdvcmQiPg0KPGRpdiBjbGFzcz0iV29y ZFNlY3Rpb24xIj4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPjxzcGFuIGxhbmc9IkVOLVVTIiBzdHls ZT0ibXNvLWZhcmVhc3QtbGFuZ3VhZ2U6RU4tVVMiPlRoYW5rcyBmb3IgdGhlIGhlYWRzLXVwLiBJ cyBmaXhlZCB3aXRoIDVlMjQ4YzIzZDk5NWEwNTlkMjRmNDc4NGQ1YTI1NmNkZGQ0MmU1NTc8bzpw PjwvbzpwPjwvc3Bhbj48L3A+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj48c3BhbiBzdHlsZT0ibXNv LWZhcmVhc3QtbGFuZ3VhZ2U6RU4tVVMiPjxvOnA+Jm5ic3A7PC9vOnA+PC9zcGFuPjwvcD4NCjxk aXY+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIj48c3BhbiBsYW5nPSJFTi1VUyI+PG86cD4mbmJzcDs8 L286cD48L3NwYW4+PC9wPg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+PGI+PHNwYW4gbGFuZz0iRU4t VVMiIHN0eWxlPSJmb250LXNpemU6OS4wcHQ7Zm9udC1mYW1pbHk6JnF1b3Q7QXJpYWwmcXVvdDss c2Fucy1zZXJpZjtjb2xvcjpibGFjayI+UmljaGFyZA0KPC9zcGFuPjwvYj48c3BhbiBsYW5nPSJF Ti1VUyIgc3R5bGU9ImZvbnQtc2l6ZTo4LjBwdDtmb250LWZhbWlseTomcXVvdDtBcmlhbCZxdW90 OyxzYW5zLXNlcmlmIj48bzpwPjwvbzpwPjwvc3Bhbj48L3A+DQo8L2Rpdj4NCjxwIGNsYXNzPSJN c29Ob3JtYWwiPjxzcGFuIHN0eWxlPSJtc28tZmFyZWFzdC1sYW5ndWFnZTpFTi1VUyI+PG86cD4m bmJzcDs8L286cD48L3NwYW4+PC9wPg0KPGRpdj4NCjxkaXYgc3R5bGU9ImJvcmRlcjpub25lO2Jv cmRlci10b3A6c29saWQgI0UxRTFFMSAxLjBwdDtwYWRkaW5nOjMuMHB0IDBjbSAwY20gMGNtIj4N CjxwIGNsYXNzPSJNc29Ob3JtYWwiPjxiPjxzcGFuIGxhbmc9IkVOLVVTIj5Gcm9tOjwvc3Bhbj48 L2I+PHNwYW4gbGFuZz0iRU4tVVMiPiBCYXB0aXN0ZSBEYXJvdXNzaW4gJmx0O2JhcHRARnJlZUJT RC5vcmcmZ3Q7DQo8YnI+DQo8Yj5TZW50OjwvYj4gU2Ftc3RhZywgMjQuIEZlYnJ1YXIgMjAyNCAx OToyNDxicj4NCjxiPlRvOjwvYj4gUmljaGFyZCBTY2hlZmZlbmVnZ2VyICZsdDtyc2NoZWZmQEZy ZWVCU0Qub3JnJmd0Ozsgc3JjLWNvbW1pdHRlcnNARnJlZUJTRC5vcmc7IGRldi1jb21taXRzLXNy Yy1hbGxARnJlZUJTRC5vcmc7IGRldi1jb21taXRzLXNyYy1tYWluQEZyZWVCU0Qub3JnPGJyPg0K PGI+U3ViamVjdDo8L2I+IFJlOiBnaXQ6IGY3NDM1MmZiY2YxNSAtIG1haW4gLSB0Y3A6IHVzZSBl bnVtIGZvciBhbGwgY29uZ2VzdGlvbiBjb250cm9sIHNpZ25hbHM8bzpwPjwvbzpwPjwvc3Bhbj48 L3A+DQo8L2Rpdj4NCjwvZGl2Pg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+PG86cD4mbmJzcDs8L286 cD48L3A+DQo8dGFibGUgY2xhc3M9Ik1zb05vcm1hbFRhYmxlIiBib3JkZXI9IjEiIGNlbGxzcGFj aW5nPSIwIiBjZWxscGFkZGluZz0iMCIgYWxpZ249ImxlZnQiIHN0eWxlPSJiYWNrZ3JvdW5kOiNG MzZENkQiPg0KPHRib2R5Pg0KPHRyPg0KPHRkIHN0eWxlPSJwYWRkaW5nOjYuMHB0IDYuMHB0IDYu MHB0IDYuMHB0Ij4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiIHN0eWxlPSJtc28tZWxlbWVudDpmcmFt ZTttc28tZWxlbWVudC1mcmFtZS1oc3BhY2U6Mi4yNXB0O21zby1lbGVtZW50LXdyYXA6YXJvdW5k O21zby1lbGVtZW50LWFuY2hvci12ZXJ0aWNhbDpwYXJhZ3JhcGg7bXNvLWVsZW1lbnQtYW5jaG9y LWhvcml6b250YWw6Y29sdW1uO21zby1oZWlnaHQtcnVsZTpleGFjdGx5Ij4NCjxiPjxzcGFuIHN0 eWxlPSJmb250LXNpemU6MTIuMHB0O2ZvbnQtZmFtaWx5OiZxdW90O0FyaWFsJnF1b3Q7LHNhbnMt c2VyaWY7Y29sb3I6YmxhY2siPkVYVEVSTkFMIEVNQUlMIC0gVVNFIENBVVRJT04gd2hlbiBjbGlj a2luZyBsaW5rcyBvciBhdHRhY2htZW50cw0KPC9zcGFuPjwvYj48bzpwPjwvbzpwPjwvcD4NCjwv dGQ+DQo8L3RyPg0KPC90Ym9keT4NCjwvdGFibGU+DQo8cCBjbGFzcz0iTXNvTm9ybWFsIiBzdHls ZT0ibWFyZ2luLWJvdHRvbToxMi4wcHQiPjxicj4NCjxicj4NCjxvOnA+PC9vOnA+PC9wPg0KPGRp dj4NCjxkaXY+DQo8ZGl2Pg0KPHAgY2xhc3M9Ik1zb05vcm1hbCI+TGUgMjQgZsOpdnJpZXIgMjAy NCAxNzoxNTozOCBHTVQrMDE6MDAsIFJpY2hhcmQgU2NoZWZmZW5lZ2dlciAmbHQ7PGEgaHJlZj0i bWFpbHRvOnJzY2hlZmZARnJlZUJTRC5vcmciPnJzY2hlZmZARnJlZUJTRC5vcmc8L2E+Jmd0OyBh IMOpY3JpdCZuYnNwOzo8bzpwPjwvbzpwPjwvcD4NCjwvZGl2Pg0KPGJsb2NrcXVvdGUgc3R5bGU9 ImJvcmRlcjpub25lO2JvcmRlci1sZWZ0OnNvbGlkICNDQ0NDQ0MgMS4wcHQ7cGFkZGluZzowY20g MGNtIDBjbSA2LjBwdDttYXJnaW4tbGVmdDo0LjhwdDttYXJnaW4tcmlnaHQ6MGNtIj4NCjxkaXY+ DQo8cHJlPlRoZSBicmFuY2ggbWFpbiBoYXMgYmVlbiB1cGRhdGVkIGJ5IHJzY2hlZmY6PGJyPjxi cj5VUkw6IDxhIGhyZWY9Imh0dHBzOi8vY2dpdC5mcmVlYnNkLm9yZy9zcmMvY29tbWl0Lz9pZD1m NzQzNTJmYmNmMTUzNDFhY2NhZjVhOTIyNDA4NzFmOTgzMjMyMTVkIj5odHRwczovL2NnaXQuRnJl ZUJTRC5vcmcvc3JjL2NvbW1pdC8/aWQ9Zjc0MzUyZmJjZjE1MzQxYWNjYWY1YTkyMjQwODcxZjk4 MzIzMjE1ZDwvYT48YnI+PGJyPmNvbW1pdCBmNzQzNTJmYmNmMTUzNDFhY2NhZjVhOTIyNDA4NzFm OTgzMjMyMTVkPGJyPkF1dGhvcjombmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgUmljaGFyZCBTY2hl ZmZlbmVnZ2VyICZsdDs8YSBocmVmPSJtYWlsdG86cnNjaGVmZkBGcmVlQlNELm9yZyI+cnNjaGVm ZkBGcmVlQlNELm9yZzwvYT4mZ3Q7PGJyPkF1dGhvckRhdGU6IDIwMjQtMDItMjQgMTU6NDE6MzEg KzAwMDA8YnI+Q29tbWl0OiZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBSaWNoYXJkIFNjaGVmZmVu ZWdnZXIgJmx0OzxhIGhyZWY9Im1haWx0bzpyc2NoZWZmQEZyZWVCU0Qub3JnIj5yc2NoZWZmQEZy ZWVCU0Qub3JnPC9hPiZndDs8YnI+Q29tbWl0RGF0ZTogMjAyNC0wMi0yNCAxNTo0MTo0OCArMDAw MDxicj48YnI+Jm5ic3A7Jm5ic3A7Jm5ic3A7IHRjcDogdXNlIGVudW0gZm9yIGFsbCBjb25nZXN0 aW9uIGNvbnRyb2wgc2lnbmFsczxicj4mbmJzcDsmbmJzcDsmbmJzcDsgPGJyPiZuYnNwOyZuYnNw OyZuYnNwOyZuYnNwO0ZhY2lsaXRhdGUgZWFzaWVyIHRyb3VibGVzaG9vdGluZyBieSBlbnVtZXJh dGluZzxicj4mbmJzcDsmbmJzcDsmbmJzcDsgYWxsIGNvbmdlc3Rpb24gY29udHJvbCBzaWduYWxz LiBUeXBlY2FzdCB0aGU8YnI+Jm5ic3A7Jm5ic3A7Jm5ic3A7IGVudW0gdG8gaW50LCB3aGVuIGEg Y29uZ2VzdGlvbiBjb250cm9sIG1vZHVsZSB1c2VzPGJyPiZuYnNwOyZuYnNwOyZuYnNwOyBwcml2 YXRlIHNpZ25hbHMuPGJyPiZuYnNwOyZuYnNwOyZuYnNwOyA8YnI+Jm5ic3A7Jm5ic3A7Jm5ic3A7 Jm5ic3A7Tm8gZXh0ZXJuYWwgY2hhbmdlLjxicj4mbmJzcDsmbmJzcDsmbmJzcDsgPGJyPiZuYnNw OyZuYnNwOyZuYnNwOyZuYnNwO1Jldmlld2VkIEJ5OiZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZu YnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBnbGViaXVzLCB0dWV4ZW4s ICN0cmFuc3BvcnQ8YnI+Jm5ic3A7Jm5ic3A7Jm5ic3A7IFNwb25zb3JlZCBieTombmJzcDsmbmJz cDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgTmV0QXBw LCBJbmMuPGJyPiZuYnNwOyZuYnNwOyZuYnNwOyBEaWZmZXJlbnRpYWwgUmV2aXNpb246Jm5ic3A7 IDxhIGhyZWY9Imh0dHBzOi8vcmV2aWV3cy5mcmVlYnNkLm9yZy9ENDM4MzgiPmh0dHBzOi8vcmV2 aWV3cy5mcmVlYnNkLm9yZy9ENDM4Mzg8L2E+PG86cD48L286cD48L3ByZT4NCjxwcmUgc3R5bGU9 InRleHQtYWxpZ246Y2VudGVyIj48aHIgc2l6ZT0iMiIgd2lkdGg9IjEwMCUiIGFsaWduPSJjZW50 ZXIiPjwvcHJlPg0KPHByZT4gc3lzL25ldGluZXQvY2MvY2MuYyZuYnNwOyZuYnNwOyZuYnNwOyZu YnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyB8Jm5ic3A7IDIgKy08YnI+IHN5cy9uZXRpbmV0 L2NjL2NjLmgmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsg fCA0MiArKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tLS08YnI+IHN5cy9u ZXRpbmV0L2NjL2NjX2NkZy5jJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7IHwgMTAgKysrKystLS0t LTxicj4gc3lzL25ldGluZXQvY2MvY2NfY2hkLmMmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgfCAx MSArKysrKystLS0tLTxicj4gc3lzL25ldGluZXQvY2MvY2NfY3ViaWMuYyZuYnNwOyZuYnNwOyB8 IDEwICsrKysrKy0tLS08YnI+IHN5cy9uZXRpbmV0L2NjL2NjX2RjdGNwLmMmbmJzcDsmbmJzcDsg fCAxMCArKysrKystLS0tPGJyPiBzeXMvbmV0aW5ldC9jYy9jY19oZC5jJm5ic3A7Jm5ic3A7Jm5i c3A7Jm5ic3A7Jm5ic3A7IHwmbmJzcDsgNCArKy0tPGJyPiBzeXMvbmV0aW5ldC9jYy9jY19odGNw LmMmbmJzcDsmbmJzcDsmbmJzcDsgfCAxMCArKysrKystLS0tPGJyPiBzeXMvbmV0aW5ldC9jYy9j Y19uZXdyZW5vLmMgfCAxMCArKysrKystLS0tPGJyPiBzeXMvbmV0aW5ldC9jYy9jY192ZWdhcy5j Jm5ic3A7Jm5ic3A7IHwgMTMgKysrKysrKy0tLS0tLTxicj4gMTAgZmlsZXMgY2hhbmdlZCwgNjYg aW5zZXJ0aW9ucygrKSwgNTYgZGVsZXRpb25zKC0pPGJyPjxicj5kaWZmIC0tZ2l0IGEvc3lzL25l dGluZXQvY2MvY2MuYyBiL3N5cy9uZXRpbmV0L2NjL2NjLmM8YnI+aW5kZXggYzI5NjViMWU2YTQ4 Li45MzA4YjVmOGQ3NjQgMTAwNjQ0PGJyPi0tLSBhL3N5cy9uZXRpbmV0L2NjL2NjLmM8YnI+Kysr IGIvc3lzL25ldGluZXQvY2MvY2MuYzxicj5AQCAtNTA1LDcgKzUwNSw3IEBAIG5ld3Jlbm9fY2Nf Y29uZ19zaWduYWwoc3RydWN0IGNjX3ZhciAqY2N2LCB1aW50MzJfdCB0eXBlKTxicj4gfTxicj4g PGJyPiZuYnNwO3ZvaWQ8YnI+LW5ld3Jlbm9fY2NfYWNrX3JlY2VpdmVkKHN0cnVjdCBjY192YXIg KmNjdiwgdWludDE2X3QgdHlwZSk8YnI+K25ld3Jlbm9fY2NfYWNrX3JlY2VpdmVkKHN0cnVjdCBj Y192YXIgKmNjdiwgY2NzaWduYWxfdCB0eXBlKTxicj4gezxicj4gJm5ic3A7Jm5ic3A7Jm5ic3A7 Jm5ic3A7IGlmICh0eXBlID09IENDX0FDSyAmYW1wOyZhbXA7ICFJTl9SRUNPVkVSWShDQ1YoY2N2 LCB0X2ZsYWdzKSkgJmFtcDsmYW1wOzxicj4gJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7ICZuYnNw OyZuYnNwOyZuYnNwOyZuYnNwOyhjY3YtJmd0O2ZsYWdzICZhbXA7IENDRl9DV05EX0xJTUlURUQp KSB7PGJyPmRpZmYgLS1naXQgYS9zeXMvbmV0aW5ldC9jYy9jYy5oIGIvc3lzL25ldGluZXQvY2Mv Y2MuaDxicj5pbmRleCA5NTcxZGE1MGIyYzcuLjViMmNiNThhMjRhMCAxMDA2NDQ8YnI+LS0tIGEv c3lzL25ldGluZXQvY2MvY2MuaDxicj4rKysgYi9zeXMvbmV0aW5ldC9jYy9jYy5oPGJyPkBAIC0x MjEsMjUgKzEyMSwyNSBAQCBzdHJ1Y3QgY2NfdmFyIHs8YnI+ICNkZWZpbmUgQ0NGX0hZU1RBUlRf Q0FOX1NIX0NXTkQmbmJzcDsmbmJzcDsmbmJzcDsgMHgwODAwJm5ic3A7IC8qIENhbiBoeXN0YXJ0 IHdoZW4gZ29pbmcgQ1NTIC0mZ3Q7IENBIHNsYW0gdGhlIGN3bmQgKi88YnI+ICNkZWZpbmUgQ0NG X0hZU1RBUlRfQ09OU19TU1RIJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7IDB4MTAwMCZu YnNwOyAvKiBTaG91bGQgaHlzdGFydCB1c2UgdGhlIG1vcmUgY29uc2VydmF0aXZlIHNzdGhyZXNo ICovPGJyPiA8YnI+LS8qIEFDSyB0eXBlcyBwYXNzZWQgdG8gdGhlIGFja19yZWNlaXZlZCgpIGhv b2suICovPGJyPi0jZGVmaW5lJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7IENDX0FDSyZuYnNwOyZu YnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyAweDAwMDEmbmJzcDsgLyog UmVndWxhciBpbiBzZXF1ZW5jZSBBQ0suICovPGJyPi0jZGVmaW5lJm5ic3A7Jm5ic3A7Jm5ic3A7 Jm5ic3A7IENDX0RVUEFDSyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyAweDAwMDImbmJz cDsgLyogRHVwbGljYXRlIEFDSy4gKi88YnI+LSNkZWZpbmUmbmJzcDsmbmJzcDsmbmJzcDsmbmJz cDsgQ0NfUEFSVElBTEFDSyZuYnNwOyAweDAwMDQmbmJzcDsgLyogTm90IHlldC4gKi88YnI+LSNk ZWZpbmUmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgQ0NfU0FDSyZuYnNwOyZuYnNwOyZuYnNwOyZu YnNwOyZuYnNwOyZuYnNwOyZuYnNwOyAweDAwMDgmbmJzcDsgLyogTm90IHlldC4gKi88YnI+K3R5 cGVkZWYgZW51bSB7PGJyPismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgLyogQUNLIHR5cGVzIHBh c3NlZCB0byB0aGUgYWNrX3JlY2VpdmVkKCkgaG9vay4gKi88YnI+KyZuYnNwOyZuYnNwOyZuYnNw OyZuYnNwOyBDQ19BQ0sgPSZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyAweDAw MDEsIC8qIFJlZ3VsYXIgaW4gc2VxdWVuY2UgQUNLLiAqLzxicj4rJm5ic3A7Jm5ic3A7Jm5ic3A7 Jm5ic3A7IENDX0RVUEFDSyA9Jm5ic3A7Jm5ic3A7Jm5ic3A7IDB4MDAwMiwgLyogRHVwbGljYXRl IEFDSy4gKi88YnI+KyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBDQ19QQVJUSUFMQUNLID0gMHgw MDA0LCAvKiBOb3QgeWV0LiAqLzxicj4rJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7IENDX1NBQ0sg PSZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyAweDAwMDgsIC8qIE5vdCB5ZXQuICovPGJy PismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgLyogQ29uZ2VzdGlvbiBzaWduYWwgdHlwZXMgcGFz c2VkIHRvIHRoZSBjb25nX3NpZ25hbCgpIGhvb2suICovPGJyPismbmJzcDsmbmJzcDsmbmJzcDsm bmJzcDsgQ0NfRUNOID0mbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgMHgwMTAw LCAvKiBFQ04gbWFya2VkIHBhY2tldCByZWNlaXZlZC4gKi88YnI+KyZuYnNwOyZuYnNwOyZuYnNw OyZuYnNwOyBDQ19SVE8gPSZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyAweDAy MDAsIC8qIFJUTyBmaXJlZC4gKi88YnI+KyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBDQ19SVE9f RVJSID0mbmJzcDsmbmJzcDsgMHgwNDAwLCAvKiBSVE8gZmlyZWQgaW4gZXJyb3IuICovPGJyPism bmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgQ0NfTkRVUEFDSyA9Jm5ic3A7Jm5ic3A7IDB4MDgwMCwg LyogVGhyZXNob2xkIG9mIGR1cGFjaydzIHJlYWNoZWQuICovPGJyPismbmJzcDsmbmJzcDsmbmJz cDsmbmJzcDsgLyo8YnI+KyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyAgKiBUaGUgaGlnaGVzdCBv cmRlciA4IGJpdHMgKDB4MDEwMDAwMDAgLSAweDgwMDAwMDAwKSBhcmUgcmVzZXJ2ZWQ8YnI+KyZu YnNwOyZuYnNwOyZuYnNwOyZuYnNwOyAgKiBmb3IgQ0MgYWxnb3MgdG8gZGVjbGFyZSB0aGVpciBv d24gY29uZ2VzdGlvbiBzaWduYWwgdHlwZXMuPGJyPismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsg ICovPGJyPismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgQ0NfU0lHUFJJVk1BU0sgPSAweEZGMDAw MDAwJm5ic3A7Jm5ic3A7Jm5ic3A7IC8qIE1hc2sgdG8gY2hlY2sgaWYgc2lnIGlzIHByaXZhdGUu ICovPGJyPit9IGNjc2lnbmFsX3Q7PGJyPiAjZW5kaWYgLyogZGVmaW5lZChfS0VSTkVMKSB8fCBk ZWZpbmVkKF9XQU5UX1RDUENCKSAqLzxicj4gPGJyPi0vKjxicj4tICogQ29uZ2VzdGlvbiBzaWdu YWwgdHlwZXMgcGFzc2VkIHRvIHRoZSBjb25nX3NpZ25hbCgpIGhvb2suIFRoZSBoaWdoZXN0IG9y ZGVyIDg8YnI+LSAqIGJpdHMgKDB4MDEwMDAwMDAgLSAweDgwMDAwMDAwKSBhcmUgcmVzZXJ2ZWQg Zm9yIENDIGFsZ29zIHRvIGRlY2xhcmUgdGhlaXIgb3duPGJyPi0gKiBjb25nZXN0aW9uIHNpZ25h bCB0eXBlcy48YnI+LSAqLzxicj4tI2RlZmluZSZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBDQ19F Q04mbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgMHgwMDAw MDAwMSZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyAvKiBFQ04gbWFya2VkIHBhY2tldCByZWNlaXZl ZC4gKi88YnI+LSNkZWZpbmUmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgQ0NfUlRPJm5ic3A7Jm5i c3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7IDB4MDAwMDAwMDImbmJzcDsm bmJzcDsmbmJzcDsmbmJzcDsgLyogUlRPIGZpcmVkLiAqLzxicj4tI2RlZmluZSZuYnNwOyZuYnNw OyZuYnNwOyZuYnNwOyBDQ19SVE9fRVJSJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7IDB4MDAwMDAw MDQmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgLyogUlRPIGZpcmVkIGluIGVycm9yLiAqLzxicj4t I2RlZmluZSZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBDQ19ORFVQQUNLJm5ic3A7Jm5ic3A7Jm5i c3A7Jm5ic3A7IDB4MDAwMDAwMDgmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgLyogVGhyZXNob2xk IG9mIGR1cGFjaydzIHJlYWNoZWQuICovPGJyPi08YnI+LSNkZWZpbmUmbmJzcDsmbmJzcDsmbmJz cDsmbmJzcDsgQ0NfU0lHUFJJVk1BU0sgMHhGRjAwMDAwMCZuYnNwOyZuYnNwOyZuYnNwOyZuYnNw OyAvKiBNYXNrIHRvIGNoZWNrIGlmIHNpZyBpcyBwcml2YXRlLiAqLzxicj4tPGJyPiAjaWZkZWYg X0tFUk5FTDxicj4gLyo8YnI+Jm5ic3A7ICogU3RydWN0dXJlIHRvIGhvbGQgZGF0YSBhbmQgZnVu Y3Rpb24gcG9pbnRlcnMgdGhhdCB0b2dldGhlciByZXByZXNlbnQgYTxicj5AQCAtMTc1LDEwICsx NzUsMTAgQEAgc3RydWN0IGNjX2FsZ28gezxicj4gJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7IHZv aWQmbmJzcDsmbmJzcDsmbmJzcDsgKCpjb25uX2luaXQpKHN0cnVjdCBjY192YXIgKmNjdik7PGJy PiA8YnI+Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7IC8qIENhbGxlZCBvbiByZWNlaXB0 IG9mIGFuIGFjay4gKi88YnI+LSZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyB2b2lkJm5ic3A7Jm5i c3A7Jm5ic3A7ICgqYWNrX3JlY2VpdmVkKShzdHJ1Y3QgY2NfdmFyICpjY3YsIHVpbnQxNl90IHR5 cGUpOzxicj4rJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7IHZvaWQmbmJzcDsmbmJzcDsmbmJzcDsg KCphY2tfcmVjZWl2ZWQpKHN0cnVjdCBjY192YXIgKmNjdiwgY2NzaWduYWxfdCB0eXBlKTs8YnI+ IDxicj4mbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgLyogQ2FsbGVkIG9uIGRldGVjdGlv biBvZiBhIGNvbmdlc3Rpb24gc2lnbmFsLiAqLzxicj4tJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7 IHZvaWQmbmJzcDsmbmJzcDsmbmJzcDsgKCpjb25nX3NpZ25hbCkoc3RydWN0IGNjX3ZhciAqY2N2 LCB1aW50MzJfdCB0eXBlKTs8YnI+KyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyB2b2lkJm5ic3A7 Jm5ic3A7Jm5ic3A7ICgqY29uZ19zaWduYWwpKHN0cnVjdCBjY192YXIgKmNjdiwgY2NzaWduYWxf dCB0eXBlKTs8YnI+IDxicj4mbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgLyogQ2FsbGVk IGFmdGVyIGV4aXRpbmcgY29uZ2VzdGlvbiByZWNvdmVyeS4gKi88YnI+ICZuYnNwOyZuYnNwOyZu YnNwOyZuYnNwOyB2b2lkJm5ic3A7Jm5ic3A7Jm5ic3A7ICgqcG9zdF9yZWNvdmVyeSkoc3RydWN0 IGNjX3ZhciAqY2N2KTs8YnI+QEAgLTIzNiw4ICsyMzYsOCBAQCBleHRlcm4gc3RydWN0IHJ3bG9j ayBjY19saXN0X2xvY2s7PGJyPiZuYnNwOyAqLzxicj4gdm9pZCBuZXdyZW5vX2NjX3Bvc3RfcmVj b3Zlcnkoc3RydWN0IGNjX3ZhciAqKTs8YnI+IHZvaWQgbmV3cmVub19jY19hZnRlcl9pZGxlKHN0 cnVjdCBjY192YXIgKik7PGJyPi12b2lkIG5ld3Jlbm9fY2NfY29uZ19zaWduYWwoc3RydWN0IGNj X3ZhciAqLCB1aW50MzJfdCApOzxicj4tdm9pZCBuZXdyZW5vX2NjX2Fja19yZWNlaXZlZChzdHJ1 Y3QgY2NfdmFyICosIHVpbnQxNl90KTs8YnI+K3ZvaWQgbmV3cmVub19jY19jb25nX3NpZ25hbChz dHJ1Y3QgY2NfdmFyICosIGNjc2lnbmFsX3QpOzxicj4rdm9pZCBuZXdyZW5vX2NjX2Fja19yZWNl aXZlZChzdHJ1Y3QgY2NfdmFyICosIGNjc2lnbmFsX3QpOzxicj4gPGJyPiZuYnNwOy8qIENhbGxl ZCB0byB0ZW1wb3JhcmlseSBrZWVwIGFuIGFsZ28gZnJvbSBnb2luZyBhd2F5IGR1cmluZyBjaGFu Z2UgKi88YnI+IHZvaWQgY2NfcmVmZXIoc3RydWN0IGNjX2FsZ28gKmFsZ28pOzxicj5kaWZmIC0t Z2l0IGEvc3lzL25ldGluZXQvY2MvY2NfY2RnLmMgYi9zeXMvbmV0aW5ldC9jYy9jY19jZGcuYzxi cj5pbmRleCAzZjIzYzQwOTExNzAuLjFlOTIzNmY4NzhkNCAxMDA2NDQ8YnI+LS0tIGEvc3lzL25l dGluZXQvY2MvY2NfY2RnLmM8YnI+KysrIGIvc3lzL25ldGluZXQvY2MvY2NfY2RnLmM8YnI+QEAg LTIyMSw4ICsyMjEsOCBAQCBzdGF0aWMgaW50IGNkZ19tb2RfZGVzdHJveSh2b2lkKTs8YnI+IHN0 YXRpYyB2b2lkIGNkZ19jb25uX2luaXQoc3RydWN0IGNjX3ZhciAqY2N2KTs8YnI+IHN0YXRpYyBp bnQgY2RnX2NiX2luaXQoc3RydWN0IGNjX3ZhciAqY2N2LCB2b2lkICpwdHIpOzxicj4gc3RhdGlj IHZvaWQgY2RnX2NiX2Rlc3Ryb3koc3RydWN0IGNjX3ZhciAqY2N2KTs8YnI+LXN0YXRpYyB2b2lk IGNkZ19jb25nX3NpZ25hbChzdHJ1Y3QgY2NfdmFyICpjY3YsIHVpbnQzMl90IHNpZ25hbF90eXBl KTs8YnI+LXN0YXRpYyB2b2lkIGNkZ19hY2tfcmVjZWl2ZWQoc3RydWN0IGNjX3ZhciAqY2N2LCB1 aW50MTZfdCBhY2tfdHlwZSk7PGJyPitzdGF0aWMgdm9pZCBjZGdfY29uZ19zaWduYWwoc3RydWN0 IGNjX3ZhciAqY2N2LCBjY3NpZ25hbF90IHNpZ25hbF90eXBlKTs8YnI+K3N0YXRpYyB2b2lkIGNk Z19hY2tfcmVjZWl2ZWQoc3RydWN0IGNjX3ZhciAqY2N2LCBjY3NpZ25hbF90IGFja190eXBlKTs8 YnI+IHN0YXRpYyBzaXplX3QgY2RnX2RhdGFfc3oodm9pZCk7PGJyPiA8YnI+Jm5ic3A7c3RydWN0 IGNjX2FsZ28gY2RnX2NjX2FsZ28gPSB7PGJyPkBAIC00NTAsMTEgKzQ1MCwxMSBAQCBjZGdfd2lu ZG93X2luY3JlYXNlKHN0cnVjdCBjY192YXIgKmNjdiwgaW50IG5ld19tZWFzdXJlbWVudCk8YnI+ IH08YnI+IDxicj4mbmJzcDtzdGF0aWMgdm9pZDxicj4tY2RnX2Nvbmdfc2lnbmFsKHN0cnVjdCBj Y192YXIgKmNjdiwgdWludDMyX3Qgc2lnbmFsX3R5cGUpPGJyPitjZGdfY29uZ19zaWduYWwoc3Ry dWN0IGNjX3ZhciAqY2N2LCBjY3NpZ25hbF90IHNpZ25hbF90eXBlKTxicj4gezxicj4gJm5ic3A7 Jm5ic3A7Jm5ic3A7Jm5ic3A7IHN0cnVjdCBjZGcgKmNkZ19kYXRhID0gY2N2LSZndDtjY19kYXRh Ozxicj4gPGJyPi0mbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgc3dpdGNoKHNpZ25hbF90eXBlKSB7 PGJyPismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgc3dpdGNoKChpbnQpc2lnbmFsX3R5cGUpIHs8 YnI+ICZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBjYXNlIENDX0NER19ERUxBWTo8YnI+ICZuYnNw OyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZu YnNwOyBDQ1YoY2N2LCBzbmRfc3N0aHJlc2gpID0gY2RnX3dpbmRvd19kZWNyZWFzZShjY3YsPGJy PiAmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsm bmJzcDsmbmJzcDsgJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Q0NWKGNjdiwgc25kX2N3bmQpLCBW X2NkZ19iZXRhX2RlbGF5KTs8YnI+QEAgLTU3MSw3ICs1NzEsNyBAQCBjYWxjX21vdmluZ19hdmVy YWdlKHN0cnVjdCBjZGcgKmNkZ19kYXRhLCBsb25nIHFkaWZmX21heCwgbG9uZyBxZGlmZl9taW4p PGJyPiB9PGJyPiA8YnI+Jm5ic3A7c3RhdGljIHZvaWQ8YnI+LWNkZ19hY2tfcmVjZWl2ZWQoc3Ry dWN0IGNjX3ZhciAqY2N2LCB1aW50MTZfdCBhY2tfdHlwZSk8YnI+K2NkZ19hY2tfcmVjZWl2ZWQo c3RydWN0IGNjX3ZhciAqY2N2LCBjY3NpZ25hbF90IGFja190eXBlKTxicj4gezxicj4gJm5ic3A7 Jm5ic3A7Jm5ic3A7Jm5ic3A7IHN0cnVjdCBjZGcgKmNkZ19kYXRhOzxicj4gJm5ic3A7Jm5ic3A7 Jm5ic3A7Jm5ic3A7IHN0cnVjdCBlcnR0ICplX3Q7PGJyPmRpZmYgLS1naXQgYS9zeXMvbmV0aW5l dC9jYy9jY19jaGQuYyBiL3N5cy9uZXRpbmV0L2NjL2NjX2NoZC5jPGJyPmluZGV4IGM2NDRkOWIy Y2RiOC4uNTIwNDhhN2MwNWFlIDEwMDY0NDxicj4tLS0gYS9zeXMvbmV0aW5ldC9jYy9jY19jaGQu Yzxicj4rKysgYi9zeXMvbmV0aW5ldC9jYy9jY19jaGQuYzxicj5AQCAtODgsMTAgKzg4LDEwIEBA PGJyPiAvKiBMYXJnZXN0IHBvc3NpYmxlIG51bWJlciByZXR1cm5lZCBieSByYW5kb20oKS4gKi88 YnI+ICNkZWZpbmUmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgUkFORE9NX01BWCZuYnNwOyZuYnNw OyZuYnNwOyZuYnNwOyBJTlRfTUFYPGJyPiA8YnI+LXN0YXRpYyB2b2lkIGNoZF9hY2tfcmVjZWl2 ZWQoc3RydWN0IGNjX3ZhciAqY2N2LCB1aW50MTZfdCBhY2tfdHlwZSk7PGJyPitzdGF0aWMgdm9p ZCBjaGRfYWNrX3JlY2VpdmVkKHN0cnVjdCBjY192YXIgKmNjdiwgY2NzaWduYWxfdCBhY2tfdHlw ZSk7PGJyPiBzdGF0aWMgdm9pZCBjaGRfY2JfZGVzdHJveShzdHJ1Y3QgY2NfdmFyICpjY3YpOzxi cj4gc3RhdGljIGludCZuYnNwOyBjaGRfY2JfaW5pdChzdHJ1Y3QgY2NfdmFyICpjY3YsIHZvaWQg KnB0cik7PGJyPi1zdGF0aWMgdm9pZCBjaGRfY29uZ19zaWduYWwoc3RydWN0IGNjX3ZhciAqY2N2 LCB1aW50MzJfdCBzaWduYWxfdHlwZSk7PGJyPitzdGF0aWMgdm9pZCBjaGRfY29uZ19zaWduYWwo c3RydWN0IGNjX3ZhciAqY2N2LCBjY3NpZ25hbF90IHNpZ25hbF90eXBlKTs8YnI+IHN0YXRpYyB2 b2lkIGNoZF9jb25uX2luaXQoc3RydWN0IGNjX3ZhciAqY2N2KTs8YnI+IHN0YXRpYyBpbnQmbmJz cDsgY2hkX21vZF9pbml0KHZvaWQpOzxicj4gc3RhdGljIHNpemVfdCZuYnNwOyZuYnNwOyZuYnNw OyZuYnNwOyZuYnNwOyZuYnNwOyBjaGRfZGF0YV9zeih2b2lkKTs8YnI+QEAgLTIzNSw3ICsyMzUs NyBAQCBjaGRfd2luZG93X2luY3JlYXNlKHN0cnVjdCBjY192YXIgKmNjdiwgaW50IG5ld19tZWFz dXJlbWVudCk8YnI+Jm5ic3A7ICogYWNrX3R5cGUgPT0gQ0NfQUNLLjxicj4mbmJzcDsgKi88YnI+ IHN0YXRpYyB2b2lkPGJyPi1jaGRfYWNrX3JlY2VpdmVkKHN0cnVjdCBjY192YXIgKmNjdiwgdWlu dDE2X3QgYWNrX3R5cGUpPGJyPitjaGRfYWNrX3JlY2VpdmVkKHN0cnVjdCBjY192YXIgKmNjdiwg Y2NzaWduYWxfdCBhY2tfdHlwZSk8YnI+IHs8YnI+ICZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBz dHJ1Y3QgY2hkICpjaGRfZGF0YTs8YnI+ICZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBzdHJ1Y3Qg ZXJ0dCAqZV90Ozxicj5AQCAtMzM2LDcgKzMzNiw3IEBAIGNoZF9jYl9pbml0KHN0cnVjdCBjY192 YXIgKmNjdiwgdm9pZCAqcHRyKTxicj4gfTxicj4gPGJyPiZuYnNwO3N0YXRpYyB2b2lkPGJyPi1j aGRfY29uZ19zaWduYWwoc3RydWN0IGNjX3ZhciAqY2N2LCB1aW50MzJfdCBzaWduYWxfdHlwZSk8 YnI+K2NoZF9jb25nX3NpZ25hbChzdHJ1Y3QgY2NfdmFyICpjY3YsIGNjc2lnbmFsX3Qgc2lnbmFs X3R5cGUpPGJyPiB7PGJyPiAmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgc3RydWN0IGVydHQgKmVf dDs8YnI+ICZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBzdHJ1Y3QgY2hkICpjaGRfZGF0YTs8YnI+ QEAgLTM0Niw3ICszNDYsNyBAQCBjaGRfY29uZ19zaWduYWwoc3RydWN0IGNjX3ZhciAqY2N2LCB1 aW50MzJfdCBzaWduYWxfdHlwZSk8YnI+ICZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBjaGRfZGF0 YSA9IGNjdi0mZ3Q7Y2NfZGF0YTs8YnI+ICZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBxZGx5ID0g aW1heChlX3QtJmd0O3J0dCwgY2hkX2RhdGEtJmd0O21heHJ0dF9pbl9ydHQpIC0gZV90LSZndDtt aW5ydHQ7PGJyPiA8YnI+LSZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBzd2l0Y2goc2lnbmFsX3R5 cGUpIHs8YnI+KyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBzd2l0Y2goKGludClzaWduYWxfdHlw ZSkgezxicj4gJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7IGNhc2UgQ0NfQ0hEX0RFTEFZOjxicj4g Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5i c3A7Jm5ic3A7IGNoZF93aW5kb3dfZGVjcmVhc2UoY2N2KTsgLyogU2V0IG5ldyBzc3RocmVzaC4g Ki88YnI+ICZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZu YnNwOyZuYnNwOyZuYnNwOyBDQ1YoY2N2LCBzbmRfY3duZCkgPSBDQ1YoY2N2LCBzbmRfc3N0aHJl c2gpOzxicj5AQCAtMzg3LDYgKzM4Nyw3IEBAIGNoZF9jb25nX3NpZ25hbChzdHJ1Y3QgY2NfdmFy ICpjY3YsIHVpbnQzMl90IHNpZ25hbF90eXBlKTxicj4gPGJyPiZuYnNwOyZuYnNwOyZuYnNwOyZu YnNwOyZuYnNwOyBkZWZhdWx0Ojxicj4gJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5i c3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7IG5ld3Jlbm9fY2NfY29uZ19zaWduYWwo Y2N2LCBzaWduYWxfdHlwZSk7PGJyPismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJz cDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgYnJlYWs7PGJyPiAmbmJzcDsmbmJzcDsm bmJzcDsmbmJzcDsgfTxicj4gfTxicj4gPGJyPmRpZmYgLS1naXQgYS9zeXMvbmV0aW5ldC9jYy9j Y19jdWJpYy5jIGIvc3lzL25ldGluZXQvY2MvY2NfY3ViaWMuYzxicj5pbmRleCBlYjE1ODdkNDQ0 MjcuLmE5Yzc1OTJiODBjYSAxMDA2NDQ8YnI+LS0tIGEvc3lzL25ldGluZXQvY2MvY2NfY3ViaWMu Yzxicj4rKysgYi9zeXMvbmV0aW5ldC9jYy9jY19jdWJpYy5jPGJyPkBAIC03MywxMCArNzMsMTAg QEA8YnI+ICNpbmNsdWRlICZsdDtuZXRpbmV0L2NjL2NjX2N1YmljLmgmZ3Q7PGJyPiAjaW5jbHVk ZSAmbHQ7bmV0aW5ldC9jYy9jY19tb2R1bGUuaCZndDs8YnI+IDxicj4tc3RhdGljIHZvaWQgY3Vi aWNfYWNrX3JlY2VpdmVkKHN0cnVjdCBjY192YXIgKmNjdiwgdWludDE2X3QgdHlwZSk7PGJyPitz dGF0aWMgdm9pZCBjdWJpY19hY2tfcmVjZWl2ZWQoc3RydWN0IGNjX3ZhciAqY2N2LCBjY3NpZ25h bF90IHR5cGUpOzxicj4gc3RhdGljIHZvaWQgY3ViaWNfY2JfZGVzdHJveShzdHJ1Y3QgY2NfdmFy ICpjY3YpOzxicj4gc3RhdGljIGludCZuYnNwOyBjdWJpY19jYl9pbml0KHN0cnVjdCBjY192YXIg KmNjdiwgdm9pZCAqcHRyKTs8YnI+LXN0YXRpYyB2b2lkIGN1YmljX2Nvbmdfc2lnbmFsKHN0cnVj dCBjY192YXIgKmNjdiwgdWludDMyX3QgdHlwZSk7PGJyPitzdGF0aWMgdm9pZCBjdWJpY19jb25n X3NpZ25hbChzdHJ1Y3QgY2NfdmFyICpjY3YsIGNjc2lnbmFsX3QgdHlwZSk7PGJyPiBzdGF0aWMg dm9pZCBjdWJpY19jb25uX2luaXQoc3RydWN0IGNjX3ZhciAqY2N2KTs8YnI+IHN0YXRpYyBpbnQm bmJzcDsgY3ViaWNfbW9kX2luaXQodm9pZCk7PGJyPiBzdGF0aWMgdm9pZCBjdWJpY19wb3N0X3Jl Y292ZXJ5KHN0cnVjdCBjY192YXIgKmNjdik7PGJyPkBAIC0yMzMsNyArMjMzLDcgQEAgY3ViaWNf ZG9lc19zbG93X3N0YXJ0KHN0cnVjdCBjY192YXIgKmNjdiwgc3RydWN0IGN1YmljICpjdWJpY2Qp PGJyPiB9PGJyPiA8YnI+Jm5ic3A7c3RhdGljIHZvaWQ8YnI+LWN1YmljX2Fja19yZWNlaXZlZChz dHJ1Y3QgY2NfdmFyICpjY3YsIHVpbnQxNl90IHR5cGUpPGJyPitjdWJpY19hY2tfcmVjZWl2ZWQo c3RydWN0IGNjX3ZhciAqY2N2LCBjY3NpZ25hbF90IHR5cGUpPGJyPiB7PGJyPiAmbmJzcDsmbmJz cDsmbmJzcDsmbmJzcDsgc3RydWN0IGN1YmljICpjdWJpY19kYXRhOzxicj4gJm5ic3A7Jm5ic3A7 Jm5ic3A7Jm5ic3A7IHVuc2lnbmVkIGxvbmcgV19lc3QsIFdfY3ViaWM7PGJyPkBAIC00MTcsNyAr NDE3LDcgQEAgY3ViaWNfY2JfaW5pdChzdHJ1Y3QgY2NfdmFyICpjY3YsIHZvaWQgKnB0cik8YnI+ Jm5ic3A7ICogUGVyZm9ybSBhbnkgbmVjZXNzYXJ5IHRhc2tzIGJlZm9yZSB3ZSBlbnRlciBjb25n ZXN0aW9uIHJlY292ZXJ5Ljxicj4mbmJzcDsgKi88YnI+IHN0YXRpYyB2b2lkPGJyPi1jdWJpY19j b25nX3NpZ25hbChzdHJ1Y3QgY2NfdmFyICpjY3YsIHVpbnQzMl90IHR5cGUpPGJyPitjdWJpY19j b25nX3NpZ25hbChzdHJ1Y3QgY2NfdmFyICpjY3YsIGNjc2lnbmFsX3QgdHlwZSk8YnI+IHs8YnI+ ICZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBzdHJ1Y3QgY3ViaWMgKmN1YmljX2RhdGE7PGJyPiAm bmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgdWludDMyX3QgbXNzLCBwaXBlOzxicj5AQCAtNTAzLDYg KzUwMyw4IEBAIGN1YmljX2Nvbmdfc2lnbmFsKHN0cnVjdCBjY192YXIgKmNjdiwgdWludDMyX3Qg dHlwZSk8YnI+ICZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNw OyZuYnNwOyZuYnNwOyZuYnNwOyBjdWJpY19kYXRhLSZndDtjd25kX2Vwb2NoID0gY3ViaWNfZGF0 YS0mZ3Q7dW5kb19jd25kX2Vwb2NoOzxicj4gJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7 Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7IGN1YmljX2RhdGEtJmd0O3RfZXBv Y2ggPSBjdWJpY19kYXRhLSZndDt1bmRvX3RfZXBvY2g7PGJyPiAmbmJzcDsmbmJzcDsmbmJzcDsm bmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgYnJlYWs7PGJy PismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgZGVmYXVsdDo8YnI+KyZuYnNwOyZuYnNwOyZuYnNw OyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBicmVhazs8 YnI+ICZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyB9PGJyPiB9PGJyPiA8YnI+ZGlmZiAtLWdpdCBh L3N5cy9uZXRpbmV0L2NjL2NjX2RjdGNwLmMgYi9zeXMvbmV0aW5ldC9jYy9jY19kY3RjcC5jPGJy PmluZGV4IGFlMGE1NjgzOTQ0OS4uMzc0ZGI5OGM1ZTYwIDEwMDY0NDxicj4tLS0gYS9zeXMvbmV0 aW5ldC9jYy9jY19kY3RjcC5jPGJyPisrKyBiL3N5cy9uZXRpbmV0L2NjL2NjX2RjdGNwLmM8YnI+ QEAgLTc5LDExICs3OSwxMSBAQCBzdHJ1Y3QgZGN0Y3Agezxicj4gJm5ic3A7Jm5ic3A7Jm5ic3A7 Jm5ic3A7IHVpbnQzMl90IG51bV9jb25nX2V2ZW50czsgLyogIyBvZiBjb25nZXN0aW9uIGV2ZW50 cyAqLzxicj4gfTs8YnI+IDxicj4tc3RhdGljIHZvaWQgZGN0Y3BfYWNrX3JlY2VpdmVkKHN0cnVj dCBjY192YXIgKmNjdiwgdWludDE2X3QgdHlwZSk7PGJyPitzdGF0aWMgdm9pZCBkY3RjcF9hY2tf cmVjZWl2ZWQoc3RydWN0IGNjX3ZhciAqY2N2LCBjY3NpZ25hbF90IHR5cGUpOzxicj4gc3RhdGlj IHZvaWQgZGN0Y3BfYWZ0ZXJfaWRsZShzdHJ1Y3QgY2NfdmFyICpjY3YpOzxicj4gc3RhdGljIHZv aWQgZGN0Y3BfY2JfZGVzdHJveShzdHJ1Y3QgY2NfdmFyICpjY3YpOzxicj4gc3RhdGljIGludCZu YnNwOyBkY3RjcF9jYl9pbml0KHN0cnVjdCBjY192YXIgKmNjdiwgdm9pZCAqcHRyKTs8YnI+LXN0 YXRpYyB2b2lkIGRjdGNwX2Nvbmdfc2lnbmFsKHN0cnVjdCBjY192YXIgKmNjdiwgdWludDMyX3Qg dHlwZSk7PGJyPitzdGF0aWMgdm9pZCBkY3RjcF9jb25nX3NpZ25hbChzdHJ1Y3QgY2NfdmFyICpj Y3YsIGNjc2lnbmFsX3QgdHlwZSk7PGJyPiBzdGF0aWMgdm9pZCBkY3RjcF9jb25uX2luaXQoc3Ry dWN0IGNjX3ZhciAqY2N2KTs8YnI+IHN0YXRpYyB2b2lkIGRjdGNwX3Bvc3RfcmVjb3Zlcnkoc3Ry dWN0IGNjX3ZhciAqY2N2KTs8YnI+IHN0YXRpYyB2b2lkIGRjdGNwX2VjbnBrdF9oYW5kbGVyKHN0 cnVjdCBjY192YXIgKmNjdik7PGJyPkBAIC0xMDQsNyArMTA0LDcgQEAgc3RydWN0IGNjX2FsZ28g ZGN0Y3BfY2NfYWxnbyA9IHs8YnI+IH07PGJyPiA8YnI+Jm5ic3A7c3RhdGljIHZvaWQ8YnI+LWRj dGNwX2Fja19yZWNlaXZlZChzdHJ1Y3QgY2NfdmFyICpjY3YsIHVpbnQxNl90IHR5cGUpPGJyPitk Y3RjcF9hY2tfcmVjZWl2ZWQoc3RydWN0IGNjX3ZhciAqY2N2LCBjY3NpZ25hbF90IHR5cGUpPGJy PiB7PGJyPiAmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgc3RydWN0IGRjdGNwICpkY3RjcF9kYXRh Ozxicj4gJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7IGludCBieXRlc19hY2tlZCA9IDA7PGJyPkBA IC0yMzcsNyArMjM3LDcgQEAgZGN0Y3BfY2JfaW5pdChzdHJ1Y3QgY2NfdmFyICpjY3YsIHZvaWQg KnB0cik8YnI+Jm5ic3A7ICogUGVyZm9ybSBhbnkgbmVjZXNzYXJ5IHRhc2tzIGJlZm9yZSB3ZSBl bnRlciBjb25nZXN0aW9uIHJlY292ZXJ5Ljxicj4mbmJzcDsgKi88YnI+IHN0YXRpYyB2b2lkPGJy Pi1kY3RjcF9jb25nX3NpZ25hbChzdHJ1Y3QgY2NfdmFyICpjY3YsIHVpbnQzMl90IHR5cGUpPGJy PitkY3RjcF9jb25nX3NpZ25hbChzdHJ1Y3QgY2NfdmFyICpjY3YsIGNjc2lnbmFsX3QgdHlwZSk8 YnI+IHs8YnI+ICZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBzdHJ1Y3QgZGN0Y3AgKmRjdGNwX2Rh dGE7PGJyPiAmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgdWludDMyX3QgY3dpbiwgbXNzLCBwaXBl Ozxicj5AQCAtMzA4LDYgKzMwOCw4IEBAIGRjdGNwX2Nvbmdfc2lnbmFsKHN0cnVjdCBjY192YXIg KmNjdiwgdWludDMyX3QgdHlwZSk8YnI+ICZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZu YnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNw OyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBkY3RjcF9kYXRhLSZndDtzYXZlX3NuZG54dCArPSBD Q1YoY2N2LCB0X21heHNlZyk7PGJyPiAmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJz cDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsm bmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgZGN0Y3BfZGF0YS0mZ3Q7bnVtX2NvbmdfZXZlbnRzKys7 PGJyPiAmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJz cDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsm bmJzcDsgYnJlYWs7PGJyPismbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJz cDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgZGVmYXVsdDo8YnI+KyZuYnNwOyZuYnNwOyZuYnNw OyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZu YnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBicmVhazs8YnI+ICZuYnNw OyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZu YnNwOyB9PGJyPiAmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgfSBlbHNlPGJyPiAmbmJzcDsmbmJz cDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsg bmV3cmVub19jY19jb25nX3NpZ25hbChjY3YsIHR5cGUpOzxicj5kaWZmIC0tZ2l0IGEvc3lzL25l dGluZXQvY2MvY2NfaGQuYyBiL3N5cy9uZXRpbmV0L2NjL2NjX2hkLmM8YnI+aW5kZXggMWE4YjYy Y2NmNDI2Li44MjQ4NjU2M2Y5N2UgMTAwNjQ0PGJyPi0tLSBhL3N5cy9uZXRpbmV0L2NjL2NjX2hk LmM8YnI+KysrIGIvc3lzL25ldGluZXQvY2MvY2NfaGQuYzxicj5AQCAtODAsNyArODAsNyBAQDxi cj4gLyogTGFyZ2VzdCBwb3NzaWJsZSBudW1iZXIgcmV0dXJuZWQgYnkgcmFuZG9tKCkuICovPGJy PiAjZGVmaW5lJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7IFJBTkRPTV9NQVgmbmJzcDsmbmJzcDsm bmJzcDsmbmJzcDsgSU5UX01BWDxicj4gPGJyPi1zdGF0aWMgdm9pZCBoZF9hY2tfcmVjZWl2ZWQo c3RydWN0IGNjX3ZhciAqY2N2LCB1aW50MTZfdCBhY2tfdHlwZSk7PGJyPitzdGF0aWMgdm9pZCBo ZF9hY2tfcmVjZWl2ZWQoc3RydWN0IGNjX3ZhciAqY2N2LCBjY3NpZ25hbF90IGFja190eXBlKTs8 YnI+IHN0YXRpYyBpbnQmbmJzcDsgaGRfbW9kX2luaXQodm9pZCk7PGJyPiBzdGF0aWMgc2l6ZV90 Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7IGhkX2RhdGFfc3oodm9pZCk7PGJy PiA8YnI+QEAgLTEzOCw3ICsxMzgsNyBAQCBzaG91bGRfYmFja29mZihpbnQgcWRseSwgaW50IG1h eHFkbHkpPGJyPiZuYnNwOyAqIGFzIE5ld1Jlbm8gaW4gYWxsIG90aGVyIGNpcmN1bXN0YW5jZXMu PGJyPiZuYnNwOyAqLzxicj4gc3RhdGljIHZvaWQ8YnI+LWhkX2Fja19yZWNlaXZlZChzdHJ1Y3Qg Y2NfdmFyICpjY3YsIHVpbnQxNl90IGFja190eXBlKTxicj4raGRfYWNrX3JlY2VpdmVkKHN0cnVj dCBjY192YXIgKmNjdiwgY2NzaWduYWxfdCBhY2tfdHlwZSk8YnI+IHs8YnI+ICZuYnNwOyZuYnNw OyZuYnNwOyZuYnNwOyBzdHJ1Y3QgZXJ0dCAqZV90Ozxicj4gJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5i c3A7IGludCBxZGx5Ozxicj5kaWZmIC0tZ2l0IGEvc3lzL25ldGluZXQvY2MvY2NfaHRjcC5jIGIv c3lzL25ldGluZXQvY2MvY2NfaHRjcC5jPGJyPmluZGV4IDQzMjI0NDQ2ZmQ4NC4uNDFjNTUyYTNi ZmEwIDEwMDY0NDxicj4tLS0gYS9zeXMvbmV0aW5ldC9jYy9jY19odGNwLmM8YnI+KysrIGIvc3lz L25ldGluZXQvY2MvY2NfaHRjcC5jPGJyPkBAIC0xMzYsMTAgKzEzNiwxMCBAQDxicj4gJm5ic3A7 Jm5ic3A7Jm5ic3A7Jm5ic3A7ICgoKGRpZmYpIC8gaHopICogKCgoZGlmZikgJmx0OyZsdDsgSFRD UF9BTFBIQV9JTkNfU0hJRlQpIC8gKDQgKiBoeikpKSBcPGJyPiApICZndDsmZ3Q7IEhUQ1BfQUxQ SEFfSU5DX1NISUZUKTxicj4gPGJyPi1zdGF0aWMgdm9pZCBodGNwX2Fja19yZWNlaXZlZChzdHJ1 Y3QgY2NfdmFyICpjY3YsIHVpbnQxNl90IHR5cGUpOzxicj4rc3RhdGljIHZvaWQgaHRjcF9hY2tf cmVjZWl2ZWQoc3RydWN0IGNjX3ZhciAqY2N2LCBjY3NpZ25hbF90IHR5cGUpOzxicj4gc3RhdGlj IHZvaWQgaHRjcF9jYl9kZXN0cm95KHN0cnVjdCBjY192YXIgKmNjdik7PGJyPiBzdGF0aWMgaW50 Jm5ic3A7IGh0Y3BfY2JfaW5pdChzdHJ1Y3QgY2NfdmFyICpjY3YsIHZvaWQgKnB0cik7PGJyPi1z dGF0aWMgdm9pZCBodGNwX2Nvbmdfc2lnbmFsKHN0cnVjdCBjY192YXIgKmNjdiwgdWludDMyX3Qg dHlwZSk7PGJyPitzdGF0aWMgdm9pZCBodGNwX2Nvbmdfc2lnbmFsKHN0cnVjdCBjY192YXIgKmNj diwgY2NzaWduYWxfdCB0eXBlKTs8YnI+IHN0YXRpYyBpbnQmbmJzcDsgaHRjcF9tb2RfaW5pdCh2 b2lkKTs8YnI+IHN0YXRpYyB2b2lkIGh0Y3BfcG9zdF9yZWNvdmVyeShzdHJ1Y3QgY2NfdmFyICpj Y3YpOzxicj4gc3RhdGljIHZvaWQgaHRjcF9yZWNhbGNfYWxwaGEoc3RydWN0IGNjX3ZhciAqY2N2 KTs8YnI+QEAgLTE5MCw3ICsxOTAsNyBAQCBzdHJ1Y3QgY2NfYWxnbyBodGNwX2NjX2FsZ28gPSB7 PGJyPiB9Ozxicj4gPGJyPiZuYnNwO3N0YXRpYyB2b2lkPGJyPi1odGNwX2Fja19yZWNlaXZlZChz dHJ1Y3QgY2NfdmFyICpjY3YsIHVpbnQxNl90IHR5cGUpPGJyPitodGNwX2Fja19yZWNlaXZlZChz dHJ1Y3QgY2NfdmFyICpjY3YsIGNjc2lnbmFsX3QgdHlwZSk8YnI+IHs8YnI+ICZuYnNwOyZuYnNw OyZuYnNwOyZuYnNwOyBzdHJ1Y3QgaHRjcCAqaHRjcF9kYXRhOzxicj4gPGJyPkBAIC0yNzgsNyAr Mjc4LDcgQEAgaHRjcF9jYl9pbml0KHN0cnVjdCBjY192YXIgKmNjdiwgdm9pZCAqcHRyKTxicj4m bmJzcDsgKiBQZXJmb3JtIGFueSBuZWNlc3NhcnkgdGFza3MgYmVmb3JlIHdlIGVudGVyIGNvbmdl c3Rpb24gcmVjb3ZlcnkuPGJyPiZuYnNwOyAqLzxicj4gc3RhdGljIHZvaWQ8YnI+LWh0Y3BfY29u Z19zaWduYWwoc3RydWN0IGNjX3ZhciAqY2N2LCB1aW50MzJfdCB0eXBlKTxicj4raHRjcF9jb25n X3NpZ25hbChzdHJ1Y3QgY2NfdmFyICpjY3YsIGNjc2lnbmFsX3QgdHlwZSk8YnI+IHs8YnI+ICZu YnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBzdHJ1Y3QgaHRjcCAqaHRjcF9kYXRhOzxicj4gJm5ic3A7 Jm5ic3A7Jm5ic3A7Jm5ic3A7IHVpbnQzMl90IG1zcywgcGlwZTs8YnI+QEAgLTM0NSw2ICszNDUs OCBAQCBodGNwX2Nvbmdfc2lnbmFsKHN0cnVjdCBjY192YXIgKmNjdiwgdWludDMyX3QgdHlwZSk8 YnI+ICZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNw OyZuYnNwOyZuYnNwOyBpZiAoQ0NWKGNjdiwgdF9yeHRzaGlmdCkgJmd0Oz0gMik8YnI+ICZuYnNw OyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZu YnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBodGNw X2RhdGEtJmd0O3RfbGFzdF9jb25nID0gdGlja3M7PGJyPiAmbmJzcDsmbmJzcDsmbmJzcDsmbmJz cDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgYnJlYWs7PGJyPism bmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgZGVmYXVsdDo8YnI+KyZuYnNwOyZuYnNwOyZuYnNwOyZu YnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBicmVhazs8YnI+ ICZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyB9PGJyPiB9PGJyPiA8YnI+ZGlmZiAtLWdpdCBhL3N5 cy9uZXRpbmV0L2NjL2NjX25ld3Jlbm8uYyBiL3N5cy9uZXRpbmV0L2NjL2NjX25ld3Jlbm8uYzxi cj5pbmRleCA3MWYyNzY0ZWY0YmMuLmFhMjBlMmM2NGY3ZCAxMDA2NDQ8YnI+LS0tIGEvc3lzL25l dGluZXQvY2MvY2NfbmV3cmVuby5jPGJyPisrKyBiL3N5cy9uZXRpbmV0L2NjL2NjX25ld3Jlbm8u Yzxicj5AQCAtODQsOSArODQsOSBAQDxicj4gI2luY2x1ZGUgJmx0O25ldGluZXQvY2MvY2NfbmV3 cmVuby5oJmd0Ozxicj4gPGJyPiZuYnNwO3N0YXRpYyB2b2lkIG5ld3Jlbm9fY2JfZGVzdHJveShz dHJ1Y3QgY2NfdmFyICpjY3YpOzxicj4tc3RhdGljIHZvaWQgbmV3cmVub19hY2tfcmVjZWl2ZWQo c3RydWN0IGNjX3ZhciAqY2N2LCB1aW50MTZfdCB0eXBlKTs8YnI+K3N0YXRpYyB2b2lkIG5ld3Jl bm9fYWNrX3JlY2VpdmVkKHN0cnVjdCBjY192YXIgKmNjdiwgY2NzaWduYWxfdCB0eXBlKTs8YnI+ IHN0YXRpYyB2b2lkIG5ld3Jlbm9fYWZ0ZXJfaWRsZShzdHJ1Y3QgY2NfdmFyICpjY3YpOzxicj4t c3RhdGljIHZvaWQgbmV3cmVub19jb25nX3NpZ25hbChzdHJ1Y3QgY2NfdmFyICpjY3YsIHVpbnQz Ml90IHR5cGUpOzxicj4rc3RhdGljIHZvaWQgbmV3cmVub19jb25nX3NpZ25hbChzdHJ1Y3QgY2Nf dmFyICpjY3YsIGNjc2lnbmFsX3QgdHlwZSk7PGJyPiBzdGF0aWMgaW50IG5ld3Jlbm9fY3RsX291 dHB1dChzdHJ1Y3QgY2NfdmFyICpjY3YsIHN0cnVjdCBzb2Nrb3B0ICpzb3B0LCB2b2lkICpidWYp Ozxicj4gc3RhdGljIHZvaWQgbmV3cmVub19uZXdyb3VuZChzdHJ1Y3QgY2NfdmFyICpjY3YsIHVp bnQzMl90IHJvdW5kX2NudCk7PGJyPiBzdGF0aWMgdm9pZCBuZXdyZW5vX3J0dHNhbXBsZShzdHJ1 Y3QgY2NfdmFyICpjY3YsIHVpbnQzMl90IHVzZWNfcnR0LCB1aW50MzJfdCByeHRjbnQsIHVpbnQz Ml90IGZhcyk7PGJyPkBAIC0yMTIsNyArMjEyLDcgQEAgbmV3cmVub19jYl9kZXN0cm95KHN0cnVj dCBjY192YXIgKmNjdik8YnI+IH08YnI+IDxicj4mbmJzcDtzdGF0aWMgdm9pZDxicj4tbmV3cmVu b19hY2tfcmVjZWl2ZWQoc3RydWN0IGNjX3ZhciAqY2N2LCB1aW50MTZfdCB0eXBlKTxicj4rbmV3 cmVub19hY2tfcmVjZWl2ZWQoc3RydWN0IGNjX3ZhciAqY2N2LCBjY3NpZ25hbF90IHR5cGUpPGJy PiB7PGJyPiAmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgc3RydWN0IG5ld3Jlbm8gKm5yZW5vOzxi cj4gPGJyPkBAIC0zNjMsNyArMzYzLDcgQEAgbmV3cmVub19hZnRlcl9pZGxlKHN0cnVjdCBjY192 YXIgKmNjdik8YnI+Jm5ic3A7ICogUGVyZm9ybSBhbnkgbmVjZXNzYXJ5IHRhc2tzIGJlZm9yZSB3 ZSBlbnRlciBjb25nZXN0aW9uIHJlY292ZXJ5Ljxicj4mbmJzcDsgKi88YnI+IHN0YXRpYyB2b2lk PGJyPi1uZXdyZW5vX2Nvbmdfc2lnbmFsKHN0cnVjdCBjY192YXIgKmNjdiwgdWludDMyX3QgdHlw ZSk8YnI+K25ld3Jlbm9fY29uZ19zaWduYWwoc3RydWN0IGNjX3ZhciAqY2N2LCBjY3NpZ25hbF90 IHR5cGUpPGJyPiB7PGJyPiAmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgc3RydWN0IG5ld3Jlbm8g Km5yZW5vOzxicj4gJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7IHVpbnQzMl90IGJldGEsIGJldGFf ZWNuLCBjd2luLCBmYWN0b3IsIG1zcywgcGlwZTs8YnI+QEAgLTQ0Miw2ICs0NDIsOCBAQCBuZXdy ZW5vX2Nvbmdfc2lnbmFsKHN0cnVjdCBjY192YXIgKmNjdiwgdWludDMyX3QgdHlwZSk8YnI+ICZu YnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNw OyZuYnNwOyB9PGJyPiAmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsm bmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgQ0NWKGNjdiwgc25kX2N3bmQpID0gbXNzOzxicj4gJm5i c3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7 Jm5ic3A7IGJyZWFrOzxicj4rJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7IGRlZmF1bHQ6PGJyPism bmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJz cDsmbmJzcDsgYnJlYWs7PGJyPiAmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgfTxicj4gfTxicj4g PGJyPmRpZmYgLS1naXQgYS9zeXMvbmV0aW5ldC9jYy9jY192ZWdhcy5jIGIvc3lzL25ldGluZXQv Y2MvY2NfdmVnYXMuYzxicj5pbmRleCBhYWM5YzljZTc3ZmYuLmVjZDQyYzFhMGY1MyAxMDA2NDQ8 YnI+LS0tIGEvc3lzL25ldGluZXQvY2MvY2NfdmVnYXMuYzxicj4rKysgYi9zeXMvbmV0aW5ldC9j Yy9jY192ZWdhcy5jPGJyPkBAIC04NCwxMiArODQsMTIgQEA8YnI+Jm5ic3A7ICogUHJpdmF0ZSBz aWduYWwgdHlwZSBmb3IgcmF0ZSBiYXNlZCBjb25nZXN0aW9uIHNpZ25hbC48YnI+Jm5ic3A7ICog U2VlICZsdDtuZXRpbmV0L2NjLmgmZ3Q7IGZvciBhcHByb3ByaWF0ZSBiaXQtcmFuZ2UgdG8gdXNl IGZvciBwcml2YXRlIHNpZ25hbHMuPGJyPiZuYnNwOyAqLzxicj4tI2RlZmluZSZuYnNwOyZuYnNw OyZuYnNwOyZuYnNwOyBDQ19WRUdBU19SQVRFJm5ic3A7IDB4MDEwMDAwMDA8YnI+KyNkZWZpbmUm bmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgQ0NfVkVHQVNfUkFURSZuYnNwOyAweDA0MDAwMDAwPGJy PiA8YnI+LXN0YXRpYyB2b2lkIHZlZ2FzX2Fja19yZWNlaXZlZChzdHJ1Y3QgY2NfdmFyICpjY3Ys IHVpbnQxNl90IGFja190eXBlKTs8YnI+K3N0YXRpYyB2b2lkIHZlZ2FzX2Fja19yZWNlaXZlZChz dHJ1Y3QgY2NfdmFyICpjY3YsIGNjc2lnbmFsX3QgYWNrX3R5cGUpOzxicj4gc3RhdGljIHZvaWQg dmVnYXNfY2JfZGVzdHJveShzdHJ1Y3QgY2NfdmFyICpjY3YpOzxicj4gc3RhdGljIGludCZuYnNw OyB2ZWdhc19jYl9pbml0KHN0cnVjdCBjY192YXIgKmNjdiwgdm9pZCAqcHRyKTs8YnI+LXN0YXRp YyB2b2lkIHZlZ2FzX2Nvbmdfc2lnbmFsKHN0cnVjdCBjY192YXIgKmNjdiwgdWludDMyX3Qgc2ln bmFsX3R5cGUpOzxicj4rc3RhdGljIHZvaWQgdmVnYXNfY29uZ19zaWduYWwoc3RydWN0IGNjX3Zh ciAqY2N2LCBjY3NpZ25hbF90IHNpZ25hbF90eXBlKTs8YnI+IHN0YXRpYyB2b2lkIHZlZ2FzX2Nv bm5faW5pdChzdHJ1Y3QgY2NfdmFyICpjY3YpOzxicj4gc3RhdGljIGludCZuYnNwOyB2ZWdhc19t b2RfaW5pdCh2b2lkKTs8YnI+IHN0YXRpYyBzaXplX3QmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsm bmJzcDsmbmJzcDsgdmVnYXNfZGF0YV9zeih2b2lkKTs8YnI+QEAgLTEyNCw3ICsxMjQsNyBAQCBz dHJ1Y3QgY2NfYWxnbyB2ZWdhc19jY19hbGdvID0gezxicj4mbmJzcDsgKiBoYXMgYmVlbiB1c2Vk Ljxicj4mbmJzcDsgKi88YnI+IHN0YXRpYyB2b2lkPGJyPi12ZWdhc19hY2tfcmVjZWl2ZWQoc3Ry dWN0IGNjX3ZhciAqY2N2LCB1aW50MTZfdCBhY2tfdHlwZSk8YnI+K3ZlZ2FzX2Fja19yZWNlaXZl ZChzdHJ1Y3QgY2NfdmFyICpjY3YsIGNjc2lnbmFsX3QgYWNrX3R5cGUpPGJyPiB7PGJyPiAmbmJz cDsmbmJzcDsmbmJzcDsmbmJzcDsgc3RydWN0IGVydHQgKmVfdDs8YnI+ICZuYnNwOyZuYnNwOyZu YnNwOyZuYnNwOyBzdHJ1Y3QgdmVnYXMgKnZlZ2FzX2RhdGE7PGJyPkBAIC0yMDMsNyArMjAzLDcg QEAgdmVnYXNfY2JfaW5pdChzdHJ1Y3QgY2NfdmFyICpjY3YsIHZvaWQgKnB0cik8YnI+Jm5ic3A7 ICogaGFuZGxlZCBoZXJlLCBvdGhlcndpc2UgaXQgZmFsbHMgYmFjayB0byBuZXdyZW5vJ3MgY29u Z2VzdGlvbiBoYW5kbGluZy48YnI+Jm5ic3A7ICovPGJyPiBzdGF0aWMgdm9pZDxicj4tdmVnYXNf Y29uZ19zaWduYWwoc3RydWN0IGNjX3ZhciAqY2N2LCB1aW50MzJfdCBzaWduYWxfdHlwZSk8YnI+ K3ZlZ2FzX2Nvbmdfc2lnbmFsKHN0cnVjdCBjY192YXIgKmNjdiwgY2NzaWduYWxfdCBzaWduYWxf dHlwZSk8YnI+IHs8YnI+ICZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBzdHJ1Y3QgdmVnYXMgKnZl Z2FzX2RhdGE7PGJyPiAmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgaW50IHByZXNpZ25hbHJlY292 Ozxicj5AQCAtMjE1LDcgKzIxNSw3IEBAIHZlZ2FzX2Nvbmdfc2lnbmFsKHN0cnVjdCBjY192YXIg KmNjdiwgdWludDMyX3Qgc2lnbmFsX3R5cGUpPGJyPiAmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsg ZWxzZTxicj4gJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7 Jm5ic3A7Jm5ic3A7Jm5ic3A7IHByZXNpZ25hbHJlY292ID0gMDs8YnI+IDxicj4tJm5ic3A7Jm5i c3A7Jm5ic3A7Jm5ic3A7IHN3aXRjaChzaWduYWxfdHlwZSkgezxicj4rJm5ic3A7Jm5ic3A7Jm5i c3A7Jm5ic3A7IHN3aXRjaCgoaW50KXNpZ25hbF90eXBlKSB7PGJyPiAmbmJzcDsmbmJzcDsmbmJz cDsmbmJzcDsgY2FzZSBDQ19WRUdBU19SQVRFOjxicj4gJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7 Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7IGlmICghSU5fUkVDT1ZF UlkoQ0NWKGNjdiwgdF9mbGFncykpKSB7PGJyPiAmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJz cDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsm bmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgQ0NWKGNjdiwgc25kX2N3bmQpID0gbWF4KDIg KiBDQ1YoY2N2LCB0X21heHNlZyksPGJyPkBAIC0yMjgsNiArMjI4LDcgQEAgdmVnYXNfY29uZ19z aWduYWwoc3RydWN0IGNjX3ZhciAqY2N2LCB1aW50MzJfdCBzaWduYWxfdHlwZSk8YnI+IDxicj4m bmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsmbmJzcDsgZGVmYXVsdDo8YnI+ICZuYnNwOyZuYnNwOyZu YnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyZuYnNwOyBuZXdy ZW5vX2NjX2Nvbmdfc2lnbmFsKGNjdiwgc2lnbmFsX3R5cGUpOzxicj4rJm5ic3A7Jm5ic3A7Jm5i c3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7IGJyZWFr Ozxicj4gJm5ic3A7Jm5ic3A7Jm5ic3A7Jm5ic3A7IH08YnI+IDxicj4mbmJzcDsmbmJzcDsmbmJz cDsmbmJzcDsmbmJzcDsgaWYgKElOX1JFQ09WRVJZKENDVihjY3YsIHRfZmxhZ3MpKSAmYW1wOyZh bXA7ICFwcmVzaWduYWxyZWNvdik8bzpwPjwvbzpwPjwvcHJlPg0KPC9kaXY+DQo8L2Jsb2NrcXVv dGU+DQo8L2Rpdj4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiPjxiciBjbGVhcj0iYWxsIj4NCjxvOnA+ PC9vOnA+PC9wPg0KPGRpdj4NCjxwIGNsYXNzPSJNc29Ob3JtYWwiIHN0eWxlPSJtYXJnaW4tYm90 dG9tOjEyLjBwdCI+QnVpbGR3b3JsZCBpcyBub3cgYnJva2VuIGZvciBhbGwgYXJjaGVzIChhdCBs ZWFzdCBpbmNyZW1lbnRhbCBidWlsZCk8YnI+DQo8YnI+DQpBbW9uZyB0aGUgZXJyb3JzPGJyPg0K PGJyPg0KL2hvbWUvYmFwdC93b3JrdHJlZXMvbWFpbi9saWIvbGlic3RhdHMvLi4vLi4vc3lzL25l dGluZXQvdGNwX3N0YXRzLmM6MTM4OjMyOiBlcnJvcjogdXNlIG9mIHVuZGVjbGFyZWQgaWRlbnRp ZmllciAnQ0NfTkRVUEFDSyc8bzpwPjwvbzpwPjwvcD4NCjwvZGl2Pg0KPC9kaXY+DQo8L2Rpdj4N CjwvYm9keT4NCjwvaHRtbD4NCg== --_000_PH0PR06MB7639163516643B8783C1DB5186542PH0PR06MB7639namp_-- From nobody Sat Feb 24 20:38:06 2024 X-Original-To: dev-commits-src-main@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 4ThzGn1HL2z5BYV4; Sat, 24 Feb 2024 20:38:09 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ThzGm65SMz4LJV; Sat, 24 Feb 2024 20:38:08 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708807088; 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: in-reply-to:in-reply-to:references:references; bh=BhN15oDwgptoHHEtm/AdNov2cmsRSBh9dhRvnP8INfg=; b=jzloIYBF2Wi9RRy3kh2SoJYTyH/6FFyOGqqsIH/Ao5TIsE73gqjrdJNKi6rlOTdWfOLroX fZ3rrAZI4IhzxpQOKDdAJZkgQGOzweEvwyW5X6gjDnachx6/ApEpL9Q1hUuUeyVt5y+of6 u9EC2WPDlqlsU2Hqwv89OVAQlI691Gk8NlIY++TSQU/UFq+8ExMJJ2cV7pObYE9vJIDfsI NMMA3dGiPGiCzbZxPdew4utLzdZjR3aTHa7JzJDOtfnqzKohXy76pbOzNYKWQPWcOvwVHA VFJ1Kzc5x2Fuc+RSUyty/9tP1/qAbShYM4bh0Z7zbeNexukIIkNmCY1tGU953Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708807088; a=rsa-sha256; cv=none; b=hfQMnC8Ibszm/GFhY9LBAQ6y3M1ZmRst6cgpxq4A3+DB/vWpkyeelu5+FBW39joJr4sDYH yP1hnn+tvB20E10vwYn1MYpHse34e1slpnhjj+NSthuJJqctl2xm361a3ttVG07YZvk0G3 ZXpchTZrhetH3VP4bPi1ojlSwLv8oYQBcZUeOx+Sdn9wEIGR1c/75bz+hA736srQeFaIYQ B4dJJ8aqvjraAuNgHa6IfaYa3S197/1eF9xCNueG5kY7MTS0SpVUm7r3CSPZG2/iZVV9ou 4wYfwJOKPPNBmqs5a4aREXXLgt7G92m6Mw8ksawCgcPjIHDU86xL7HY15yQ57A== 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=1708807088; 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: in-reply-to:in-reply-to:references:references; bh=BhN15oDwgptoHHEtm/AdNov2cmsRSBh9dhRvnP8INfg=; b=IaJrpxp2Kt0s/uJaA/mSUfhdnCekuJRa2uCpk53noSyVL6okjjTn3HTC1CrhJhfiFneiVQ mE1nDH/cHZOUl9iFXsKIRlmOElkdcE4VDn+CbI2xXAtD0YzgFg1gA140fMQJCUuW+uyeu5 ntqcBK7hTCs9Vx4n1+oyRWjSmqVBLJy9CaEP9rc0xbeYCiZjCwUvXGnyFHQA+sDuGlFTef Yl4lAeFuByM8tkACCL4E1RQYKmltvTVe6QyavEDrR8/mSteDSwwwyGL2weTersFunmMIMg 1h94u87j8DFzrzlUqI1GcUdHK82uFxm1UYZRON9ux1sO8weY8vEhSTzLjJfH1w== Received: from [IPV6:2601:644:937f:4c50:9110:97a:5df4:795c] (unknown [IPv6:2601:644:937f:4c50:9110:97a:5df4:795c]) (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) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4ThzGm20Qfz1Zjl; Sat, 24 Feb 2024 20:38:08 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <88451bc6-fb9a-42d0-9d6f-ba83330aa6b9@FreeBSD.org> Date: Sat, 24 Feb 2024 12:38:06 -0800 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 5e248c23d995 - main - tcp: retain some CC signals outside of kernel scope Content-Language: en-US To: Richard Scheffenegger , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202402242002.41OK2Rs0085089@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202402242002.41OK2Rs0085089@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 2/24/24 12:02 PM, Richard Scheffenegger wrote: > The branch main has been updated by rscheff: > > URL: https://cgit.FreeBSD.org/src/commit/?id=5e248c23d995a059d24f4784d5a256cddd42e557 > > commit 5e248c23d995a059d24f4784d5a256cddd42e557 > Author: Richard Scheffenegger > AuthorDate: 2024-02-24 20:01:54 +0000 > Commit: Richard Scheffenegger > CommitDate: 2024-02-24 20:01:54 +0000 > > tcp: retain some CC signals outside of kernel scope > > Summary: fix build error after f74352fbcf15341accaf5a92240871f98323215d > > Reviewers: #transport! > > Subscribers: imp, melifaro, glebius > > Differential Revision: https://reviews.freebsd.org/D44066 > --- > sys/netinet/cc/cc.h | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/sys/netinet/cc/cc.h b/sys/netinet/cc/cc.h > index 5b2cb58a24a0..aac0825e5fe1 100644 > --- a/sys/netinet/cc/cc.h > +++ b/sys/netinet/cc/cc.h > @@ -121,12 +121,15 @@ struct cc_var { > #define CCF_HYSTART_CAN_SH_CWND 0x0800 /* Can hystart when going CSS -> CA slam the cwnd */ > #define CCF_HYSTART_CONS_SSTH 0x1000 /* Should hystart use the more conservative ssthresh */ > > +#endif /* defined(_KERNEL) || defined(_WANT_TCPCB) */ > typedef enum { > +#if defined(_KERNEL) || defined(_WANT_TCPCB) > /* ACK types passed to the ack_received() hook. */ > CC_ACK = 0x0001, /* Regular in sequence ACK. */ > CC_DUPACK = 0x0002, /* Duplicate ACK. */ > CC_PARTIALACK = 0x0004, /* Not yet. */ > CC_SACK = 0x0008, /* Not yet. */ > +#endif /* defined(_KERNEL) || defined(_WANT_TCPCB) */ > /* Congestion signal types passed to the cong_signal() hook. */ > CC_ECN = 0x0100, /* ECN marked packet received. */ > CC_RTO = 0x0200, /* RTO fired. */ > @@ -138,7 +141,6 @@ typedef enum { > */ > CC_SIGPRIVMASK = 0xFF000000 /* Mask to check if sig is private. */ > } ccsignal_t; > -#endif /* defined(_KERNEL) || defined(_WANT_TCPCB) */ Is there a good reason to not just expose all of the enum values always? -- John Baldwin From nobody Sun Feb 25 00:58:27 2024 X-Original-To: dev-commits-src-main@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 4Tj5381vsXz5BxW1; Sun, 25 Feb 2024 00:58:28 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tj5381BgZz4tG9; Sun, 25 Feb 2024 00:58:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708822708; 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=FfgJe/GAe/sGr3x0tNuyGKGKdM9ZARcBeVFcRurVD4M=; b=ZPDhTbWYTaWh5i0IudaVG9fZp35hcsNePPWswXWajW+7nNXej0upQzw+K7Dy+RZF3OVpvh H9el/r6pjmdCgl+gOjd+atkxKQRBM4rp+5ENnJWNCbCBu2qKCJ1lhM5GdOMWGiZFMAeTZu uMK17mnc0XWrkBZtZHiwYEhtk9dcdE6erEPVl2IWf+Zij/5uEizIzylzhlpYSps3jsVZpg 4ertlY1PUSwAlCkyXxKcXUUprsP3pmsn1Wh5P2ksrNPxtiRZBZFf9eiEd/fNG8T0eYFLUM g+08S4YwbU+dwSezAPUIg1PuoR5ooMxycD8v4Ozsc4ogav3hNRKCY1p4crUZgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708822708; a=rsa-sha256; cv=none; b=Zx6O5/BboXPkehkHsNysK9WX5G5qbumRkv3D5Dry+wQPBJwOVmnPdE4WxrYGoHcxsMLRuk O+CgKZNTWgEp7Su/BIcz4FdaaUblBF7Elp53kuKjvyaw1ffn2YXGGggK/VE9n8aaUKLWuI zsN2lmE8vNjTx6id7Bl1VYUv4gfjgCvr+fyszYSh3W0NxcgO3SGx8Psu1TArLlBzIIOpzk VEX1S+QnUTBnu2BdDsYFp5b2wGRJx5SGDEh9+DO1hNYyrRyqDR5+E+AY+nCQVijRuGhDET HNQknYRuzNu2EAEfLxzsBQuGO5U1tOny9D+33DLItmRxZ5BlAxbQr8WwutE1EA== 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=1708822708; 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=FfgJe/GAe/sGr3x0tNuyGKGKdM9ZARcBeVFcRurVD4M=; b=LygPjKA6ZVxgCQtyTS7k/V5etkd4bXQ7ByLjHGOv4ps0psL7wFXqebB5P3z3N3Pd5n/k5C gQqRhrcF79t7jZKkeuc5AXRmRHENIdG/VMCq77AYAgDXws0YSDsM2zlJpTSRp3T/v5UHqQ SDJU0NKPtkwNfOpoT2/1nsMkQhT4F1eOHsJjsKoNLNabMi8040t2ue7pLt35SbpL7X4mzL ySaY30yC8VNeHj8VQ0Y7bB9qC2JFChf+BCc0fsepf4yW73d3EoRDduNj4Bl8AK4EJnGjeg CjgWsOk+2aXwxm6xiedcMa+waRfkmBY0kaorgF/6PgiUuJwQslN9nFq2jh3M8g== 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 4Tj5376whJzNJZ; Sun, 25 Feb 2024 00:58:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41P0wRhW081533; Sun, 25 Feb 2024 00:58:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41P0wRVE081530; Sun, 25 Feb 2024 00:58:27 GMT (envelope-from git) Date: Sun, 25 Feb 2024 00:58:27 GMT Message-Id: <202402250058.41P0wRVE081530@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 5b3b9a58584b - main - loader: Move ldscripts to match more standard practices List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5b3b9a58584b101e3ea0fd8dd50dc8d9157c058e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5b3b9a58584b101e3ea0fd8dd50dc8d9157c058e commit 5b3b9a58584b101e3ea0fd8dd50dc8d9157c058e Author: Warner Losh AuthorDate: 2024-02-25 00:56:14 +0000 Commit: Warner Losh CommitDate: 2024-02-25 00:56:14 +0000 loader: Move ldscripts to match more standard practices In the larger open source community, ld scripts are foo.ldscrpt rather than ldscript.arch like we use here. This moves the EFI ldscripts. Sponsored by: Netflix Reviewed by: tsoome, kevans, emaste Differential Revision: https://reviews.freebsd.org/D44056 --- stand/efi/boot1/Makefile | 2 +- stand/efi/loader/Makefile | 2 +- stand/efi/loader/arch/amd64/{ldscript.amd64 => amd64.ldscript} | 0 stand/efi/loader/arch/arm/{ldscript.arm => arm.ldscript} | 0 stand/efi/loader/arch/arm64/{ldscript.arm64 => arm64.ldscript} | 0 stand/efi/loader/arch/riscv/{ldscript.riscv => riscv.ldscript} | 0 6 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile index e03b95d2276f..fd5069004dff 100644 --- a/stand/efi/boot1/Makefile +++ b/stand/efi/boot1/Makefile @@ -64,7 +64,7 @@ CFLAGS+= -I${LDRSRC} FILES= ${BOOT1}.efi FILESMODE_${BOOT1}.efi= ${BINMODE} -LDSCRIPT= ${EFISRC}/loader/arch/${MACHINE}/ldscript.${MACHINE} +LDSCRIPT= ${EFISRC}/loader/arch/${MACHINE}/${MACHINE}.ldscript LDFLAGS+= -Wl,-T${LDSCRIPT},-Bsymbolic,-znotext -pie .if ${LINKER_TYPE} == "bfd" && ${LINKER_VERSION} >= 23400 LDFLAGS+= -Wl,--no-dynamic-linker diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index 5a755c1d329f..2031400814e9 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -100,7 +100,7 @@ FILESMODE_${LOADER}.efi= ${BINMODE} LINKS+= ${BINDIR}/${LOADER}.efi ${BINDIR}/loader.efi .endif -LDSCRIPT= ${.CURDIR}/../loader/arch/${MACHINE}/ldscript.${MACHINE} +LDSCRIPT= ${.CURDIR}/../loader/arch/${MACHINE}/${MACHINE}.ldscript LDFLAGS+= -Wl,-T${LDSCRIPT},-Bsymbolic,-znotext -pie .if ${LINKER_TYPE} == "bfd" && ${LINKER_VERSION} >= 23400 LDFLAGS+= -Wl,--no-dynamic-linker diff --git a/stand/efi/loader/arch/amd64/ldscript.amd64 b/stand/efi/loader/arch/amd64/amd64.ldscript similarity index 100% rename from stand/efi/loader/arch/amd64/ldscript.amd64 rename to stand/efi/loader/arch/amd64/amd64.ldscript diff --git a/stand/efi/loader/arch/arm/ldscript.arm b/stand/efi/loader/arch/arm/arm.ldscript similarity index 100% rename from stand/efi/loader/arch/arm/ldscript.arm rename to stand/efi/loader/arch/arm/arm.ldscript diff --git a/stand/efi/loader/arch/arm64/ldscript.arm64 b/stand/efi/loader/arch/arm64/arm64.ldscript similarity index 100% rename from stand/efi/loader/arch/arm64/ldscript.arm64 rename to stand/efi/loader/arch/arm64/arm64.ldscript diff --git a/stand/efi/loader/arch/riscv/ldscript.riscv b/stand/efi/loader/arch/riscv/riscv.ldscript similarity index 100% rename from stand/efi/loader/arch/riscv/ldscript.riscv rename to stand/efi/loader/arch/riscv/riscv.ldscript From nobody Sun Feb 25 00:58:28 2024 X-Original-To: dev-commits-src-main@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 4Tj5391lNRz5BxfK; Sun, 25 Feb 2024 00:58:29 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tj53911B4z4tGB; Sun, 25 Feb 2024 00:58:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708822709; 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=1t3xo7N1AzsiGTyIbsClNm7kGj0HLmgLlebdTvzrJL4=; b=Ig2W5P/IISfWVTNy5lZQLrc8oqrGpMYaj3AC9zKOp6mxa4GdSNnqyHxR+93DfI1vd+SixA Dvga88YKupMHARl9Tcjf5dgP5g3LLUD2ox6+grmoFUORP0bvn4E2+ZisxtVCPSM2d5/8PT VXDpAaiPU/8UVey1j+MIc6XhcSWRiXDw5muhU6NCZUnJ3xd5dyk7VUEv5Ku0KK1Rz8xiKe phTi7MwQJWXoxlBJlvUfYiMPpPaFD4PsCoix2Oze/HgDiwfwidJ9XWXw35erjvhbXyHTg7 GJtWJUW3m3dmlrE08zb3CYfq1dnHZMHQ/MDM+hgt4ytlaoiiBaIndVwKj8FiyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708822709; a=rsa-sha256; cv=none; b=U9t2BV3LbznelX4ws6Evevb7XaFfDQYyxgaNJq5KFpcdmsy7fyUapHR3IoEfKcSOEaT2pa 671U3JnAacRpdE+m0Yrgqg9ebbTmowi1WeN5ShFdycr9FiAO0hJ++vJxnFYG4QyIm3Y2r5 8vxoF5oPqGepBL3m7cmfB7De4XhavhNYgAOd185vEUdmF7EThEtxq2dMHlii0BTKGpMMOX 0YTHSH1fMVCYt4Ciygd7qtD56F+K0aeTMtkm6788UqBzshfaBDvN9e8L+qk89MrAu/RL8A bHvOVcHbWsr8ekUqalsrtfqGHv1iE0KwlqzB8NnRRWdWxHbUXpMl7a+YiDmXqA== 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=1708822709; 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=1t3xo7N1AzsiGTyIbsClNm7kGj0HLmgLlebdTvzrJL4=; b=prlQqIAkEHBxoy0DeUCxb1zg4mS5QPh5UkZLxdjmNDJrT69Zpaqlo3QWafb3IBl5cFgwwL SlA0VwlONB5BYiOuYd930Eoq3SzZNpCvQ2Dg/orz/+4LdZj6r60u2bjCMfndLjGkjO9DG+ JKBRvN6fmcM2ifcGc1N7m4HK8LachuRsjdcE2J8QQiFlINLnZgVZzKJj+pvummKQWt8xWg NDJjorrVXS5mi05JjG+VrbgUV/9ZqZAIf5bfShDSyW6siDwm/BaE4LubRKt71F7GeM/fqV iF9lVKULcGnbOSAe5IahZKOoMOjXdo6yXdAZGgiyouZ6zUSKtx2YVkNYbObu0A== 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 4Tj5390595zMYQ; Sun, 25 Feb 2024 00:58:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41P0wSi6081572; Sun, 25 Feb 2024 00:58:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41P0wSCT081569; Sun, 25 Feb 2024 00:58:28 GMT (envelope-from git) Date: Sun, 25 Feb 2024 00:58:28 GMT Message-Id: <202402250058.41P0wSCT081569@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: acb474c084b8 - main - kboot: Centralize ldscript addition List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: acb474c084b8e3b7bb738a286f9218f926a15823 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=acb474c084b8e3b7bb738a286f9218f926a15823 commit acb474c084b8e3b7bb738a286f9218f926a15823 Author: Warner Losh AuthorDate: 2024-02-25 00:56:23 +0000 Commit: Warner Losh CommitDate: 2024-02-25 00:56:23 +0000 kboot: Centralize ldscript addition Make the pattern for ldscripts always be arch/$MACHINE_ARCH/$MACHINE_ARCH.ldscript so we can add it from a central Makefile. This also moves from ldscript.arch to arch.ldscript to match the loader's new convention. Sponsored by: Netflix Reviewed by: tsoome, kevans Differential Revision: https://reviews.freebsd.org/D44057 --- stand/kboot/kboot/Makefile | 3 +++ stand/kboot/kboot/arch/aarch64/Makefile.inc | 2 -- stand/kboot/kboot/arch/aarch64/{ldscript.aarch64 => aarch64.ldscript} | 0 stand/kboot/kboot/arch/amd64/Makefile.inc | 2 -- stand/kboot/kboot/arch/amd64/{ldscript.amd64 => amd64.ldscript} | 0 stand/kboot/kboot/arch/powerpc64/Makefile.inc | 2 -- .../kboot/arch/powerpc64/{ldscript.powerpc => powerpc64.ldscript} | 0 7 files changed, 3 insertions(+), 6 deletions(-) diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile index b571c3acada1..c6cb47fbbba2 100644 --- a/stand/kboot/kboot/Makefile +++ b/stand/kboot/kboot/Makefile @@ -51,6 +51,9 @@ HELP_FILENAME= loader.help.kboot .PATH: ${.CURDIR}/arch/${MACHINE_ARCH} .include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" +# Bring in our ldscript +LDFLAGS= -nostdlib -static -T ${.CURDIR}/arch/${MACHINE_ARCH}/${MACHINE_ARCH}.ldscript + # Always add MI sources .include "${BOOTSRC}/loader.mk" CFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH} diff --git a/stand/kboot/kboot/arch/aarch64/Makefile.inc b/stand/kboot/kboot/arch/aarch64/Makefile.inc index 744a15f363d3..3e856f5322b3 100644 --- a/stand/kboot/kboot/arch/aarch64/Makefile.inc +++ b/stand/kboot/kboot/arch/aarch64/Makefile.inc @@ -8,5 +8,3 @@ CFLAGS+= -I${SYSDIR}/contrib/dev/acpica/include # load address. set in linker script RELOC?= 0x0 CFLAGS+= -DRELOC=${RELOC} - -LDFLAGS= -nostdlib -static -T ${.CURDIR}/arch/${MACHINE_ARCH}/ldscript.${MACHINE_ARCH} diff --git a/stand/kboot/kboot/arch/aarch64/ldscript.aarch64 b/stand/kboot/kboot/arch/aarch64/aarch64.ldscript similarity index 100% rename from stand/kboot/kboot/arch/aarch64/ldscript.aarch64 rename to stand/kboot/kboot/arch/aarch64/aarch64.ldscript diff --git a/stand/kboot/kboot/arch/amd64/Makefile.inc b/stand/kboot/kboot/arch/amd64/Makefile.inc index 55b1819ccdee..edb8a1de0bba 100644 --- a/stand/kboot/kboot/arch/amd64/Makefile.inc +++ b/stand/kboot/kboot/arch/amd64/Makefile.inc @@ -1,5 +1,3 @@ SRCS+= amd64_tramp.S elf64_freebsd.c load_addr.c fdt_arch.c CFLAGS+= -I${SYSDIR}/contrib/dev/acpica/include - -LDFLAGS= -nostdlib -static -T ${.CURDIR}/arch/${MACHINE_ARCH}/ldscript.amd64 diff --git a/stand/kboot/kboot/arch/amd64/ldscript.amd64 b/stand/kboot/kboot/arch/amd64/amd64.ldscript similarity index 100% rename from stand/kboot/kboot/arch/amd64/ldscript.amd64 rename to stand/kboot/kboot/arch/amd64/amd64.ldscript diff --git a/stand/kboot/kboot/arch/powerpc64/Makefile.inc b/stand/kboot/kboot/arch/powerpc64/Makefile.inc index 338d1222ab65..11a67a93d9e0 100644 --- a/stand/kboot/kboot/arch/powerpc64/Makefile.inc +++ b/stand/kboot/kboot/arch/powerpc64/Makefile.inc @@ -2,6 +2,4 @@ CFLAGS+= -mcpu=powerpc64 SRCS+= ppc64_elf_freebsd.c kerneltramp.S load_addr.c fdt_arch.c -LDFLAGS= -nostdlib -static -T ${.CURDIR}/arch/${MACHINE_ARCH}/ldscript.powerpc - MK_PIE= no diff --git a/stand/kboot/kboot/arch/powerpc64/ldscript.powerpc b/stand/kboot/kboot/arch/powerpc64/powerpc64.ldscript similarity index 100% rename from stand/kboot/kboot/arch/powerpc64/ldscript.powerpc rename to stand/kboot/kboot/arch/powerpc64/powerpc64.ldscript From nobody Sun Feb 25 00:58:30 2024 X-Original-To: dev-commits-src-main@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 4Tj53B4FGHz5BxW7; Sun, 25 Feb 2024 00:58:30 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tj53B1mVFz4tJC; Sun, 25 Feb 2024 00:58:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708822710; 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=f8mRnsIhRCab7mnsVXJf6J7Sp3okwaCM9Q6E5WYzBAg=; b=G9jak/OcrWQqKA2BYbMDFwcTpR8VJaiLqoViHEj2p4K4+MbtULy+qe7P1OJWquguydTSZD Vh2PZm2WJywT/M+OGa56u6qxeJYKRLslxDw3GCmhQTxVP0DIRP89M4WfUgeZza8RVkd9NJ RhEcKwfynWYFxmfREtUzLh163duZf9/Ywclwrd6blp+T40toeG7N6lwG/Yapr0vzcOY1Jb mqlm8g6sjAJPjkrmEsonLu+f7imJdaCk+6nEm5lPuWXANIcRtbC7lDNugS7YvwmrZd6VYR xUxPwzseFai9dZAvKxFBNPO0ENtbHIB4qs6Uinf1bM7BPaeOqMjvfDfZ2j956g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708822710; a=rsa-sha256; cv=none; b=uyOV0FM1yx7PfNwIfIzk7dFpJAhoLg8DIdCUKYfO4ZYDxi6nRagEpo8Zet5I2C3F97kyCt xe9FJ7dAeu7sqPWzMe7XkVrD21Ltp56J1MK0pcS+1M1KueNafonQ3wginPfHGnvaNFZFIy KfeNg9yBuxLrbQe6/pUC+RmYATaIqGNOrVznkZbiB/dodwk/o6F3MGBOs7lmW2QOuzLJIo PZ04G24cD0MksoM1hHBvd9FMw1rFPlOvQdPt9lTCjg7kaMbvrDRSfHWm+mAZKW8c0+3fI/ +gI3KX6Zx6gu/0YA1yzmn4i0JVkUw/MjXGyuwak4tlKqfYYXxiAicg/zRkkHoA== 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=1708822710; 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=f8mRnsIhRCab7mnsVXJf6J7Sp3okwaCM9Q6E5WYzBAg=; b=YPvlYmi81DL2xLolbXixhumi8U/Lg7T66isXprKIw/Elmb0XR9VC75GqIAHHz0tAA1JR7t vv5GsPqiZgDiXHAXwjnXXIxYDoIOgP/GxIRuZttFejUx0LeR6LCQyjND5ZAN8yucGvCxtn kFu/GeIa/08FpwsJTGw9gUqOe0fXlvZoQMLtXZksVjZMjrZeBzFGW4B4bmBlY9QeiQHC7E 5bZ3qDwLvSdgMPXIsnnZP41RiVVVTNgBNx+5iveXt8i9txlrTpqbSkTtc2+Dkj75LT8Viy UuwU0JcPyEV9C5yE7+gaPEyzhsY/4ggkGeKMkmy9jOYnjI3a3aCJtKSDclWATg== 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 4Tj53B0q1nzNJb; Sun, 25 Feb 2024 00:58:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41P0wUlm081615; Sun, 25 Feb 2024 00:58:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41P0wUAo081612; Sun, 25 Feb 2024 00:58:30 GMT (envelope-from git) Date: Sun, 25 Feb 2024 00:58:30 GMT Message-Id: <202402250058.41P0wUAo081612@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: fe4ab1fdb0da - main - loader/powerpc: Share ldscript List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: fe4ab1fdb0da06ddfbd8bf168db9f91b66609253 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fe4ab1fdb0da06ddfbd8bf168db9f91b66609253 commit fe4ab1fdb0da06ddfbd8bf168db9f91b66609253 Author: Warner Losh AuthorDate: 2024-02-25 00:56:31 +0000 Commit: Warner Losh CommitDate: 2024-02-25 00:56:31 +0000 loader/powerpc: Share ldscript Share ldscript between the different ppc versions. There's two different scripts since we build 32-bit binaries for all types of powerpc, but have little endian and big endian variations that are different by only two lines. Set the output format and include the rest. Move to foo.ldscript as well. Sponsored by: Netflix Reviewed by: tsoome, kevans Differential Revision: https://reviews.freebsd.org/D44058 --- stand/powerpc/ofw/Makefile | 6 +- stand/powerpc/ofw/ldscript.powerpcle | 142 --------------------- stand/powerpc/ofw/powerpc.ldscript | 3 + stand/powerpc/ofw/powerpc64.ldscript | 3 + stand/powerpc/ofw/powerpc64le.ldscript | 3 + stand/powerpc/ofw/powerpcspe.ldscript | 3 + .../ofw/{ldscript.powerpc => ppc-common.ldscript} | 3 - 7 files changed, 13 insertions(+), 150 deletions(-) diff --git a/stand/powerpc/ofw/Makefile b/stand/powerpc/ofw/Makefile index b7cbbd9fca00..80ebaf486296 100644 --- a/stand/powerpc/ofw/Makefile +++ b/stand/powerpc/ofw/Makefile @@ -47,11 +47,7 @@ CFLAGS+= -DRELOC=${RELOC} -g LDFLAGS= -nostdlib -static -.if ${MACHINE_ARCH} == "powerpc64le" -LDFLAGS+= -T ${.CURDIR}/ldscript.powerpcle -.else -LDFLAGS+= -T ${.CURDIR}/ldscript.powerpc -.endif +LDFLAGS+= -L ${.CURDIR} -T ${.CURDIR}/${MACHINE_ARCH}.ldscript # Open Firmware standalone support library LIBOFW= ${BOOTOBJ}/libofw/libofw.a diff --git a/stand/powerpc/ofw/ldscript.powerpcle b/stand/powerpc/ofw/ldscript.powerpcle deleted file mode 100644 index 946e3dd48ae9..000000000000 --- a/stand/powerpc/ofw/ldscript.powerpcle +++ /dev/null @@ -1,142 +0,0 @@ - -OUTPUT_FORMAT("elf32-powerpcle-freebsd", "elf32-powerpcle-freebsd", - "elf32-powerpcle-freebsd") -OUTPUT_ARCH(powerpcle:common) -ENTRY(_start) -SEARCH_DIR(/usr/lib); -PROVIDE (__stack = 0); -PHDRS -{ - text PT_LOAD; -} -SECTIONS -{ - /* Read-only sections, merged into text segment: */ - . = 0x02c00000 + SIZEOF_HEADERS; - .interp : { *(.interp) } :text - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .gnu.version : { *(.gnu.version) } - .gnu.version_d : { *(.gnu.version_d) } - .gnu.version_r : { *(.gnu.version_r) } - .rela.text : - { *(.rela.text) *(.rela.gnu.linkonce.t*) } - .rela.data : - { *(.rela.data) *(.rela.gnu.linkonce.d*) } - .rela.rodata : - { *(.rela.rodata) *(.rela.gnu.linkonce.r*) } - .rela.got : { *(.rela.got) } - .rela.got1 : { *(.rela.got1) } - .rela.got2 : { *(.rela.got2) } - .rela.ctors : { *(.rela.ctors) } - .rela.dtors : { *(.rela.dtors) } - .rela.init : { *(.rela.init) } - .rela.fini : { *(.rela.fini) } - .rela.bss : { *(.rela.bss) } - .rela.plt : { *(.rela.plt) } - .rela.sdata : { *(.rela.sdata) } - .rela.sbss : { *(.rela.sbss) } - .rela.sdata2 : { *(.rela.sdata2) } - .rela.sbss2 : { *(.rela.sbss2) } - .text : - { - *(.text) - /* .gnu.warning sections are handled specially by elf32.em. */ - *(.gnu.warning) - *(.gnu.linkonce.t*) - } =0 - _etext = .; - PROVIDE (etext = .); - .init : { *(.init) } =0 - .fini : { *(.fini) } =0 - .rodata : { *(.rodata) *(.gnu.linkonce.r*) } - .rodata1 : { *(.rodata1) } - .sdata2 : { *(.sdata2) } - .sbss2 : { *(.sbss2) } - /* Adjust the address for the data segment to the next page up. */ - . = ((. + 0x1000) & ~(0x1000 - 1)); - .data.rel.ro : { *(.data.rel.ro*) } - .data : - { - *(.data) - *(.gnu.linkonce.d*) - CONSTRUCTORS - } - .data1 : { *(.data1) } - .got1 : { *(.got1) } - .dynamic : { *(.dynamic) } - /* Put .ctors and .dtors next to the .got2 section, so that the pointers - get relocated with -mrelocatable. Also put in the .fixup pointers. - The current compiler no longer needs this, but keep it around for 2.7.2 */ - PROVIDE (_GOT2_START_ = .); - .got2 : { *(.got2) } - PROVIDE (__CTOR_LIST__ = .); - .ctors : { *(.ctors) } - PROVIDE (__CTOR_END__ = .); - PROVIDE (__DTOR_LIST__ = .); - .dtors : { *(.dtors) } - PROVIDE (__DTOR_END__ = .); - PROVIDE (_FIXUP_START_ = .); - .fixup : { *(.fixup) } - PROVIDE (_FIXUP_END_ = .); - PROVIDE (_GOT2_END_ = .); - PROVIDE (_GOT_START_ = .); - .got : { *(.got) } - .got.plt : { *(.got.plt) } - PROVIDE (_GOT_END_ = .); - /* We want the small data sections together, so single-instruction offsets - can access them all, and initialized data all before uninitialized, so - we can shorten the on-disk segment size. */ - .sdata : { *(.sdata) } - _edata = .; - PROVIDE (edata = .); - .sbss : - { - PROVIDE (__sbss_start = .); - *(.sbss) - *(.scommon) - *(.dynsbss) - PROVIDE (__sbss_end = .); - } - .plt : { *(.plt) } - .bss : - { - PROVIDE (__bss_start = .); - *(.dynbss) - *(.bss) - *(COMMON) - } - _end = . ; - PROVIDE (end = .); - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - /* DWARF debug sections. - Symbols in the DWARF debugging sections are relative to the beginning - of the section so we begin them at 0. */ - /* DWARF 1 */ - .debug 0 : { *(.debug) } - .line 0 : { *(.line) } - /* GNU DWARF 1 extensions */ - .debug_srcinfo 0 : { *(.debug_srcinfo) } - .debug_sfnames 0 : { *(.debug_sfnames) } - /* DWARF 1.1 and DWARF 2 */ - .debug_aranges 0 : { *(.debug_aranges) } - .debug_pubnames 0 : { *(.debug_pubnames) } - /* DWARF 2 */ - .debug_info 0 : { *(.debug_info) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line) } - .debug_frame 0 : { *(.debug_frame) } - .debug_str 0 : { *(.debug_str) } - .debug_loc 0 : { *(.debug_loc) } - .debug_macinfo 0 : { *(.debug_macinfo) } - /* SGI/MIPS DWARF 2 extensions */ - .debug_weaknames 0 : { *(.debug_weaknames) } - .debug_funcnames 0 : { *(.debug_funcnames) } - .debug_typenames 0 : { *(.debug_typenames) } - .debug_varnames 0 : { *(.debug_varnames) } - /* These must appear regardless of . */ -} - diff --git a/stand/powerpc/ofw/powerpc.ldscript b/stand/powerpc/ofw/powerpc.ldscript new file mode 100644 index 000000000000..aa48f257af1a --- /dev/null +++ b/stand/powerpc/ofw/powerpc.ldscript @@ -0,0 +1,3 @@ +OUTPUT_FORMAT("elf32-powerpc-freebsd", "elf32-powerpc-freebsd", + "elf32-powerpc-freebsd") +INCLUDE "ppc-common.ldscript" diff --git a/stand/powerpc/ofw/powerpc64.ldscript b/stand/powerpc/ofw/powerpc64.ldscript new file mode 100644 index 000000000000..aa48f257af1a --- /dev/null +++ b/stand/powerpc/ofw/powerpc64.ldscript @@ -0,0 +1,3 @@ +OUTPUT_FORMAT("elf32-powerpc-freebsd", "elf32-powerpc-freebsd", + "elf32-powerpc-freebsd") +INCLUDE "ppc-common.ldscript" diff --git a/stand/powerpc/ofw/powerpc64le.ldscript b/stand/powerpc/ofw/powerpc64le.ldscript new file mode 100644 index 000000000000..269d8121db6b --- /dev/null +++ b/stand/powerpc/ofw/powerpc64le.ldscript @@ -0,0 +1,3 @@ +OUTPUT_FORMAT("elf32-powerpcle-freebsd", "elf32-powerpcle-freebsd", + "elf32-powerpcle-freebsd") +INCLUDE "ppc-common.ldscript" diff --git a/stand/powerpc/ofw/powerpcspe.ldscript b/stand/powerpc/ofw/powerpcspe.ldscript new file mode 100644 index 000000000000..aa48f257af1a --- /dev/null +++ b/stand/powerpc/ofw/powerpcspe.ldscript @@ -0,0 +1,3 @@ +OUTPUT_FORMAT("elf32-powerpc-freebsd", "elf32-powerpc-freebsd", + "elf32-powerpc-freebsd") +INCLUDE "ppc-common.ldscript" diff --git a/stand/powerpc/ofw/ldscript.powerpc b/stand/powerpc/ofw/ppc-common.ldscript similarity index 97% rename from stand/powerpc/ofw/ldscript.powerpc rename to stand/powerpc/ofw/ppc-common.ldscript index 1c023ce6ade6..e12dee74824a 100644 --- a/stand/powerpc/ofw/ldscript.powerpc +++ b/stand/powerpc/ofw/ppc-common.ldscript @@ -1,6 +1,3 @@ - -OUTPUT_FORMAT("elf32-powerpc-freebsd", "elf32-powerpc-freebsd", - "elf32-powerpc-freebsd") OUTPUT_ARCH(powerpc:common) ENTRY(_start) SEARCH_DIR(/usr/lib); From nobody Sun Feb 25 00:58:31 2024 X-Original-To: dev-commits-src-main@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 4Tj53C7302z5BxYf; Sun, 25 Feb 2024 00:58:31 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tj53C2xgMz4tGY; Sun, 25 Feb 2024 00:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708822711; 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=dEKDwr3sdPxpkBQEbrVjayNTKzHHH3BJrJgbnNGzGJQ=; b=xE142NthHU/xX+1OXJ9UxBPNWYiMAn6quBRyKUXDkFNIbsNnGePv08Aq3992SbHv7U4p2u ralGmB1Zq5gX+BLw9jmngUigNXW8o62nt8H7yfOYY2xb/d+Oe0FduE9SGHxRydfrr6izoX PdQsQ5QxaTBUAPl6NBjXdE92Ak5GK0gJSCbYQKEPzMwWjSTJ/CrzLFSQPzFGogqerkelZD RFAfc/9XQPcP381q79mvHWYKtap0/qNlZ5uGkQ3AkAkZd25GysJlZUHJWCzjKWIL0n/LZk K35JN5xWRoJ7BUtJUxv5yiTKY3qIpdZfiAEXwfIv2fUzPQs3QyEs9yz2jhuCpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708822711; a=rsa-sha256; cv=none; b=qLODsDMEHSael9JTS1rliew6YKnmowtH1XzWQHYfS5ImLKv5DE5hEpdsXHZkhpbPFg0oXC Vr/YH91iVqo9ytu/LURZcrF+l88mFZG9UaYU9r0/pvL8ZaMzeQZZ+Wiq8zGLPl1cMIXXDb tvbOyUXyGDo0bFdAw3EjQ73u5B/HJeHUpS2uop0WxCZ+bkIpajnCAIXWGaKYw1Lj/kAfdC 1BBbIGuRqUjcHCdvzl1hSk5uWG/5rQ40eIsSnJCedRoS8ngaROoe2K1GdLBGZZV+1MJ7Sg lcbQ6Cb8bjpZKObaR1RpE5TH3M8z23gy/I+p4bMtd/PBJsfkGwxe6Pgb0Yi8ng== 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=1708822711; 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=dEKDwr3sdPxpkBQEbrVjayNTKzHHH3BJrJgbnNGzGJQ=; b=QZSUMWv2o3FyULpNrawNgOoB9/8gTBP1S9ZfD0hEqHNnqjQpFGlBkVFabypJlmibIUfb+e yB3eSuvuJett46jaewqjLp/RIis5RvGX14768/i3cPiQdO5PGncN5puydm48yOmU1J8PKt vw4aseHWMXO0UGxIlZ9tvebkWadaQJAs3g81xml2584rUuoRwOJRzKlXoJJrNlzNRQlGrX dh8f/G1aOSBWVrztc72x8tarXORt6VH1IefS7K6t7QN8vvUyG3hcVt9csst7BYxYYzrQZ6 Lg6Oe/wIxU0ryk5OkoqaNHehqCPDmEvFJzVO/0Z2E+hAekBeTrcNfrIKDF/U7g== 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 4Tj53C1plkzN27; Sun, 25 Feb 2024 00:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41P0wVGV081657; Sun, 25 Feb 2024 00:58:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41P0wVdO081654; Sun, 25 Feb 2024 00:58:31 GMT (envelope-from git) Date: Sun, 25 Feb 2024 00:58:31 GMT Message-Id: <202402250058.41P0wVdO081654@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 3d6239d2449e - main - loader/uboot: Move to foo.ldconfig List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 3d6239d2449ee085a9a078c378659469fd69b135 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3d6239d2449ee085a9a078c378659469fd69b135 commit 3d6239d2449ee085a9a078c378659469fd69b135 Author: Warner Losh AuthorDate: 2024-02-25 00:56:48 +0000 Commit: Warner Losh CommitDate: 2024-02-25 00:56:48 +0000 loader/uboot: Move to foo.ldconfig Move to the foo.ldconfig convention to match the rest of the boot loader. No functional change intended. Sponsored by: Netflix Reviewed by: tsoome, kevans Differential Revision: https://reviews.freebsd.org/D44059 --- stand/uboot/Makefile | 2 +- stand/uboot/arch/arm/Makefile.inc | 14 +++++++------- stand/uboot/arch/arm/{ldscript.arm => arm.ldscript} | 0 .../arch/powerpc/{ldscript.powerpc => powerpc.ldscript} | 0 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stand/uboot/Makefile b/stand/uboot/Makefile index 4405f09408bf..ccd02c44957f 100644 --- a/stand/uboot/Makefile +++ b/stand/uboot/Makefile @@ -40,7 +40,7 @@ HELP_FILENAME= loader.help.uboot # Always add MI sources .include "${BOOTSRC}/loader.mk" -LDSCRIPT= ${.CURDIR}/arch/${MACHINE_CPUARCH}/ldscript.${MACHINE_CPUARCH} +LDSCRIPT= ${.CURDIR}/arch/${MACHINE_CPUARCH}/${MACHINE_CPUARCH}.ldscript LDFLAGS= -nostdlib -static -T ${LDSCRIPT} LDFLAGS+= -Wl,-znotext diff --git a/stand/uboot/arch/arm/Makefile.inc b/stand/uboot/arch/arm/Makefile.inc index 66cb3f1b4dda..115f48672b18 100644 --- a/stand/uboot/arch/arm/Makefile.inc +++ b/stand/uboot/arch/arm/Makefile.inc @@ -4,22 +4,22 @@ UBLDR_LOADADDR?= 0x1000000 SRCS+= start.S conf.c self_reloc.c -ldscript.abs: +abs.ldscript: echo "UBLDR_LOADADDR = ${UBLDR_LOADADDR};" >${.TARGET} -ldscript.pie: +pie.ldscript: echo "UBLDR_LOADADDR = 0;" >${.TARGET} -ubldr: ${OBJS} ldscript.abs ${LDSCRIPT} ${DPADD} - ${CC} ${CFLAGS} -T ldscript.abs ${LDFLAGS} \ +ubldr: ${OBJS} abs.ldscript ${LDSCRIPT} ${DPADD} + ${CC} ${CFLAGS} -T abs.ldscript ${LDFLAGS} \ -o ${.TARGET} ${OBJS} ${LDADD} -ubldr.pie: ${OBJS} ldscript.pie ${LDSCRIPT} ${DPADD} - ${CC} ${CFLAGS} -T ldscript.pie ${LDFLAGS} -pie -Wl,-Bsymbolic \ +ubldr.pie: ${OBJS} pie.ldscript ${LDSCRIPT} ${DPADD} + ${CC} ${CFLAGS} -T pie.ldscript ${LDFLAGS} -pie -Wl,-Bsymbolic \ -o ${.TARGET} ${OBJS} ${LDADD} ubldr.bin: ubldr.pie ${OBJCOPY} -S -O binary ubldr.pie ${.TARGET} -CLEANFILES+= ldscript.abs ldscript.pie ubldr ubldr.pie ubldr.bin +CLEANFILES+= abs.ldscript pie.ldscript ubldr ubldr.pie ubldr.bin diff --git a/stand/uboot/arch/arm/ldscript.arm b/stand/uboot/arch/arm/arm.ldscript similarity index 100% rename from stand/uboot/arch/arm/ldscript.arm rename to stand/uboot/arch/arm/arm.ldscript diff --git a/stand/uboot/arch/powerpc/ldscript.powerpc b/stand/uboot/arch/powerpc/powerpc.ldscript similarity index 100% rename from stand/uboot/arch/powerpc/ldscript.powerpc rename to stand/uboot/arch/powerpc/powerpc.ldscript From nobody Sun Feb 25 00:58:33 2024 X-Original-To: dev-commits-src-main@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 4Tj53G0Pblz5BxWD; Sun, 25 Feb 2024 00:58: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tj53F4VSFz4tRj; Sun, 25 Feb 2024 00:58:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708822713; 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=BsNpsB2kxZUuoTKBear28XPj1Q8/+0ID0NyyZPrf4jA=; b=pNm5MFEqqKTDYlBGRlxK2n3yp8gz91rm1N1LhtX+MniXVhbRQkurqGpPSBMeCgYJfh56Sc 4Am7PzoXExkHjsIR8qisqOJevkvyFGOjuqDke7oDLw0rIMir4RpHTthAus0HLM8pKM4eQR 0adSf3KGaU8SCvjewvBqRg7FjBmSCaIbuG8nTsttDb3dKdDHweIZPmh4bPzTfLLLSmCLWQ DC1YzaQV0BufmL0Ut26OngapH/wWlIwD2kzXUVSLy2Zr2cZI44GVfjBLOaQxRQk4NMbBrc 6wCQdby/k0IbvtQ77Mp3INI+bXdWsyNmNS9xVVryqNTJHJO9CjiGyx1UtHNyqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708822713; a=rsa-sha256; cv=none; b=RrGfdkjtrI6TtmB32/tE3f4I+Oekv0hREGHeBVdFu9nLxpKIV1KK1fohToYblKZtmLYwzM jCZvmJG2JL5nn2zLwmdERvbFapRXqopgDjblM7obTfO9pGHo66gmEb8OTugerwhC0xRC3g a5GEisANXUBnQwqBku4thE+Tlivd849XG95lug2rNREkd/EvbjDc5qZZjDuDMPg8KuBagu 4hysQlomeHJ3iMvqcB4WzeKwCCPRmAKMkfaJCVM3rDBMFi5B7tmkrUCQGpM4O6JtLEpBai 9AIfIPlc2vRHLVIxMygChFsI258EfLUX5k08VbLC47JBErVidO0kY49lvKkhhw== 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=1708822713; 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=BsNpsB2kxZUuoTKBear28XPj1Q8/+0ID0NyyZPrf4jA=; b=nOHJPoHjkAmpucYbvS5tQRNAExGTFhPhAIMyoLEG9gXK5cR/vYgaXVc6bZ8s+TMLJMMJBW FzsGefP4NajoASK2dqe951XafYtDI0KtXM7kASUicWWR7JQAilDgmHpQ3azXDivIlCKv3s GWgKKabzVT/cDfAXuUlJ+777YsjKUi1wlwF5++y0PkgwrC3Oh10Bi3w6X9BdPpjgX7jwQZ onlPHli1+zneqtYWu3fKdi5WMUUEYozPsKWQoMjISPOknUHFAejU05egGdLwDH+r7MYdAL weYsWWACqxggnUfbucKNhN91pO4SaiF4Y/W7MTWCnZ4Pej+B989mAvQlPalfnw== 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 4Tj53F3c6SzN4w; Sun, 25 Feb 2024 00:58:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41P0wX10081747; Sun, 25 Feb 2024 00:58:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41P0wXNb081744; Sun, 25 Feb 2024 00:58:33 GMT (envelope-from git) Date: Sun, 25 Feb 2024 00:58:33 GMT Message-Id: <202402250058.41P0wXNb081744@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d024bc7ff5e8 - main - loader/efi: Linker sets not needed. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: d024bc7ff5e80537438b4556810782e9a8257b44 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d024bc7ff5e80537438b4556810782e9a8257b44 commit d024bc7ff5e80537438b4556810782e9a8257b44 Author: Warner Losh AuthorDate: 2024-02-25 00:57:04 +0000 Commit: Warner Losh CommitDate: 2024-02-25 00:57:04 +0000 loader/efi: Linker sets not needed. We don't need linker sets listed as sections. They are explicitly included in the objcopy we use to create the .efi file. This practice was added in 2002 by peter@ in a6d81d83a280 to make ia64 builds self-hosted. However, it was added back to the objcopy in 2010 by rpaulo in 8df7a05edd36 for i386 EFI support, though the ldscript file then retained them needlessly. The gcc/binutils bug having been fixed in the interim. We've not needed them since then, but the redundancy didn't matter. Sponsored by: Netflix Reviewed by: tsoome, kevans Differential Revision: https://reviews.freebsd.org/D44061 --- stand/efi/loader/arch/amd64/amd64.ldscript | 11 ----------- stand/efi/loader/arch/arm/arm.ldscript | 10 ---------- stand/efi/loader/arch/arm64/arm64.ldscript | 11 ----------- stand/efi/loader/arch/riscv/riscv.ldscript | 11 ----------- 4 files changed, 43 deletions(-) diff --git a/stand/efi/loader/arch/amd64/amd64.ldscript b/stand/efi/loader/arch/amd64/amd64.ldscript index 57014aefc025..0e620654ea81 100644 --- a/stand/efi/loader/arch/amd64/amd64.ldscript +++ b/stand/efi/loader/arch/amd64/amd64.ldscript @@ -34,17 +34,6 @@ SECTIONS *(COMMON) } . = ALIGN(4096); - set_Xcommand_set : { - __start_set_Xcommand_set = .; - *(set_Xcommand_set) - __stop_set_Xcommand_set = .; - } - set_Xficl_compile_set : { - __start_set_Xficl_compile_set = .; - *(set_Xficl_compile_set) - __stop_set_Xficl_compile_set = .; - } - . = ALIGN(4096); __gp = .; .sdata : { *(.got.plt .got) diff --git a/stand/efi/loader/arch/arm/arm.ldscript b/stand/efi/loader/arch/arm/arm.ldscript index 13affe12bbba..7b5c2af399c9 100644 --- a/stand/efi/loader/arch/arm/arm.ldscript +++ b/stand/efi/loader/arch/arm/arm.ldscript @@ -42,16 +42,6 @@ SECTIONS *(.got.plt .got) *(.sdata*.sdata.* .gnu.linkonce.s.*) } - set_Xcommand_set : { - __start_set_Xcommand_set = .; - *(set_Xcommand_set) - __stop_set_Xcommand_set = .; - } - set_Xficl_compile_set : { - __start_set_Xficl_compile_set = .; - *(set_Xficl_compile_set) - __stop_set_Xficl_compile_set = .; - } __gp = .; .plt : { *(.plt) } .reloc : { *(.reloc) } diff --git a/stand/efi/loader/arch/arm64/arm64.ldscript b/stand/efi/loader/arch/arm64/arm64.ldscript index bacb81b5032f..18aead05cb49 100644 --- a/stand/efi/loader/arch/arm64/arm64.ldscript +++ b/stand/efi/loader/arch/arm64/arm64.ldscript @@ -39,17 +39,6 @@ SECTIONS __bss_end = .; } . = ALIGN(16); - set_Xcommand_set : { - __start_set_Xcommand_set = .; - *(set_Xcommand_set) - __stop_set_Xcommand_set = .; - } - set_Xficl_compile_set : { - __start_set_Xficl_compile_set = .; - *(set_Xficl_compile_set) - __stop_set_Xficl_compile_set = .; - } - . = ALIGN(16); __gp = .; .sdata : { *(.got.plt .got) diff --git a/stand/efi/loader/arch/riscv/riscv.ldscript b/stand/efi/loader/arch/riscv/riscv.ldscript index 342ec62cf03e..63b71c3bd702 100644 --- a/stand/efi/loader/arch/riscv/riscv.ldscript +++ b/stand/efi/loader/arch/riscv/riscv.ldscript @@ -35,17 +35,6 @@ SECTIONS __bss_end = .; } . = ALIGN(16); - set_Xcommand_set : { - __start_set_Xcommand_set = .; - *(set_Xcommand_set) - __stop_set_Xcommand_set = .; - } - set_Xficl_compile_set : { - __start_set_Xficl_compile_set = .; - *(set_Xficl_compile_set) - __stop_set_Xficl_compile_set = .; - } - . = ALIGN(16); .sdata : { /* * u-boot expects the gp register to be untouched by the EFI payload, so we From nobody Sun Feb 25 00:58:34 2024 X-Original-To: dev-commits-src-main@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 4Tj53H0qjgz5BxYk; Sun, 25 Feb 2024 00:58:35 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tj53G5b7Bz4tRv; Sun, 25 Feb 2024 00:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708822714; 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=pqZFAISMZVa7GzIMi0XMnPfPYg+Zuf0XjugsVXTz4GQ=; b=KwtqttvQiIx9gieZTNW4RF3AOITJEIZy8tYimfCkQzHhoQ2XG2t9GtIQFOPscJ7oE7zU/8 ZlVNekn+k1n728hy9BHz0mfF10L4u6lvokKL7OnXWYxRgDe2fkVwZqKxmPPJs276qobVcM fyGsdH4Yx3zS/auKvNsJGy6S+Lo6w0ZPPbsQNmaVyCtNh+pTPGgJaWTLxZJcgicgQ3F+KH MI2Vm8ujv8/q7ZQv5FprNSP418ak8ypZMQAk/oKR9uX22lHgbzcnWE8DcDatWMeSH/MlBy POVn/ul79uKQII9kUyXGZxC5ZkSpYKLoC4OVPnYT+caSwXZUFhzJ3QguUcmOFg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708822714; a=rsa-sha256; cv=none; b=fkyhyK9FCIegAO0zqqvAzB2lVcOGj5Yzd+YtswBLMKpsamkrcf93/Ylt7aTp4N6BSkpGIF k3yJOWvOltOvTovQP7oWmEGZFTJKLhz/0EBqKYTUHBkf/Iqv9h1Ih3WI7u3NuwanGyY/Da CPgHuVWfeMbAL6AxNOe/OrDFZsAfhKdCo1kb9w//hC9kdGqaJlCIRRch6rfaJgCgsMW1Xh NIO6M6tASspobwO4BnSNrfQXSaastevWUNgozPPzK8fny5MOupADmYNcEmNXFFdRZHkYOY xwYILreCnuS2nhWsQ2IRtnpK+dhIlXn0XgDSVTT7jEZpnUOkCQOV9ZtEGJ/HJQ== 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=1708822714; 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=pqZFAISMZVa7GzIMi0XMnPfPYg+Zuf0XjugsVXTz4GQ=; b=CPrpASTu5i6iWZTQTVwMuV+i7mPONJI65MnCPXu/U/6Q14h2EKAl2nn9EzhofQhCpoi+rq PCRhiunW5V8O/Er+eSVJv9UMfSEaXMI2gujH72zdPNR+Ag32XPbNLNGD+lBzFtjfCfO01K aJMicN2UaEmOD4n71jfqHuVh+FK21Qvwddvpbj7Q6QCbjtvwmxGtcAjJphHVUyjSZAx18I 0L0aZ3SeQonCMsafulOZ+smm9X7FN58feqdUa2gXnQYM/TXDzvijMtgipfW0VzXVoPODrB mEq9p7IpoW3wZPEFqMG/WE3wNhZUf9hJCHcXyW9gEszhzB95A/zXrqWu8gyGVw== 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 4Tj53G4h8szN4x; Sun, 25 Feb 2024 00:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41P0wYir081798; Sun, 25 Feb 2024 00:58:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41P0wYp1081795; Sun, 25 Feb 2024 00:58:34 GMT (envelope-from git) Date: Sun, 25 Feb 2024 00:58:34 GMT Message-Id: <202402250058.41P0wYp1081795@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b4e85f760b6b - main - loader/efi: Use unique linker set for lua List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: b4e85f760b6b77d276747c9beb6191bfb864e0c2 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b4e85f760b6b77d276747c9beb6191bfb864e0c2 commit b4e85f760b6b77d276747c9beb6191bfb864e0c2 Author: Warner Losh AuthorDate: 2024-02-25 00:57:13 +0000 Commit: Warner Losh CommitDate: 2024-02-25 00:57:13 +0000 loader/efi: Use unique linker set for lua After the linker set cleanup in ldscripts, there's now only one place we need to know the linkerset name, so go ahead and change the lua interpreter augmentation linker set to be uniquely named. Sponsored by: Netflix Reviewed by: tsoome, kevans Differential Revision: https://reviews.freebsd.org/D44062 --- stand/efi/loader/Makefile | 2 +- stand/liblua/lutils.h | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index 2031400814e9..bb95b6480646 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -117,7 +117,7 @@ ${LOADER}.efi: ${PROG} ${OBJCOPY} -j .peheader -j .text -j .sdata -j .data \ -j .dynamic -j .dynsym -j .rel.dyn \ -j .rela.dyn -j .reloc -j .eh_frame -j set_Xcommand_set \ - -j set_Xficl_compile_set \ + -j set_Xficl_compile_set -j set_Xlua_compile_set \ --output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET} LIBEFI= ${BOOTOBJ}/efi/libefi/libefi.a diff --git a/stand/liblua/lutils.h b/stand/liblua/lutils.h index 522abfd3d0d4..ea715096df09 100644 --- a/stand/liblua/lutils.h +++ b/stand/liblua/lutils.h @@ -34,8 +34,9 @@ int luaopen_pager(lua_State *); #include typedef void lua_init_md_t(lua_State *); +#define _LUA_COMPIE_SET Xlua_compile_set #define LUA_COMPILE_SET(func) \ - DATA_SET(Xficl_compile_set, func) /* XXX linker set know by ldscrips */ + DATA_SET(_LUA_COMPILE_SET, func) #define LUA_FOREACH_SET(s) \ - SET_FOREACH((s), Xficl_compile_set) -SET_DECLARE(Xficl_compile_set, lua_init_md_t); + SET_FOREACH((s), _LUA_COMPILE_SET) +SET_DECLARE(_LUA_COMPILE_SET, lua_init_md_t); From nobody Sun Feb 25 00:58:35 2024 X-Original-To: dev-commits-src-main@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 4Tj53J1GG1z5Bxhn; Sun, 25 Feb 2024 00:58: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tj53H6dQ6z4tZc; Sun, 25 Feb 2024 00:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708822715; 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=/Vz6VAU6BQcj7eEg/tS4I0CN65lh+2GigMSpswC2bBo=; b=KFb0WlxWHWSgcIEXLkWwlZo0vKYu16ZeU2sDVqxOhGVcopJMMY1RiNe8teNUiMTKjad0gY a9u/Cp6NsgmsSHAzPdKeGDMpQUkFuUMESEH341sHp00PZQNYKyU/exrINeW/HctxXxKVcC 53MTMyNI6xH0FpLRV5QoFampa1qs0IXV63JeKUSEgnKPnbE5k0EZ07MQ2ZOjDXB8ZQn/Wj oxSdla7kdcY6AyrCkBotzYUBEuEcS2RMPFzTeKUR8rEVJedQgZe66uIyB7m1uIjkgsO9mH NBLFbFkX7xUrXFLGwM7fU87jZ8un30icH2ddn35W/NQfvTin71r1XWMenEbdIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708822715; a=rsa-sha256; cv=none; b=OA4uDiucTOKnmFSylu/jpHhkBzIixAEuDcSUS7NTUQeKmxaFJhDb+V0bb2Zzx+E22Gvgf1 ZORLMKhkWU/3MtZH46PkS5WA/ta4TcckvCsGgQjvm3oi0ajzBQxfouHhKpmhlI654gZ0iS y21Dn2hdbNcF064oBS3xOitck9OXX8jgS2cCEs9HUmS8N0lZgSeZMPqP/XWrmM+wdWmZRZ dd38PJGm4RAsglpZNoRyGDE0qHbPnglwrpJXdPy8F5mX7WlwnVAPPGtGg3VahOQrt/30LL w03MiYr08P+qp3WACThUTwTxYNEOdYAcrbAY0i+oloLHqeLp4M9WEprnQhkgew== 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=1708822715; 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=/Vz6VAU6BQcj7eEg/tS4I0CN65lh+2GigMSpswC2bBo=; b=hn6tqzioLUwIL+WDqgDHkWXl9tBlPW3fVF2vS3kxa4Dhuy6D4BDoqumHDh4auoVAMpnFam 6QBNGdNUSMWbYMeijWdrT8pczjs6WSTWrA4SyjwU8lzkDHZQyaJkXX/7ay1XS/OS1qpTmg oRcsg4F8sQ/8TOAFv4UtuhHRSRDjiPVcy68d7eqtmErgpEH/0Ql7+7uNas7af2TIr2PhOk n37GvN4K8Ug4x8JKhvbJDo78oIRn+Uc0bEk3UusBJUNWUVV04M6xpjcqH5TuE555qG025J crIl/a1GJxwC6rj/wTPdQZssRt/Kuv2nLlsoEiYWxeEsLPcXAGsVx+vJ9hpbzw== 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 4Tj53H5bDVzN0H; Sun, 25 Feb 2024 00:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41P0wZpd081855; Sun, 25 Feb 2024 00:58:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41P0wZuL081852; Sun, 25 Feb 2024 00:58:35 GMT (envelope-from git) Date: Sun, 25 Feb 2024 00:58:35 GMT Message-Id: <202402250058.41P0wZuL081852@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 8ec8413faa35 - main - loader/ficl: Rename the ficl compile set to X4th_compile_set List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 8ec8413faa3573c579d9e6361de904f8251b0c0e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8ec8413faa3573c579d9e6361de904f8251b0c0e commit 8ec8413faa3573c579d9e6361de904f8251b0c0e Author: Warner Losh AuthorDate: 2024-02-25 00:57:21 +0000 Commit: Warner Losh CommitDate: 2024-02-25 00:57:21 +0000 loader/ficl: Rename the ficl compile set to X4th_compile_set And upcoming change will need this set to be named this. Since it's only used in the efi Makefile, and inside if ficl itself, the change should be a nop. Sponsored by: Netflix Reviewed by: tsoome, kevans Differential Revision: https://reviews.freebsd.org/D44063 --- stand/efi/loader/Makefile | 2 +- stand/ficl/ficl.h | 4 ++-- stand/ficl/loader.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index bb95b6480646..b8a98fc1dd47 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -117,7 +117,7 @@ ${LOADER}.efi: ${PROG} ${OBJCOPY} -j .peheader -j .text -j .sdata -j .data \ -j .dynamic -j .dynsym -j .rel.dyn \ -j .rela.dyn -j .reloc -j .eh_frame -j set_Xcommand_set \ - -j set_Xficl_compile_set -j set_Xlua_compile_set \ + -j set_X4th_compile_set -j set_Xlua_compile_set \ --output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET} LIBEFI= ${BOOTOBJ}/efi/libefi/libefi.a diff --git a/stand/ficl/ficl.h b/stand/ficl/ficl.h index bdade26eee09..7be78f1a36b8 100644 --- a/stand/ficl/ficl.h +++ b/stand/ficl/ficl.h @@ -1153,8 +1153,8 @@ typedef struct ficlFILE typedef void ficlCompileFcn(FICL_SYSTEM *); #define FICL_COMPILE_SET(func) \ - DATA_SET(Xficl_compile_set, func) -SET_DECLARE(Xficl_compile_set, ficlCompileFcn); + DATA_SET(X4th_compile_set, func) +SET_DECLARE(X4th_compile_set, ficlCompileFcn); #ifdef LOADER_VERIEXEC #include diff --git a/stand/ficl/loader.c b/stand/ficl/loader.c index 618d9483fbd9..69a65ebedb73 100644 --- a/stand/ficl/loader.c +++ b/stand/ficl/loader.c @@ -865,7 +865,7 @@ void ficlCompilePlatform(FICL_SYSTEM *pSys) dictAppendWord(dp, "uuid-from-string", ficlUuidFromString, FW_DEFAULT); dictAppendWord(dp, "uuid-to-string", ficlUuidToString, FW_DEFAULT); - SET_FOREACH(fnpp, Xficl_compile_set) + SET_FOREACH(fnpp, X4th_compile_set) (*fnpp)(pSys); #if defined(__i386__) From nobody Sun Feb 25 00:58:36 2024 X-Original-To: dev-commits-src-main@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 4Tj53K2P5fz5BxQb; Sun, 25 Feb 2024 00:58: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tj53K0NLmz4tVQ; Sun, 25 Feb 2024 00:58:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708822717; 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=fy5mj+ojQKWdgykTMtLlD9Se880NX0stE/I/UwrrnKw=; b=mdvyG8cFqZ9G7fmCn8lKvZfBM9Fo+twOkegMXyduPHA6ig1cynXB/OQjyL5/8m402GjQWi PIM9mitstgniGqQ+J4z5s+yid6eSAjLxFnpW/Zq4E2dZJDqIAJVOJ3Nsusa5+Ygb1pUGRR jU3WkdNzmXy/A3hQY+UNpxQ+vUVtgmF4aczzy3UDOJ6EmZVH5heeOesXDY7Oh4fRqsCWwl JOfINa/RogRTTU1pMxkj5qJ3gwETjceq0jKiTke/WB5vaTZAVdDjf0ZX1dB+bN0fZEXq4q wJNDJVktUSBbH3Ysjx7KxoQu391gjrtIMA6lYUYjSy84GE8XhXc0x3xGChaGRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708822717; a=rsa-sha256; cv=none; b=nVlpZF38xkcOh2VG9pyQHh/eNczZU8h35z12uIHJDBrHje5uwT5Hin2x+qGO28S2d+0SUD g77OYcxTiSh0bEuwOb7ybkNZ5f6x/dypJKl7ui5cJQ/uL6DeeQ6TyRcSeSMMPrFb4wxF62 PvPCIO58Afi/MBYJ4ZsJa9XbafOAcYcs19ja4Nq/88sGq3iNcPt9Kkal5KHlyXZyRaAGFA vU2qbbxKghXj9MBaKJOg7ZB8IuAoSEpUi0yapODIhBsTHi0oiQ0Le0P7HqG6e3sq/RiuR6 t4M1OTFGUPTDVbqvWzdG+5V26bx9e7Jbff3XXdQjucABxKfUFy7oYp3I1OSf0A== 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=1708822717; 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=fy5mj+ojQKWdgykTMtLlD9Se880NX0stE/I/UwrrnKw=; b=yWk7sVKAb8y/rIC4dCba4A774VT53H4h5W9VRkCvthgLwI+yGOI8W7OjiekTIJA//Wqlk6 Eb+EoamUD/kEsx0XiTAQPw3OeY/X+yFe5V5f4shxHP1gjF7TtSHFZL378j0eC5Fy6iWJue +AbUGrR6LA8c0q/11rEcXUSGommnPTv/hQdGc50275xIuv3Wprnhawx90wSwptB08MC7V3 rtEkoG1zHE3zqM38uuv0JISvc4wsvu9J8VT2EWS3ULp2pvGRPb/BzH8+uZaG/hQtJNW0qJ lzItt1FTSfq1k94+uWn4xGXefeB8CgHQKySowQjY1Uw3xeP9BOohg1K6PGG8+Q== 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 4Tj53J6byrzN0J; Sun, 25 Feb 2024 00:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41P0wa4e081903; Sun, 25 Feb 2024 00:58:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41P0wavY081900; Sun, 25 Feb 2024 00:58:36 GMT (envelope-from git) Date: Sun, 25 Feb 2024 00:58:36 GMT Message-Id: <202402250058.41P0wavY081900@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f5f08e41aa57 - main - loader/efi: Only include interpreter's linker script List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: f5f08e41aa57f94e3c127a488a82b4e518781f89 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f5f08e41aa57f94e3c127a488a82b4e518781f89 commit f5f08e41aa57f94e3c127a488a82b4e518781f89 Author: Warner Losh AuthorDate: 2024-02-25 00:57:29 +0000 Commit: Warner Losh CommitDate: 2024-02-25 00:57:29 +0000 loader/efi: Only include interpreter's linker script For safety, only include the interpreter's linker script. Note that the simple loader doesn't have one, but it's not an error to copy a ELF section that does not exist. No functional change, however. Sponsored by: Netflix Reviewed by: tsoome, kevans Differential Revision: https://reviews.freebsd.org/D44064 --- stand/efi/loader/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index b8a98fc1dd47..b3395bdfdf53 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -117,7 +117,7 @@ ${LOADER}.efi: ${PROG} ${OBJCOPY} -j .peheader -j .text -j .sdata -j .data \ -j .dynamic -j .dynsym -j .rel.dyn \ -j .rela.dyn -j .reloc -j .eh_frame -j set_Xcommand_set \ - -j set_X4th_compile_set -j set_Xlua_compile_set \ + -j set_X${LOADER_INTERP}_compile_set \ --output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET} LIBEFI= ${BOOTOBJ}/efi/libefi/libefi.a From nobody Sun Feb 25 08:15:34 2024 X-Original-To: dev-commits-src-main@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 4TjGlV664Jz5By2h; Sun, 25 Feb 2024 08:15: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TjGlV3l4qz4VHn; Sun, 25 Feb 2024 08:15:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708848934; 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=KsN7vp6I3pS8v5IwtCI/fBZkUpg6m3mf0P1yPD73La8=; b=d5xnBovNIG5rhIie/mtzh7B8Eo3Vh77tTuAePzB5iB3hXdlKMPm030XVTCKrCcA3+toCgV REPnYPQyrFcz6bbEWn4c+accbwP8449zO8HgamcSIT8w/Y27rxlYKb1HiVotcbuSfCE+n7 f7HE/SPtTelaVsY7uPuShfDufvbb7t+xbTdZkZ48viFJrdHLCP7T8v3cvtRQQemRIPOjN3 EH36uZS8PitSZ5HNTvtIyEfQt8K9xjH0lFgkwjDBpiiqKrKKKFXVYH/1LqWnZ9xeanhiI8 fyUrpgoWLRg8cw2Yl468f9LudK3oH0VmtKp8cQubiNfj333h7ol44v5ayFQq0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708848934; a=rsa-sha256; cv=none; b=Sr2gZeJisovH/1pbozoHVoDZiImKl0RCMVDXKRfNDpCwLfmnOzee0Za0dSmKKCKN+DPxkT mjTpFe3mMEFQFRFTuyar7WcgOquvjtBiGMMBqleTk7OsQ1Wa99Y5okBi3Zb8wyT8Tig+aK 7bTnbujz4Uzz6sX6ydcranWzLNKaL8yj5WLiyu2kLWmE7MoeJN5BAgLld2f3labWkkFi50 yxZQoqqFXPGBq+qvqASoIENfXa5IMqnxYhvzWGWIk3YK6ORWxq7e0RoJryU3JriG9d0aUQ +rdxr2AVHn+p/SJjrkLWfTBcW5No0qi/usRL/NdxU9n780z4fnEz8jKlnu3NmA== 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=1708848934; 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=KsN7vp6I3pS8v5IwtCI/fBZkUpg6m3mf0P1yPD73La8=; b=rQYHxXgAFZnjM7XMBd//ndbBYNuVt+VRVENH5zGU3hGyKpepp++4ZHIAuT2Uw8RC7NGeOK 7s0DDWKOT0eWrHpvMzSfMJOoA4eAhrDmOrbjp2CaVso8pkRHyVFqWLEKPKB2dM0gaAJp08 Qr1UL67swGT/+MHxy7vLbefqdHfGJ3xOHb4YXtvaQ4or0OV32DL3pS7n9GheibvUTjElQL jTfVVZ+FzvyIUs4eflmyTsOmc4XQcg8iVauzcmNQIKSasGNgd1OT8djXvwqra/MgW1wqQt xV2ewqHSfIfAxX4ufuQEUyjgVyDe/gqrxSISzrlk+8oUMStQpglAH6gqfrsc/w== 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 4TjGlV2q6Hzc7c; Sun, 25 Feb 2024 08:15:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41P8FYl1026658; Sun, 25 Feb 2024 08:15:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41P8FY7h026655; Sun, 25 Feb 2024 08:15:34 GMT (envelope-from git) Date: Sun, 25 Feb 2024 08:15:34 GMT Message-Id: <202402250815.41P8FY7h026655@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 09dd7240acf1 - main - sigsys test: correct count of delivered signals List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 09dd7240acf1fc50061246013ce318404d70c4e0 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=09dd7240acf1fc50061246013ce318404d70c4e0 commit 09dd7240acf1fc50061246013ce318404d70c4e0 Author: Konstantin Belousov AuthorDate: 2024-02-25 01:36:27 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-25 08:11:49 +0000 sigsys test: correct count of delivered signals When knob is zero, intent is that no SIGSYS signals are delivered. Comparing zero to zero does not test much, we should compare the count of delivered SIGSYSs to zero. Reviewed by: dchagin, imp Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44077 --- tests/sys/kern/sigsys.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/sys/kern/sigsys.c b/tests/sys/kern/sigsys.c index 8b9a4e8516e7..d135ed777498 100644 --- a/tests/sys/kern/sigsys.c +++ b/tests/sys/kern/sigsys.c @@ -41,23 +41,23 @@ sigsys_test(int knob) ATF_REQUIRE(syscall(273) == -1); /* reserved */ ATF_CHECK_ERRNO(ENOSYS, true); atomic_signal_fence(memory_order_seq_cst); - ATF_CHECK_EQ(1 * knob, sigsys_cnt * knob); + ATF_CHECK_EQ(1 * knob, sigsys_cnt); ATF_REQUIRE(syscall(440) == -1); /* SYS_kse_switchin */ ATF_CHECK_ERRNO(ENOSYS, true); atomic_signal_fence(memory_order_seq_cst); - ATF_CHECK_EQ(2 * knob, sigsys_cnt * knob); + ATF_CHECK_EQ(2 * knob, sigsys_cnt); /* Hope this is enough for say next two months */ ATF_REQUIRE(syscall(3000000) == -1); ATF_CHECK_ERRNO(ENOSYS, true); atomic_signal_fence(memory_order_seq_cst); - ATF_CHECK_EQ(3 * knob, sigsys_cnt * knob); + ATF_CHECK_EQ(3 * knob, sigsys_cnt); ATF_REQUIRE(syscall(SYS_afs3_syscall) == -1); ATF_CHECK_ERRNO(ENOSYS, true); atomic_signal_fence(memory_order_seq_cst); - ATF_CHECK_EQ(4 * knob, sigsys_cnt * knob); + ATF_CHECK_EQ(4 * knob, sigsys_cnt); } static void From nobody Sun Feb 25 09:17:18 2024 X-Original-To: dev-commits-src-main@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 4TjJ6l19XBz5C48S; Sun, 25 Feb 2024 09:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TjJ6l0fwRz4c61; Sun, 25 Feb 2024 09:17:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708852639; 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=lUjTvlrU8nNVUQpCOteWR3PecD4at6LIKcsXoR8BOpY=; b=v0udpfsNAxEWPu+UxObgI/qvuqFkeyjCdy7ney1b6EgVdVoGE9KJoW+hm3qQV/T0M1EWLh dFn77nFZ8+bInelstizaUFLQWlaie1+gWl+UmHoTIxuvx7dpZ1qhXeQSwmtjeWhUXvugrd W03hXVqbPhTUbmYZ4h0ZEP0/2/Yjc59jqIb5l8CKZRwZeF3Mmz2pBYMbk2rF+G40lm5LVX SYhi65sgQh0cSo4ym+CCNHvgLCWAtR/LoAMXgQJ1k8AaOVR4PBY2+srfQDQ6SrO9nE6ViY puzDQ+g7RIqfzNEtS5QfxQqSddSBimUvnt7OFo3sk9/R8aVdPt+EtnyZ1PnHtA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708852639; a=rsa-sha256; cv=none; b=tH+INt2sW+EmMCMX2DfxNN5BURbgK8G52hlDKYkNr1baRJi+m3COWZaetI3CKuBTlwmmXO ggeCmadjBre5QmuBSPuJfnmDL4ruez2klGAAYfxcizX7TBr1B6ur5sQpFhC8BmRans5x1q 9vZlxJ6/xzocJDt+3wQZu75121S3clPAFvlvhP4HFfoqhYb+97uDfS67LhQYZkZ6rOAMLD NUch/b6vGvqZNgOYIo3Wy3XnvNzQLbkyKdF1Dk742AJ9J7yqKAXZBykZlIkl7OWJnStGf+ 9wuKZxcV4APDmHEqK6Jn1VbVGl+P5u8/gSOaNvWhwSyfxSBZePdUs8vYB9Vk8Q== 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=1708852639; 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=lUjTvlrU8nNVUQpCOteWR3PecD4at6LIKcsXoR8BOpY=; b=AedPJke+BTD01UJFTnnTZwWXDtfJGU+S8KTFofU6kfbL7obCpfEWTKu+9SZGuRPBBB00q3 /NZBOYD7QPCquJ0gayU3yXO2eptJoXIu9bA4wnKaJCcrTfnG6h3oi5IqN3Y6Mt8RS8x7Io InN6Z7y/iT7VkmBQu6Cb2/qqCNcCZRY9Fkew0LG7/EFYIZnBLe5fgMeaMtKp17Wvk+O9aF tJ7rfFFVItef6db8Ss89MI35PYM1dkk8LEcwQkNbCzvT49kF0Wpj9t+Kw1kXNnOw9gYOY9 Y9XgHf5Rd36SIU0mHMgEUNYuD6L6wR9czIIY5VbRuuK2FfY4t9u6xt1X45bwhA== 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 4TjJ6k6sLFzdHF; Sun, 25 Feb 2024 09:17:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41P9HIKs029064; Sun, 25 Feb 2024 09:17:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41P9HIef029061; Sun, 25 Feb 2024 09:17:18 GMT (envelope-from git) Date: Sun, 25 Feb 2024 09:17:18 GMT Message-Id: <202402250917.41P9HIef029061@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 6e9a71706906 - main - tcp_rack.4: Fix a link in the SEE ALSO section List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 6e9a71706906b86e627cfdd27bc37b88a796f46e Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=6e9a71706906b86e627cfdd27bc37b88a796f46e commit 6e9a71706906b86e627cfdd27bc37b88a796f46e Author: Gordon Bergling AuthorDate: 2024-02-25 09:16:25 +0000 Commit: Gordon Bergling CommitDate: 2024-02-25 09:16:25 +0000 tcp_rack.4: Fix a link in the SEE ALSO section The URL of the paper at arxiv.org has changed so link the PDF-file directly. MFC after: 3 days --- share/man/man4/tcp_rack.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man4/tcp_rack.4 b/share/man/man4/tcp_rack.4 index 791b48baf6f6..566834f4283b 100644 --- a/share/man/man4/tcp_rack.4 +++ b/share/man/man4/tcp_rack.4 @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd December 17, 2023 +.Dd February 25, 2024 .Dt TCP_RACK 4 .Os .Sh NAME @@ -134,7 +134,7 @@ What method should we use for rate sampling 0=high, 1=low .%A "Ahmed M. Abdelmoniem" .%A "Brahim Bensaou" .%T "T-RACKs: A Faster Recovery Mechanism for TCP in Data Center Networks" -.%O "https://arxiv.org/abs/2102.07477" +.%O "https://arxiv.org/pdf/2102.07477.pdf" .%D "February 2021" .Re .Sh HISTORY From nobody Sun Feb 25 09:29:23 2024 X-Original-To: dev-commits-src-main@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 4TjJNp2Q0bz5C4pX; Sun, 25 Feb 2024 09:29:30 +0000 (UTC) (envelope-from tuexen@fh-muenster.de) Received: from drew.franken.de (mail-n.franken.de [193.175.24.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "Sectigo RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TjJNn6K9hz4fl7; Sun, 25 Feb 2024 09:29:29 +0000 (UTC) (envelope-from tuexen@fh-muenster.de) Authentication-Results: mx1.freebsd.org; none Received: from smtpclient.apple (ip4d15f54e.dynamic.kabel-deutschland.de [77.21.245.78]) (Authenticated sender: micmac) by mail-n.franken.de (Postfix) with ESMTPSA id A2DB0721E2817; Sun, 25 Feb 2024 10:29:24 +0100 (CET) Content-Type: multipart/signed; boundary="Apple-Mail=_05E37298-BFCE-4336-BAEA-AE1983E28300"; protocol="application/pkcs7-signature"; micalg=sha-256 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.400.31\)) Subject: Re: git: 6e9a71706906 - main - tcp_rack.4: Fix a link in the SEE ALSO section From: tuexen@fh-muenster.de In-Reply-To: <202402250917.41P9HIef029061@gitrepo.freebsd.org> Date: Sun, 25 Feb 2024 10:29:23 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <6731EBF5-A6BD-48A6-BABD-685DE54DF764@fh-muenster.de> References: <202402250917.41P9HIef029061@gitrepo.freebsd.org> To: Gordon Bergling X-Mailer: Apple Mail (2.3774.400.31) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, T_SCC_BODY_TEXT_LINE autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:680, ipnet:193.174.0.0/15, country:DE] X-Rspamd-Queue-Id: 4TjJNn6K9hz4fl7 --Apple-Mail=_05E37298-BFCE-4336-BAEA-AE1983E28300 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii > On Feb 25, 2024, at 10:17, Gordon Bergling wrote: >=20 > The branch main has been updated by gbe: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D6e9a71706906b86e627cfdd27bc37b88= a796f46e >=20 > commit 6e9a71706906b86e627cfdd27bc37b88a796f46e > Author: Gordon Bergling > AuthorDate: 2024-02-25 09:16:25 +0000 > Commit: Gordon Bergling > CommitDate: 2024-02-25 09:16:25 +0000 >=20 > tcp_rack.4: Fix a link in the SEE ALSO section >=20 > The URL of the paper at arxiv.org has changed so link the > PDF-file directly. >=20 > MFC after: 3 days > --- > share/man/man4/tcp_rack.4 | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/share/man/man4/tcp_rack.4 b/share/man/man4/tcp_rack.4 > index 791b48baf6f6..566834f4283b 100644 > --- a/share/man/man4/tcp_rack.4 > +++ b/share/man/man4/tcp_rack.4 > @@ -23,7 +23,7 @@ > .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE = POSSIBILITY OF > .\" SUCH DAMAGE. > .\" > -.Dd December 17, 2023 > +.Dd February 25, 2024 > .Dt TCP_RACK 4 > .Os > .Sh NAME > @@ -134,7 +134,7 @@ What method should we use for rate sampling = 0=3Dhigh, 1=3Dlow > .%A "Ahmed M. Abdelmoniem" > .%A "Brahim Bensaou" > .%T "T-RACKs: A Faster Recovery Mechanism for TCP in Data Center = Networks" > -.%O "https://arxiv.org/abs/2102.07477" > +.%O "https://arxiv.org/pdf/2102.07477.pdf" Hi Gordon, as I asked before: Why is that link given at all? It is not related to the RACK = implementation. Best regards Michael > .%D "February 2021" > .Re > .Sh HISTORY --Apple-Mail=_05E37298-BFCE-4336-BAEA-AE1983E28300 Content-Disposition: attachment; filename=smime.p7s Content-Type: application/pkcs7-signature; name=smime.p7s Content-Transfer-Encoding: base64 MIAGCSqGSIb3DQEHAqCAMIACAQExDzANBglghkgBZQMEAgEFADCABgkqhkiG9w0BBwEAAKCCEfMw ggUSMIID+qADAgECAgkA4wvV+K8l2YEwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAkRFMSsw KQYDVQQKDCJULVN5c3RlbXMgRW50ZXJwcmlzZSBTZXJ2aWNlcyBHbWJIMR8wHQYDVQQLDBZULVN5 c3RlbXMgVHJ1c3QgQ2VudGVyMSUwIwYDVQQDDBxULVRlbGVTZWMgR2xvYmFsUm9vdCBDbGFzcyAy MB4XDTE2MDIyMjEzMzgyMloXDTMxMDIyMjIzNTk1OVowgZUxCzAJBgNVBAYTAkRFMUUwQwYDVQQK EzxWZXJlaW4genVyIEZvZXJkZXJ1bmcgZWluZXMgRGV1dHNjaGVuIEZvcnNjaHVuZ3NuZXR6ZXMg ZS4gVi4xEDAOBgNVBAsTB0RGTi1QS0kxLTArBgNVBAMTJERGTi1WZXJlaW4gQ2VydGlmaWNhdGlv biBBdXRob3JpdHkgMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMtg1/9moUHN0vqH l4pzq5lN6mc5WqFggEcVToyVsuXPztNXS43O+FZsFVV2B+pG/cgDRWM+cNSrVICxI5y+NyipCf8F XRgPxJiZN7Mg9mZ4F4fCnQ7MSjLnFp2uDo0peQcAIFTcFV9Kltd4tjTTwXS1nem/wHdN6r1ZB+Ba L2w8pQDcNb1lDY9/Mm3yWmpLYgHurDg0WUU2SQXaeMpqbVvAgWsRzNI8qIv4cRrKO+KA3Ra0Z3qL NupOkSk9s1FcragMvp0049ENF4N1xDkesJQLEvHVaY4l9Lg9K7/AjsMeO6W/VRCrKq4Xl14zzsjz 9AkH4wKGMUZrAcUQDBHHWekCAwEAAaOCAXQwggFwMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU k+PYMiba1fFKpZFK4OpL4qIMz+EwHwYDVR0jBBgwFoAUv1kgNgB5oKAia4zV8mHSuCzLgkowEgYD VR0TAQH/BAgwBgEB/wIBAjAzBgNVHSAELDAqMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGC LB4wCAYGZ4EMAQICMEwGA1UdHwRFMEMwQaA/oD2GO2h0dHA6Ly9wa2kwMzM2LnRlbGVzZWMuZGUv cmwvVGVsZVNlY19HbG9iYWxSb290X0NsYXNzXzIuY3JsMIGGBggrBgEFBQcBAQR6MHgwLAYIKwYB BQUHMAGGIGh0dHA6Ly9vY3NwMDMzNi50ZWxlc2VjLmRlL29jc3ByMEgGCCsGAQUFBzAChjxodHRw Oi8vcGtpMDMzNi50ZWxlc2VjLmRlL2NydC9UZWxlU2VjX0dsb2JhbFJvb3RfQ2xhc3NfMi5jZXIw DQYJKoZIhvcNAQELBQADggEBAIcL/z4Cm2XIVi3WO5qYi3FP2ropqiH5Ri71sqQPrhE4eTizDnS6 dl2e6BiClmLbTDPo3flq3zK9LExHYFV/53RrtCyD2HlrtrdNUAtmB7Xts5et6u5/MOaZ/SLick0+ hFvu+c+Z6n/XUjkurJgARH5pO7917tALOxrN5fcPImxHhPalR6D90Bo0fa3SPXez7vTXTf/D6OWS T1k+kEcQSrCFWMBvf/iu7QhCnh7U3xQuTY+8npTD5+32GPg8SecmqKc22CzeIs2LgtjZeOJVEqM7 h0S2EQvVDFKvaYwPBt/QolOLV5h7z/0HJPT8vcP9SpIClxvyt7bPZYoaorVyGTkwggWsMIIElKAD AgECAgcbY7rQHiw9MA0GCSqGSIb3DQEBCwUAMIGVMQswCQYDVQQGEwJERTFFMEMGA1UEChM8VmVy ZWluIHp1ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYu MRAwDgYDVQQLEwdERk4tUEtJMS0wKwYDVQQDEyRERk4tVmVyZWluIENlcnRpZmljYXRpb24gQXV0 aG9yaXR5IDIwHhcNMTYwNTI0MTEzODQwWhcNMzEwMjIyMjM1OTU5WjCBjTELMAkGA1UEBhMCREUx RTBDBgNVBAoMPFZlcmVpbiB6dXIgRm9lcmRlcnVuZyBlaW5lcyBEZXV0c2NoZW4gRm9yc2NodW5n c25ldHplcyBlLiBWLjEQMA4GA1UECwwHREZOLVBLSTElMCMGA1UEAwwcREZOLVZlcmVpbiBHbG9i YWwgSXNzdWluZyBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ07eRxH3h+Gy8Zp 1xCeOdfZojDbchwFfylfS2jxrRnWTOFrG7ELf6Gr4HuLi9gtzm6IOhDuV+UefwRRNuu6cG1joL6W LkDh0YNMZj0cZGnlm6Stcq5oOVGHecwX064vXWNxSzl660Knl5BpBb+Q/6RAcL0D57+eGIgfn5mI TQ5HjUhfZZkQ0tkqSe3BuS0dnxLLFdM/fx5ULzquk1enfnjK1UriGuXtQX1TX8izKvWKMKztFwUk P7agCwf9TRqaA1KgNpzeJIdl5Of6x5ZzJBTN0OgbaJ4YWa52fvfRCng8h0uwN89Tyjo4EPPLR22M ZD08WkVKusqAfLjz56dMTM0CAwEAAaOCAgUwggIBMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYDVR0P AQH/BAQDAgEGMCkGA1UdIAQiMCAwDQYLKwYBBAGBrSGCLB4wDwYNKwYBBAGBrSGCLAEBBDAdBgNV HQ4EFgQUazqYi/nyU4na4K2yMh4JH+iqO3QwHwYDVR0jBBgwFoAUk+PYMiba1fFKpZFK4OpL4qIM z+EwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtcm9v dC1nMi1jYS9wdWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS9n bG9iYWwtcm9vdC1nMi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEEgdAwgc0wMwYI KwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NTUDBKBggrBgEF BQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS9nbG9iYWwtcm9vdC1nMi1jYS9wdWIvY2FjZXJ0 L2NhY2VydC5jcnQwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZ2xvYmFsLXJv b3QtZzItY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQCBeEWkTqR/ DlXwCbFqPnjMaDWpHPOVnj/z+N9rOHeJLI21rT7H8pTNoAauusyosa0zCLYkhmI2THhuUPDVbmCN T1IxQ5dGdfBi5G5mUcFCMWdQ5UnnOR7Ln8qGSN4IFP8VSytmm6A4nwDO/afr0X9XLchMX9wQEZc+ lgQCXISoKTlslPwQkgZ7nu7YRrQbtQMMONncsKk/cQYLsgMHM8KNSGMlJTx6e1du94oFOO+4oK4v 9NsH1VuEGMGpuEvObJAaguS5Pfp38dIfMwK/U+d2+dwmJUFvL6Yb+qQTkPp8ftkLYF3sv8pBoGH7 EUkp2KgtdRXYShjqFu9VNCIaE40GMIIHKTCCBhGgAwIBAgIMJrRClNKRzetB0jc/MA0GCSqGSIb3 DQEBCwUAMIGNMQswCQYDVQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1ciBGb2VyZGVydW5nIGVp bmVzIERldXRzY2hlbiBGb3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYDVQQLDAdERk4tUEtJMSUw IwYDVQQDDBxERk4tVmVyZWluIEdsb2JhbCBJc3N1aW5nIENBMB4XDTIyMDUzMDEzMjIxNVoXDTI1 MDUyOTEzMjIxNVowgcQxCzAJBgNVBAYTAkRFMRwwGgYDVQQIDBNOb3JkcmhlaW4tV2VzdGZhbGVu MREwDwYDVQQHDAhNdWVuc3RlcjEUMBIGA1UECgwLRkggTXVlbnN0ZXIxMjAwBgNVBAsMKUZhY2hi ZXJlaWNoIEVsZWt0cm90ZWNobmlrIHVuZCBJbmZvcm1hdGlrMQ8wDQYDVQQEDAZUdWV4ZW4xEDAO BgNVBCoMB01pY2hhZWwxFzAVBgNVBAMMDk1pY2hhZWwgVHVleGVuMIICIjANBgkqhkiG9w0BAQEF AAOCAg8AMIICCgKCAgEA2QZ7Uheto325SEnX2BTxBvYnz7u/BVmzxKlogaR4K0MA8ZcfNIdQkiJU efjL6imq21BSFsr/tXcODFZmPrvx9aIxjntCxmEFr7qFaw3e3mUIxJyj5n6BxjzZ/hyJte8LBDbj zj+e8WPUzXmYbSxtrh9kgw8NMx3+bo3Hslic+PkKEGx9JJp2I2TEs88xD0rHC2Ljwcfk6bS9jC+/ BAuY/TsbJoq+8d64DYSLGiIYbvMMuxM2C8BlpHLIOLx2FaH+uMqdH2dLVvCacZJ9YzHvvZY8O2nQ OBFCG1UMpX5YLHN8g/t02a+IBt+oe97JMdJ/kZsPjolI98dcRdzz0hTXZql2xvp6zlocm9iGTRcv dCSxy+0x4CIZD1EkVX9zCPGpzdTXnrU+zvnz14Uq3Wbfl3GiVgK0Avr1enfZepruAxAy7KGIm2zi /qY3XSkN8fvWJmYnomOjCRjaPtqS/azmnyeodsxlVhqQKbES65u/PbOXjOlhiYAvemS0IbK4iR76 3iSmkpwSNpJt6BCtFJN+w3Y8tztCP66KPPC1Fri1oj27KPaf04J66MkSjlQdpI7POS6lDyN7X2Hw tgZKRVA94h/JvZp4ld7mTzXTEW2tdO5azPILsL9xOYjSS5VIyUFF4MoxSbfZtXWaZFsMC1fXDNNL uRDrISotdwADuU75Fe0CAwEAAaOCAk4wggJKMD4GA1UdIAQ3MDUwDwYNKwYBBAGBrSGCLAEBBDAQ Bg4rBgEEAYGtIYIsAQEECjAQBg4rBgEEAYGtIYIsAgEECjAJBgNVHRMEAjAAMA4GA1UdDwEB/wQE AwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwHQYDVR0OBBYEFFDbROYIxDr3fvlX tkXqx7T8lihxMB8GA1UdIwQYMBaAFGs6mIv58lOJ2uCtsjIeCR/oqjt0MCAGA1UdEQQZMBeBFXR1 ZXhlbkBmaC1tdWVuc3Rlci5kZTCBjQYDVR0fBIGFMIGCMD+gPaA7hjlodHRwOi8vY2RwMS5wY2Eu ZGZuLmRlL2Rmbi1jYS1nbG9iYWwtZzIvcHViL2NybC9jYWNybC5jcmwwP6A9oDuGOWh0dHA6Ly9j ZHAyLnBjYS5kZm4uZGUvZGZuLWNhLWdsb2JhbC1nMi9wdWIvY3JsL2NhY3JsLmNybDCB2wYIKwYB BQUHAQEEgc4wgcswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2 ZXIvT0NTUDBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDEucGNhLmRmbi5kZS9kZm4tY2EtZ2xvYmFs LWcyL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDBJBggrBgEFBQcwAoY9aHR0cDovL2NkcDIucGNhLmRm bi5kZS9kZm4tY2EtZ2xvYmFsLWcyL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDANBgkqhkiG9w0BAQsF AAOCAQEALubmL854icQMxKxOxQK+deXTjC6CLYnUDwB8MvnDC+BSeh3tUHT37fSgsK1ShNUSNJX0 YF0VYLfZ6+lPyaFYLArVrAIHqvDiVURaulB9NA+3gck/VSuRz4ILYBy61XbcGQQ8Wx+g6TcqsjsF oOhqEBycj5QuITj+EFmX8nvfo0dJtVa2OPDk1N9beLfQBcLhspJ/nv0pKhpNWv5YETG26YqYfsC7 FA/ZNGvRcoOPkjkDhBTtG+qq9DDD75XtGEBZhYXbnG15tn4/UV07B+UyK4/cqQSA+My5FML3YsQw EYrV9klVD/mLMOdZV5+95xt7O8IdYeHrBapVlhANH5bFazGCBJ0wggSZAgEBMIGeMIGNMQswCQYD VQQGEwJERTFFMEMGA1UECgw8VmVyZWluIHp1ciBGb2VyZGVydW5nIGVpbmVzIERldXRzY2hlbiBG b3JzY2h1bmdzbmV0emVzIGUuIFYuMRAwDgYDVQQLDAdERk4tUEtJMSUwIwYDVQQDDBxERk4tVmVy ZWluIEdsb2JhbCBJc3N1aW5nIENBAgwmtEKU0pHN60HSNz8wDQYJYIZIAWUDBAIBBQCgggHPMBgG CSqGSIb3DQEJAzELBgkqhkiG9w0BBwEwHAYJKoZIhvcNAQkFMQ8XDTI0MDIyNTA5MjkyM1owLwYJ KoZIhvcNAQkEMSIEIHh3tHHhWfYuU7gGMzmBvpuJT2nknD48A3sOOx4Hz58GMIGvBgkrBgEEAYI3 EAQxgaEwgZ4wgY0xCzAJBgNVBAYTAkRFMUUwQwYDVQQKDDxWZXJlaW4genVyIEZvZXJkZXJ1bmcg ZWluZXMgRGV1dHNjaGVuIEZvcnNjaHVuZ3NuZXR6ZXMgZS4gVi4xEDAOBgNVBAsMB0RGTi1QS0kx JTAjBgNVBAMMHERGTi1WZXJlaW4gR2xvYmFsIElzc3VpbmcgQ0ECDCa0QpTSkc3rQdI3PzCBsQYL KoZIhvcNAQkQAgsxgaGggZ4wgY0xCzAJBgNVBAYTAkRFMUUwQwYDVQQKDDxWZXJlaW4genVyIEZv ZXJkZXJ1bmcgZWluZXMgRGV1dHNjaGVuIEZvcnNjaHVuZ3NuZXR6ZXMgZS4gVi4xEDAOBgNVBAsM B0RGTi1QS0kxJTAjBgNVBAMMHERGTi1WZXJlaW4gR2xvYmFsIElzc3VpbmcgQ0ECDCa0QpTSkc3r QdI3PzANBgkqhkiG9w0BAQsFAASCAgANJFHYWeRQtr5LcVbuPCxw4V0Wb3tNcv074a1VgYUAtqUA TA/WyX4GksJ9uxUwh/rfO3Uf1Qh5XkanB7SnabRBL8FFMLdlsdBHOLlK64uDAvhZ8ZXKWgewwir8 82/KX102LTA5bo0VHz9Mpsd598/7rHsqJnS3bzKpmePn2gsiuCQlr0PgONAhAm6EmX2/z6EwJtyW A6EdPoAL4fA65IaXkFSycFrk6mCR4wDPDhu+81sJnRZG+gSjK+Ur8ziHdG96p/kmQx5GKccKBJfl x5E5VYAOZgoP4xTfBtrdJ+JunNh78MwwyAlz6EecnkOukRbUQed+8hWMqmn0LENs2kGZGHnDSV1M 53WSjG57gHvpe/rt1i6jafnQbAsw5Q3YugDwDLEPpgm6IO+/KaSUneYNA0c0RT2Du/kgIMjv27xv ZzxFmb8+3mschwKmMBhEJrygjGLgDpC2I7rJc/QVkWor5vrrzJrbR/4LaGQ1Pw0aLSy4GoDf6m7C fyrfUk6nTd7WkBcfk+5G0NLiiytvJcfwP9Pt3F29tVQVlH79VSfWZEfl5X4tf3jQoaIuHluXpicQ 0ZoZdaQqs+S64R8XAbAOkTgoAtNCFQNjuVN6pc/tQQ96OO8Y/YC0vHFfei13r91QGXbOECbzcOVg fJSfISrIS/jcXvUO3eZGhHGRwXV4PAAAAAAAAA== --Apple-Mail=_05E37298-BFCE-4336-BAEA-AE1983E28300-- From nobody Sun Feb 25 11:49:14 2024 X-Original-To: dev-commits-src-main@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 4TjMV23z9Cz5B4Wx; Sun, 25 Feb 2024 11:49: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TjMV23SpWz41dM; Sun, 25 Feb 2024 11:49:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708861754; 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=uJBeUyWHnrtJZmOQeGpHLfpoa17aaUg2H6QRDSZP6YE=; b=viDvefjrBavSUK7MQz/hfOhyhqkyqfosqW3hi72Qp4dNBwEXybeMcxLmFDKqLhyBfxlKm7 INlBv3QO0kOh7Rf+sngtieASikZqF+iZU76KsGz3TyxGyxVAQfHc8DK9uo0uwANLKTxNun LscVQYImeMxc1wyBD7ISHz9oAIbuIzXiFhCRKSkk/0oL1FqA6pxLKQ/rpe7ASQxs13fFIk YM/zrIOvldhVznqf3Nq4i39HABA8Wi8mu18OOltRhP1oXbbr5jRzWJUfMoV+pqZDPB6jb6 RPHxFjWqlJyzQmIrovOvbhA9pvC1TDKHO9ji1K+YCpg5zvH7vOh3xOhJJWEhcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708861754; a=rsa-sha256; cv=none; b=RodSP+L3NIv//vJ4yi8VjAOh2dZ4pZPWuOLJLdTr00PCkZA2mbq7/Zwk60LdKuMBEnvOMg AorLG3clhtmbzx9D0ME/xlHjLmMiW4/ewauEWj9+SVE0iSKWMwm7giJenyC0HXxKEY9aOx VlB+bbTyFbqCdsmNcdozNYaAxtv/4GUZkbu3uXtEV5JVL3mFqWiPXiZRDQGJ2nV35e0XK8 X0quVyoeoX+kjZWGbiHOx5d6/deoIQz81KgmzxVAfrHdODEcT5jNFfp5qIt3IK7coqsTrE +HDmsKRAt2oZmVQZqTvn61G0HazzszteZxpcDTMhGwONgiSGVlUrBgtnap7GPw== 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=1708861754; 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=uJBeUyWHnrtJZmOQeGpHLfpoa17aaUg2H6QRDSZP6YE=; b=e6woChHnE7xJ4uK6Dp0f0i5IX9VFSs8NOtoaY7iDHFicICwNGpgTyFMoDqncXrPYLw0GnD jVmobsmjL1DN/pMNB3RRl8mVAzVSJ6NgbTlx2ldM0x8u8OFJ5CmTimdTu6OXreFzaKiEeg TVOKJxtbPvpUBRiRMBnd48V5KQARxo2l3vtufMYO6qv1babhWItoUL0qgDP4EfsTDHKIgp oyX+FAb6HzFIHQ7z/W4q5vy7K+1cK5nYi+6pjdlZLKL/gW6jPmZ5t3Co1Fs8YIxtNVWaHN A2fFD/NGSP1jXL9NVyPiN7h+s0JNVJGMT62biRRsIBKnuYifjl3+ldFxqTBv8Q== 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 4TjMV22WJQzjTK; Sun, 25 Feb 2024 11:49:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41PBnEfH086744; Sun, 25 Feb 2024 11:49:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41PBnENk086741; Sun, 25 Feb 2024 11:49:14 GMT (envelope-from git) Date: Sun, 25 Feb 2024 11:49:14 GMT Message-Id: <202402251149.41PBnENk086741@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: c9b6241e250a - main - tcp: address enum-int-mismatch fix gcc13 error after f74352fbcf15341accaf5a92240871f98323215d List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c9b6241e250a4f1156e2150ccdbad0d3029dcef6 Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=c9b6241e250a4f1156e2150ccdbad0d3029dcef6 commit c9b6241e250a4f1156e2150ccdbad0d3029dcef6 Author: Richard Scheffenegger AuthorDate: 2024-02-25 03:45:05 +0000 Commit: Richard Scheffenegger CommitDate: 2024-02-25 03:46:39 +0000 tcp: address enum-int-mismatch fix gcc13 error after f74352fbcf15341accaf5a92240871f98323215d --- sys/netinet/cc/cc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/cc/cc.c b/sys/netinet/cc/cc.c index 9308b5f8d764..adcb16e87637 100644 --- a/sys/netinet/cc/cc.c +++ b/sys/netinet/cc/cc.c @@ -452,7 +452,7 @@ newreno_cc_after_idle(struct cc_var *ccv) * Perform any necessary tasks before we enter congestion recovery. */ void -newreno_cc_cong_signal(struct cc_var *ccv, uint32_t type) +newreno_cc_cong_signal(struct cc_var *ccv, ccsignal_t type) { uint32_t cwin, factor, mss, pipe; From nobody Sun Feb 25 12:30:29 2024 X-Original-To: dev-commits-src-main@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 4TjNPn1ChTz5B8Pk; Sun, 25 Feb 2024 12:30:37 +0000 (UTC) (envelope-from bapt@nours.eu) Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4TjNPm2vGnz46bG; Sun, 25 Feb 2024 12:30:36 +0000 (UTC) (envelope-from bapt@nours.eu) Authentication-Results: mx1.freebsd.org; none Received: from [IPv6:::1] (2a02-8428-078f-2201-3283-37fb-2795-6f19.rev.sfr.net [IPv6:2a02:8428:78f:2201:3283:37fb:2795:6f19]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aniel.nours.eu (Postfix) with ESMTPSA id 0BE4210CEA; Sun, 25 Feb 2024 13:30:29 +0100 (CET) Date: Sun, 25 Feb 2024 13:30:29 +0100 From: Baptiste Daroussin To: Richard Scheffenegger , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: =?US-ASCII?Q?Re=3A_git=3A_c9b6241e250a_-_main_-_?= =?US-ASCII?Q?tcp=3A_address_enum-int-mismatch_?= =?US-ASCII?Q?_fix_gcc13_error_after_f74352fb?= =?US-ASCII?Q?cf15341accaf5a92240871f98323215d?= User-Agent: K-9 Mail for Android In-Reply-To: <202402251149.41PBnENk086741@gitrepo.freebsd.org> References: <202402251149.41PBnENk086741@gitrepo.freebsd.org> Message-ID: <8136FFC0-33D6-4E57-8835-452A0A4E9A03@nours.eu> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary=----D698OXYCBC5PNXG3R5A7JIX564LU6D Content-Transfer-Encoding: 7bit X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:16276, ipnet:176.31.0.0/16, country:FR] X-Rspamd-Queue-Id: 4TjNPm2vGnz46bG ------D698OXYCBC5PNXG3R5A7JIX564LU6D Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Le 25 f=C3=A9vrier 2024 12:49:14 GMT+01:00, Richard Scheffenegger a =C3=A9crit=C2=A0: >The branch main has been updated by rscheff: > >URL: https://cgit=2EFreeBSD=2Eorg/src/commit/?id=3Dc9b6241e250a4f1156e215= 0ccdbad0d3029dcef6 > >commit c9b6241e250a4f1156e2150ccdbad0d3029dcef6 >Author: Richard Scheffenegger >AuthorDate: 2024-02-25 03:45:05 +0000 >Commit: Richard Scheffenegger >CommitDate: 2024-02-25 03:46:39 +0000 > > tcp: address enum-int-mismatch > fix gcc13 error after f74352fbcf15341accaf5a92240871f98323215d >--- > sys/netinet/cc/cc=2Ec | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/sys/netinet/cc/cc=2Ec b/sys/netinet/cc/cc=2Ec >index 9308b5f8d764=2E=2Eadcb16e87637 100644 >--- a/sys/netinet/cc/cc=2Ec >+++ b/sys/netinet/cc/cc=2Ec >@@ -452,7 +452,7 @@ newreno_cc_after_idle(struct cc_var *ccv) > * Perform any necessary tasks before we enter congestion recovery=2E > */ > void >-newreno_cc_cong_signal(struct cc_var *ccv, uint32_t type) >+newreno_cc_cong_signal(struct cc_var *ccv, ccsignal_t type) > { > uint32_t cwin, factor, mss, pipe; >=20 Somehow incremental build has been broken in the last couple of days=2E /home/bapt/worktrees/main/sys/netinet/cc/cc=2Ec:475:10: error: 6 enumerati= on values not handled in switch: 'CC_ACK', 'CC_DUPACK', 'CC_PARTIALACK'=2E= =2E=2E [-Werror,-Wswitch] 4= 75 | switch (type) { | ^= ~~~ This is the error I get since this commit in buildkernel for pkgbase, all = arches Best regards, Bapt ------D698OXYCBC5PNXG3R5A7JIX564LU6D Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable
Le 25= f=C3=A9vrier 2024 12:49:14 GMT+01:00, Richard Scheffenegger <rscheff@Fr= eeBSD=2Eorg> a =C3=A9crit=C2=A0:
The branch main has been updated b=
y rscheff:

URL: https://cgit=2EFreeBSD=2Eorg=
/src/commit/?id=3Dc9b6241e250a4f1156e2150ccdbad0d3029dcef6

commi=
t c9b6241e250a4f1156e2150ccdbad0d3029dcef6
Author:     Richard Scheffene=
gger <rscheff@FreeBSD=2Eorg>
AuthorDate: 2024-02-25 03:45:05 +0000=

Commit:     Richard Scheffenegger <rscheff@FreeBSD=2Eorg>
Comm=
itDate: 2024-02-25 03:46:39 +0000

    tcp: address enum-int-mismatch=

    fix gcc13 error after f74352fbcf15341accaf5a92240871f98323215d
 =
sys/netinet/cc/cc=2Ec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion=
(-)

diff --git a/sys/netinet/cc/cc=2Ec b/sys/netinet/cc/cc=2Ec
in=
dex 9308b5f8d764=2E=2Eadcb16e87637 100644
--- a/sys/netinet/cc/cc=2Ec+++ b/sys/netinet/cc/cc=2Ec
@@ -452,7 +452,7 @@ newreno_cc_after_idle(s=
truct cc_var *ccv)
  * Perform any necessary tasks before we enter conge=
stion recovery=2E
  */
 void
-newreno_cc_cong_signal(struct cc_var=
 *ccv, uint32_t type)
+newreno_cc_cong_signal(struct cc_var *ccv, ccsign=
al_t type)
 {
 	uint32_t cwin, factor, mss, pipe;

Somehow incremental= build has been broken in the last couple of days=2E

/home/bapt/work= trees/main/sys/netinet/cc/cc=2Ec:475:10: error: 6 enumeration values not ha= ndled in switch: 'CC_ACK', 'CC_DUPACK', 'CC_PARTIALACK'=2E=2E=2E [-Werror,-= Wswitch]=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 47= 5 |=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 switch (type) {=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0 |=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 ^~~~

This is the error I get since th= is commit in buildkernel for pkgbase, all arches

Best regards,
Ba= pt
------D698OXYCBC5PNXG3R5A7JIX564LU6D-- From nobody Sun Feb 25 13:30:56 2024 X-Original-To: dev-commits-src-main@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 4TjPm62DNgz5BG8s; Sun, 25 Feb 2024 13:31:34 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp6.goneo.de (smtp6.goneo.de [IPv6:2001:1640:5::8:31]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4TjPm55TpPz4KSr; Sun, 25 Feb 2024 13:31:33 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; none Received: from hub2.goneo.de (hub2.goneo.de [IPv6:2001:1640:5::8:53]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp6.goneo.de (Postfix) with ESMTPS id A1FE0240865; Sun, 25 Feb 2024 14:31:26 +0100 (CET) Received: from hub2.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hub2.goneo.de (Postfix) with ESMTPS id A9F822400CA; Sun, 25 Feb 2024 14:31:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1708867884; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=S+FhDwrTzrFkUPhLz0nskzKfL3eJKREd5fVui8k+sNc=; b=UitLQHoCktC8VsJuR7/LGDinsqybBlhdy5v7QxIvurTP2VE9dFf/um1BxJaKIlZwBgv4jg h8p3UCIVDxZmiQID/e2/jGzQTBOFYAto4TwCSQ6IoCIIJhUXfkmEOBMkKhTBnoqBHJyX/J 3pxixyq+70hFLXqZS1L2Yy20/iElCR4npToK4rRDTZ5hT28q6SGOtBRW9868CFcJEPUoNS oJMQyK/W1fg2mHN3Io/6xic2wrEGCqXj2JmGBZ5jY9zkntyDx58CajHQKq+Vfp+77h7+EH M4PHRWo5xPpwKwCueaPOOoOgJzS6+3bOyZchRbpeM0qVErMWq+NtQM2TTeS7IA== Received: from thor.intern.walstatt.dynvpn.de (dynamic-077-013-153-128.77.13.pool.telefonica.de [77.13.153.128]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hub2.goneo.de (Postfix) with ESMTPSA id 6BE53240022; Sun, 25 Feb 2024 14:31:24 +0100 (CET) Date: Sun, 25 Feb 2024 14:30:56 +0100 From: FreeBSD User To: Richard Scheffenegger Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: c9b6241e250a - main - tcp: address enum-int-mismatch fix gcc13 error after f74352fbcf15341accaf5a92240871f98323215d Message-ID: <20240225143123.5cd90ae3@thor.intern.walstatt.dynvpn.de> In-Reply-To: <202402251149.41PBnENk086741@gitrepo.freebsd.org> References: <202402251149.41PBnENk086741@gitrepo.freebsd.org> Organization: walstatt-de.de List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-UID: fa6e7b X-Rspamd-UID: 9c004a X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:25394, ipnet:2001:1640::/32, country:DE] X-Rspamd-Queue-Id: 4TjPm55TpPz4KSr Am Sun, 25 Feb 2024 11:49:14 GMT Richard Scheffenegger schrieb: > The branch main has been updated by rscheff: > > URL: https://cgit.FreeBSD.org/src/commit/?id=c9b6241e250a4f1156e2150ccdbad0d3029dcef6 > > commit c9b6241e250a4f1156e2150ccdbad0d3029dcef6 > Author: Richard Scheffenegger > AuthorDate: 2024-02-25 03:45:05 +0000 > Commit: Richard Scheffenegger > CommitDate: 2024-02-25 03:46:39 +0000 > > tcp: address enum-int-mismatch > fix gcc13 error after f74352fbcf15341accaf5a92240871f98323215d > --- > sys/netinet/cc/cc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sys/netinet/cc/cc.c b/sys/netinet/cc/cc.c > index 9308b5f8d764..adcb16e87637 100644 > --- a/sys/netinet/cc/cc.c > +++ b/sys/netinet/cc/cc.c > @@ -452,7 +452,7 @@ newreno_cc_after_idle(struct cc_var *ccv) > * Perform any necessary tasks before we enter congestion recovery. > */ > void > -newreno_cc_cong_signal(struct cc_var *ccv, uint32_t type) > +newreno_cc_cong_signal(struct cc_var *ccv, ccsignal_t type) > { > uint32_t cwin, factor, mss, pipe; > > The patch corrupts building the kernel: /usr/src/sys/netinet/cc/cc.c:475:10: error: 6 enumeration values not handled in switch: 'CC_ACK', 'CC_DUPACK', 'CC_PARTIALACK'... [-Werror,-Wswitch] -- O. Hartmann From nobody Sun Feb 25 16:34:57 2024 X-Original-To: dev-commits-src-main@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 4TjTql2skBz5BYkV; Sun, 25 Feb 2024 16:34:59 +0000 (UTC) (envelope-from bapt@nours.eu) Received: from aniel.nours.eu (nours.eu [176.31.115.77]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4TjTqk3mV7z4mvm; Sun, 25 Feb 2024 16:34:58 +0000 (UTC) (envelope-from bapt@nours.eu) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=pass (policy=none) header.from=nours.eu; spf=pass (mx1.freebsd.org: domain of bapt@nours.eu designates 176.31.115.77 as permitted sender) smtp.mailfrom=bapt@nours.eu Received: from [IPv6:::1] (2a02-8428-078f-2201-fbd7-2dba-7903-24bc.rev.sfr.net [IPv6:2a02:8428:78f:2201:fbd7:2dba:7903:24bc]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aniel.nours.eu (Postfix) with ESMTPSA id 00EA2112E2; Sun, 25 Feb 2024 17:34:55 +0100 (CET) Date: Sun, 25 Feb 2024 17:34:57 +0100 From: Baptiste Daroussin To: Richard Scheffenegger , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: =?US-ASCII?Q?Re=3A_git=3A_c9b6241e250a_-_main_-_?= =?US-ASCII?Q?tcp=3A_address_enum-int-mismatch_?= =?US-ASCII?Q?_fix_gcc13_error_after_f74352fb?= =?US-ASCII?Q?cf15341accaf5a92240871f98323215d?= User-Agent: K-9 Mail for Android In-Reply-To: <8136FFC0-33D6-4E57-8835-452A0A4E9A03@nours.eu> References: <202402251149.41PBnENk086741@gitrepo.freebsd.org> <8136FFC0-33D6-4E57-8835-452A0A4E9A03@nours.eu> Message-ID: <1B1DFBB8-6926-48DF-9192-E794D60B6E3D@nours.eu> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: multipart/alternative; boundary=----6R0Z6S6D35S1COZOCMTQIGOQU8WOF7 Content-Transfer-Encoding: 7bit X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.50 / 15.00]; SUBJ_EXCESS_QP(1.20)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[nours.eu,none]; R_SPF_ALLOW(-0.20)[+ip4:176.31.115.77]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; ONCE_RECEIVED(0.10)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; ASN(0.00)[asn:16276, ipnet:176.31.0.0/16, country:FR]; RCVD_COUNT_ONE(0.00)[1]; FREEFALL_USER(0.00)[bapt]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; RCPT_COUNT_THREE(0.00)[4] X-Rspamd-Queue-Id: 4TjTqk3mV7z4mvm ------6R0Z6S6D35S1COZOCMTQIGOQU8WOF7 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Le 25 f=C3=A9vrier 2024 13:30:29 GMT+01:00, Baptiste Daroussin a =C3=A9crit=C2=A0: >Le 25 f=C3=A9vrier 2024 12:49:14 GMT+01:00, Richard Scheffenegger a =C3=A9crit=C2=A0: >>The branch main has been updated by rscheff: >> >>URL: https://cgit=2EFreeBSD=2Eorg/src/commit/?id=3Dc9b6241e250a4f1156e21= 50ccdbad0d3029dcef6 >> >>commit c9b6241e250a4f1156e2150ccdbad0d3029dcef6 >>Author: Richard Scheffenegger >>AuthorDate: 2024-02-25 03:45:05 +0000 >>Commit: Richard Scheffenegger >>CommitDate: 2024-02-25 03:46:39 +0000 >> >> tcp: address enum-int-mismatch >> fix gcc13 error after f74352fbcf15341accaf5a92240871f98323215d >>--- >> sys/netinet/cc/cc=2Ec | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >>diff --git a/sys/netinet/cc/cc=2Ec b/sys/netinet/cc/cc=2Ec >>index 9308b5f8d764=2E=2Eadcb16e87637 100644 >>--- a/sys/netinet/cc/cc=2Ec >>+++ b/sys/netinet/cc/cc=2Ec >>@@ -452,7 +452,7 @@ newreno_cc_after_idle(struct cc_var *ccv) >> * Perform any necessary tasks before we enter congestion recovery=2E >> */ >> void >>-newreno_cc_cong_signal(struct cc_var *ccv, uint32_t type) >>+newreno_cc_cong_signal(struct cc_var *ccv, ccsignal_t type) >> { >> uint32_t cwin, factor, mss, pipe; >>=20 > >Somehow incremental build has been broken in the last couple of days=2E > >/home/bapt/worktrees/main/sys/netinet/cc/cc=2Ec:475:10: error: 6 enumerat= ion values not handled in switch: 'CC_ACK', 'CC_DUPACK', 'CC_PARTIALACK'=2E= =2E=2E [-Werror,-Wswitch] 4= 75 | switch (type) { | ^= ~~~ > >This is the error I get since this commit in buildkernel for pkgbase, all= arches > >Best regards, >Bapt Ci confirms all arches are broken ------6R0Z6S6D35S1COZOCMTQIGOQU8WOF7 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable
Le 25= f=C3=A9vrier 2024 13:30:29 GMT+01:00, Baptiste Daroussin <bapt@nours=2E= eu> a =C3=A9crit=C2=A0:
Le 25 f=C3=A9vrier 2024 12:49= :14 GMT+01:00, Richard Scheffenegger <rscheff@FreeBSD=2Eorg> a =C3=A9= crit :
The branch main has been updated b= y rscheff:

URL: https://cgit=2EFreeBSD=2Eorg= /src/commit/?id=3Dc9b6241e250a4f1156e2150ccdbad0d3029dcef6

commi= t c9b6241e250a4f1156e2150ccdbad0d3029dcef6
Author: Richard Scheffene= gger <rscheff@FreeBSD=2Eorg>
AuthorDate: 2024-02-25 03:45:05 +0000=
Commit: Richard Scheffenegger <rscheff@FreeBSD=2Eorg>
Comm= itDate: 2024-02-25 03:46:39 +0000

tcp: address enum-int-mismatch=
fix gcc13 error after f74352fbcf15341accaf5a92240871f98323215d
= sys/netinet/cc/cc=2Ec | 2 +-
1 file changed, 1 insertion(+), 1 deletion= (-)

diff --git a/sys/netinet/cc/cc=2Ec b/sys/netinet/cc/cc=2Ec
in= dex 9308b5f8d764=2E=2Eadcb16e87637 100644
--- a/sys/netinet/cc/cc=2Ec+++ b/sys/netinet/cc/cc=2Ec
@@ -452,7 +452,7 @@ newreno_cc_after_idle(s= truct cc_var *ccv)
* Perform any necessary tasks before we enter conge= stion recovery=2E
*/
void
-newreno_cc_cong_signal(struct cc_var= *ccv, uint32_t type)
+newreno_cc_cong_signal(struct cc_var *ccv, ccsign= al_t type)
{
uint32_t cwin, factor, mss, pipe;


Somehow incremental= build has been broken in the last couple of days=2E

/home/bapt/work= trees/main/sys/netinet/cc/cc=2Ec:475:10: error: 6 enumeration values not ha= ndled in switch: 'CC_ACK', 'CC_DUPACK', 'CC_PARTIALACK'=2E=2E=2E [-Werror,-= Wswitch]           &= nbsp;           &nbs= p;            &= nbsp;            475= |         switch (type) { &nb= sp;            =             &nb= sp; |           &nbs= p;     ^~~~

This is the error I get since this c= ommit in buildkernel for pkgbase, all arches

Best regards,
Bapt

Ci confirms all = arches are broken
------6R0Z6S6D35S1COZOCMTQIGOQU8WOF7-- From nobody Sun Feb 25 19:09:06 2024 X-Original-To: dev-commits-src-main@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 4TjYFb3rXsz5BpRh; Sun, 25 Feb 2024 19:09: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TjYFb0Qjhz4Ft5; Sun, 25 Feb 2024 19:09:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708888147; 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=qO7+K8/btQRpfqparwIgxLZsezIgX4oQ9JOTr+dwJuY=; b=HUyOVO1Z1QdkzxJ98YVFqAbAUb3CdM2ycD+2IX/L2J6T8EWk//p36VD4Ikr4+Vbd9XRPwp UjlyAGjuXQNThw65bitjIq/LoEoVigAseKwo1BjGXHaq5COcaoF/q4ZiCGHlboFCsdXd4h ehbL5GI3WeznTTV0Yf+CCO/f4LLfhcydozFNaXSAAJe6j6VuvYZXJ8LIuTiMe7UB1DHdAz OPp+rZwk/Mz1ZpdehW1uUI+a5o/2QdPbsd+FZt7QSq4Vba6hsZZ64rga+uoqz7d2YUtK3D BIkY8UGLEi/5I/g+d/rBVu+6O3fvNTtAGSZzIyW2Ls0hLa4Zix+veByaxCSvAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708888147; a=rsa-sha256; cv=none; b=Z/5V1uK0Hmgt3qAUZzQEg+J2Ml5uziBFIznyOFMs8l2W+gkawP6A6dFwd2uwLI1wZFMn7d qOS09U7yi7F3CyX6MmtotOFOMiBqNVJVJ6sU3GbZ43gSAmBx3kCEWFO3/2VzU1HNEY0UTG ZxtcBmdPcsKi2F2OMt10G+ZUX4gY1H8OGLI5fE6rUTOkzoniN7QAmaXl0H1WyeIjjqk612 LqRqcvfIzx5YuPTSXp49FY9tV/V/fa3fv1p+AKogrVBVaY65rAI0EyfEwa3nlDNYdsz0MA yyPfFmHvLS1d7nw8I33sQt8LIw0ELJ9Y6JfohJxu9h8RjDWtz49kjijt+e5mkw== 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=1708888147; 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=qO7+K8/btQRpfqparwIgxLZsezIgX4oQ9JOTr+dwJuY=; b=pDJnfvCTZS5zao5WriaDx/w9qqyqycMDMCm5LhOd91sSyVYCj2ql6IQDmdG7BngdcKOjJu lGHz1APWlA1xHbPUQVpBJVdXJiiu7wkwOfzCWe6X5G/YImX6KlgmyKB4nlHx0aBOd9phfm v3ZRvuDDrnUPhUYuK76aFfJT9NaL+zFJ5Cum7YFotko15ZIICOFA3pA51r6ez0P5S6AEHr 3BSUk5floNWw9typFM0cOa4brX6Pqfb3VcBf2mHcMmDp81wOsl0QP4IAeaykpi9ebR5Yi5 lBFnZB7debUu1XvF5/SgSJ5bOf06SwfUtqXQUUQrlJop+9evKeXbfCha0S4YoA== 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 4TjYFZ5rwpzwgB; Sun, 25 Feb 2024 19:09:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41PJ96qM037740; Sun, 25 Feb 2024 19:09:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41PJ96lv037737; Sun, 25 Feb 2024 19:09:06 GMT (envelope-from git) Date: Sun, 25 Feb 2024 19:09:06 GMT Message-Id: <202402251909.41PJ96lv037737@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Richard Scheffenegger Subject: git: 8917131e00b0 - main - tcp: need default in switch statement for enum. fix clang error after c9b6241e250a4f1156e2150ccdbad0d3029dcef6 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8917131e00b0fcd47113bdf3fa8f9b01d6c7f8da Auto-Submitted: auto-generated The branch main has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=8917131e00b0fcd47113bdf3fa8f9b01d6c7f8da commit 8917131e00b0fcd47113bdf3fa8f9b01d6c7f8da Author: Richard Scheffenegger AuthorDate: 2024-02-25 07:23:07 +0000 Commit: Richard Scheffenegger CommitDate: 2024-02-25 07:24:13 +0000 tcp: need default in switch statement for enum. fix clang error after c9b6241e250a4f1156e2150ccdbad0d3029dcef6 Reviewed By: imp Differential Revision: https://reviews.freebsd.org/D44081 --- sys/netinet/cc/cc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/netinet/cc/cc.c b/sys/netinet/cc/cc.c index adcb16e87637..9a8ca760fa28 100644 --- a/sys/netinet/cc/cc.c +++ b/sys/netinet/cc/cc.c @@ -501,6 +501,8 @@ newreno_cc_cong_signal(struct cc_var *ccv, ccsignal_t type) } CCV(ccv, snd_cwnd) = mss; break; + default: + break; } } From nobody Sun Feb 25 20:36:22 2024 X-Original-To: dev-commits-src-main@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 4TjbBG39dcz5C2M8; Sun, 25 Feb 2024 20:36:22 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TjbBG2dpKz4QtL; Sun, 25 Feb 2024 20:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708893382; 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=y7ucEgSSV0feaI2ZWijGT5Kgxi0uVy2lbysBrKRu304=; b=GFck6Pmnt1Lt0CbCNXhcD9bCUYlAylcS/dr7fYCYkHnst9EpwkzJkqLXxLY2gwftuwZwIm lW2xyLvpPUMUaWkxo5XHbC8nkJoffXEQlzVOkSzK2nmlGC96y+DcSqYbRZgCCSSy8rP9Tz aS2J8RhYqluW0lMEe4N/iWwr1vXGgqlKdlbNzw4RMax4f/0DTnT7zQJzets/0KfzIM5UtS 8v0UPf3h5w5Dfb1jF2W2NI0zBWEUkoSmeMZ3NmxjJ+u1O4lvkARolBvcoXJxs7gD0zgH7b f9XDKj6esTUstpqs+Ag4AB41XXxzWXXdOWiLU9nXP32fQAYfrnHQP3gb2chcKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708893382; a=rsa-sha256; cv=none; b=WZlVPG7epL7PC2BcOz6axUVzN95z3aYnqNIarO1EHBmgMbEXZciLv2DvSSjLtr8HO++Yn/ 3UIjmhboNg9n+sYoJ2/JjrGEJwVM6/ByE5mFXaaJvvOri7jlwiDg19nAlVaUF0sqNXdqse pnhSpqTHg8RB3mYg+U5Mnl2tbw1FBnuxULC+SRxCMSOFoRHP7vpY3eDLQQ0QoOL9a4wgDD czCOBrMvRoXRLmS1NizkHlj1VEp+nqJ/JLH+Ug6ofBmhMMR/D6sPUEJAJbFhWbs+F7OluL 5a6Xv/YshJqfXbn9ceSFx9BLFbd8jOW9zxO+pthQLtHmkN+1sD3+B1vrHe4DjQ== 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=1708893382; 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=y7ucEgSSV0feaI2ZWijGT5Kgxi0uVy2lbysBrKRu304=; b=Gtkrzj3PS+tKQ7b216KWbhXMdBOJo3pqVuOFGY71VVIRmQiXzepnHlkyEg0JBOuBCXO4TA rl3QMdjPP3IR+pZDxdLal9U54PVLeN4rSpRyRA+SkgjZpBivmBkk8FY36DCf6/BXnhrLF3 9XDpqyKMI736CV0piaikqRzslRLts+12Ar0yXb5ayR0gErWdycOUqdRIw97m0eAkKKNETM kgXdLB1gEkIFFT7u+MEJHTCVb52R9zmCiU/a3oMJ8H565HcavEt/hnKteHuCv/9nG9E3kW tX8B+Jti5m1KxPDCSkS3WdXq1E+lCzuv2bTEOgQq82HPBN+FrOH/5dqfJQ+gSg== 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 4TjbBG1hCpzyhM; Sun, 25 Feb 2024 20:36:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41PKaMdv089047; Sun, 25 Feb 2024 20:36:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41PKaMwn089044; Sun, 25 Feb 2024 20:36:22 GMT (envelope-from git) Date: Sun, 25 Feb 2024 20:36:22 GMT Message-Id: <202402252036.41PKaMwn089044@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 32fdcff8703d - main - libc/sys: add errno test List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 32fdcff8703da6f2795193acc77ec3c1fb8b723d Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=32fdcff8703da6f2795193acc77ec3c1fb8b723d commit 32fdcff8703da6f2795193acc77ec3c1fb8b723d Author: Konstantin Belousov AuthorDate: 2024-02-24 23:39:02 +0000 Commit: Konstantin Belousov CommitDate: 2024-02-25 20:35:17 +0000 libc/sys: add errno test Despite looking trivial, it requires proper split of exports from libsys and libc, proper filtering work in rtld, and operational libsys. Reviewed by: emaste, imp Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D44075 --- lib/libc/tests/sys/Makefile | 1 + lib/libc/tests/sys/errno_test.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/lib/libc/tests/sys/Makefile b/lib/libc/tests/sys/Makefile index f44cec11225d..380b3b511049 100644 --- a/lib/libc/tests/sys/Makefile +++ b/lib/libc/tests/sys/Makefile @@ -7,6 +7,7 @@ PACKAGE= tests ATF_TESTS_C+= brk_test .endif ATF_TESTS_C+= cpuset_test +ATF_TESTS_C+= errno_test ATF_TESTS_C+= queue_test ATF_TESTS_C+= sendfile_test diff --git a/lib/libc/tests/sys/errno_test.c b/lib/libc/tests/sys/errno_test.c new file mode 100644 index 000000000000..27d0548fc29d --- /dev/null +++ b/lib/libc/tests/sys/errno_test.c @@ -0,0 +1,36 @@ +/*- + * Copyright (c) 2024 The FreeBSD Foundation + * + * SPDX-License-Identifier: BSD-2-Clause + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + */ + +#include +#include + +#include + +ATF_TC(errno_basic); +ATF_TC_HEAD(errno_basic, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Verify basic functionality of errno"); +} + +ATF_TC_BODY(errno_basic, tc) +{ + int res; + + res = unlink("/non/existent/file"); + ATF_REQUIRE(res == -1); + ATF_REQUIRE(errno == ENOENT); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, errno_basic); + + return (atf_no_error()); +} From nobody Sun Feb 25 21:48:00 2024 X-Original-To: dev-commits-src-main@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 4Tjcmw5B1fz5C8mY; Sun, 25 Feb 2024 21:48: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tjcmw4kWBz4bdk; Sun, 25 Feb 2024 21:48:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708897680; 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=LKmxxRwXRsN4J2ZOveO6/G72pZUNf81vlacNV4ZHg5A=; b=HSjSbrw3758fpL5sGlYUjDwWkwwonS2M1L4LGOZ1x7HjLDZ0RJPzWM9q3vFnaMckqGbnkR IsYJuwUjez1HsgAnR1j+LevWGHG0FEMFWHl8UjzX0uZ6qCcOmkfk1SV0kPdeAt7Fs9VZdJ vm1OpQ7fGz1DSHk+Nkhn89o2I3ttCbpzUYa3p40GUaBVxocYOclm4LJFKk/guzgsg519wu swPrYVVGukhfu0mu542ZCCkpk/wJWECmuOUhUYU/LuPeOzCfq0U0MA/9wslMAkw8OEzyX8 ubQy/CzoxlIm329AvSMWC0LT6XEtmt2m8tRhtaSR97MlHzalsHudhHlX7wgw6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708897680; a=rsa-sha256; cv=none; b=cQ565+PH22H2CKdw9oMCfvxKSwRvnkKje7VqUaMX1e4zlgvhd7sIvkdBTmAOAewvmZ+p0j x4WOtc7u3fo2vYGBd+MxfYWLr+6PlQKCtBCdp2n4ugQzlGoSEonMc+CCBeY4yG4/KFRlDK 5VYnRx9J4deEJzqpKOjR3RJ3k7n8NIkj4kMKuSE+DhmRyZKMCkBXHzyLonTlGxLHPf8Qzi TRxkT1ru4J5SvRR9EeXydS7Nnx7v8gjZJQnWCm9vRYj/WSbr/5K+oYGtXlxu8HVVDrMJhk PDxm7vg12W7K99n2jA0+qJRmvQ9yrecnAzcLJdEpfEj1GUW30yRhr/MtISXVXA== 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=1708897680; 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=LKmxxRwXRsN4J2ZOveO6/G72pZUNf81vlacNV4ZHg5A=; b=AW4/pcEOHN290kTsdtHRJ4pZ8SrXFYQyKf9j6sdSDpc2sgA52utXr/BjEH4I27d3C/y+vV qukutBcSra8dDgfmHBl2GGvarontEQA4pjYQ9hsMgeDuGJvIjv+5zawmtLfQaEjeQ3na9Q atPV5HEOrM0QYoIkoAi0NFcviEvYXwNs/uXMl9INIxlLu4qTE5rHzZUf8mqvkXso9nBUwr R2klMkXGqjpj3h4D1JV7zgUM7+mANQwMQhSTTpvqxvE6Qr4ICK4iW+fLcCATSCtDKeOkFZ uFA0dfvzC+YIet/l+Pxc540WoxTolsK7MtnVdFfYuaxPRwCyL9ufLT0edfAiaQ== 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 4Tjcmw3fyxz11LD; Sun, 25 Feb 2024 21:48:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41PLm0V3007193; Sun, 25 Feb 2024 21:48:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41PLm01B007190; Sun, 25 Feb 2024 21:48:00 GMT (envelope-from git) Date: Sun, 25 Feb 2024 21:48:00 GMT Message-Id: <202402252148.41PLm01B007190@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ruslan Bukin Subject: git: dc15f025062d - main - snd_hdspe(4): Optional unified pcm device. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: br X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc15f025062da40ac3a2529b6c979c597b9eb94c Auto-Submitted: auto-generated The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=dc15f025062da40ac3a2529b6c979c597b9eb94c commit dc15f025062da40ac3a2529b6c979c597b9eb94c Author: Florian Walpen AuthorDate: 2024-02-25 21:39:36 +0000 Commit: Ruslan Bukin CommitDate: 2024-02-25 21:39:36 +0000 snd_hdspe(4): Optional unified pcm device. Add a sysctl tunable to unify all physical ports of an HDSPe sound card into one pcm device, with up to 14 (AIO) or 36 (RayDAT) channels. This makes all ports available in multi-channel audio software. Differential Revision: https://reviews.freebsd.org/D43798 --- share/man/man4/snd_hdspe.4 | 23 ++++++++++++++++++++++- sys/dev/sound/pci/hdspe-pcm.c | 9 ++++++++- sys/dev/sound/pci/hdspe.c | 22 ++++++++++++++++++++-- 3 files changed, 50 insertions(+), 4 deletions(-) diff --git a/share/man/man4/snd_hdspe.4 b/share/man/man4/snd_hdspe.4 index 7d8cc2adc1af..a8c7be538dd1 100644 --- a/share/man/man4/snd_hdspe.4 +++ b/share/man/man4/snd_hdspe.4 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd January 29, 2024 +.Dd February 9, 2024 .Dt SND_HDSPE 4 .Os .Sh NAME @@ -64,8 +64,29 @@ By default, each .Xr pcm 4 device corresponds to a physical port on the sound card. For ADAT ports, 8 channel, 4 channel and 2 channel formats are supported. +The effective number of ADAT channels is 8 channels at single speed +(32kHz-48kHz), 4 channels at double speed (64kHz-96kHz), and 2 channels at +quad speed (128kHz-192kHz). Depending on sample rate and channel format selected, not all pcm channels can be mapped to ADAT channels and vice versa. +.Sh LOADER TUNABLES +These settings can be entered at the +.Xr loader 8 +prompt or in +.Xr loader.conf 5 . +.Bl -tag -width indent +.It Va hw.hdspe.unified_pcm +If set to 1, all physical ports are combined into one unified pcm device. +When opened in multi-channel audio software, this makes all ports available +at the same time, and fully synchronized. +For resulting channel numbers consult the following table: +.El +.Bl -column "HDSPe RayDAT" "Single Speed" "Double Speed" "Quad Speed" +.Sy "Sound Card" Ta Sy "Single Speed" Ta Sy "Double Speed" Ta Sy "Quad Speed" +.It "" Ta "Play | Rec" Ta "Play | Rec" Ta "Play | Rec" +.It HDSPe AIO Ta " 16 | 14" Ta " 12 | 10" Ta " 10 | 8" +.It HDSPe RayDAT Ta " 36 | 36" Ta " 20 | 20" Ta " 12 | 12" +.El .Sh SYSCTL TUNABLES These settings and informational values can be accessed at runtime with the .Xr sysctl 8 diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c index cf764f19a933..594a4f704028 100644 --- a/sys/dev/sound/pci/hdspe-pcm.c +++ b/sys/dev/sound/pci/hdspe-pcm.c @@ -41,6 +41,8 @@ #include +#define HDSPE_MATRIX_MAX 8 + struct hdspe_latency { uint32_t n; uint32_t period; @@ -1007,6 +1009,7 @@ hdspe_pcm_attach(device_t dev) char status[SND_STATUSLEN]; struct sc_pcminfo *scp; const char *buf; + uint32_t pcm_flags; int err; int play, rec; @@ -1025,7 +1028,11 @@ hdspe_pcm_attach(device_t dev) * We don't register interrupt handler with snd_setup_intr * in pcm device. Mark pcm device as MPSAFE manually. */ - pcm_setflags(dev, pcm_getflags(dev) | SD_F_MPSAFE); + pcm_flags = pcm_getflags(dev) | SD_F_MPSAFE; + if (hdspe_channel_count(scp->hc->ports, 8) > HDSPE_MATRIX_MAX) + /* Disable vchan conversion, too many channels. */ + pcm_flags |= SD_F_BITPERFECT; + pcm_setflags(dev, pcm_flags); play = (hdspe_channel_play_ports(scp->hc)) ? 1 : 0; rec = (hdspe_channel_rec_ports(scp->hc)) ? 1 : 0; diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c index 1d1068c9f8fe..0773362f2bc3 100644 --- a/sys/dev/sound/pci/hdspe.c +++ b/sys/dev/sound/pci/hdspe.c @@ -44,6 +44,14 @@ #include +static bool hdspe_unified_pcm = false; + +static SYSCTL_NODE(_hw, OID_AUTO, hdspe, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, + "PCI HDSPe"); + +SYSCTL_BOOL(_hw_hdspe, OID_AUTO, unified_pcm, CTLFLAG_RWTUN, + &hdspe_unified_pcm, 0, "Combine physical ports in one unified pcm device"); + static struct hdspe_clock_source hdspe_clock_source_table_rd[] = { { "internal", 0 << 1 | 1, HDSPE_STATUS1_CLOCK(15), 0, 0 }, { "word", 0 << 1 | 0, HDSPE_STATUS1_CLOCK( 0), 1 << 24, 1 << 25 }, @@ -78,6 +86,11 @@ static struct hdspe_channel chan_map_aio[] = { { 0, NULL }, }; +static struct hdspe_channel chan_map_aio_uni[] = { + { HDSPE_CHAN_AIO_ALL, "all" }, + { 0, NULL }, +}; + static struct hdspe_channel chan_map_rd[] = { { HDSPE_CHAN_RAY_AES, "aes" }, { HDSPE_CHAN_RAY_SPDIF, "s/pdif" }, @@ -88,6 +101,11 @@ static struct hdspe_channel chan_map_rd[] = { { 0, NULL }, }; +static struct hdspe_channel chan_map_rd_uni[] = { + { HDSPE_CHAN_RAY_ALL, "all" }, + { 0, NULL }, +}; + static void hdspe_intr(void *p) { @@ -538,11 +556,11 @@ hdspe_attach(device_t dev) switch (rev) { case PCI_REVISION_AIO: sc->type = HDSPE_AIO; - chan_map = chan_map_aio; + chan_map = hdspe_unified_pcm ? chan_map_aio_uni : chan_map_aio; break; case PCI_REVISION_RAYDAT: sc->type = HDSPE_RAYDAT; - chan_map = chan_map_rd; + chan_map = hdspe_unified_pcm ? chan_map_rd_uni : chan_map_rd; break; default: return (ENXIO); From nobody Sun Feb 25 23:46:57 2024 X-Original-To: dev-commits-src-main@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 4TjgQD0xHFz5BbN3; Sun, 25 Feb 2024 23:47: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TjgQD0RGTz4mB1; Sun, 25 Feb 2024 23:47:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708904820; 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=BEv6430vfumYnvettnvJ+Z5VwU2jrQZ8q6ZDc8Spuww=; b=nSsgjnzOqhvth1VNUXEGmLPHoUwCg0ph1xzHYjeQ777ZJgbcDc0nPORwqKme+CdsT2XId8 CIV5uY8+3J6RHruK4zRVON3yfO6MIUndXlrf2XfPi42d/l8MKYu6SmFvbD455gW93pyiGd vJWpwacoP0LaaiRKPfsiMQcLJJEsSt7Pj2ytsbR/yk8WtOLHA1hxi8ZtMamCPRmFFKXoGc d4faC1yN9bkdoIt9b+Bx2x+qNEgP/keMur+0tKTuykHH3PaBuLo/nesRZ7nDKsV8vI5VwK /Bajrvw7BbtwlbH27lD+huBX87xTo1IJqzNDQ/aq5MCBqQTH5BJigWEpJPPo0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708904820; a=rsa-sha256; cv=none; b=j0XIxNKhhpv2bulyH6hyjupeumhh2iaiIjSbQ4iEtFHQoU2gfujcQcDFCWK1VAcLDGhI58 SKohCC2LS5p+DZvENA62A1b1VVZ7Z1rhs19DeCJRcR/YAjbNbOYR4vKP9yTl80Ve6AygBk oFbhfoqTWsrrwLmFdI4Ke2MiQfuqGs8WaAAYGiT3tl4S8XANFpE/RazluLr4VpkLnnBaMY W0whOvUI62yEf5vkkbQInwpvLGWob/AdI4oWswY9EU7aE/+PrYKWGjvwl/JHegukEsYiOo foIkAOvs4NIBpah9tePC5AL7332nZpxAhobT3vxueYiZ0VA+sXOFEz+IBPm4/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=1708904820; 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=BEv6430vfumYnvettnvJ+Z5VwU2jrQZ8q6ZDc8Spuww=; b=DBBuYJPIwmLDh8Fz0bYyyj7Tkwda06QsEhBhr+xBVw/WIyDcfO5zgZbmYj35KpUOnpEwGW 36Lk/bqyBUMzW5baQpQMceulpgbyZUtn8eBqBA+YLHTzr3cxLHE39vBNhAGz1z1VZnUGKQ f7xyS88oVCp3EAamybFyZPI0abTFUH0rWxxhcGpNqy100cIJHBZo3kPMFBSMhRP1MGZbYL ht704ZK3u3VBsQbar0VJhU44twTuLcHDV72KtIZGLNSgFfkyUrhdHmK+zzGFPqnwF18chW WXlnUKWq6AMAi3tn7OVARdTVXivpqAS4sAvIWYfxsfYgRLWM89AIlPWtY6pDtw== 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 4TjgQC6d0qz14wt; Sun, 25 Feb 2024 23:46:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41PNkxEM009358; Sun, 25 Feb 2024 23:46:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41PNkvCn009349; Sun, 25 Feb 2024 23:46:57 GMT (envelope-from git) Date: Sun, 25 Feb 2024 23:46:57 GMT Message-Id: <202402252346.41PNkvCn009349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 8db56defa766 - main - MFV: xz 5.6.0. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8db56defa766eacdbaf89a37f25b11a57fd9787a Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=8db56defa766eacdbaf89a37f25b11a57fd9787a commit 8db56defa766eacdbaf89a37f25b11a57fd9787a Merge: dc15f025062d a7819ed7ade8 Author: Xin LI AuthorDate: 2024-02-25 23:46:22 +0000 Commit: Xin LI CommitDate: 2024-02-25 23:46:22 +0000 MFV: xz 5.6.0. MFC after: 2 weeks contrib/xz/AUTHORS | 40 +- contrib/xz/COPYING | 116 +- contrib/xz/COPYING.0BSD | 11 + contrib/xz/COPYING.CC-BY-SA-4.0 | 427 + contrib/xz/ChangeLog | 16248 ++++++++----------- contrib/xz/README | 43 +- contrib/xz/THANKS | 7 + contrib/xz/TODO | 4 - contrib/xz/doxygen/Doxyfile | 6 +- contrib/xz/doxygen/footer.html | 13 + contrib/xz/doxygen/update-doxygen | 6 +- contrib/xz/src/common/mythread.h | 28 +- contrib/xz/src/common/sysdefs.h | 18 +- contrib/xz/src/common/tuklib_common.h | 27 +- contrib/xz/src/common/tuklib_config.h | 2 + contrib/xz/src/common/tuklib_cpucores.c | 5 +- contrib/xz/src/common/tuklib_cpucores.h | 5 +- contrib/xz/src/common/tuklib_exit.c | 5 +- contrib/xz/src/common/tuklib_exit.h | 9 +- contrib/xz/src/common/tuklib_gettext.h | 5 +- contrib/xz/src/common/tuklib_integer.h | 7 +- contrib/xz/src/common/tuklib_mbstr.h | 5 +- contrib/xz/src/common/tuklib_mbstr_fw.c | 5 +- contrib/xz/src/common/tuklib_mbstr_width.c | 5 +- contrib/xz/src/common/tuklib_open_stdxxx.c | 5 +- contrib/xz/src/common/tuklib_open_stdxxx.h | 5 +- contrib/xz/src/common/tuklib_physmem.c | 25 +- contrib/xz/src/common/tuklib_physmem.h | 5 +- contrib/xz/src/common/tuklib_progname.c | 5 +- contrib/xz/src/common/tuklib_progname.h | 5 +- contrib/xz/src/liblzma/api/lzma.h | 31 +- contrib/xz/src/liblzma/api/lzma/base.h | 23 +- contrib/xz/src/liblzma/api/lzma/bcj.h | 10 +- contrib/xz/src/liblzma/api/lzma/block.h | 5 +- contrib/xz/src/liblzma/api/lzma/check.h | 5 +- contrib/xz/src/liblzma/api/lzma/container.h | 43 +- contrib/xz/src/liblzma/api/lzma/delta.h | 5 +- contrib/xz/src/liblzma/api/lzma/filter.h | 11 +- contrib/xz/src/liblzma/api/lzma/hardware.h | 5 +- contrib/xz/src/liblzma/api/lzma/index.h | 36 +- contrib/xz/src/liblzma/api/lzma/index_hash.h | 5 +- contrib/xz/src/liblzma/api/lzma/lzma12.h | 7 +- contrib/xz/src/liblzma/api/lzma/stream_flags.h | 5 +- contrib/xz/src/liblzma/api/lzma/version.h | 9 +- contrib/xz/src/liblzma/api/lzma/vli.h | 5 +- contrib/xz/src/liblzma/check/check.c | 5 +- contrib/xz/src/liblzma/check/check.h | 5 +- contrib/xz/src/liblzma/check/crc32_arm64.h | 119 + contrib/xz/src/liblzma/check/crc32_fast.c | 187 +- contrib/xz/src/liblzma/check/crc32_small.c | 5 +- contrib/xz/src/liblzma/check/crc32_table.c | 36 +- contrib/xz/src/liblzma/check/crc32_table_be.h | 4 +- contrib/xz/src/liblzma/check/crc32_table_le.h | 4 +- contrib/xz/src/liblzma/check/crc32_tablegen.c | 21 +- contrib/xz/src/liblzma/check/crc32_x86.S | 5 +- contrib/xz/src/liblzma/check/crc64_fast.c | 450 +- contrib/xz/src/liblzma/check/crc64_small.c | 5 +- contrib/xz/src/liblzma/check/crc64_table.c | 16 +- contrib/xz/src/liblzma/check/crc64_table_be.h | 4 +- contrib/xz/src/liblzma/check/crc64_table_le.h | 4 +- contrib/xz/src/liblzma/check/crc64_tablegen.c | 13 +- contrib/xz/src/liblzma/check/crc64_x86.S | 5 +- contrib/xz/src/liblzma/check/crc_common.h | 143 + contrib/xz/src/liblzma/check/crc_macros.h | 30 - contrib/xz/src/liblzma/check/crc_x86_clmul.h | 435 + contrib/xz/src/liblzma/common/alone_decoder.c | 5 +- contrib/xz/src/liblzma/common/alone_decoder.h | 5 +- contrib/xz/src/liblzma/common/alone_encoder.c | 5 +- contrib/xz/src/liblzma/common/auto_decoder.c | 5 +- .../xz/src/liblzma/common/block_buffer_decoder.c | 5 +- .../xz/src/liblzma/common/block_buffer_encoder.c | 5 +- .../xz/src/liblzma/common/block_buffer_encoder.h | 5 +- contrib/xz/src/liblzma/common/block_decoder.c | 5 +- contrib/xz/src/liblzma/common/block_decoder.h | 5 +- contrib/xz/src/liblzma/common/block_encoder.c | 5 +- contrib/xz/src/liblzma/common/block_encoder.h | 5 +- .../xz/src/liblzma/common/block_header_decoder.c | 5 +- .../xz/src/liblzma/common/block_header_encoder.c | 5 +- contrib/xz/src/liblzma/common/block_util.c | 5 +- contrib/xz/src/liblzma/common/common.c | 5 +- contrib/xz/src/liblzma/common/common.h | 5 +- .../xz/src/liblzma/common/easy_buffer_encoder.c | 5 +- .../xz/src/liblzma/common/easy_decoder_memusage.c | 5 +- contrib/xz/src/liblzma/common/easy_encoder.c | 5 +- .../xz/src/liblzma/common/easy_encoder_memusage.c | 5 +- contrib/xz/src/liblzma/common/easy_preset.c | 5 +- contrib/xz/src/liblzma/common/easy_preset.h | 5 +- contrib/xz/src/liblzma/common/file_info.c | 5 +- .../xz/src/liblzma/common/filter_buffer_decoder.c | 5 +- .../xz/src/liblzma/common/filter_buffer_encoder.c | 5 +- contrib/xz/src/liblzma/common/filter_common.c | 14 +- contrib/xz/src/liblzma/common/filter_common.h | 5 +- contrib/xz/src/liblzma/common/filter_decoder.c | 13 +- contrib/xz/src/liblzma/common/filter_decoder.h | 5 +- contrib/xz/src/liblzma/common/filter_encoder.c | 39 +- contrib/xz/src/liblzma/common/filter_encoder.h | 11 +- .../xz/src/liblzma/common/filter_flags_decoder.c | 5 +- .../xz/src/liblzma/common/filter_flags_encoder.c | 5 +- .../xz/src/liblzma/common/hardware_cputhreads.c | 5 +- contrib/xz/src/liblzma/common/hardware_physmem.c | 5 +- contrib/xz/src/liblzma/common/index.c | 5 +- contrib/xz/src/liblzma/common/index.h | 5 +- contrib/xz/src/liblzma/common/index_decoder.c | 5 +- contrib/xz/src/liblzma/common/index_decoder.h | 5 +- contrib/xz/src/liblzma/common/index_encoder.c | 5 +- contrib/xz/src/liblzma/common/index_encoder.h | 5 +- contrib/xz/src/liblzma/common/index_hash.c | 5 +- contrib/xz/src/liblzma/common/lzip_decoder.c | 5 +- contrib/xz/src/liblzma/common/lzip_decoder.h | 5 +- contrib/xz/src/liblzma/common/memcmplen.h | 24 +- contrib/xz/src/liblzma/common/microlzma_decoder.c | 5 +- contrib/xz/src/liblzma/common/microlzma_encoder.c | 5 +- contrib/xz/src/liblzma/common/outqueue.c | 5 +- contrib/xz/src/liblzma/common/outqueue.h | 5 +- .../xz/src/liblzma/common/stream_buffer_decoder.c | 5 +- .../xz/src/liblzma/common/stream_buffer_encoder.c | 5 +- contrib/xz/src/liblzma/common/stream_decoder.c | 5 +- contrib/xz/src/liblzma/common/stream_decoder.h | 5 +- contrib/xz/src/liblzma/common/stream_decoder_mt.c | 5 +- contrib/xz/src/liblzma/common/stream_encoder.c | 5 +- contrib/xz/src/liblzma/common/stream_encoder_mt.c | 25 +- .../xz/src/liblzma/common/stream_flags_common.c | 5 +- .../xz/src/liblzma/common/stream_flags_common.h | 5 +- .../xz/src/liblzma/common/stream_flags_decoder.c | 5 +- .../xz/src/liblzma/common/stream_flags_encoder.c | 5 +- contrib/xz/src/liblzma/common/string_conversion.c | 14 +- contrib/xz/src/liblzma/common/vli_decoder.c | 5 +- contrib/xz/src/liblzma/common/vli_encoder.c | 5 +- contrib/xz/src/liblzma/common/vli_size.c | 5 +- contrib/xz/src/liblzma/delta/delta_common.c | 5 +- contrib/xz/src/liblzma/delta/delta_common.h | 5 +- contrib/xz/src/liblzma/delta/delta_decoder.c | 5 +- contrib/xz/src/liblzma/delta/delta_decoder.h | 5 +- contrib/xz/src/liblzma/delta/delta_encoder.c | 5 +- contrib/xz/src/liblzma/delta/delta_encoder.h | 5 +- contrib/xz/src/liblzma/delta/delta_private.h | 5 +- contrib/xz/src/liblzma/liblzma.pc.in | 6 +- contrib/xz/src/liblzma/liblzma_generic.map | 7 + contrib/xz/src/liblzma/liblzma_linux.map | 7 + contrib/xz/src/liblzma/lz/lz_decoder.c | 48 +- contrib/xz/src/liblzma/lz/lz_decoder.h | 116 +- contrib/xz/src/liblzma/lz/lz_encoder.c | 13 +- contrib/xz/src/liblzma/lz/lz_encoder.h | 21 +- contrib/xz/src/liblzma/lz/lz_encoder_hash.h | 5 +- contrib/xz/src/liblzma/lz/lz_encoder_hash_table.h | 4 +- contrib/xz/src/liblzma/lz/lz_encoder_mf.c | 5 +- contrib/xz/src/liblzma/lzma/fastpos.h | 5 +- contrib/xz/src/liblzma/lzma/fastpos_table.c | 4 +- contrib/xz/src/liblzma/lzma/fastpos_tablegen.c | 17 +- contrib/xz/src/liblzma/lzma/lzma2_decoder.c | 5 +- contrib/xz/src/liblzma/lzma/lzma2_decoder.h | 5 +- contrib/xz/src/liblzma/lzma/lzma2_encoder.c | 8 +- contrib/xz/src/liblzma/lzma/lzma2_encoder.h | 5 +- contrib/xz/src/liblzma/lzma/lzma_common.h | 41 +- contrib/xz/src/liblzma/lzma/lzma_decoder.c | 760 +- contrib/xz/src/liblzma/lzma/lzma_decoder.h | 5 +- contrib/xz/src/liblzma/lzma/lzma_encoder.c | 18 +- contrib/xz/src/liblzma/lzma/lzma_encoder.h | 5 +- .../src/liblzma/lzma/lzma_encoder_optimum_fast.c | 5 +- .../src/liblzma/lzma/lzma_encoder_optimum_normal.c | 7 +- contrib/xz/src/liblzma/lzma/lzma_encoder_presets.c | 5 +- contrib/xz/src/liblzma/lzma/lzma_encoder_private.h | 9 +- contrib/xz/src/liblzma/rangecoder/price.h | 5 +- contrib/xz/src/liblzma/rangecoder/price_table.c | 4 +- contrib/xz/src/liblzma/rangecoder/price_tablegen.c | 22 +- contrib/xz/src/liblzma/rangecoder/range_common.h | 14 +- contrib/xz/src/liblzma/rangecoder/range_decoder.h | 838 +- contrib/xz/src/liblzma/rangecoder/range_encoder.h | 5 +- contrib/xz/src/liblzma/simple/arm.c | 5 +- contrib/xz/src/liblzma/simple/arm64.c | 5 +- contrib/xz/src/liblzma/simple/armthumb.c | 5 +- contrib/xz/src/liblzma/simple/ia64.c | 5 +- contrib/xz/src/liblzma/simple/powerpc.c | 5 +- contrib/xz/src/liblzma/simple/riscv.c | 755 + contrib/xz/src/liblzma/simple/simple_coder.c | 5 +- contrib/xz/src/liblzma/simple/simple_coder.h | 14 +- contrib/xz/src/liblzma/simple/simple_decoder.c | 5 +- contrib/xz/src/liblzma/simple/simple_decoder.h | 5 +- contrib/xz/src/liblzma/simple/simple_encoder.c | 5 +- contrib/xz/src/liblzma/simple/simple_encoder.h | 5 +- contrib/xz/src/liblzma/simple/simple_private.h | 5 +- contrib/xz/src/liblzma/simple/sparc.c | 5 +- contrib/xz/src/liblzma/simple/x86.c | 5 +- contrib/xz/src/liblzma/validate_map.sh | 6 +- contrib/xz/src/lzmainfo/lzmainfo.1 | 4 +- contrib/xz/src/lzmainfo/lzmainfo.c | 5 +- contrib/xz/src/xz/args.c | 159 +- contrib/xz/src/xz/args.h | 8 +- contrib/xz/src/xz/coder.c | 648 +- contrib/xz/src/xz/coder.h | 31 +- contrib/xz/src/xz/file_io.c | 144 +- contrib/xz/src/xz/file_io.h | 21 +- contrib/xz/src/xz/hardware.c | 11 +- contrib/xz/src/xz/hardware.h | 5 +- contrib/xz/src/xz/list.c | 31 +- contrib/xz/src/xz/list.h | 5 +- contrib/xz/src/xz/main.c | 91 +- contrib/xz/src/xz/main.h | 5 +- contrib/xz/src/xz/message.c | 94 +- contrib/xz/src/xz/message.h | 15 +- contrib/xz/src/xz/mytime.c | 105 +- contrib/xz/src/xz/mytime.h | 11 +- contrib/xz/src/xz/options.c | 7 +- contrib/xz/src/xz/options.h | 5 +- contrib/xz/src/xz/private.h | 26 +- contrib/xz/src/xz/sandbox.c | 355 + contrib/xz/src/xz/sandbox.h | 43 + contrib/xz/src/xz/signals.c | 22 +- contrib/xz/src/xz/signals.h | 5 +- contrib/xz/src/xz/suffix.c | 17 +- contrib/xz/src/xz/suffix.h | 5 +- contrib/xz/src/xz/util.c | 36 +- contrib/xz/src/xz/util.h | 19 +- contrib/xz/src/xz/xz.1 | 439 +- contrib/xz/src/xzdec/xzdec.1 | 8 +- contrib/xz/src/xzdec/xzdec.c | 160 +- lib/liblzma/Makefile | 1 + lib/liblzma/Symbol.map | 5 +- lib/liblzma/Versions.def | 5 +- lib/liblzma/config.h | 120 +- usr.bin/xz/Makefile | 1 + 221 files changed, 13494 insertions(+), 11300 deletions(-) diff --cc contrib/xz/COPYING.0BSD index 000000000000,4322122aecf1..4322122aecf1 mode 000000,100644..100644 --- a/contrib/xz/COPYING.0BSD +++ b/contrib/xz/COPYING.0BSD diff --cc contrib/xz/COPYING.CC-BY-SA-4.0 index 000000000000,7d4f96c54aa1..7d4f96c54aa1 mode 000000,100644..100644 --- a/contrib/xz/COPYING.CC-BY-SA-4.0 +++ b/contrib/xz/COPYING.CC-BY-SA-4.0 diff --cc contrib/xz/doxygen/footer.html index 000000000000,38d6ea0f4364..38d6ea0f4364 mode 000000,100644..100644 --- a/contrib/xz/doxygen/footer.html +++ b/contrib/xz/doxygen/footer.html diff --cc contrib/xz/src/liblzma/check/crc32_arm64.h index 000000000000,6cdb5dab32e6..6cdb5dab32e6 mode 000000,100644..100644 --- a/contrib/xz/src/liblzma/check/crc32_arm64.h +++ b/contrib/xz/src/liblzma/check/crc32_arm64.h diff --cc contrib/xz/src/liblzma/check/crc_common.h index 000000000000,856665db79a8..856665db79a8 mode 000000,100644..100644 --- a/contrib/xz/src/liblzma/check/crc_common.h +++ b/contrib/xz/src/liblzma/check/crc_common.h diff --cc contrib/xz/src/liblzma/check/crc_x86_clmul.h index 000000000000,ae66ca9f8c71..ae66ca9f8c71 mode 000000,100644..100644 --- a/contrib/xz/src/liblzma/check/crc_x86_clmul.h +++ b/contrib/xz/src/liblzma/check/crc_x86_clmul.h diff --cc contrib/xz/src/liblzma/simple/riscv.c index 000000000000,aabbb0520577..aabbb0520577 mode 000000,100644..100644 --- a/contrib/xz/src/liblzma/simple/riscv.c +++ b/contrib/xz/src/liblzma/simple/riscv.c diff --cc contrib/xz/src/xz/sandbox.c index 000000000000,3b3069c8b2c8..3b3069c8b2c8 mode 000000,100644..100644 --- a/contrib/xz/src/xz/sandbox.c +++ b/contrib/xz/src/xz/sandbox.c diff --cc contrib/xz/src/xz/sandbox.h index 000000000000,f41b4725ce3f..f41b4725ce3f mode 000000,100644..100644 --- a/contrib/xz/src/xz/sandbox.h +++ b/contrib/xz/src/xz/sandbox.h diff --cc lib/liblzma/Makefile index 85e7b87bbbf0,000000000000..e656ddd9bb45 mode 100644,000000..100644 --- a/lib/liblzma/Makefile +++ b/lib/liblzma/Makefile @@@ -1,176 -1,0 +1,177 @@@ + +PACKAGE=lib${LIB} +LIB= lzma +LZMADIR= ${SRCTOP}/contrib/xz/src/liblzma + +.PATH: ${LZMADIR:H}/common +SRCS+= tuklib_physmem.c tuklib_cpucores.c + +.PATH: ${LZMADIR}/api/lzma + +MAININCS= ../lzma.h +MAININCSDIR= ${INCLUDEDIR} + +LZMAINCS+= base.h \ + bcj.h \ + block.h \ + check.h \ + container.h \ + delta.h \ + filter.h \ + hardware.h \ + index.h \ + index_hash.h \ + lzma12.h \ + stream_flags.h \ + version.h \ + vli.h + +LZMAINCSDIR= ${INCLUDEDIR}/lzma + +INCSGROUPS= MAININCS LZMAINCS + +.PATH: ${LZMADIR}/common +SRCS+= common.c \ + block_util.c \ + easy_preset.c \ + filter_common.c \ + hardware_physmem.c \ + hardware_cputhreads.c \ + index.c \ + stream_flags_common.c \ + string_conversion.c \ + vli_size.c \ + alone_encoder.c \ + block_buffer_encoder.c \ + block_encoder.c \ + block_header_encoder.c \ + easy_buffer_encoder.c \ + easy_encoder.c \ + easy_encoder_memusage.c \ + filter_buffer_encoder.c \ + filter_encoder.c \ + filter_flags_encoder.c \ + index_encoder.c \ + lzip_decoder.c \ + microlzma_encoder.c \ + microlzma_decoder.c \ + stream_buffer_encoder.c \ + stream_encoder.c \ + stream_flags_encoder.c \ + vli_encoder.c \ + alone_decoder.c \ + auto_decoder.c \ + block_buffer_decoder.c \ + block_decoder.c \ + block_header_decoder.c \ + easy_decoder_memusage.c \ + file_info.c \ + filter_buffer_decoder.c \ + filter_decoder.c \ + filter_flags_decoder.c \ + index_decoder.c \ + index_hash.c \ + stream_buffer_decoder.c \ + stream_decoder.c \ + stream_decoder_mt.c \ + stream_flags_decoder.c \ + stream_encoder_mt.c \ + vli_decoder.c \ + outqueue.c + + +.PATH: ${LZMADIR}/check +SRCS+= check.c \ + crc32_table.c \ + crc64_table.c +.if defined(MACHINE_ARCH) && ${MACHINE_ARCH} == "i386" +SRCS+= crc32_x86.S \ + crc64_x86.S +ACFLAGS+= -Wa,--noexecstack +.else +SRCS+= crc32_fast.c \ + crc64_fast.c +.endif + +.PATH: ${LZMADIR}/lz +SRCS+= lz_encoder.c \ + lz_encoder_mf.c \ + lz_decoder.c + +.PATH: ${LZMADIR}/lzma +SRCS+= lzma_encoder.c \ + lzma_encoder_presets.c \ + lzma_encoder_optimum_fast.c \ + lzma_encoder_optimum_normal.c \ + fastpos_table.c \ + lzma_decoder.c \ + lzma2_encoder.c \ + lzma2_decoder.c + +.PATH: ${LZMADIR}/rangecoder +SRCS+= price_table.c + +.PATH: ${LZMADIR}/delta +SRCS+= delta_common.c \ + delta_encoder.c \ + delta_decoder.c + +.PATH: ${LZMADIR}/simple +SRCS+= simple_coder.c \ + simple_encoder.c \ + simple_decoder.c \ + x86.c \ + powerpc.c \ + ia64.c \ + arm.c \ + arm64.c \ + armthumb.c \ ++ riscv.c \ + sparc.c + +.PATH: ${LZMADIR} + +VERSION_MAJOR!= sed -n '/define.*LZMA_VERSION_MAJOR/{s,[^0-9.],,gp;q;}' \ + ${LZMADIR}/api/lzma/version.h +VERSION_MINOR!= sed -n '/define.*LZMA_VERSION_MINOR/{s,[^0-9.],,gp;q;}' \ + ${LZMADIR}/api/lzma/version.h +VERSION_PATCH!= sed -n '/define.*LZMA_VERSION_PATCH/{s,[^0-9.],,gp;q;}' \ + ${LZMADIR}/api/lzma/version.h + +WARNS?= 3 + +CFLAGS+= -DHAVE_CONFIG_H \ + -DTUKLIB_SYMBOL_PREFIX=lzma_ \ + -I${.CURDIR} \ + -I${LZMADIR}/api \ + -I${LZMADIR}/common \ + -I${LZMADIR}/check \ + -I${LZMADIR}/lz \ + -I${LZMADIR}/rangecoder \ + -I${LZMADIR}/lzma \ + -I${LZMADIR}/delta \ + -I${LZMADIR}/simple \ + -I${LZMADIR:H}/common + +LIBADD+= md pthread + +VERSION_DEF= ${.CURDIR}/Versions.def +SYMBOL_MAPS= ${.CURDIR}/Symbol.map + +CLEANFILES+= liblzma.pc + +PCFILES= liblzma.pc + +liblzma.pc: liblzma.pc.in + sed -e 's,@prefix@,/usr,g ; \ + s,@exec_prefix@,/usr,g ; \ + s,@libdir@,${LIBDIR},g ; \ + s,@sharedlibdir@,${SHLIBDIR},g ; \ + s,@includedir@,${INCLUDEDIR},g ; \ + s,@LIBS@,-pthread -lmd,g ; \ + s,@PACKAGE_URL@,https://tukaani.org/xz/,g ; \ + s,@PACKAGE_VERSION@,${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH},g ; \ + s,@PTHREAD_CFLAGS@,,g ; \ + s,@PTHREAD_LIBS@,,g' ${.ALLSRC} > ${.TARGET} + +.include diff --cc lib/liblzma/Symbol.map index 8e8fc10a2453,000000000000..3b58bc759e75 mode 100644,000000..100644 --- a/lib/liblzma/Symbol.map +++ b/lib/liblzma/Symbol.map @@@ -1,211 -1,0 +1,214 @@@ +XZ_5.0 { + lzma_alone_decoder; + lzma_alone_encoder; + lzma_auto_decoder; + lzma_block_buffer_bound; + lzma_block_buffer_decode; + lzma_block_buffer_encode; + lzma_block_compressed_size; + lzma_block_decoder; + lzma_block_encoder; + lzma_block_header_decode; + lzma_block_header_encode; + lzma_block_header_size; + lzma_block_total_size; + lzma_block_unpadded_size; + lzma_check_is_supported; + lzma_check_size; + lzma_code; + lzma_crc32; + lzma_crc64; + lzma_easy_buffer_encode; + lzma_easy_decoder_memusage; + lzma_easy_encoder; + lzma_easy_encoder_memusage; + lzma_end; + lzma_filter_decoder_is_supported; + lzma_filter_encoder_is_supported; + lzma_filter_flags_decode; + lzma_filter_flags_encode; + lzma_filter_flags_size; + lzma_filters_copy; + lzma_filters_update; + lzma_get_check; + lzma_index_append; + lzma_index_block_count; + lzma_index_buffer_decode; + lzma_index_buffer_encode; + lzma_index_cat; + lzma_index_checks; + lzma_index_decoder; + lzma_index_dup; + lzma_index_encoder; + lzma_index_end; + lzma_index_file_size; + lzma_index_hash_append; + lzma_index_hash_decode; + lzma_index_hash_end; + lzma_index_hash_init; + lzma_index_hash_size; + lzma_index_init; + lzma_index_iter_init; + lzma_index_iter_locate; + lzma_index_iter_next; + lzma_index_iter_rewind; + lzma_index_memusage; + lzma_index_memused; + lzma_index_size; + lzma_index_stream_count; + lzma_index_stream_flags; + lzma_index_stream_padding; + lzma_index_stream_size; + lzma_index_total_size; + lzma_index_uncompressed_size; + lzma_lzma_preset; + lzma_memlimit_get; + lzma_memlimit_set; + lzma_memusage; + lzma_mf_is_supported; + lzma_mode_is_supported; + lzma_physmem; + lzma_properties_decode; + lzma_properties_encode; + lzma_properties_size; + lzma_raw_buffer_decode; + lzma_raw_buffer_encode; + lzma_raw_decoder; + lzma_raw_decoder_memusage; + lzma_raw_encoder; + lzma_raw_encoder_memusage; + lzma_stream_buffer_bound; + lzma_stream_buffer_decode; + lzma_stream_buffer_encode; + lzma_stream_decoder; + lzma_stream_encoder; + lzma_stream_flags_compare; + lzma_stream_footer_decode; + lzma_stream_footer_encode; + lzma_stream_header_decode; + lzma_stream_header_encode; + lzma_version_number; + lzma_version_string; + lzma_vli_decode; + lzma_vli_encode; + lzma_vli_size; +}; + +XZ_5.2 { + lzma_block_uncomp_encode; + lzma_cputhreads; + lzma_get_progress; + lzma_stream_encoder_mt; + lzma_stream_encoder_mt_memusage; +}; + +XZ_5.4 { + lzma_file_info_decoder; + lzma_filters_free; + lzma_lzip_decoder; + lzma_microlzma_decoder; + lzma_microlzma_encoder; + lzma_stream_decoder_mt; + lzma_str_from_filters; + lzma_str_list_filters; + lzma_str_to_filters; +}; + ++XZ_5.6 { ++ lzma_mt_block_size; ++}; ++ +XZprivate_1.0 { + lzma_alloc; + lzma_alloc_zero; + lzma_alone_decoder_init; + lzma_block_buffer_bound64; + lzma_block_decoder_init; + lzma_block_encoder_init; + lzma_bufcpy; + lzma_check_finish; + lzma_check_init; + lzma_check_update; + lzma_delta_coder_init; + lzma_delta_coder_memusage; + lzma_delta_decoder_init; + lzma_delta_encoder_init; + lzma_delta_props_decode; + lzma_delta_props_encode; + lzma_easy_preset; + lzma_free; + lzma_index_encoder_init; + lzma_index_padding_size; + lzma_index_prealloc; + lzma_lz_decoder_init; + lzma_lz_decoder_memusage; + lzma_lz_decoder_uncompressed; + lzma_lz_encoder_init; + lzma_lz_encoder_memusage; + lzma_lzma2_block_size; + lzma_lzma2_decoder_init; + lzma_lzma2_decoder_memusage; + lzma_lzma2_encoder_init; + lzma_lzma2_encoder_memusage; + lzma_lzma2_props_decode; + lzma_lzma2_props_encode; + lzma_lzma_decoder_create; + lzma_lzma_decoder_init; + lzma_lzma_decoder_memusage; + lzma_lzma_decoder_memusage_nocheck; + lzma_lzma_encode; + lzma_lzma_encoder_create; + lzma_lzma_encoder_init; + lzma_lzma_encoder_memusage; + lzma_lzma_encoder_reset; + lzma_lzma_lclppb_decode; + lzma_lzma_lclppb_encode; + lzma_lzma_optimum_fast; + lzma_lzma_optimum_normal; + lzma_lzma_props_decode; + lzma_lzma_props_encode; + lzma_mf_bt2_find; + lzma_mf_bt2_skip; + lzma_mf_bt3_find; + lzma_mf_bt3_skip; + lzma_mf_bt4_find; + lzma_mf_bt4_skip; + lzma_mf_find; + lzma_mf_hc3_find; + lzma_mf_hc3_skip; + lzma_mf_hc4_find; + lzma_mf_hc4_skip; - lzma_mt_block_size; + lzma_next_end; + lzma_next_filter_init; + lzma_next_filter_update; + lzma_outq_end; + lzma_outq_get_buf; + lzma_outq_init; + lzma_outq_is_readable; + lzma_outq_memusage; + lzma_outq_read; + lzma_raw_coder_init; + lzma_raw_coder_memusage; + lzma_raw_decoder_init; + lzma_raw_encoder_init; + lzma_simple_arm_decoder_init; + lzma_simple_arm_encoder_init; + lzma_simple_armthumb_decoder_init; + lzma_simple_armthumb_encoder_init; + lzma_simple_coder_init; + lzma_simple_ia64_decoder_init; + lzma_simple_ia64_encoder_init; + lzma_simple_powerpc_decoder_init; + lzma_simple_powerpc_encoder_init; + lzma_simple_props_decode; + lzma_simple_props_encode; + lzma_simple_props_size; + lzma_simple_sparc_decoder_init; + lzma_simple_sparc_encoder_init; + lzma_simple_x86_decoder_init; + lzma_simple_x86_encoder_init; + lzma_stream_decoder_init; + lzma_strm_init; + lzma_tuklib_cpucores; + lzma_tuklib_physmem; +}; diff --cc lib/liblzma/Versions.def index dea89514beda,000000000000..25064d9d50e7 mode 100644,000000..100644 --- a/lib/liblzma/Versions.def +++ b/lib/liblzma/Versions.def @@@ -1,13 -1,0 +1,16 @@@ + +XZ_5.0 { +}; + +XZ_5.2 { +} XZ_5.0; + +XZ_5.4 { +} XZ_5.2; + - XZprivate_1.0 { ++XZ_5.6 { +} XZ_5.4; + ++XZprivate_1.0 { ++} XZ_5.6; ++ diff --cc lib/liblzma/config.h index cfa53becb2ad,000000000000..15e0c71e5ed1 mode 100644,000000..100644 --- a/lib/liblzma/config.h +++ b/lib/liblzma/config.h @@@ -1,618 -1,0 +1,654 @@@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ + +/* How many MiB of RAM to assume if the real amount cannot be determined. */ +#define ASSUME_RAM 128 + +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +/* FreeBSD - disabled intentionally */ +/* #undef ENABLE_NLS */ + ++/* Define to 1 if ARM64 CRC32 instruction is supported. See configure.ac for ++ details. */ ++/* #undef HAVE_ARM64_CRC32 */ ++ +/* Define to 1 if bswap_16 is available. */ +/* #undef HAVE_BSWAP_16 */ + +/* Define to 1 if bswap_32 is available. */ +/* #undef HAVE_BSWAP_32 */ + +/* Define to 1 if bswap_64 is available. */ +/* #undef HAVE_BSWAP_64 */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_BYTESWAP_H */ + +#ifndef WITHOUT_CAPSICUM - /* Define to 1 if Capsicum is available. */ - #define HAVE_CAPSICUM 1 ++/* Define to 1 if you have the 'cap_rights_limit' function. */ ++#define HAVE_CAP_RIGHTS_LIMIT 1 +#endif + - /* Define to 1 if the system has the type `CC_SHA256_CTX'. */ ++/* Define to 1 if the system has the type 'CC_SHA256_CTX'. */ +/* #undef HAVE_CC_SHA256_CTX */ + - /* Define to 1 if you have the `CC_SHA256_Init' function. */ ++/* Define to 1 if you have the 'CC_SHA256_Init' function. */ +/* #undef HAVE_CC_SHA256_INIT */ + +/* 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 */ + +/* Define to 1 if crc32 integrity check is enabled. */ +#define HAVE_CHECK_CRC32 1 + +/* Define to 1 if crc64 integrity check is enabled. */ +#define HAVE_CHECK_CRC64 1 + +/* Define to 1 if sha256 integrity check is enabled. */ +#define HAVE_CHECK_SHA256 1 + - /* Define to 1 if you have the `clock_gettime' function. */ ++/* Define to 1 if you have the 'clock_gettime' function. */ +#define HAVE_CLOCK_GETTIME 1 + - /* Define to 1 if `CLOCK_MONOTONIC' is declared in . */ ++/* Define to 1 if 'CLOCK_MONOTONIC' is declared in . */ +#define HAVE_CLOCK_MONOTONIC 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_COMMONCRYPTO_COMMONDIGEST_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_CPUID_H 1 + +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +/* FreeBSD - disabled intentionally */ +/* #undef HAVE_DCGETTEXT */ + +/* Define to 1 if any of HAVE_DECODER_foo have been defined. */ +#define HAVE_DECODERS 1 + +/* Define to 1 if arm decoder is enabled. */ +#define HAVE_DECODER_ARM 1 + +/* Define to 1 if arm64 decoder is enabled. */ +#define HAVE_DECODER_ARM64 1 + +/* Define to 1 if armthumb decoder is enabled. */ +#define HAVE_DECODER_ARMTHUMB 1 + +/* Define to 1 if delta decoder is enabled. */ +#define HAVE_DECODER_DELTA 1 + +/* Define to 1 if ia64 decoder is enabled. */ +#define HAVE_DECODER_IA64 1 + +/* Define to 1 if lzma1 decoder is enabled. */ +#define HAVE_DECODER_LZMA1 1 + +/* Define to 1 if lzma2 decoder is enabled. */ +#define HAVE_DECODER_LZMA2 1 + +/* Define to 1 if powerpc decoder is enabled. */ +#define HAVE_DECODER_POWERPC 1 + ++/* Define to 1 if riscv decoder is enabled. */ ++#define HAVE_DECODER_RISCV 1 ++ +/* Define to 1 if sparc decoder is enabled. */ +#define HAVE_DECODER_SPARC 1 + +/* Define to 1 if x86 decoder is enabled. */ +#define HAVE_DECODER_X86 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + ++/* Define to 1 if you have the 'elf_aux_info' function. */ ++/* #undef HAVE_ELF_AUX_INFO */ ++ +/* Define to 1 if any of HAVE_ENCODER_foo have been defined. */ +#define HAVE_ENCODERS 1 + +/* Define to 1 if arm encoder is enabled. */ +#define HAVE_ENCODER_ARM 1 + +/* Define to 1 if arm64 encoder is enabled. */ +#define HAVE_ENCODER_ARM64 1 + +/* Define to 1 if armthumb encoder is enabled. */ +#define HAVE_ENCODER_ARMTHUMB 1 + +/* Define to 1 if delta encoder is enabled. */ +#define HAVE_ENCODER_DELTA 1 + +/* Define to 1 if ia64 encoder is enabled. */ +#define HAVE_ENCODER_IA64 1 + +/* Define to 1 if lzma1 encoder is enabled. */ +#define HAVE_ENCODER_LZMA1 1 + +/* Define to 1 if lzma2 encoder is enabled. */ +#define HAVE_ENCODER_LZMA2 1 + +/* Define to 1 if powerpc encoder is enabled. */ +#define HAVE_ENCODER_POWERPC 1 + ++/* Define to 1 if riscv encoder is enabled. */ ++#define HAVE_ENCODER_RISCV 1 ++ +/* Define to 1 if sparc encoder is enabled. */ +#define HAVE_ENCODER_SPARC 1 + +/* Define to 1 if x86 encoder is enabled. */ +#define HAVE_ENCODER_X86 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if __attribute__((__constructor__)) is supported for functions. + */ +#define HAVE_FUNC_ATTRIBUTE_CONSTRUCTOR 1 + - /* Define to 1 if you have the `futimens' function. */ ++/* Define to 1 if __attribute__((__ifunc__())) is supported for functions. */ ++#define HAVE_FUNC_ATTRIBUTE_IFUNC 1 ++ ++/* Define to 1 if you have the 'futimens' function. */ +#define HAVE_FUTIMENS 1 + - /* Define to 1 if you have the `futimes' function. */ ++/* Define to 1 if you have the 'futimes' function. */ +/* #undef HAVE_FUTIMES */ + - /* Define to 1 if you have the `futimesat' function. */ ++/* Define to 1 if you have the 'futimesat' function. */ +/* #undef HAVE_FUTIMESAT */ + ++/* Define to 1 if you have the 'getauxval' function. */ ++/* #undef HAVE_GETAUXVAL */ ++ +/* Define to 1 if you have the header file. */ +#define HAVE_GETOPT_H 1 + - /* Define to 1 if you have the `getopt_long' function. */ ++/* Define to 1 if you have the 'getopt_long' function. */ +#define HAVE_GETOPT_LONG 1 + +/* Define if the GNU gettext() function is already present or preinstalled. */ +/* FreeBSD - disabled intentionally */ +/* #undef HAVE_GETTEXT */ + +/* Define if you have the iconv() function and it works. */ +#define HAVE_ICONV 1 + +/* Define to 1 if you have the header file. */ +/* FreeBSD - only with clang because the base gcc does not support it */ +#if defined(__clang__) && defined(__FreeBSD__) && defined(__amd64__) +#define HAVE_IMMINTRIN_H 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + ++/* Define to 1 if you have the header file. */ ++/* #undef HAVE_LINUX_LANDLOCK_H */ ++ +/* Define to 1 if .lz (lzip) decompression support is enabled. */ +#define HAVE_LZIP_DECODER 1 + +/* Define to 1 if mbrtowc and mbstate_t are properly declared. */ +#define HAVE_MBRTOWC 1 + +/* Define to 1 to enable bt2 match finder. */ +#define HAVE_MF_BT2 1 + +/* Define to 1 to enable bt3 match finder. */ +#define HAVE_MF_BT3 1 + +/* Define to 1 to enable bt4 match finder. */ +#define HAVE_MF_BT4 1 + +/* Define to 1 to enable hc3 match finder. */ +#define HAVE_MF_HC3 1 + +/* Define to 1 to enable hc4 match finder. */ +#define HAVE_MF_HC4 1 + ++/* Define to 1 if MicroLZMA support is enabled. */ ++#define HAVE_MICROLZMA 1 ++ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_MINIX_CONFIG_H */ + +/* Define to 1 if getopt.h declares extern int optreset. */ +#define HAVE_OPTRESET 1 + - /* Define to 1 if you have the `pledge' function. */ ++/* Define to 1 if you have the 'pledge' function. */ +/* #undef HAVE_PLEDGE */ + - /* Define to 1 if you have the `posix_fadvise' function. */ ++/* Define to 1 if you have the 'posix_fadvise' function. */ +#define HAVE_POSIX_FADVISE 1 + - /* Define to 1 if `program_invocation_name' is declared in . */ ++/* Define to 1 if 'program_invocation_name' is declared in . */ +/* #undef HAVE_PROGRAM_INVOCATION_NAME */ + - /* Define to 1 if you have the `pthread_condattr_setclock' function. */ ++/* Define to 1 if you have the 'pthread_condattr_setclock' function. */ +#define HAVE_PTHREAD_CONDATTR_SETCLOCK 1 + +/* Have PTHREAD_PRIO_INHERIT. */ +#define HAVE_PTHREAD_PRIO_INHERIT 1 + - /* Define to 1 if you have the `SHA256Init' function. */ ++/* Define to 1 if you have the 'SHA256Init' function. */ +/* #undef HAVE_SHA256INIT */ + - /* Define to 1 if the system has the type `SHA256_CTX'. */ ++/* Define to 1 if the system has the type 'SHA256_CTX'. */ +#define HAVE_SHA256_CTX 1 + +/* Define to 1 if you have the header file. */ *** 484 LINES SKIPPED ***