From nobody Mon Jun 10 08:15: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 4VyPjw60tRz5P9SS; Mon, 10 Jun 2024 08:15: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 4VyPjw5LGNz40F4; Mon, 10 Jun 2024 08:15:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718007300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UYz2DwrbM/8euOqvJ7c8U4dQ+5DFnG5QDkpj1+8IIfA=; b=RcavUpwNiBSqOtz2pV0utPA9kE9jGFbIx6UgWm2ZxYR7rPt6HkGrqPFaoXvc5EZU8leToO RAbHiQBgUzgs/uO+Xc1o7608Y03gs+paIsmkUv2gQYIjzcrXO5qi0Lvhryse+mvaPkbR6e LoF5Jng1MtsmJbCPP3p323AMjHX5R+d16AwW7z8EpHGBYzoSXdWG18EfK7uRImtKKfiSUv uCFkvrFNxCyixwMc2bZft+vKnZyGr6IaG+xnJuiqSMwAX2bdFzEbyMV7ppiFWbeGa/0d28 jqiEHEmAc6PDyLnscW+diHvdKY+7l+mPYuL4JalJ2xEOProCjzJOBsxcaQa8pA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718007300; a=rsa-sha256; cv=none; b=Fo70Ga8B4XISSz5tcc+EI/ysikaVpraVAqJemPG0eunBhvNBw6n5Jw50giXtVUKUItNJRG svXQP3HHbgefxP/0++ZbgHpQ5MQkk+lg6028wE5S19+Zwjamu+asMYzqVLURyTxVzWp3f7 nIu74dvbksef47g8cZ2jiEcUFnWV6Y68B1D6VhHF84CieWRGr4lTDBE3DR5UL5PBYGWT8k CYwzgRxsmKOwysO5E/h+7dQ/iUCTUnI4UP88o5Q5w20cr7ZCefbEC6J3pe894g92b2FqnU Zl1dR9XVY6R3CvyfIp1MEW7jUaPzZVqi7omaqONioHXXsSB2iZVzTDaxI5ALOA== 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=1718007300; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UYz2DwrbM/8euOqvJ7c8U4dQ+5DFnG5QDkpj1+8IIfA=; b=FesId///ETfEzEwhjzrU/JSf2buXYyvD3lFAYCfYNCJzbrk3TFHXatsj4xnxjbETzDloH4 Qe7RLZyIiMKLSEyVWjcRAqNl2fRz9hmVD1Ccy+W3CAQBUtVeOs9U5JzWHAoOk0xGR9YJ2A Wu4WBkoNSHdg8WXOeGk6qPwlXmm0pqQ8FBqNwYuMkfiKsCLLHP4ZKIgRb/ACJ2YWDtApG9 Z9sLrQuKsruU9f2oen0mf5fH29o81Rj3yuclXgoijKBOtlWz5p9ilfgBTDalDslno+j2L3 k+6BtDs2oRZzVpn62SXYQ8v1eooABDboy0mwvbUQmTlawnEZ7p7ZQegO2xIcKg== 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 4VyPjw4xTFzHgJ; Mon, 10 Jun 2024 08:15: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 45A8F0Rb011919; Mon, 10 Jun 2024 08:15:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45A8F0R5011916; Mon, 10 Jun 2024 08:15:00 GMT (envelope-from git) Date: Mon, 10 Jun 2024 08:15:00 GMT Message-Id: <202406100815.45A8F0R5011916@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Benedict Reuschling Subject: git: e335a74b5671 - main - accf_http.9: Fix grammar in description (singular/plural) 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e335a74b5671fa31ea347e70f43004ec29b35280 Auto-Submitted: auto-generated The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/src/commit/?id=e335a74b5671fa31ea347e70f43004ec29b35280 commit e335a74b5671fa31ea347e70f43004ec29b35280 Author: Benedict Reuschling AuthorDate: 2024-06-10 08:13:58 +0000 Commit: Benedict Reuschling CommitDate: 2024-06-10 08:13:58 +0000 accf_http.9: Fix grammar in description (singular/plural) --- share/man/man9/accf_http.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/accf_http.9 b/share/man/man9/accf_http.9 index f48894807312..f71bb7811dc0 100644 --- a/share/man/man9/accf_http.9 +++ b/share/man/man9/accf_http.9 @@ -28,7 +28,7 @@ .Os .Sh NAME .Nm accf_http -.Nd "buffer incoming connections until a certain complete HTTP requests arrive" +.Nd "buffer incoming connections until a certain complete HTTP request arrives" .Sh SYNOPSIS .Nm options INET .Nm options ACCEPT_FILTER_HTTP From nobody Mon Jun 10 08:30: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 4VyQ3k1jP0z5PBXB; Mon, 10 Jun 2024 08:30: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 4VyQ3k1Ddpz41mj; Mon, 10 Jun 2024 08:30:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718008226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QtrWllLgjVVJpCeg1HoMAhIxIMGrPXZrfcfOETZh1QI=; b=kngr0EPD4KjX6HSc4xT5wqg0DmnOq1Y5lMc7/YRg/ez1LMo5vt+4+atJLkwxWsTLKeMuQs MUsww/fCI8lXurMXtXG8++/glB0b+ZqBMgAZblo39JSP5WMN5g383RDGErmqf2WApAOlCC /n1IVHfXCu2NrDUaJeOi+dai9kOqe+G7aN5FHPDXy9pQJjo0XszIaVMJC5qugSQCg88OFn +Ms3PiGApH6kbcB1pxUWg6twG4+ab2HXd/Aj89kyI4goN1+ObidiWIBSH4wqGUnMkECzJt rk8fGlEyIn1q4obm7V0z2gYWbhtmpdHxdFWBiw7Rtu5MJ+ra3QPfOv5ahA/+og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718008226; a=rsa-sha256; cv=none; b=t8U0uuGVrgQFEnsJSnFr44nGZsV6H+5gqRxkM0T6GzK33O90sAWu+GuGWoMmIoORPW5Lr/ cVqq5A1wBtyK2fwO4IjYeW2+SSOX8NV31jYw/RqyRHodYlb1eUxt5ss1pEUXrN+vRb/3Cv 1ASua7u/KAgtKFuAe9K388RQL1j8mTciyBfmBF+m9zaYo2FWZnuUskCNmSFZJCz7LRQTPO 28c4+JNAd0mJVU6q8jAmRB1YbH1LKl3s81iHr1Eo6H49WxW1OHq+6OYpj9/nDp+4QVlD5W aLybirkcqmweYoYLYm3snKWutS4nr11hRX1WDXgyThIRzaGSWSsN8VILAnrWqg== 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=1718008226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QtrWllLgjVVJpCeg1HoMAhIxIMGrPXZrfcfOETZh1QI=; b=T0EsjrrmTFSQhB8io5704Jw3kPWvtXY14o1+jonrjlzjTLZyomlCTAOUkbTeP0xtzu6okD G5N5AsDDVfDZ86JiQn+YG6TWwo67iix1KdCzZH3IHHeTjv3FY4nBsQhuTElFJd7Wvskbly i4kYItIjvEcN0SkYDe7mUgz4RI3qRKxLAo2RI2WvpVdsxSiZVGIPS+pZhXbbkuUuVBRaX/ Q0tZ/ddtkptQgCz0V0B3TJZFfMIss6jW2xuhHYVuOaTk+7Zlqyc9aTwP+cUKYPDYN54wSj Y+X5tAW/1U3FXIbzb9Gpfg7C+v+OdH1yfN3tcJxV103dlVupvcXxPnwVmMFExw== 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 4VyQ3k0jjhzJRm; Mon, 10 Jun 2024 08:30: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 45A8UQa6038419; Mon, 10 Jun 2024 08:30:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45A8UQ5H038416; Mon, 10 Jun 2024 08:30:26 GMT (envelope-from git) Date: Mon, 10 Jun 2024 08:30:26 GMT Message-Id: <202406100830.45A8UQ5H038416@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Benedict Reuschling Subject: git: e5a54f19be8e - main - accf_tls(9): Fix grammar in description (singular/plural) 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bcr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5a54f19be8e0e4e700aaf46ab70d42d3ffba469 Auto-Submitted: auto-generated The branch main has been updated by bcr: URL: https://cgit.FreeBSD.org/src/commit/?id=e5a54f19be8e0e4e700aaf46ab70d42d3ffba469 commit e5a54f19be8e0e4e700aaf46ab70d42d3ffba469 Author: Benedict Reuschling AuthorDate: 2024-06-10 08:29:26 +0000 Commit: Benedict Reuschling CommitDate: 2024-06-10 08:29:26 +0000 accf_tls(9): Fix grammar in description (singular/plural) --- share/man/man9/accf_tls.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/accf_tls.9 b/share/man/man9/accf_tls.9 index 331ea2aa4fb8..d4dbc299e5bb 100644 --- a/share/man/man9/accf_tls.9 +++ b/share/man/man9/accf_tls.9 @@ -26,7 +26,7 @@ .Os .Sh NAME .Nm accf_tls -.Nd "buffer incoming connections until a TLS handshake like requests arrive" +.Nd "buffer incoming connections until a TLS handshake like request arrives" .Sh SYNOPSIS .Nm options INET .Nm options ACCEPT_FILTER_TLS From nobody Mon Jun 10 09:05: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 4VyQrP3w9Tz5PF4H; Mon, 10 Jun 2024 09:05: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 4VyQrP3C0Qz442M; Mon, 10 Jun 2024 09:05:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718010341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MJa2Q4vSsYYviARZbl3cQk30iF4SHSV+OaF4bQnVYKU=; b=d2pKoAyuA9cR1TXMN0jWM+gDPElHwy+ftsY8fAlL5gc2C49lCmYKfAqVeAGRB3H7JBZixW IOZFh9JzUhJ+/1EJd78K75WNwcxUiaPqb8IBvvT2n+QEBWwru6WMQDHIL16ZDnoyepTjyZ 1GFEOgIf2RN1cVZ9JoyfxVLezJ8mSKBvrs9EGNmVij65XGpM5Tnpc0IZ/DgqRChkTeziIs KgYK+IaoGuzcQANRdpQF/7n8UlA7Vkiv1GCIKomQtESuztHEXvGyQe5RKdXPs9uCqq6Kcw HpEDvmBklxqs/MkLO3MiS/LHmXxyC22YGOXpl5IXNo1g5O+um7wsIDvurEQYhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718010341; a=rsa-sha256; cv=none; b=eCIuWcFiEdHzr/OsF4Ysn7mtixtx2p1/qGAu6mSkzLpHJ4DI/kJG0d8d+Nnv5VagCp0GF1 W252I8iUSLnPYS5kv0RHonueGCvxTBV3mbdgSuAEtcsBXl0AjpXG3uah1V3sNjvjiFDcQ7 ltAST8UbEqx71L+oxZO/OFHWny4sgyq5XtiYLkPSz04bK/l9ts5/Tl2C6EpTH0WhcjiNTa T87554Ss+c5NYkdBw7w+cx29ro+TLhAjxs7EwJP4ZVYtzchYFYJpWFm8cCefroAKkX1mjx 4OzrWu55VHKrVW127A4QU2ZT0X9l6jIGlf8VS/2YlT37WG4vZsYQxgTEMKuVnw== 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=1718010341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MJa2Q4vSsYYviARZbl3cQk30iF4SHSV+OaF4bQnVYKU=; b=XflCrxXLyCVNNUbONQyitzfyn88J5gV6c3Skp6dBCFq3CxZDoTDPKLt6dJ/eGjatVpOYja eFyIIfRWCRFD3otEJaTcILQNwnVptVTmS8C0gRrZkLOWIjQlFIP/CKX5axNqle9yjjlF7n zMdNPz51ZRypgE3QmD8Hh0vJ1wJ0ViS36yyGH7Ae6GgcYsiILlcNNj3WpFLo2Mdp+9A7Qt V2sXT7vXNWOtvZFZcvsZ0UxcFNj7yQ5AVd5FttG4h/veOdkfHmRizT1uUFBFgMpOQICMpR fMelDMPew+jOERA252TyqMyxw6jvlIT5PxgnszxeHCTBPK1nE+BqY3pbWiEbnw== 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 4VyQrP2pYJzKNp; Mon, 10 Jun 2024 09:05: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 45A95f41096940; Mon, 10 Jun 2024 09:05:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45A95fRn096937; Mon, 10 Jun 2024 09:05:41 GMT (envelope-from git) Date: Mon, 10 Jun 2024 09:05:41 GMT Message-Id: <202406100905.45A95fRn096937@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 3ff0dc1af85e - main - vmxnet3: make descriptor count checks more robust 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ff0dc1af85e253b83127ea2417a22a7b2c31f27 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=3ff0dc1af85e253b83127ea2417a22a7b2c31f27 commit 3ff0dc1af85e253b83127ea2417a22a7b2c31f27 Author: Kristof Provost AuthorDate: 2024-06-10 08:47:38 +0000 Commit: Kristof Provost CommitDate: 2024-06-10 09:04:47 +0000 vmxnet3: make descriptor count checks more robust When we update credits there is a potential for a race causing an overflow of vxcr_next (i.e. incrementing it past vxcr_ndesc). Change the check to >= rather than == to be more robust against this. Reviewed by: emaste Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D43712 --- sys/dev/vmware/vmxnet3/if_vmx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/vmware/vmxnet3/if_vmx.c b/sys/dev/vmware/vmxnet3/if_vmx.c index fdcad0dd4bba..62b5f313a137 100644 --- a/sys/dev/vmware/vmxnet3/if_vmx.c +++ b/sys/dev/vmware/vmxnet3/if_vmx.c @@ -1429,7 +1429,8 @@ vmxnet3_isc_txd_credits_update(void *vsc, uint16_t txqid, bool clear) return (1); vmxnet3_barrier(sc, VMXNET3_BARRIER_RD); - if (++txc->vxcr_next == txc->vxcr_ndesc) { + MPASS(txc->vxcr_next < txc->vxcr_ndesc); + if (++txc->vxcr_next >= txc->vxcr_ndesc) { txc->vxcr_next = 0; txc->vxcr_gen ^= 1; } From nobody Mon Jun 10 12:46: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 4VyWl36lprz5Lbdp; Mon, 10 Jun 2024 12:46: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 4VyWl36GGlz4Rlh; Mon, 10 Jun 2024 12:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718023583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eePjmacLE1vcXvNk1fDglgsRbGWrjGoP25742CEvHIA=; b=FIU5HdnDwTj5X9CnXFz1sEqtXGXRHvcaOh7fHnX4xJ0gk0n+QHsgPpnjuUd0hlizYbgxwz TetQSvKbUs8hVAD4kiMCC49ob/yjGzNskylPOtEs8rf1O0xLMf6PIoVaCD+M4h7yGmnnZr cOMWIJIXYicTprYc/fEfyO0UPOt4/d1nqZ59yIYqpb4sAYyWh+NlRcWwmqPAxu4fhZFn5G nCh1/n0RQE6Cc7ybpRhcN1yG40eIyiIyaWLrO3QAwZbCsHeQcs0sDpZjVAbKnDTsF2Cwn9 sFuUYy45W0yiHMCoVCbqRPdffj3R3rl1OdWKEGqL9Z+Wyrarcs2Oc0JGlla48A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718023583; a=rsa-sha256; cv=none; b=Yd03pe1C2YOF4whUvL3nmabn2AoYmi7F0fXRrmJo7nom+0Fr1anOMde/EmBD8Acat8LPQI QotbswiFILPQ9ks72DhIFaBp2byc39u4ei3ay+UL71MNhe/3DiDVKblUNiPa32ReE8v6j9 46iLpqFw1v/cYRN05KrCDZ8+RY/+2bEipu596N0yLZXhBv7deCLzjGw5/sL9xrpPQz4A0b 6xlWnIcppQx8VXcXuisU3645ExqMTHllNNp/CUABQKvCxiCLlloG41u8j6i+yNOZG1kk7M 2CkTJF/+j6v/vRyWpb2RkvKmCEKUcnJcAVV8udHH5YB3Z0EJP12kZyszLO2MBQ== 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=1718023583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eePjmacLE1vcXvNk1fDglgsRbGWrjGoP25742CEvHIA=; b=eVeeVDlkJzKuiqk6oYcd4cTvqcTVlOetHQ4t757dm56iX7+2YIpxFhL6QV13a0seM/7QEp Y3N8UCCXzr4y6hB20eUWFObQ6mXTfLPHzD/3nGu3uwdcA0x4SQjAJqln47o/vnj6rWFAfQ Ri0lsvr5+Vvtw/tHtrqK05xVbEk64128wpAohFka0MBpknxRJ3oZsrFUeDkfc/lmGk1eM5 YgSHr+Amg6jg/NIya85EKayNjk5o1QxlhenYV0HhKn7cADS4Af3QhsrAkl83BSdL/s9R0l pB8apG6U+QWc+c9GgxOW6iVj8d2CRZqVHken5FZZNmO2UDE+aO3zZPGcbMQyCA== 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 4VyWl35l88zQPy; Mon, 10 Jun 2024 12:46: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 45ACkNnn068146; Mon, 10 Jun 2024 12:46:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45ACkNvS068142; Mon, 10 Jun 2024 12:46:23 GMT (envelope-from git) Date: Mon, 10 Jun 2024 12:46:23 GMT Message-Id: <202406101246.45ACkNvS068142@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wei Hu Subject: git: fd911ae60924 - main - Hyper-V: remove unused alloc_pcpu_ptr() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd911ae609247ef5c91493fb5506e77aa6e497bc Auto-Submitted: auto-generated The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=fd911ae609247ef5c91493fb5506e77aa6e497bc commit fd911ae609247ef5c91493fb5506e77aa6e497bc Author: Wei Hu AuthorDate: 2024-06-10 12:33:46 +0000 Commit: Wei Hu CommitDate: 2024-06-10 12:33:46 +0000 Hyper-V: remove unused alloc_pcpu_ptr() Fixes: 2b887687edc25bb4553f0d8a1183f454a85d413d Sponsored by: Microsoft --- sys/dev/hyperv/vmbus/vmbus.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/dev/hyperv/vmbus/vmbus.c b/sys/dev/hyperv/vmbus/vmbus.c index a3daed05c21a..c1fa9107d3c2 100644 --- a/sys/dev/hyperv/vmbus/vmbus.c +++ b/sys/dev/hyperv/vmbus/vmbus.c @@ -140,7 +140,6 @@ static void vmbus_event_proc_dummy(struct vmbus_softc *, static bus_dma_tag_t vmbus_get_dma_tag(device_t parent, device_t child); static struct vmbus_softc *vmbus_sc; static void free_pcpu_ptr(void); -static void alloc_pcpu_ptr(void); SYSCTL_NODE(_hw, OID_AUTO, vmbus, CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "Hyper-V vmbus"); From nobody Mon Jun 10 14:42: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 4VyZJZ5fFSz5M2fS; Mon, 10 Jun 2024 14:42: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 4VyZJZ54z9z4dnr; Mon, 10 Jun 2024 14:42:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718030526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fgcgGBKjYEcFCGJNizz09DE9sKJ1yj6ZQMrquyiKN3c=; b=gW42pLZa5RBUZ7fiCxSAWvxz3fR6rg9mvvbh82mRElqKNdOTUnkZKBlr7bcvLPvm6SO1n/ l5IDAPc4/O6rX6xtvVDlDVVwztArUyazD9LojAvzVzqmUbabYrBITUC7/RQY9PrjIbi5NM xL3iGJaHvswd71G42Q/UNu3/TqLe3TfMM2CR+diAVwgJ00tFaOhwkVDOKQZpFmsTWfbl1R 9zPKMoIklcNQBIwx6As+wc2kb6o6vek8V74pBAkelBvauqFfPZ2JNdI2gWGsvC5eUtrUio yll8vB5P0KVu900+Ss2Lel7X+8m8VF0g0h3kBcMCeqX6UHMS4c5I31uJtHTetw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718030526; a=rsa-sha256; cv=none; b=IXGtUvEp8uFxY/KbCCzeRupIFcW5RGydECetSVTyMPkYO705uWtV6yZHBRFCxL+UUTlPgc m6F0ETYZP3tIKHlHGd26qo0UuP3zTmAFg92Z3lGLfBkERx1svpgaNx9Noe9HATPDbjgrI6 OH94TPgbZ1yldsDL+5gnutY9ANHyv210vJLfjcBg9ykbxFQdaG6aINrKAEwKHvLoQbSqZQ Cs0P0UlzNqH9YLHHlcKpyKDs/hACcVlLIyQkc77Z+0//CFBz2KwO4oPN4rTrOwdU2lqxo7 fItSLlQIz33JhLwetZGrHEwlyrPPOp0wNazqalbQbnwx1B1UUdcbDFWE/0svZg== 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=1718030526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fgcgGBKjYEcFCGJNizz09DE9sKJ1yj6ZQMrquyiKN3c=; b=Rf+x5Oo31ZqqVZWLv2FW19h162mfQ2UzSPEzP1RPUqr/Wx/qvzy3ZrabD9Qhg23biXKol6 e7PoWCJxkr11SK+LZEK5oTsLL5G5XELvHst1Mh+o7EREH+KViHdbP1nbkMjXaI5v+28V0R 0p+nBfS407LTWgx9s8FsUp3i2tzNLmXGLsz+Z5ODXSHB4451NzHR1KFB34f6Qq7+PQa0oT 9xMw4mAefOGKeieFG5e+kztV5SESQQRymA7RmhTglIki4Z4Yl7okopoYN/OQm9QoSjXOC0 JIfsFIbBHyhCoCCeWQqufFvXS6uQjagX0PUvi+4iDbp1uZR/CI6+ze1RGvdKwA== 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 4VyZJZ4gx1zVdR; Mon, 10 Jun 2024 14:42: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 45AEg6nv067963; Mon, 10 Jun 2024 14:42:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45AEg68w067960; Mon, 10 Jun 2024 14:42:06 GMT (envelope-from git) Date: Mon, 10 Jun 2024 14:42:06 GMT Message-Id: <202406101442.45AEg68w067960@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: a87651e2ff18 - main - ktrace(1): add xref to namei(9) 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: a87651e2ff189cec4c26cb220354f1bc93794f31 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a87651e2ff189cec4c26cb220354f1bc93794f31 commit a87651e2ff189cec4c26cb220354f1bc93794f31 Author: Ed Maste AuthorDate: 2024-06-10 12:51:01 +0000 Commit: Ed Maste CommitDate: 2024-06-10 14:41:45 +0000 ktrace(1): add xref to namei(9) namei was mistaken for a typo (see GitHub pull request #1284). Add an xref to make it clear. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45546 --- usr.bin/ktrace/ktrace.1 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/usr.bin/ktrace/ktrace.1 b/usr.bin/ktrace/ktrace.1 index da39aac7800f..162706c65e6e 100644 --- a/usr.bin/ktrace/ktrace.1 +++ b/usr.bin/ktrace/ktrace.1 @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 20, 2024 +.Dd June 10, 2024 .Dt KTRACE 1 .Os .Sh NAME @@ -48,7 +48,8 @@ The utility enables kernel trace logging for the specified processes. Kernel trace data is logged to the file .Pa ktrace.out . -The kernel operations that are traced include system calls, namei +The kernel operations that are traced include system calls, +.Xr namei 9 translations, signal processing, and .Tn I/O . .Pp @@ -199,7 +200,8 @@ Disable tracing of all user-owned processes: .Xr truss 1 , .Xr ktrace 2 , .Xr utrace 2 , -.Xr capsicum 4 +.Xr capsicum 4 , +.Xr namei 9 .Sh HISTORY The .Nm From nobody Mon Jun 10 14:49: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 4VyZSd4H01z5M2vy; Mon, 10 Jun 2024 14:49: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 4VyZSd3d0yz4fQl; Mon, 10 Jun 2024 14:49:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718030945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uA5QBy+JWvBS6QuDXc6T51KQDsNfN0ATxEECn/bC7vE=; b=FaSaobLpmVD9ZVr/N9NYHP1p3hV0ycOpcQfeAncgX5amQQVBA2vqzPNoYDjowRnsNU3mUq Lq2Bv4XGOF4JMHQbcwa+eC9tfjJtIslrMPgy1EGt1mWkaub19iwWvmzfs9LNOoS7pv9ShR /BCkmRYPTAIJsoU3u7yAB+cVXe0xqo3lA/vMgQYZZccAbaPmCru4W6y4fNaWBmcc4Acgln BzjGwxCgz8H0Izp4qWgOBtT4U1bQDuRafh804rfmyvFiVEn1diW7ILo8k1gu5N2YZj0puo C1PQOlpwu4+RLESwual26T+hvlcGRPopGKIRTeYmxZa8tNWY6xOEN35RsIYgAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718030945; a=rsa-sha256; cv=none; b=lvMOVbHDH6Zs18NWaX8Dn6o1OREVo7GsD9o/o/ZYdthEmYEwfy3QzDcv6I0PB/dUkJG7V/ MlR2ECH2coe1E+PnPjXXPH3t+fx4+/IffUHY3g3AVahKX5N3pUzkgitFYzx0TwfFR2DHN9 pN3hY/uZDgLwdkIAvmiDEiGc2NaKcr/Flr4R3/1nEs6barPrun5321XpCJhYiJDy+dA/Xj /5NMvu3DWk0P+J7ZwpWMJTI/ghCRDeu+uEe6eqvm5+xefVxwAQgY3k9cRz/XzgV3KwFFXj Dme9JfxS2AoCEmqqlQyZxKi7IAMKV12pBe1RfbZBC1MRDzRNesulV2bJzXzB1Q== 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=1718030945; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uA5QBy+JWvBS6QuDXc6T51KQDsNfN0ATxEECn/bC7vE=; b=XjN2glp2/QyO/0BaMWXCRndneAkWOICUZhJPPqa/q7+XWphUvFyrJ6jCF3UqqiMGFedXsm YiwUC7IbROszoGuo0P/GOmknFDOVsTMpMzZBm3zH8Kq0ziViF7x5zQbIp0psLmH6Wa2t1y yA2hO2v8onoFRPW2mqltdChSxrl41fzxWfaI2hYEHWc4UwMs8349iuP805JXD0xiVf20td o9c5BP8GZJKxE7s+68shSR4iW8SxKB0WizoRk97FZClpRDQeEzsZvA/KdgFGgJpD/WTOFJ I5Yrxa2z11ouMG84e+ebLhzedD4kdQ8iVs5C28TRlmBU3vrkslWlDa5zMk0olg== 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 4VyZSd3DwPzVWY; Mon, 10 Jun 2024 14:49: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 45AEn5Vl071287; Mon, 10 Jun 2024 14:49:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45AEn5oE071284; Mon, 10 Jun 2024 14:49:05 GMT (envelope-from git) Date: Mon, 10 Jun 2024 14:49:05 GMT Message-Id: <202406101449.45AEn5oE071284@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: 87e5b17c149e - main - prepare-commit-msg: add 50 column marker 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 87e5b17c149ef7e68c23c7dfd18734b3e0abe48d Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=87e5b17c149ef7e68c23c7dfd18734b3e0abe48d commit 87e5b17c149ef7e68c23c7dfd18734b3e0abe48d Author: Ed Maste AuthorDate: 2024-06-09 17:24:13 +0000 Commit: Ed Maste CommitDate: 2024-06-10 14:48:32 +0000 prepare-commit-msg: add 50 column marker A common convention suggests a 50 column commit subject line (the first line of the commit message). Add a 50 column marker to the commit message template Reviewed by: lwhsu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45538 --- tools/tools/git/hooks/prepare-commit-msg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/tools/git/hooks/prepare-commit-msg b/tools/tools/git/hooks/prepare-commit-msg index ac3844accec2..e8e0e2887c3f 100755 --- a/tools/tools/git/hooks/prepare-commit-msg +++ b/tools/tools/git/hooks/prepare-commit-msg @@ -38,7 +38,7 @@ outfile=$(mktemp /tmp/freebsd-git-commit.XXXXXXXX) cat >$outfile < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 63f7a383434a - main - vmm: Only link the arm64 hyp code in vmm.ko once 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 63f7a383434ae81cdccc6250045f637f8ae9615a Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=63f7a383434ae81cdccc6250045f637f8ae9615a commit 63f7a383434ae81cdccc6250045f637f8ae9615a Author: Andrew Turner AuthorDate: 2024-06-10 14:58:15 +0000 Commit: Andrew Turner CommitDate: 2024-06-10 15:16:10 +0000 vmm: Only link the arm64 hyp code in vmm.ko once This code runs at EL2 while the kernel runs at EL1. We build these files for EL2 through a dependency in vmm_hyp_blob.elf.full so there is no need to include them in SRCS. Reviewed by: imp, kib, markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45467 --- sys/modules/vmm/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index 6737d868f2ea..8f6eb915290a 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -34,8 +34,7 @@ SRCS+= vgic.c \ vgic_v3.c \ vtimer.c -SRCS+= vmm_hyp_exception.S vmm_hyp.c - +CLEANFILES+= vmm_hyp_exception.o vmm_hyp.o CLEANFILES+= vmm_hyp_blob.elf.full CLEANFILES+= vmm_hyp_blob.elf vmm_hyp_blob.bin From nobody Mon Jun 10 15:29: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 4VybMV13ryz5M5sL; Mon, 10 Jun 2024 15:29:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VybMT70lbz4jS8; Mon, 10 Jun 2024 15:29:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718033382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=94W+ZvKT5OasXHusGERtFwrQ6m4AOlwtx8t/wc8UMX4=; b=OI3Loz/Vp2Mhxdzi0eBolzsGVpkpL+w4NssLWFCv7uOfl38npH6OlEv3ut1Fs/YuD4n599 tw6AN2gMc8t0bd1kR8PKqJOF++dnSrVC79z6wxdvtCjsK/Cqlq1inRvRI0xsS/r9DwXvuj FDf5zYxD5rMmuKh/ZQrDjdZYfJQ4p4ghqyoahPZ0T3f+kXpYTcIZ3koBu1WCG4geJXTPrX fcXfFQ0U34ncBPXhIymPRjnBvrVGhjCiKGEprSRulY3UJy9ALPgB9JV35aQV/GwlIfhldf rDQ4oYi50tRto2JwAFUwO0y2IwELqsmxsy/dWAaZqgOlPp1MfxQBjdalo0ga2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718033382; a=rsa-sha256; cv=none; b=dBllFcB3XPELpF/BConsEcdwJDVP8T6qQUDdXwf67dGIo3WD6qFfzPFbGjzyV9v4rTJTre vo/jS4pIaiGZfrNSaxOJmav74vUwHad9FOVEFRRepq05k0AEVtcL2DioQlNKJR7X265Tke 2S/FCnhs00naQRX6XjUkPUL5qLZ7l8j/VsgesrGhonOQFWhUZFj859ynwTg5sVVm7p0POC kSLacFCkC5A4dvHxt9dEu4/sQjpK/BR9Sro3Z+askBnDtaLveXJWMx/jgPV/uhHnXZFNgk 3Wu5Ho/10JQ/vOTounAxKnIlQwDhRFdSDaZXCyo47qDX8yTOQ32ZQDn0yLzNlQ== 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=1718033382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=94W+ZvKT5OasXHusGERtFwrQ6m4AOlwtx8t/wc8UMX4=; b=ZHq5t6NArdx2l1x2epicksZ9zpkDXrxOaCdo9PxoY6zMW3k48c8ycOCGxYODwkzkS5JOco 3K7qd/9/sPLAl5AABu+J0BVW7SxhEuzsgmNooiYeFDqB/es/TjAnlLeE3Ul3IGnFHFyM4d TQx4hbYhpnTijbi/LH5y/lZ44CHluIj4/8CWGlj62XgfBZZJZ0hLk8VW9f60XMzAKI5r8S Kto5TqbdbYIoMIHV4SrkKQfwnUY6zvH5gAOXrUKGN1HsgdOcNR3XiePRhnx1W0zvFrfOj6 fHT4gcvY5qQfOYqLg3Dxi4IKazudgZC2G9DR4T/GwGIO5COrkGI3xaXcCPvxMw== 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 4VybMT6YS6zX5j; Mon, 10 Jun 2024 15:29: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 45AFTfiA039322; Mon, 10 Jun 2024 15:29:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45AFTf10039319; Mon, 10 Jun 2024 15:29:41 GMT (envelope-from git) Date: Mon, 10 Jun 2024 15:29:41 GMT Message-Id: <202406101529.45AFTf10039319@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: 86bafddd61ab - main - arm64: Fix indentation to be consistent 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 86bafddd61aba115bc46bcf1d7e0afb125850b5f Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=86bafddd61aba115bc46bcf1d7e0afb125850b5f commit 86bafddd61aba115bc46bcf1d7e0afb125850b5f Author: Andrew Turner AuthorDate: 2024-06-10 14:58:22 +0000 Commit: Andrew Turner CommitDate: 2024-06-10 15:16:10 +0000 arm64: Fix indentation to be consistent Adjust the mair_el1 macro indentation to be consistent with the surrounding macros. Reviewed by: emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45524 --- sys/arm64/include/armreg.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/arm64/include/armreg.h b/sys/arm64/include/armreg.h index 7bdb28aad1e5..194731c98902 100644 --- a/sys/arm64/include/armreg.h +++ b/sys/arm64/include/armreg.h @@ -1505,13 +1505,13 @@ #define ID_ISAR5_VCMA_IMPL (UL(0x1) << ID_ISAR5_VCMA_SHIFT) /* MAIR_EL1 - Memory Attribute Indirection Register */ -#define MAIR_ATTR_MASK(idx) (UL(0xff) << ((n)* 8)) -#define MAIR_ATTR(attr, idx) ((attr) << ((idx) * 8)) -#define MAIR_DEVICE_nGnRnE UL(0x00) -#define MAIR_DEVICE_nGnRE UL(0x04) -#define MAIR_NORMAL_NC UL(0x44) -#define MAIR_NORMAL_WT UL(0xbb) -#define MAIR_NORMAL_WB UL(0xff) +#define MAIR_ATTR_MASK(idx) (UL(0xff) << ((n)* 8)) +#define MAIR_ATTR(attr, idx) ((attr) << ((idx) * 8)) +#define MAIR_DEVICE_nGnRnE UL(0x00) +#define MAIR_DEVICE_nGnRE UL(0x04) +#define MAIR_NORMAL_NC UL(0x44) +#define MAIR_NORMAL_WT UL(0xbb) +#define MAIR_NORMAL_WB UL(0xff) /* MDCCINT_EL1 */ #define MDCCINT_EL1 MRS_REG(MDCCINT_EL1) From nobody Mon Jun 10 15:29: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 4VybMW3Nslz5M67S; Mon, 10 Jun 2024 15:29: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 4VybMW0ls1z4jsZ; Mon, 10 Jun 2024 15:29:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718033383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZTLBIWbl17+xdTv3RdygrTJlnVLm2glnBGHHAk9ew9c=; b=UJ8mhL/RS97G6iAGWTXMtEj0YQ5N+srJpgdxJ7kJ+07gkcHeFAZg5+1qJq4b6uFp2OmxdR WRGdqoWpXyKjDnbzLo+A51nfzUJsC0GRXi4cmlrpdFuXvmpAELiTaP52KS3DiwUq3XQEhK 8TSvROk03R48ppy7XlUXrKRH/6jcCDG11Y9EpWiW9tqLpGZId32c4rIjJ7+LGYMYe608eG BBhkPrHZexvjvjZD9BQKSZogtliYMR1/irpySSd4SLGorp/pRvqSaFrh9Toyg1AdJ4eu46 m6dKini1Va1kITPhPt5UQnRpuoRkfG3LrY7u2Wrd1gbJHX+vMqqrx1YO1uUCKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718033383; a=rsa-sha256; cv=none; b=RyJWFj9jqHpseGUnZCGOQHfOFtUOMN0yV6StvCskNZQY2wOscfQCq+MTmzJqDco66u/WDd lWXXCp1ew4iVtrD3YuK1CYMyfl9dsVqHyRS9ncadFFR0+NJDm8r/bKVztknJS7LF0KQn3X h6SUnTSyjP+yUkyF8+xxFVWW/OXbrOZsiw20no+jSIHtynAAPEu5uYaRW5gzjc73j9a5BT cKG4Qjew4fyIQ1AnjUQsnPjnd/WXiLf70XdTg3yZfvxUU6/T2j1sw625PI82nvu4oFwaD5 puAajsrx7+sLHR6RHWXx78RfjHTGZeV3vzlygBgUt79j4qDMkAi6/dj4odKkHQ== 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=1718033383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZTLBIWbl17+xdTv3RdygrTJlnVLm2glnBGHHAk9ew9c=; b=rCw/i3LYQYkm7BhmQNbyZ656o1KCg+x9De7sR5JD4bG59z4vKO9iy9eK0cPGPVYvtSp7/m TBi0dqgBNGmol2PWnF2sYJFlEzicq6wsAhPELNyqqRXE9kSPkjet0rx1WEDbrk2FdOfQH5 rVqaZgj3ZcstF9xOIY+nHopp2cj9pr6zq7Tr/oOJUqc0QRG99nDMxN+WdSAkMA904htqoP PArdVFMXnUm9lSuP2ygTv31wrk5lcphHgt4dUVT4iLfH4IdyMmPvkP92vJOovTt9mJVTWm hPrw2ofHqTtIfYTAugX+U0QA7vHrIK2uAeqRb3qyb3NdMuV5keDMWvmSz3Ejjg== 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 4VybMW0BjkzX88; Mon, 10 Jun 2024 15:29: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 45AFTgJc039366; Mon, 10 Jun 2024 15:29:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45AFTgY7039363; Mon, 10 Jun 2024 15:29:42 GMT (envelope-from git) Date: Mon, 10 Jun 2024 15:29:42 GMT Message-Id: <202406101529.45AFTgY7039363@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: 6abad5b6062d - main - Remove the arm FIQ support 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 6abad5b6062d9e8f7e6dd08eaa4033a5358b952e Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=6abad5b6062d9e8f7e6dd08eaa4033a5358b952e commit 6abad5b6062d9e8f7e6dd08eaa4033a5358b952e Author: Andrew Turner AuthorDate: 2024-06-10 14:58:47 +0000 Commit: Andrew Turner CommitDate: 2024-06-10 15:16:10 +0000 Remove the arm FIQ support It isn't used, and only masks/unmasks FIQs on the local CPU so will be broken on SMP. Reviewed by: mmel Differential Revision: https://reviews.freebsd.org/D33804 --- sys/arm/arm/autoconf.c | 2 +- sys/arm/arm/exception.S | 37 +---------- sys/arm/arm/fiq.c | 163 ------------------------------------------------ sys/arm/arm/fiq_subr.S | 92 --------------------------- sys/arm/arm/machdep.c | 2 +- sys/arm/arm/pmap-v6.c | 4 +- sys/arm/arm/syscall.c | 2 - sys/arm/arm/trap-v6.c | 4 +- sys/arm/arm/undefined.c | 2 - sys/arm/include/cpu.h | 2 +- sys/arm/include/fiq.h | 71 --------------------- sys/conf/files.arm | 2 - 12 files changed, 9 insertions(+), 374 deletions(-) diff --git a/sys/arm/arm/autoconf.c b/sys/arm/arm/autoconf.c index 23289db9c19a..fe2882dc6d9f 100644 --- a/sys/arm/arm/autoconf.c +++ b/sys/arm/arm/autoconf.c @@ -90,7 +90,7 @@ static void configure_final(void *dummy) { - enable_interrupts(PSR_I | PSR_F); + enable_interrupts(PSR_I); cninit_finish(); cold = 0; } diff --git a/sys/arm/arm/exception.S b/sys/arm/arm/exception.S index d2e55bd7d84d..d0be3bd9c90a 100644 --- a/sys/arm/arm/exception.S +++ b/sys/arm/arm/exception.S @@ -165,12 +165,12 @@ _C_LABEL(dtrace_invop_jump_addr): #define DO_AST \ ldr r0, [sp]; /* Get the SPSR from stack */ \ mrs r4, cpsr; /* save CPSR */ \ - orr r1, r4, #(PSR_I|PSR_F); \ + orr r1, r4, #(PSR_I); \ msr cpsr_c, r1; /* Disable interrupts */ \ and r0, r0, #(PSR_MODE); /* Returning to USR mode? */ \ teq r0, #(PSR_USR32_MODE); \ bne 2f; /* Nope, get out now */ \ - bic r4, r4, #(PSR_I|PSR_F); \ + bic r4, r4, #(PSR_I); \ 1: GET_CURTHREAD_PTR(r5); \ ldr r1, [r5, #(TD_AST)]; \ teq r1, #0; \ @@ -178,7 +178,7 @@ _C_LABEL(dtrace_invop_jump_addr): msr cpsr_c, r4; /* Restore interrupts */ \ mov r0, sp; \ bl _C_LABEL(ast); /* ast(frame) */ \ - orr r0, r4, #(PSR_I|PSR_F); \ + orr r0, r4, #(PSR_I); \ msr cpsr_c, r0; \ b 1b; \ 2: @@ -315,21 +315,6 @@ ASENTRY_NP(irq_entry) b _C_LABEL(intr_irq_handler)/* trapframe to the handler. */ END(irq_entry) -/* - * Entry point for an FIQ interrupt. - * - * We don't currently support FIQ handlers very much. Something can - * install itself in the FIQ vector using code (that may or may not work - * these days) in fiq.c. If nobody does that and an FIQ happens, this - * default handler just disables FIQs and otherwise ignores it. - */ -ASENTRY_NP(fiq_entry) - mrs r8, cpsr /* FIQ handling isn't supported, */ - bic r8, #(PSR_F) /* just disable FIQ and return. */ - msr cpsr_c, r8 /* The r8 we trash here is the */ - subs pc, lr, #4 /* banked FIQ-mode r8. */ -END(fiq_entry) - /* * Entry point for an Address Exception exception. * This is an arm26 exception that should never happen. @@ -378,8 +363,6 @@ _C_LABEL(page0): ldr pc, .Ldata_abort_entry ldr pc, .Laddr_exception_entry ldr pc, .Lirq_entry -.fiqv: ldr pc, .Lfiq_entry - .space 256 /* room for some fiq handler code */ _C_LABEL(page0_data): .Lreset_entry: .word reset_entry @@ -389,18 +372,4 @@ _C_LABEL(page0_data): .Ldata_abort_entry: .word data_abort_entry .Laddr_exception_entry: .word addr_exception_entry .Lirq_entry: .word irq_entry -.Lfiq_entry: .word fiq_entry - -/* - * These items are used by the code in fiq.c to install what it calls the - * "null" handler. It's actually our default vector entry that just jumps - * to the default handler which just disables FIQs and returns. - */ - .global _C_LABEL(fiq_nullhandler_code), _C_LABEL(fiq_nullhandler_size) - -_C_LABEL(fiq_nullhandler_code): - .word .fiqv -_C_LABEL(fiq_nullhandler_size): - .word 4 - diff --git a/sys/arm/arm/fiq.c b/sys/arm/arm/fiq.c deleted file mode 100644 index e517bbeaf01b..000000000000 --- a/sys/arm/arm/fiq.c +++ /dev/null @@ -1,163 +0,0 @@ -/* $NetBSD: fiq.c,v 1.5 2002/04/03 23:33:27 thorpej Exp $ */ - -/*- - * SPDX-License-Identifier: BSD-4-Clause - * - * Copyright (c) 2001, 2002 Wasabi Systems, Inc. - * All rights reserved. - * - * Written by Jason R. Thorpe for Wasabi Systems, Inc. - * - * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed for the NetBSD Project by - * Wasabi Systems, Inc. - * 4. The name of Wasabi Systems, Inc. may not be used to endorse - * or promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC - * 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 - -TAILQ_HEAD(, fiqhandler) fiqhandler_stack = - TAILQ_HEAD_INITIALIZER(fiqhandler_stack); - -extern char *fiq_nullhandler_code; -extern uint32_t fiq_nullhandler_size; - -/* - * fiq_installhandler: - * - * Actually install the FIQ handler down at the FIQ vector. - * - * The FIQ vector is fixed by the hardware definition as the - * seventh 32-bit word in the vector page. - * - * Note: If the FIQ is invoked via an extra layer of - * indirection, the actual FIQ code store lives in the - * data segment, so there is no need to manipulate - * the vector page's protection. - */ -static void -fiq_installhandler(void *func, size_t size) -{ - const uint32_t fiqvector = 7 * sizeof(uint32_t); - - memcpy((void *)(vector_page + fiqvector), func, size); - icache_sync((vm_offset_t) fiqvector, size); -} - -/* - * fiq_claim: - * - * Claim the FIQ vector. - */ -int -fiq_claim(struct fiqhandler *fh) -{ - struct fiqhandler *ofh; - u_int oldirqstate; - int error = 0; - - if (fh->fh_size > 0x100) - return (EFBIG); - - oldirqstate = disable_interrupts(PSR_F); - - if ((ofh = TAILQ_FIRST(&fiqhandler_stack)) != NULL) { - if ((ofh->fh_flags & FH_CANPUSH) == 0) { - error = EBUSY; - goto out; - } - - /* Save the previous FIQ handler's registers. */ - if (ofh->fh_regs != NULL) - fiq_getregs(ofh->fh_regs); - } - - /* Set FIQ mode registers to ours. */ - if (fh->fh_regs != NULL) - fiq_setregs(fh->fh_regs); - - TAILQ_INSERT_HEAD(&fiqhandler_stack, fh, fh_list); - - /* Now copy the actual handler into place. */ - fiq_installhandler(fh->fh_func, fh->fh_size); - - /* Make sure FIQs are enabled when we return. */ - oldirqstate &= ~PSR_F; - - out: - restore_interrupts(oldirqstate); - return (error); -} - -/* - * fiq_release: - * - * Release the FIQ vector. - */ -void -fiq_release(struct fiqhandler *fh) -{ - u_int oldirqstate; - struct fiqhandler *ofh; - - oldirqstate = disable_interrupts(PSR_F); - - /* - * If we are the currently active FIQ handler, then we - * need to save our registers and pop the next one back - * into the vector. - */ - if (fh == TAILQ_FIRST(&fiqhandler_stack)) { - if (fh->fh_regs != NULL) - fiq_getregs(fh->fh_regs); - TAILQ_REMOVE(&fiqhandler_stack, fh, fh_list); - if ((ofh = TAILQ_FIRST(&fiqhandler_stack)) != NULL) { - if (ofh->fh_regs != NULL) - fiq_setregs(ofh->fh_regs); - fiq_installhandler(ofh->fh_func, ofh->fh_size); - } - } else - TAILQ_REMOVE(&fiqhandler_stack, fh, fh_list); - - if (TAILQ_FIRST(&fiqhandler_stack) == NULL) { - /* Copy the NULL handler back down into the vector. */ - fiq_installhandler(fiq_nullhandler_code, fiq_nullhandler_size); - - /* Make sure FIQs are disabled when we return. */ - oldirqstate |= PSR_F; - } - - restore_interrupts(oldirqstate); -} diff --git a/sys/arm/arm/fiq_subr.S b/sys/arm/arm/fiq_subr.S deleted file mode 100644 index e2fc793d2fd3..000000000000 --- a/sys/arm/arm/fiq_subr.S +++ /dev/null @@ -1,92 +0,0 @@ -/* $NetBSD: fiq_subr.S,v 1.3 2002/04/12 18:50:31 thorpej Exp $ */ - -/*- - * Copyright (c) 2001 Wasabi Systems, Inc. - * All rights reserved. - * - * Written by Jason R. Thorpe for Wasabi Systems, Inc. - * - * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed for the NetBSD Project by - * Wasabi Systems, Inc. - * 4. The name of Wasabi Systems, Inc. may not be used to endorse - * or promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC - * 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 - -/* - * MODE_CHANGE_NOP should be inserted between a mode change and a - * banked register (R8--R15) access. - */ -#if defined(CPU_ARM2) || defined(CPU_ARM250) -#define MODE_CHANGE_NOP mov r0, r0 -#else -#define MODE_CHANGE_NOP /* Data sheet says ARM3 doesn't need it */ -#endif - -#define SWITCH_TO_FIQ_MODE \ - mrs r2, cpsr ; \ - mov r3, r2 ; \ - bic r2, r2, #(PSR_MODE) ; \ - orr r2, r2, #(PSR_FIQ32_MODE) ; \ - msr cpsr_fsxc, r2 - -#define BACK_TO_SVC_MODE \ - msr cpsr_fsxc, r3 - -/* - * fiq_getregs: - * - * Fetch the FIQ mode banked registers into the fiqhandler - * structure. - */ -ENTRY(fiq_getregs) - SWITCH_TO_FIQ_MODE - - stmia r0, {r8-r13} - - BACK_TO_SVC_MODE - RET -END(fiq_getregs) - -/* - * fiq_setregs: - * - * Load the FIQ mode banked registers from the fiqhandler - * structure. - */ -ENTRY(fiq_setregs) - SWITCH_TO_FIQ_MODE - - ldmia r0, {r8-r13} - - BACK_TO_SVC_MODE - RET -END(fiq_setregs) - diff --git a/sys/arm/arm/machdep.c b/sys/arm/arm/machdep.c index f54113e3d0ca..fdaf5d3dade8 100644 --- a/sys/arm/arm/machdep.c +++ b/sys/arm/arm/machdep.c @@ -314,7 +314,7 @@ spinlock_enter(void) td = curthread; if (td->td_md.md_spinlock_count == 0) { - cspr = disable_interrupts(PSR_I | PSR_F); + cspr = disable_interrupts(PSR_I); td->td_md.md_spinlock_count = 1; td->td_md.md_saved_cspr = cspr; critical_enter(); diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index 8d7292f7aa02..de1082e7ae62 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -3364,7 +3364,7 @@ pmap_change_pte1(pmap_t pmap, pt1_entry_t *pte1p, vm_offset_t va, * will be affected by the broken mapping, disable interrupts * until the mapping change is completed. */ - cspr = disable_interrupts(PSR_I | PSR_F); + cspr = disable_interrupts(PSR_I); pte1_clear(pte1p); pmap_tlb_flush_pte1(pmap, va, npte1); pte1_store(pte1p, npte1); @@ -3389,7 +3389,7 @@ pmap_change_pte1(pmap_t pmap, pt1_entry_t *pte1p, vm_offset_t va, * mappings. It's absolutely safe in UP case when interrupts * are disabled. */ - cspr = disable_interrupts(PSR_I | PSR_F); + cspr = disable_interrupts(PSR_I); pte1_clear(pte1p); pmap_tlb_flush_pte1(pmap, va, npte1); pte1_store(pte1p, npte1); diff --git a/sys/arm/arm/syscall.c b/sys/arm/arm/syscall.c index 73ac0560cd91..cce63cdadf32 100644 --- a/sys/arm/arm/syscall.c +++ b/sys/arm/arm/syscall.c @@ -160,8 +160,6 @@ swi_handler(struct trapframe *frame) if (td->td_md.md_spinlock_count == 0) { if (__predict_true(frame->tf_spsr & PSR_I) == 0) enable_interrupts(PSR_I); - if (__predict_true(frame->tf_spsr & PSR_F) == 0) - enable_interrupts(PSR_F); } syscall(td, frame); diff --git a/sys/arm/arm/trap-v6.c b/sys/arm/arm/trap-v6.c index 681f1f90eec6..d58f8c2e4a48 100644 --- a/sys/arm/arm/trap-v6.c +++ b/sys/arm/arm/trap-v6.c @@ -408,8 +408,6 @@ abort_handler(struct trapframe *tf, int prefetch) if (td->td_md.md_spinlock_count == 0) { if (__predict_true(tf->tf_spsr & PSR_I) == 0) enable_interrupts(PSR_I); - if (__predict_true(tf->tf_spsr & PSR_F) == 0) - enable_interrupts(PSR_F); } p = td->td_proc; @@ -565,7 +563,7 @@ abort_fatal(struct trapframe *tf, u_int idx, u_int fsr, u_int far, mode = usermode ? "user" : "kernel"; rw_mode = fsr & FSR_WNR ? "write" : "read"; - disable_interrupts(PSR_I|PSR_F); + disable_interrupts(PSR_I); if (td != NULL) { printf("Fatal %s mode data abort: '%s' on %s\n", mode, diff --git a/sys/arm/arm/undefined.c b/sys/arm/arm/undefined.c index dc29b55ae596..e882a911ba4a 100644 --- a/sys/arm/arm/undefined.c +++ b/sys/arm/arm/undefined.c @@ -226,8 +226,6 @@ undefinedinstruction(struct trapframe *frame) /* Enable interrupts if they were enabled before the exception. */ if (__predict_true(frame->tf_spsr & PSR_I) == 0) enable_interrupts(PSR_I); - if (__predict_true(frame->tf_spsr & PSR_F) == 0) - enable_interrupts(PSR_F); VM_CNT_INC(v_trap); diff --git a/sys/arm/include/cpu.h b/sys/arm/include/cpu.h index b2c370d01cdc..75b0956d0620 100644 --- a/sys/arm/include/cpu.h +++ b/sys/arm/include/cpu.h @@ -729,7 +729,7 @@ get_cyclecount(void) #define cpu_spinwait() /* nothing */ #define cpu_lock_delay() DELAY(1) -#define ARM_NVEC 8 +#define ARM_NVEC 7 #define ARM_VEC_ALL 0xffffffff extern vm_offset_t vector_page; diff --git a/sys/arm/include/fiq.h b/sys/arm/include/fiq.h deleted file mode 100644 index f01011bb63ce..000000000000 --- a/sys/arm/include/fiq.h +++ /dev/null @@ -1,71 +0,0 @@ -/* $NetBSD: fiq.h,v 1.1 2001/12/20 01:20:23 thorpej Exp $ */ - -/*- - * SPDX-License-Identifier: BSD-4-Clause - * - * Copyright (c) 2001 Wasabi Systems, Inc. - * All rights reserved. - * - * Written by Jason R. Thorpe for Wasabi Systems, Inc. - * - * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed for the NetBSD Project by - * Wasabi Systems, Inc. - * 4. The name of Wasabi Systems, Inc. may not be used to endorse - * or promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC - * 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 _MACHINE_FIQ_H_ -#define _MACHINE_FIQ_H_ - -#include - -struct fiqregs { - u_int fr_r8; /* FIQ mode r8 */ - u_int fr_r9; /* FIQ mode r9 */ - u_int fr_r10; /* FIQ mode r10 */ - u_int fr_r11; /* FIQ mode r11 */ - u_int fr_r12; /* FIQ mode r12 */ - u_int fr_r13; /* FIQ mode r13 */ -}; - -struct fiqhandler { - TAILQ_ENTRY(fiqhandler) fh_list;/* link in the FIQ handler stack */ - void *fh_func; /* FIQ handler routine */ - size_t fh_size; /* size of FIQ handler */ - int fh_flags; /* flags; see below */ - struct fiqregs *fh_regs; /* pointer to regs structure */ -}; - -#define FH_CANPUSH 0x01 /* can push this handler out of the way */ - -int fiq_claim(struct fiqhandler *); -void fiq_release(struct fiqhandler *); - -void fiq_getregs(struct fiqregs *); -void fiq_setregs(struct fiqregs *); - -#endif /* _MACHINE_FIQ_H_ */ diff --git a/sys/conf/files.arm b/sys/conf/files.arm index 110c0a9e9dbf..b049479fbe82 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -25,8 +25,6 @@ arm/arm/elf_machdep.c standard arm/arm/elf_note.S standard arm/arm/exception.S standard arm/arm/exec_machdep.c standard -arm/arm/fiq.c standard -arm/arm/fiq_subr.S standard arm/arm/fusu.S standard arm/arm/gdb_machdep.c optional gdb arm/arm/generic_timer.c optional generic_timer From nobody Mon Jun 10 15:50: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 4Vybqw5Qzjz5M86L; Mon, 10 Jun 2024 15:50: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 4Vybqw4ykKz4nFn; Mon, 10 Jun 2024 15:50:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718034652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mGSmmELcqh3i7jJumYf0o3qNwTaZmHzxSOcNRnMeMCc=; b=AGJuZ3dxh5guZ+5Cmm4FXFG6OGRIHPpoCMgsmwzAhoqspR2GYUxYfOdQLynJWUuTbqHNEv WhPbK/YrKZ+0QuIF7yRfU6FEBsXiVo5BVhiB5lsiVS9Y7EeBqvuXQ5KKWsi0ZkUcJJLSC/ V5r1U8q1jTE5KBPnRiB1ZTKJKy147RJyu3tZHxoUb64mBcR8xsB1kYhll7PNXsz+iTuzlQ YQ3pIVfsjSCmjgBRrutTQNn7N5l9OiMR9sLK2B96qXJdLBay7/IWldoPCMoqMHqgJWQMmf ivHhI05of4kfYe35GK210cR/mGco0L/7CdsjcQP/al71EgNbDlgyhtMI9xgD3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718034652; a=rsa-sha256; cv=none; b=WS5xmdQYhrH6cnaeY19LB2IJxT6529omJqemE9jI5gpKK5wAegWMifbhg4yYf8abT0ZcHu kyCERV8rjMFVMeGRgsqgkvtbKQQOJTQ3mqwJP3sfuWd5hEzPgI7Y+PuH88ztQRTBSd0oq9 oXr4pxpVBmLoWLVGUOlP/ttY7iIfFyJcnux4u0Y/Eeq/jZtuc9SqwMyx6BBdEZ7LL5HDPU AXIxMlOSdjoPvzH38OSOhNKRVbjCZDEeGYgAQTrfOnxbeYOS3Mtfo6N9jXZC5kvWfzHj7V gRObnJMRvyHms7w/MzsfnBY7o6Gxn27BMSDz1T5OdTLsvmyuU0ICb4LdiVI8oA== 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=1718034652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mGSmmELcqh3i7jJumYf0o3qNwTaZmHzxSOcNRnMeMCc=; b=GKFxofYD4XGUDNf2Hzy+gyTaiIemBHuQxGnQs/zCFYhsn3KwmRYWBU5wn0VglVYK5MJdw3 NjdSiZAY5NPYt1IUkLXQfyoMOEwxydeybnNaqUWgsWDOsaXRmroH0GpBSoBnhWb3oU2sdf VilSbV2FsH5+oc5Hl34/wo+WUM9JDA9ZMiSp4/jF7x7vCKiVCo53UriaZF3jsXWu97rfS2 sWyVZG8h6Rol/IfZwDaf4duQd4jJF/etYnNnOom6HveJECejp8/fXSCo742uP1XWuVSrpX RHVIjBSyibBtbHwvYFxRNy1hP+WtKJ/dZtZwmoz99OqA38vOQZYCBpsKZa7+9A== 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 4Vybqw4YcVzXMX; Mon, 10 Jun 2024 15:50: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 45AFoqkG084876; Mon, 10 Jun 2024 15:50:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45AFoqFl084873; Mon, 10 Jun 2024 15:50:52 GMT (envelope-from git) Date: Mon, 10 Jun 2024 15:50:52 GMT Message-Id: <202406101550.45AFoqFl084873@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: 0e34d0993096 - main - Add WITHOUT_LLVM_BINUTILS src.conf description 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 0e34d099309687f19420c615c5c56c032f30119d Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0e34d099309687f19420c615c5c56c032f30119d commit 0e34d099309687f19420c615c5c56c032f30119d Author: Ed Maste AuthorDate: 2024-06-10 15:45:41 +0000 Commit: Ed Maste CommitDate: 2024-06-10 15:50:32 +0000 Add WITHOUT_LLVM_BINUTILS src.conf description Before FreeBSD 15 I plan to switch to LLVM_BINUTILS by default. Add the src.conf description now, for the benefit of downstream branches and testing/CI. PR: 258872 [exp-run] Sponsored by: The FreeBSD Foundation --- tools/build/options/WITHOUT_LLVM_BINUTILS | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tools/build/options/WITHOUT_LLVM_BINUTILS b/tools/build/options/WITHOUT_LLVM_BINUTILS new file mode 100644 index 000000000000..35cc0c0e034f --- /dev/null +++ b/tools/build/options/WITHOUT_LLVM_BINUTILS @@ -0,0 +1,17 @@ +Install ELF Tool Chain's binary utilities instead of LLVM's. +This includes +.Xr addr2line 1 , +.Xr ar 1 , +.Xr nm 1 , +.Xr objcopy 1 , +.Xr ranlib 1 , +.Xr readelf 1 , +.Xr size 1 , +and +.Xr strip 1 . +Regardless of this setting, LLVM tools are used for +.Xr c++filt 1 +and +.Xr objdump 1 . +.Xr strings 1 +is always provided by ELF Tool Chain. From nobody Mon Jun 10 16:01: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 4Vyc4Q0hJNz5M8vy; Mon, 10 Jun 2024 16:01:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vyc4Q01XJz4pgm; Mon, 10 Jun 2024 16:01:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718035302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Vf277lJNZJ+GbTKdYYqxyQC4w4Y2Pk8lhI6BXUY/ak=; b=K9W4KlyeX7bDjPWOhFX/BRlCrRyd5ZemV24X48Y5CQG3VW4jth1Q8SQM33c1ksyU1sMfUK BxaUR9whCBBk1pshxyHu7WGQ+Fua6WtGXmLsfQC0WKbWWMnvbnb/vKSox1t4e2f0ijbDAQ mudpoytpcdm7MRLpHILbUGy+gJH5bIpC10hN4D9aL/adsps45x/AnwsT1bNpAJojt7XlGK RqQ1kwNO4DiuYY9PcvGbhya+N6aONif24mj4WVd1FnMPXlT9UYxtenph7nwHGrm7f/uLXz BOVPBdwQuzLEtgVgjiRS0EY0SZXnLrkJhWAeofZZVWyGFrJ0JgTsTR9X/TL/KA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718035302; a=rsa-sha256; cv=none; b=W+E0ro+/AsV6pKbz2RMJjlHBKnYr7IDKMDVFwLwvnEiRr2RRb8KDBq/AhupmNtH/pC2j7I +PJDT79t4560UU7W89joZXVLWd3DpH7qCaJTEkbE7MlgTXUb3/j68KPZy1UrfU1M6n0AHk ZfJmIwEp92GmZe4kIfpyQCY+xiCLaSIXGQF5bEscvReFVz+coQTUTFlyD2oITHFQrZRxs9 LFu0jPiv5UE0gwKC26oMrTA8qYtyInoj2/og1klIuIysWTeXIyJe7CM3TtzLJX+vcwgtkH 5Lwdf4J3MBFUkJki2YQoVU2eN5R6Q/tOhzT4d71PWePsHwYu109StXjotJWfQw== 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=1718035302; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Vf277lJNZJ+GbTKdYYqxyQC4w4Y2Pk8lhI6BXUY/ak=; b=m8I9kS6wrfY6nj7bHDXFT2n6DZAVuaIUBOac5Mq/nYZFLYBvRZuqujcSFCZDrGe6F80Vgl +FkVkZooPacylpMwBZofLJNbYDWG7jPnzg5QHwgF/rh6vXQxB3bq52MqLTbqeWHK1H9FHL BqdIisMB255tGZOYipgP/iQjsGOip+UqdOqhh5c+u9rccm2R3xGzEbHotOitFofx0bjbAO H0TqXLZ21Q217h4SlfB0T6nM1q0I5fiQt5PuZ7gE6S0rShHPcw6fbe1XROjbNsQn0eeGap OeECIpB++0Azskh/a0p+EfCQzHGD69CmQlWTxeQUJsyGVZJry/I6Qx5bnr6/DQ== 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 4Vyc4P6jxqzXQH; Mon, 10 Jun 2024 16:01: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 45AG1fa5001344; Mon, 10 Jun 2024 16:01:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45AG1fQw001341; Mon, 10 Jun 2024 16:01:41 GMT (envelope-from git) Date: Mon, 10 Jun 2024 16:01:41 GMT Message-Id: <202406101601.45AG1fQw001341@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 9747d11d9164 - main - Add some ATF tests for ctladm 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9747d11d91642cb9b81602d88e8aebeb388543c7 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=9747d11d91642cb9b81602d88e8aebeb388543c7 commit 9747d11d91642cb9b81602d88e8aebeb388543c7 Author: Alan Somers AuthorDate: 2024-06-05 20:16:25 +0000 Commit: Alan Somers CommitDate: 2024-06-10 16:01:25 +0000 Add some ATF tests for ctladm So far only "ctladm port -c" and "ctladm port -r" are covered. MFC after: 2 weeks Sponsored by: Axcient Reviewed by: mav Pull Request: https://github.com/freebsd/freebsd-src/pull/1279 --- etc/mtree/BSD.tests.dist | 2 + usr.sbin/ctladm/Makefile | 3 + usr.sbin/ctladm/tests/Makefile | 10 +++ usr.sbin/ctladm/tests/port.sh | 155 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 170 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 3f447f9ec25e..86db4304b932 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -90,6 +90,8 @@ .. .. usr.sbin + ctladm + .. dtrace common aggs diff --git a/usr.sbin/ctladm/Makefile b/usr.sbin/ctladm/Makefile index 5e0df8065cce..b563891672be 100644 --- a/usr.sbin/ctladm/Makefile +++ b/usr.sbin/ctladm/Makefile @@ -23,4 +23,7 @@ MAN= ctladm.8 CFLAGS+= -DWANT_ISCSI .endif +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include diff --git a/usr.sbin/ctladm/tests/Makefile b/usr.sbin/ctladm/tests/Makefile new file mode 100644 index 000000000000..73ac94d77d21 --- /dev/null +++ b/usr.sbin/ctladm/tests/Makefile @@ -0,0 +1,10 @@ + +PACKAGE= tests + +ATF_TESTS_SH= port + +# "ctladm port" does not report the name of the port just created, so we can't +# cleanup unless we assume that no other test created a port too. +TEST_METADATA+= is_exclusive="true" + +.include diff --git a/usr.sbin/ctladm/tests/port.sh b/usr.sbin/ctladm/tests/port.sh new file mode 100644 index 000000000000..b2cdea6f1de2 --- /dev/null +++ b/usr.sbin/ctladm/tests/port.sh @@ -0,0 +1,155 @@ +# Things that aren't tested due to lack of kernel support: +# * Creating camsim ports +# * Creating tpc ports +# * Creating camtgt ports +# * Creating umass ports + +# TODO +# * Creating iscsi ports +# * Creating nvmf ports +# * Creating ha ports +# * Creating fc ports + +skip_if_ctld() { + if service ctld onestatus > /dev/null; then + # If ctld is running on this server, let's not interfere. + atf_skip "Cannot run this test while ctld is running" + fi +} + +cleanup() { + driver=$1 + + if [ -e after-ports ]; then + diff before-ports after-ports | awk "/$driver/ {print \$2}" | xargs -n1 ctladm port -r -d ioctl -p + fi +} + +atf_test_case create_ioctl cleanup +create_ioctl_head() +{ + atf_set "descr" "ctladm can create a new ioctl port" + atf_set "require.user" "root" +} +create_ioctl_body() +{ + skip_if_ctld + + atf_check -o save:before-ports ctladm portlist -qf ioctl + atf_check ctladm port -c -d "ioctl" + atf_check -o save:after-ports ctladm portlist -qf ioctl + if test `wc -l before-ports | cut -w -f2` -ge `wc -l after-ports | cut -w -f2`; then + atf_fail "Did not create a new ioctl port" + fi +} +create_ioctl_cleanup() +{ + cleanup ioctl +} + +atf_test_case create_ioctl_options cleanup +create_ioctl_options_head() +{ + atf_set "descr" "ctladm can set options when creating a new ioctl port" + atf_set "require.user" "root" +} +create_ioctl_options_body() +{ + skip_if_ctld + + atf_check -o save:before-ports ctladm portlist -qf ioctl + atf_check ctladm port -c -d "ioctl" -O pp=101 -O vp=102 + atf_check -o save:after-ports ctladm portlist -qf ioctl + if test `wc -l before-ports | cut -w -f2` -ge `wc -l after-ports | cut -w -f2`; then + atf_fail "Did not create a new ioctl port" + fi + if ! egrep -q '101[[:space:]]+102' after-ports; then + ctladm portlist + atf_fail "Did not create the port with the specified options" + fi +} +create_ioctl_options_cleanup() +{ + cleanup ioctl +} + + +atf_test_case disable_ioctl cleanup +disable_ioctl_head() +{ + atf_set "descr" "ctladm can disable an ioctl port" + atf_set "require.user" "root" +} +disable_ioctl_body() +{ + skip_if_ctld + + atf_check -o save:before-ports ctladm portlist -qf ioctl + atf_check ctladm port -c -d "ioctl" + atf_check -o save:after-ports ctladm portlist -qf ioctl + if test `wc -l before-ports | cut -w -f2` -ge `wc -l after-ports | cut -w -f2`; then + atf_fail "Did not create a new ioctl port" + fi + portnum=`diff before-ports after-ports | awk '/ioctl/ {print $2}'`; + atf_check -o ignore ctladm port -o off -p $portnum + atf_check -o match:"^$portnum *NO" ctladm portlist -qf ioctl +} +disable_ioctl_cleanup() +{ + cleanup ioctl +} + +atf_test_case enable_ioctl cleanup +enable_ioctl_head() +{ + atf_set "descr" "ctladm can enable an ioctl port" + atf_set "require.user" "root" +} +enable_ioctl_body() +{ + skip_if_ctld + + atf_check -o save:before-ports ctladm portlist -qf ioctl + atf_check ctladm port -c -d "ioctl" + atf_check -o save:after-ports ctladm portlist -qf ioctl + if test `wc -l before-ports | cut -w -f2` -ge `wc -l after-ports | cut -w -f2`; then + atf_fail "Did not create a new ioctl port" + fi + portnum=`diff before-ports after-ports | awk '/ioctl/ {print $2}'`; + atf_check -o ignore ctladm port -o off -p $portnum + atf_check -o ignore ctladm port -o on -p $portnum + atf_check -o match:"^$portnum *YES" ctladm portlist -qf ioctl +} +enable_ioctl_cleanup() +{ + cleanup ioctl +} + +atf_test_case remove_ioctl +remove_ioctl_head() +{ + atf_set "descr" "ctladm can remove an ioctl port" + atf_set "require.user" "root" +} +remove_ioctl_body() +{ + skip_if_ctld + + atf_check -o save:before-ports ctladm portlist -qf ioctl + atf_check ctladm port -c -d "ioctl" + atf_check -o save:after-ports ctladm portlist -qf ioctl + if test `wc -l before-ports | cut -w -f2` -ge `wc -l after-ports | cut -w -f2`; then + atf_fail "Did not create a new ioctl port" + fi + portnum=`diff before-ports after-ports | awk '/ioctl/ {print $2}'`; + atf_check ctladm port -r -d ioctl -p $portnum +} + +atf_init_test_cases() +{ + atf_add_test_case create_ioctl + atf_add_test_case create_ioctl_options + atf_add_test_case disable_ioctl + atf_add_test_case enable_ioctl + atf_add_test_case remove_ioctl +} From nobody Mon Jun 10 16:01: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 4Vyc4R20rpz5M8jn; Mon, 10 Jun 2024 16:01: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 4Vyc4R16DFz4pQp; Mon, 10 Jun 2024 16:01:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718035303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C0ji/nvjaNzzTYpSWrddn05wSI4iZ7S7wOMpm8Oypmw=; b=veNFPYu2ziBAqWL5+V/K85TXzSL95fZ90FW+O0v8uG6RRzCYj82Yie1cDWGNB8orvejXwq G8cpc0sT6i5/HZjFJMbWypnsrp/bQhArXEGcFHWLcE2b9W4tnbA343X3XHbbqGL7agEB0E I1bp3TEq3FEzdooi/bRj+VYtd5xeqcnjYTLNofxOo66XgfjDstkBbXGjx/uvRJthPUi4uy yGblVprluJQBJEZ0FsCRiYvqWtypAihrB+sb8FSZSShjnMHD/HcquMaNo9k/dxBw8NhAZ7 aDF+6T6PGMnw0yZfNoPXysAS0d+w0xso2vvrrHpxvcLWHjfXUwK3TjekUgSZnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718035303; a=rsa-sha256; cv=none; b=bcnCUjGu62CmAAXQpCMmPCrn1/EQuf2K88/kziLQSDXeFRvmO/eFMOH3xMdeK3ESlMjIAW JJdVi/QoRkKWkdzv08vUXdZBshVdn6hjbeY96WsYeW/ZA2yPDFI9IR7j4uUfkE0b80erMh DUNOyOMIONc3rlcNtmS/c+1xIudf1Kg0GjdmmnujUsnuj8HnpKFjbo4dOv8kB2iOZf5HFX 2zOTIKL3S/YgbrjBqnd69AeMFHIpaLplZGsh3kEef80VHM0LDDaaqgmoJ16CDL0GPwbBdB 8y89P+QfagSlQOSP5a2zIrvzH9x3Xb28Kra7yIkdecsYWMTEUT7fwb7YPqY9aw== 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=1718035303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C0ji/nvjaNzzTYpSWrddn05wSI4iZ7S7wOMpm8Oypmw=; b=MiKd5AlK0y6QAHKVbWSE43btUEOBINvSPRbIO0sEZztmoKDl12PTOG479ltXwJ1WE/hFBp MunZc5N5/SBEcJbhJG2/ModvbWgkhksLZP5pqMXKinMBFuwR9dUi+TWRZeU58YIHxIE10i lKktcVTx6ejhuyeJmd5mPa7/vmXjlO4veLaX5X7lQikusMaVZTtTQ6TG0nVwp6fqGh8BcM khPxBCj1VJMfBkeRYCv9njrGMx2C6rxibXoxKI5qEmD3SEfsIdvpQKjT182GlEuEsT08vQ 4ao6U5t9IzjU6VIbHJwUWe1oKDsusYDZCsUf0yj2RMnj+WwZ3RbasRda1ZjpAA== 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 4Vyc4R0gVpzXQJ; Mon, 10 Jun 2024 16:01: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 45AG1gEZ001401; Mon, 10 Jun 2024 16:01:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45AG1gdG001398; Mon, 10 Jun 2024 16:01:42 GMT (envelope-from git) Date: Mon, 10 Jun 2024 16:01:42 GMT Message-Id: <202406101601.45AG1gdG001398@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 591de7534fb3 - main - ctladm: print port number with a succesful "port -c" command 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 591de7534fb3acb2e6eef94a1e5e92000d2cf83d Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=591de7534fb3acb2e6eef94a1e5e92000d2cf83d commit 591de7534fb3acb2e6eef94a1e5e92000d2cf83d Author: Alan Somers AuthorDate: 2024-06-05 23:54:46 +0000 Commit: Alan Somers CommitDate: 2024-06-10 16:01:25 +0000 ctladm: print port number with a succesful "port -c" command Make "ctladm port -c" print the port number of the newly successful port. This way it won't have to be guessed by a subsequent "ctladm portlist" command. That means it's safe to use it concurrently with other ctladm processes. In particular, this allows the tests to be run in parallel. MFC after: 2 weeks Sponsored by: Axcient Reviewed by: mav Pull Request: https://github.com/freebsd/freebsd-src/pull/1279 --- usr.sbin/ctladm/ctladm.c | 18 +++++++++++ usr.sbin/ctladm/tests/Makefile | 4 --- usr.sbin/ctladm/tests/port.sh | 70 ++++++++++++++++++++---------------------- 3 files changed, 52 insertions(+), 40 deletions(-) diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c index 28f9a39386d3..14951797ddf1 100644 --- a/usr.sbin/ctladm/ctladm.c +++ b/usr.sbin/ctladm/ctladm.c @@ -397,7 +397,9 @@ static struct ctladm_opts cctl_fe_table[] = { static int cctl_port(int fd, int argc, char **argv, char *combinedopt) { + char result_buf[1024]; int c; + uint64_t created_port = -1; int32_t targ_port = -1; int retval = 0; int wwnn_set = 0, wwpn_set = 0; @@ -587,6 +589,8 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) case CCTL_PORT_MODE_CREATE: { bzero(&req, sizeof(req)); strlcpy(req.driver, driver, sizeof(req.driver)); + req.result = result_buf; + req.result_len = sizeof(result_buf); if (port_mode == CCTL_PORT_MODE_REMOVE) { req.reqtype = CTL_REQ_REMOVE; @@ -619,6 +623,20 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) warnx("warning: %s", req.error_str); break; case CTL_LUN_OK: + if (port_mode == CCTL_PORT_MODE_CREATE) { + req.result_nvl = nvlist_unpack(result_buf, req.result_len, 0); + if (req.result_nvl == NULL) { + warnx("error unpacking result nvlist"); + break; + } + created_port = nvlist_get_number(req.result_nvl, "port_id"); + printf("Port created successfully\n" + "frontend: %s\n" + "port: %ju\n", driver, + (uintmax_t) created_port); + nvlist_destroy(req.result_nvl); + } else + printf("Port destroyed successfully\n"); break; default: warnx("unknown status: %d", req.status); diff --git a/usr.sbin/ctladm/tests/Makefile b/usr.sbin/ctladm/tests/Makefile index 73ac94d77d21..825e38e6c6e3 100644 --- a/usr.sbin/ctladm/tests/Makefile +++ b/usr.sbin/ctladm/tests/Makefile @@ -3,8 +3,4 @@ PACKAGE= tests ATF_TESTS_SH= port -# "ctladm port" does not report the name of the port just created, so we can't -# cleanup unless we assume that no other test created a port too. -TEST_METADATA+= is_exclusive="true" - .include diff --git a/usr.sbin/ctladm/tests/port.sh b/usr.sbin/ctladm/tests/port.sh index b2cdea6f1de2..ccc4a6fc502e 100644 --- a/usr.sbin/ctladm/tests/port.sh +++ b/usr.sbin/ctladm/tests/port.sh @@ -20,8 +20,9 @@ skip_if_ctld() { cleanup() { driver=$1 - if [ -e after-ports ]; then - diff before-ports after-ports | awk "/$driver/ {print \$2}" | xargs -n1 ctladm port -r -d ioctl -p + if [ -e port-create.txt ]; then + portnum=`awk '/port:/ {print $2}' port-create.txt` + ctladm port -r -d $driver -p $portnum fi } @@ -35,12 +36,13 @@ create_ioctl_body() { skip_if_ctld - atf_check -o save:before-ports ctladm portlist -qf ioctl - atf_check ctladm port -c -d "ioctl" - atf_check -o save:after-ports ctladm portlist -qf ioctl - if test `wc -l before-ports | cut -w -f2` -ge `wc -l after-ports | cut -w -f2`; then - atf_fail "Did not create a new ioctl port" - fi + atf_check -o save:port-create.txt ctladm port -c -d "ioctl" + atf_check egrep -q "Port created successfully" port-create.txt + atf_check egrep -q "frontend: *ioctl" port-create.txt + atf_check egrep -q "port: *[0-9]+" port-create.txt + portnum=`awk '/port:/ {print $2}' port-create.txt` + atf_check -o save:portlist.txt ctladm portlist -qf ioctl + atf_check egrep -q "$portnum *YES *ioctl *ioctl" portlist.txt } create_ioctl_cleanup() { @@ -57,13 +59,13 @@ create_ioctl_options_body() { skip_if_ctld - atf_check -o save:before-ports ctladm portlist -qf ioctl - atf_check ctladm port -c -d "ioctl" -O pp=101 -O vp=102 - atf_check -o save:after-ports ctladm portlist -qf ioctl - if test `wc -l before-ports | cut -w -f2` -ge `wc -l after-ports | cut -w -f2`; then - atf_fail "Did not create a new ioctl port" - fi - if ! egrep -q '101[[:space:]]+102' after-ports; then + atf_check -o save:port-create.txt ctladm port -c -d "ioctl" -O pp=101 -O vp=102 + atf_check egrep -q "Port created successfully" port-create.txt + atf_check egrep -q "frontend: *ioctl" port-create.txt + atf_check egrep -q "port: *[0-9]+" port-create.txt + portnum=`awk '/port:/ {print $2}' port-create.txt` + atf_check -o save:portlist.txt ctladm portlist -qf ioctl + if ! egrep -q '101[[:space:]]+102' portlist.txt; then ctladm portlist atf_fail "Did not create the port with the specified options" fi @@ -84,13 +86,9 @@ disable_ioctl_body() { skip_if_ctld - atf_check -o save:before-ports ctladm portlist -qf ioctl - atf_check ctladm port -c -d "ioctl" - atf_check -o save:after-ports ctladm portlist -qf ioctl - if test `wc -l before-ports | cut -w -f2` -ge `wc -l after-ports | cut -w -f2`; then - atf_fail "Did not create a new ioctl port" - fi - portnum=`diff before-ports after-ports | awk '/ioctl/ {print $2}'`; + atf_check -o save:port-create.txt ctladm port -c -d "ioctl" + portnum=`awk '/port:/ {print $2}' port-create.txt` + atf_check -o save:portlist.txt ctladm portlist -qf ioctl atf_check -o ignore ctladm port -o off -p $portnum atf_check -o match:"^$portnum *NO" ctladm portlist -qf ioctl } @@ -109,13 +107,9 @@ enable_ioctl_body() { skip_if_ctld - atf_check -o save:before-ports ctladm portlist -qf ioctl - atf_check ctladm port -c -d "ioctl" - atf_check -o save:after-ports ctladm portlist -qf ioctl - if test `wc -l before-ports | cut -w -f2` -ge `wc -l after-ports | cut -w -f2`; then - atf_fail "Did not create a new ioctl port" - fi - portnum=`diff before-ports after-ports | awk '/ioctl/ {print $2}'`; + atf_check -o save:port-create.txt ctladm port -c -d "ioctl" + portnum=`awk '/port:/ {print $2}' port-create.txt` + atf_check -o save:portlist.txt ctladm portlist -qf ioctl atf_check -o ignore ctladm port -o off -p $portnum atf_check -o ignore ctladm port -o on -p $portnum atf_check -o match:"^$portnum *YES" ctladm portlist -qf ioctl @@ -135,14 +129,18 @@ remove_ioctl_body() { skip_if_ctld - atf_check -o save:before-ports ctladm portlist -qf ioctl - atf_check ctladm port -c -d "ioctl" - atf_check -o save:after-ports ctladm portlist -qf ioctl - if test `wc -l before-ports | cut -w -f2` -ge `wc -l after-ports | cut -w -f2`; then - atf_fail "Did not create a new ioctl port" + # Specify exact pp and vp to make the post-removal portlist check + # unambiguous + atf_check -o save:port-create.txt ctladm port -c -d "ioctl" -O pp=10001 -O vp=10002 + portnum=`awk '/port:/ {print $2}' port-create.txt` + atf_check -o save:portlist.txt ctladm portlist -qf ioctl + atf_check -o inline:"Port destroyed successfully\n" ctladm port -r -d ioctl -p $portnum + # Check that the port was removed. A new port may have been added with + # the same ID, so match against the pp and vp numbers, too. + if ctladm portlist -qf ioctl | egrep -q "^${portnum} .*10001 *10002"; then + ctladm portlist -qf ioctl + atf_fail "port was not removed" fi - portnum=`diff before-ports after-ports | awk '/ioctl/ {print $2}'`; - atf_check ctladm port -r -d ioctl -p $portnum } atf_init_test_cases() From nobody Mon Jun 10 16:01: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 4Vyc4S408Rz5M8y7; Mon, 10 Jun 2024 16:01: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 4Vyc4S2BZtz4pdt; Mon, 10 Jun 2024 16:01:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718035304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IruziadEJW24JeCXhHM/QBcqtuqY7kubVzg+gAAe8yk=; b=guM4Uq5Trs+oI8hiu2jgUmicxDx6XATc/AXjdSneY2g8eidP6BOwoME486dXhl7PkqZpYd A2r0/PXREVcwpguxJPzpvYlsg/oJe55wyvCqlATtgzqPVlkh5evIRAi/AjkECK2CQs2HfZ 9bEdDLkd6nzH47F1ekBk1IFUrSv170yXeVX93kx0lTAM/mkcc8jXcBvkxdfCp6mWNjjnfo U4kxS7BjodcBB2wxoPuf1AZtXM9thFguS1fly1BIVvnylIazkfhFXnYKJ5VUavn/bgdTNj CIQLXsYsCTn46y8XFLdeyu71WNv0eAAA2LsxbDdkAQlwQLCTH5r09mqyV+9CHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718035304; a=rsa-sha256; cv=none; b=k4M84180Wl42wSIL5qWJ4zUUKaBtDO44S0sCBUSpJZ1a2TkBPp5WQKjGvfw+gNZRyCSs23 vHYGw7FJShyLnbVD/mE/ZP60VTzsk0emCpCYfLplNzTERToyoDynT2FJQJXARysAdM6nZ9 ZctO6tCcIXGZFXDFIfqSZ2JlfsdTp70KumDiC9SJBCrNkDqXfbWbx3tVLW16kBiCQNqh4a yPV6VPzfWh3r9UFY9p/H11KZI3bXVNMhxW2uh9tUMFAMcspSxjAYgSbU3B7p1I+/p3Gjse basicDvImuv33QGXaBR23f+3eztXYMWItFQwg6EVUgDYr4mQsVejx/EC8yASxg== 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=1718035304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IruziadEJW24JeCXhHM/QBcqtuqY7kubVzg+gAAe8yk=; b=RHqezWjail/nJ3sqQ5fLkhn4gAmAFnb7Y1/AxBFdrkF+Ju0YAvwYPAbTDxH962B7T1/WWv 0710cXLIOmP5Ls1VnBag9gw0SIOqGpp1jWL6321JM+/lZiOfd8uLVBwnPw/lDRgRQtM4Pn nqwyfvWJ4mUCuivfmQst/LVa0k+2hhLfCCeqM+bJvl5JwNa1kATSG6nTpBLmVPPUenSOH6 dSVKiBLUaUtchcLIE/wkQxAxj0b5EWYVMz/fWvtU60CbZ7i+kaaKBM4oPwDymP8COhdMdy sKGW66lnmqI4d4vmwLcwJ4biGHC8r93vBKKtLqN/uBb8UZF93aS5T3gF30tQ+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 4Vyc4S1lSdzXQL; Mon, 10 Jun 2024 16:01: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 45AG1iTq001461; Mon, 10 Jun 2024 16:01:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45AG1iff001458; Mon, 10 Jun 2024 16:01:44 GMT (envelope-from git) Date: Mon, 10 Jun 2024 16:01:44 GMT Message-Id: <202406101601.45AG1iff001458@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: afecc74cd715 - main - ctladm: better documentation for adding and removing cfiscsi ports 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: afecc74cd7158da8e89c26c5267bc715c2417fe7 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=afecc74cd7158da8e89c26c5267bc715c2417fe7 commit afecc74cd7158da8e89c26c5267bc715c2417fe7 Author: Alan Somers AuthorDate: 2024-06-06 17:19:19 +0000 Commit: Alan Somers CommitDate: 2024-06-10 16:01:25 +0000 ctladm: better documentation for adding and removing cfiscsi ports MFC after: 2 weeks Sponsored by: Axcient Reviewed by: mav Pull Request: https://github.com/freebsd/freebsd-src/pull/1279 --- sys/cam/ctl/ctl_frontend_iscsi.c | 27 ++++++-- usr.sbin/ctladm/ctladm.8 | 32 +++++++-- usr.sbin/ctladm/tests/port.sh | 146 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 191 insertions(+), 14 deletions(-) diff --git a/sys/cam/ctl/ctl_frontend_iscsi.c b/sys/cam/ctl/ctl_frontend_iscsi.c index fe3b1a943206..e8a3fe7cd36a 100644 --- a/sys/cam/ctl/ctl_frontend_iscsi.c +++ b/sys/cam/ctl/ctl_frontend_iscsi.c @@ -2149,17 +2149,24 @@ cfiscsi_ioctl_port_create(struct ctl_req *req) uint16_t tag; target = dnvlist_get_string(req->args_nvl, "cfiscsi_target", NULL); - alias = dnvlist_get_string(req->args_nvl, "cfiscsi_target_alias", NULL); + if (target == NULL) { + req->status = CTL_LUN_ERROR; + snprintf(req->error_str, sizeof(req->error_str), + "Missing required argument: cfiscsi_target"); + return; + } + val = dnvlist_get_string(req->args_nvl, "cfiscsi_portal_group_tag", NULL); - - if (target == NULL || val == NULL) { + if (val == NULL) { req->status = CTL_LUN_ERROR; snprintf(req->error_str, sizeof(req->error_str), - "Missing required argument"); + "Missing required argument: cfiscsi_portal_group_tag"); return; } + alias = dnvlist_get_string(req->args_nvl, "cfiscsi_target_alias", NULL); + tag = strtoul(val, NULL, 0); ct = cfiscsi_target_find_or_create(&cfiscsi_softc, target, alias, tag); if (ct == NULL) { @@ -2250,13 +2257,19 @@ cfiscsi_ioctl_port_remove(struct ctl_req *req) uint16_t tag; target = dnvlist_get_string(req->args_nvl, "cfiscsi_target", NULL); + if (target == NULL) { + req->status = CTL_LUN_ERROR; + snprintf(req->error_str, sizeof(req->error_str), + "Missing required argument: cfiscsi_target"); + return; + } + val = dnvlist_get_string(req->args_nvl, "cfiscsi_portal_group_tag", NULL); - - if (target == NULL || val == NULL) { + if (val == NULL) { req->status = CTL_LUN_ERROR; snprintf(req->error_str, sizeof(req->error_str), - "Missing required argument"); + "Missing required argument: cfiscsi_portal_group_tag"); return; } diff --git a/usr.sbin/ctladm/ctladm.8 b/usr.sbin/ctladm/ctladm.8 index b3af4b45ba26..5c6e4aa04c77 100644 --- a/usr.sbin/ctladm/ctladm.8 +++ b/usr.sbin/ctladm/ctladm.8 @@ -35,7 +35,7 @@ .\" .\" $Id: //depot/users/kenm/FreeBSD-test2/usr.sbin/ctladm/ctladm.8#3 $ .\" -.Dd June 5, 2024 +.Dd June 6, 2024 .Dt CTLADM 8 .Os .Sh NAME @@ -166,7 +166,7 @@ .Op Fl o Ar on|off .Op Fl w Ar wwpn .Op Fl W Ar wwnn -.Op Fl O Ar pp|vp +.Op Fl O Ar name=value .Op Fl p Ar targ_port .Op Fl r .Op Fl t Ar fe_type @@ -625,7 +625,7 @@ The WWNN and WWPN may both be specified at the same time, but cannot be combined with enabling/disabling or listing ports. .Bl -tag -width 12n .It Fl c -Create new frontend port using free pp and vp=0. +Create new frontend port. .It Fl d Ar driver Specify the name of the frontend driver used by the .Pq Fl c @@ -644,7 +644,31 @@ If no port number or port type is specified, all ports are turned on or off. .It Fl O Ar pp|vp Specify generic options on the ioctl frontend port. -At present, only pp and vp port numbers can be set. +The list of recognized options is driver-dependent. +The +.Dq ioctl +driver recognizes +.Dq pp +and +.Dq vp . +The +.Dq iscsi +driver recongizes +.Dq cfiscsi_portal_group_tag , +.Dq cfiscsi_target , +and +.Dq cfiscsi_target_alias . +The +.Dq nvmf +driver recognizes +.Dq subnqn , +.Dq portid , +.Dq max_io_qsize , +.Dq enable_timeout , +.Dq ioccsz , +.Dq nn , +and +.Dq serial . .It Fl p Ar targ_port Specify the frontend port number. The port numbers can be found in the frontend port list. diff --git a/usr.sbin/ctladm/tests/port.sh b/usr.sbin/ctladm/tests/port.sh index ccc4a6fc502e..1f2c9aaed5c1 100644 --- a/usr.sbin/ctladm/tests/port.sh +++ b/usr.sbin/ctladm/tests/port.sh @@ -5,11 +5,20 @@ # * Creating umass ports # TODO -# * Creating iscsi ports # * Creating nvmf ports # * Creating ha ports # * Creating fc ports +# The PGTAG can be any 16-bit number. The only constraint is that each +# PGTAG,TARGET pair must be globally unique. +PGTAG=30257 + +load_cfiscsi() { + if ! kldstat -q -m cfiscsi; then + kldload cfiscsi || atf_skip "could not load cfscsi kernel mod" + fi +} + skip_if_ctld() { if service ctld onestatus > /dev/null; then # If ctld is running on this server, let's not interfere. @@ -21,8 +30,18 @@ cleanup() { driver=$1 if [ -e port-create.txt ]; then - portnum=`awk '/port:/ {print $2}' port-create.txt` - ctladm port -r -d $driver -p $portnum + case "$driver" in + "ioctl") + PORTNUM=`awk '/port:/ {print $2}' port-create.txt` + ctladm port -r -d $driver -p $PORTNUM + ;; + "iscsi") + TARGET=`awk '/target:/ {print $2}' port-create.txt` + # PORTNUM is ignored, but must be set + PORTNUM=9999 + ctladm port -r -d $driver -p "$PORTNUM" -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target=$TARGET + ;; + esac fi } @@ -49,6 +68,75 @@ create_ioctl_cleanup() cleanup ioctl } +atf_test_case create_iscsi cleanup +create_iscsi_head() +{ + atf_set "descr" "ctladm can create a new iscsi port" + atf_set "require.user" "root" +} +create_iscsi_body() +{ + skip_if_ctld + load_cfiscsi + + TARGET=iqn.2018-10.myhost.create_iscsi + atf_check -o save:port-create.txt ctladm port -c -d "iscsi" -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET" + echo "target: $TARGET" >> port-create.txt + atf_check egrep -q "Port created successfully" port-create.txt + atf_check egrep -q "frontend: *iscsi" port-create.txt + atf_check egrep -q "port: *[0-9]+" port-create.txt + atf_check -o save:portlist.txt ctladm portlist -qf iscsi + # Unlike the ioctl driver, the iscsi driver creates ports in a disabled + # state, so the port's lunmap may be set before enabling it. + atf_check egrep -q "$portnum *NO *iscsi *iscsi.*$TARGET" portlist.txt +} +create_iscsi_cleanup() +{ + cleanup iscsi +} + +atf_test_case create_iscsi_alias cleanup +create_iscsi_alias_head() +{ + atf_set "descr" "ctladm can create a new iscsi port with a target alias" + atf_set "require.user" "root" +} +create_iscsi_alias_body() +{ + skip_if_ctld + load_cfiscsi + + TARGET=iqn.2018-10.myhost.create_iscsi_alias + ALIAS="foobar" + atf_check -o save:port-create.txt ctladm port -c -d "iscsi" -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET" -O cfiscsi_target_alias="$ALIAS" + echo "target: $TARGET" >> port-create.txt + atf_check egrep -q "Port created successfully" port-create.txt + atf_check egrep -q "frontend: *iscsi" port-create.txt + atf_check egrep -q "port: *[0-9]+" port-create.txt + atf_check -o save:portlist.txt ctladm portlist -qvf iscsi + atf_check egrep -q "cfiscsi_target_alias=$ALIAS" portlist.txt +} +create_iscsi_alias_cleanup() +{ + cleanup iscsi +} + +atf_test_case create_iscsi_without_required_args +create_iscsi_without_required_args_head() +{ + atf_set "descr" "ctladm will gracefully fail to create an iSCSI target if required arguments are missing" + atf_set "require.user" "root" +} +create_iscsi_without_required_args_body() +{ + skip_if_ctld + load_cfiscsi + + TARGET=iqn.2018-10.myhost.create_iscsi + atf_check -s exit:1 -e match:"Missing required argument: cfiscsi_target" ctladm port -c -d "iscsi" -O cfiscsi_portal_group_tag=$PGTAG + atf_check -s exit:1 -e match:"Missing required argument: cfiscsi_portal_group_tag" ctladm port -c -d "iscsi" -O cfiscsi_target=$TARGET +} + atf_test_case create_ioctl_options cleanup create_ioctl_options_head() { @@ -143,11 +231,63 @@ remove_ioctl_body() fi } +atf_test_case remove_iscsi +remove_iscsi_head() +{ + atf_set "descr" "ctladm can remove an iscsi port" + atf_set "require.user" "root" +} +remove_iscsi_body() +{ + skip_if_ctld + load_cfiscsi + + TARGET=iqn.2018-10.myhost.remove_iscsi + atf_check -o save:port-create.txt ctladm port -c -d "iscsi" -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET" + portnum=`awk '/port:/ {print $2}' port-create.txt` + atf_check -o save:portlist.txt ctladm portlist -qf iscsi + atf_check -o inline:"Port destroyed successfully\n" ctladm port -r -d iscsi -p 9999 -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET" + # Check that the port was removed. A new port may have been added with + # the same ID, so match against the target and tag, too. + PGTAGHEX=0x7631 # PGTAG in hex + if ctladm portlist -qf iscsi | egrep -q "^${portnum} .*$PGTAG +[0-9]+ +$TARGET,t,$PGTAGHEX"; then + ctladm portlist -qf iscsi + atf_fail "port was not removed" + fi +} + +atf_test_case remove_iscsi_without_required_args cleanup +remove_iscsi_without_required_args_head() +{ + atf_set "descr" "ctladm will gracefully fail to remove an iSCSI target if required arguments are missing" + atf_set "require.user" "root" +} +remove_iscsi_without_required_args_body() +{ + skip_if_ctld + load_cfiscsi + + TARGET=iqn.2018-10.myhost.remove_iscsi_without_required_args + atf_check -o save:port-create.txt ctladm port -c -d "iscsi" -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET" + echo "target: $TARGET" >> port-create.txt + atf_check -s exit:1 -e match:"Missing required argument: cfiscsi_portal_group_tag" ctladm port -r -d iscsi -p 9999 -O cfiscsi_target="$TARGET" + atf_check -s exit:1 -e match:"Missing required argument: cfiscsi_target" ctladm port -r -d iscsi -p 9999 -O cfiscsi_portal_group_tag=$PGTAG +} +remove_iscsi_without_required_args_cleanup() +{ + cleanup iscsi +} + atf_init_test_cases() { atf_add_test_case create_ioctl + atf_add_test_case create_iscsi + atf_add_test_case create_iscsi_without_required_args + atf_add_test_case create_iscsi_alias atf_add_test_case create_ioctl_options atf_add_test_case disable_ioctl atf_add_test_case enable_ioctl atf_add_test_case remove_ioctl + atf_add_test_case remove_iscsi + atf_add_test_case remove_iscsi_without_required_args } From nobody Mon Jun 10 16:01: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 4Vyc4T4LnHz5M8y8; Mon, 10 Jun 2024 16:01: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 4Vyc4T2nMdz4pWy; Mon, 10 Jun 2024 16:01:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718035305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+gGCURNHyXgNtnm6cbe+d1MFAdv7+rScwceCtsiaWDQ=; b=iWXgxDKe5+E09buIPpzHAkgmoft0BWft5MOxVEt7JCcb1O/c8zOtxdkbZBZyjaP5NNQbyp CyqI5a9CEjxar+MlDWD31VVGyK/dNTSwRJ1nkVEQkQcM8hYdoV00kXVFYbUtOeEuUwaBEY NZahP5J84y0nCLJMFYFV8Blcyv4MgWzW4oLY6JB4kL95MW3X9xp17nSmIMi7b3B+qugEXj WtOSJWykXNhEDPnC0kOaNdXFmss8ArlkRBOTp4EtjvMALWrYih5m1CudAK4l6nT2RuNIKx vlm/V1tNGOCkaF0CNbPjqKmL+65EC+zj3+NYK5ibsaIsZt1/FMXdiy1Pm6v5GQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718035305; a=rsa-sha256; cv=none; b=akwtykSj2PUZ4F4oYEgokPkaLnjH2FGt+JOSy5zRmBNItVCIcKd6Q0S0DaM3b0QHnv0v5n Km5nj+cnhPRQtjBCgZWocVyHBzVd/DUBq7SVbG5YmCqm1I5OlbeaGoL8m9RWx4xAIq3vBZ e/E5hBCisUDZ7A+oLunVrclaV/lG/K+lxJufKb+gJE0hbZJ0VCt5/Yai899E+8wgzmjjqT IFT3ByqqhZ3vnhYNuZWLrmI92PwQjYnHeihMnJHK/JmXsEQ2k7k4wxBnaqPS48cXEB5Yv0 P7PbqZPKbTSJKelpMqE1542ypKl/e8j1JbuAlhKwBSS+Py24u169DoYbMXKjjQ== 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=1718035305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+gGCURNHyXgNtnm6cbe+d1MFAdv7+rScwceCtsiaWDQ=; b=LncYoxTG93FtxBmZaId6/Bb9yC9nortz9PDhyyTEXqktOlU8vBFe4lp+FU/4Hi5894k/VR qvMN9WwvApsp4nJfuqHSOf9HBB6vWsr3DW1hk3E6uqo74YaX1VDptHazmjo1g2bkPS/BuL 2iGyUn0eAUPllxpnE/qdmCPTMDq8ufu5eULLf3L6GTNvS2Mg2mvfsB+K1IFXBwyOEaNFnj 6k1GaefSosQezHXSqUhRgh4aqsqPjbfyiDURh8FWX9rV4CbIgDsJRLaQIAqZMqmfQcgvHp mXNsC6/EYsuVvMfzrmyTN0rhGQykliBWp1VxE+OMPZJH25V7F8c3vDggD6lUDA== 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 4Vyc4T2Pv2zXqJ; Mon, 10 Jun 2024 16:01: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 45AG1jVg001519; Mon, 10 Jun 2024 16:01:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45AG1jSb001516; Mon, 10 Jun 2024 16:01:45 GMT (envelope-from git) Date: Mon, 10 Jun 2024 16:01:45 GMT Message-Id: <202406101601.45AG1jSb001516@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: edbd489d09ba - main - ctladm: don't require the use of "-p" with "port -r" 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: edbd489d09babebdc6c03924a912013be584c409 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=edbd489d09babebdc6c03924a912013be584c409 commit edbd489d09babebdc6c03924a912013be584c409 Author: Alan Somers AuthorDate: 2024-06-06 19:14:43 +0000 Commit: Alan Somers CommitDate: 2024-06-10 16:01:25 +0000 ctladm: don't require the use of "-p" with "port -r" When removing a port, the ioctl frontend requires the "-p" argument. But other frontends, like cfiscsi, do not. So don't require that argument in the ctladm command. The frontend driver will report an error if any required argument is missing. MFC after: 2 weeks Sponsored by: Axcient Reviewed by: mav Pull Request: https://github.com/freebsd/freebsd-src/pull/1279 --- sys/cam/ctl/ctl_frontend_ioctl.c | 2 +- usr.sbin/ctladm/ctladm.8 | 3 +-- usr.sbin/ctladm/ctladm.c | 10 +++------- usr.sbin/ctladm/tests/port.sh | 28 +++++++++++++++++++++++----- 4 files changed, 28 insertions(+), 15 deletions(-) diff --git a/sys/cam/ctl/ctl_frontend_ioctl.c b/sys/cam/ctl/ctl_frontend_ioctl.c index 7fc8deac82b3..3449154afb38 100644 --- a/sys/cam/ctl/ctl_frontend_ioctl.c +++ b/sys/cam/ctl/ctl_frontend_ioctl.c @@ -267,7 +267,7 @@ cfi_ioctl_port_remove(struct ctl_req *req) if (port_id == -1) { req->status = CTL_LUN_ERROR; snprintf(req->error_str, sizeof(req->error_str), - "port_id not provided"); + "Missing required argument: port_id"); return; } diff --git a/usr.sbin/ctladm/ctladm.8 b/usr.sbin/ctladm/ctladm.8 index 5c6e4aa04c77..72f0162eed54 100644 --- a/usr.sbin/ctladm/ctladm.8 +++ b/usr.sbin/ctladm/ctladm.8 @@ -673,8 +673,7 @@ and Specify the frontend port number. The port numbers can be found in the frontend port list. .It Fl r -Remove port specified with -.Pq Fl p Ar targ_port . +Remove a port. .It Fl t Ar fe_type Specify the frontend type used by the .Pq Fl o , diff --git a/usr.sbin/ctladm/ctladm.c b/usr.sbin/ctladm/ctladm.c index 14951797ddf1..46b7b88547dd 100644 --- a/usr.sbin/ctladm/ctladm.c +++ b/usr.sbin/ctladm/ctladm.c @@ -580,11 +580,6 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) break; } case CCTL_PORT_MODE_REMOVE: - if (targ_port == -1) { - warnx("%s: -r requires -p", __func__); - retval = 1; - goto bailout; - } /* FALLTHROUGH */ case CCTL_PORT_MODE_CREATE: { bzero(&req, sizeof(req)); @@ -594,8 +589,9 @@ cctl_port(int fd, int argc, char **argv, char *combinedopt) if (port_mode == CCTL_PORT_MODE_REMOVE) { req.reqtype = CTL_REQ_REMOVE; - nvlist_add_stringf(option_list, "port_id", "%d", - targ_port); + if (targ_port != -1) + nvlist_add_stringf(option_list, "port_id", "%d", + targ_port); } else req.reqtype = CTL_REQ_CREATE; diff --git a/usr.sbin/ctladm/tests/port.sh b/usr.sbin/ctladm/tests/port.sh index 1f2c9aaed5c1..139e1a7d29a0 100644 --- a/usr.sbin/ctladm/tests/port.sh +++ b/usr.sbin/ctladm/tests/port.sh @@ -37,8 +37,6 @@ cleanup() { ;; "iscsi") TARGET=`awk '/target:/ {print $2}' port-create.txt` - # PORTNUM is ignored, but must be set - PORTNUM=9999 ctladm port -r -d $driver -p "$PORTNUM" -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target=$TARGET ;; esac @@ -68,6 +66,25 @@ create_ioctl_cleanup() cleanup ioctl } +atf_test_case remove_ioctl_without_required_args cleanup +remove_ioctl_without_required_args_head() +{ + atf_set "descr" "ctladm will gracefully fail to remove an ioctl target if required arguments are missing" + atf_set "require.user" "root" +} +remove_ioctl_without_required_args_body() +{ + skip_if_ctld + + atf_check -o save:port-create.txt ctladm port -c -d "ioctl" + atf_check egrep -q "Port created successfully" port-create.txt + atf_check -s exit:1 -e match:"Missing required argument: port_id" ctladm port -r -d "ioctl" +} +remove_ioctl_without_required_args_cleanup() +{ + cleanup ioctl +} + atf_test_case create_iscsi cleanup create_iscsi_head() { @@ -246,7 +263,7 @@ remove_iscsi_body() atf_check -o save:port-create.txt ctladm port -c -d "iscsi" -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET" portnum=`awk '/port:/ {print $2}' port-create.txt` atf_check -o save:portlist.txt ctladm portlist -qf iscsi - atf_check -o inline:"Port destroyed successfully\n" ctladm port -r -d iscsi -p 9999 -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET" + atf_check -o inline:"Port destroyed successfully\n" ctladm port -r -d iscsi -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET" # Check that the port was removed. A new port may have been added with # the same ID, so match against the target and tag, too. PGTAGHEX=0x7631 # PGTAG in hex @@ -270,8 +287,8 @@ remove_iscsi_without_required_args_body() TARGET=iqn.2018-10.myhost.remove_iscsi_without_required_args atf_check -o save:port-create.txt ctladm port -c -d "iscsi" -O cfiscsi_portal_group_tag=$PGTAG -O cfiscsi_target="$TARGET" echo "target: $TARGET" >> port-create.txt - atf_check -s exit:1 -e match:"Missing required argument: cfiscsi_portal_group_tag" ctladm port -r -d iscsi -p 9999 -O cfiscsi_target="$TARGET" - atf_check -s exit:1 -e match:"Missing required argument: cfiscsi_target" ctladm port -r -d iscsi -p 9999 -O cfiscsi_portal_group_tag=$PGTAG + atf_check -s exit:1 -e match:"Missing required argument: cfiscsi_portal_group_tag" ctladm port -r -d iscsi -O cfiscsi_target="$TARGET" + atf_check -s exit:1 -e match:"Missing required argument: cfiscsi_target" ctladm port -r -d iscsi -O cfiscsi_portal_group_tag=$PGTAG } remove_iscsi_without_required_args_cleanup() { @@ -288,6 +305,7 @@ atf_init_test_cases() atf_add_test_case disable_ioctl atf_add_test_case enable_ioctl atf_add_test_case remove_ioctl + atf_add_test_case remove_ioctl_without_required_args atf_add_test_case remove_iscsi atf_add_test_case remove_iscsi_without_required_args } From nobody Mon Jun 10 17:30: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 4Vyf3J63LMz5MJWj; Mon, 10 Jun 2024 17:30: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 4Vyf3J54qTz3yp0; Mon, 10 Jun 2024 17:30:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718040652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J5ebToySv2y0cJeSHAD51IXBFkbFEy94GxTUNZqkD/w=; b=YZTI+bq0a7PHIndJJy44uqyarOCi8QQg2kB9ut2rZklVrHlN7WATxrXPo0EC8N9DSKSEpH h9ezmfj+H9yddSwufieQPd6xj9MFIjQSohQvRol0fqjKbVQm8/LN2HDEG5XZhSJ+AHJTow TKKjV07s1QhdTIMeIL+A6Aya2P5rU0O0qQ2ezqvegXmcy8LzGGV5ltpB9csyDIw70TxoVK XWKV5rKLaZg8f6pcO6VWBLcFIwCX3XCuO6/pyiUwhLroWeiGh1V6oYopMBWYg80hpyA1w6 5EffIexmM7Qkc4XYK3xAP8gH7poUUB5YXTknjDf3pkEnMokC+AJmW5zrSV7Dow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718040652; a=rsa-sha256; cv=none; b=wkddUV++TPwFbqUBN8Oeqogea70c5OmPrrmLMKfiVF9UjZDVEROBXASbu94vgaLJ+XvTPH EklJnGlCfjZEcor4ZOztHATrWDVRcH7EQWoop9oBpw5FSJpsnMACek0SGXUmTuXWX7PmoF GoL9H1fjeqwUJ8t2kELjRi2qkYpxL8luY0lZCT2wkBwaikHuDMC114HID/IsNVxcs9FD60 t/ic7Ebq+IzHGy+Cg9Wz+C5VXRsXyyPkq78dSpenCpKpOZ7Udl/7HNdU+52g4NlAPObk8Y 5k4/GZ2z6vBjqIi92tjm17EFGkKonEa5iyipDJhaEPh71azX7rQiWiFdprOz3g== 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=1718040652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J5ebToySv2y0cJeSHAD51IXBFkbFEy94GxTUNZqkD/w=; b=SoLL/GJ3DZg7vjW/OPFEcj3KhzceBrs3nRC0XIGEQY096aatfeyFZwA7rt5CH3idUJwrMN RlEAkCoqSkt6WOp8F7intp7NloStDO06P3zeYvVryDBrsb8DpuIA93I3xpIdcXTob19UK0 fD5qCHKjB1opTrc789W5Jx2D2uu3ii6zMC5d9AnorZMMx55uQXTmL2ljbk/E2jOWzJiQxp oqGzZ99LjVA1FYC/v060zRy+mTSfudPV1keW9fmgGyUuXjL7HCDbg/c8d+DpYbkAr/79xk /ywoybCLxgPynZZCGFNPrshznEUlwFfIoirBvVUuOVTL+3b+e6wW8DEUtSX3QA== 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 4Vyf3J4hLszZrM; Mon, 10 Jun 2024 17:30: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 45AHUqEp052030; Mon, 10 Jun 2024 17:30:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45AHUqtv052027; Mon, 10 Jun 2024 17:30:52 GMT (envelope-from git) Date: Mon, 10 Jun 2024 17:30:52 GMT Message-Id: <202406101730.45AHUqtv052027@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 81ef0a89fcc0 - main - Fix mtree entry for ctladm tests 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81ef0a89fcc055bdf3d0f1affbadb643412ebce9 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=81ef0a89fcc055bdf3d0f1affbadb643412ebce9 commit 81ef0a89fcc055bdf3d0f1affbadb643412ebce9 Author: Alan Somers AuthorDate: 2024-06-10 17:29:48 +0000 Commit: Alan Somers CommitDate: 2024-06-10 17:29:48 +0000 Fix mtree entry for ctladm tests MFC after: 2 weeks MFC with: 9747d11d91642cb9b81602d88e8aebeb388543c7 Sponsored by: Axcient --- etc/mtree/BSD.tests.dist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 86db4304b932..92501766ef88 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -90,8 +90,6 @@ .. .. usr.sbin - ctladm - .. dtrace common aggs @@ -1225,6 +1223,8 @@ usr.sbin chown .. + ctladm + .. daemon .. etcupdate From nobody Mon Jun 10 17:34: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 4Vyf7k1yCTz5MK77; Mon, 10 Jun 2024 17:34:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vyf7j703dz40m5; Mon, 10 Jun 2024 17:34:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718040882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CD4qut4vP0U2vUj+wtYY92DJiVgP2zeB4wpAVV9pG+E=; b=gMSteZmUD5/KD5bkmsesceg8inqWBspwPS5UDrNmO0Q6rhuPx4i1BjzyqY517ARymkCfU4 ACaSfZ1jKzppJ7VNdSfDW6rXUl0jmCqi5vvPzb7uY2/JAAwHJXIFbutFxvylzo9rsQ6LuI m6sh71apLUTDczL55wMcnvStusFZAsv4VdRfS1icJIuaabBJTkFjPk9OoWPtP/RtzJjYcn xUjy9BNg+2ZFtc3nvtMjV7ZCxXgo92zUFf7yryeUJjUtVjPmCSaavKXpVomuZ48O6ypbiK kJphBdBZEtuy0JxDHafMOp42hZJTu26poYrQ8nhMUAszg6j9G8M5eT63iQz9Tg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718040882; a=rsa-sha256; cv=none; b=cERCJowu1cyQGbii6H0SgNQBwIQ1HtRN8T1dMEf9Vb7NSgh55ItQWtFEnXTmP0ZAcC5rqb nkx8w36Mj7ufmB1hLNKH2zjbGEF2hOISBioLE0tyPYFyMKFKT6OhmSN7WKhBQf/1gKse+o gnsrxJq/Jf6lWoDpsA5G/y3cLn6DENXviiEna6fBbeyb6pjitVuOKcOsjdZn7W9QTaMWO5 UHYOuuUdh54fnO2coOlPD0vp6NyjYB9tQyGgmg/msjJL8h0yLlc2b4dhJbu4KkA/kWe6a+ S05cogr/eTd2G9PY7D1JDcuoNU6zerhQCE23J5SBP7FcQGZnibATCJ9kw+AVQw== 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=1718040882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CD4qut4vP0U2vUj+wtYY92DJiVgP2zeB4wpAVV9pG+E=; b=i1dG9ojukdOD1aOQoVVTn1WU6jh3Gkj1WXsTki35EgQh88y2+wBKdBRAXUkWDu3jz11ADq Pz/TThIzUzygvyc3mjjisCfHUHxDL1xK1fpMy8QgUT+o1FYorqIfXythjJjC2RqsqOnQTn b9TMdvcDmY5661i4Nss0wCC7cWr2BFpPWpU+TGmF3iN5F29MmQ87UbBy+YI/fVDwN20Mjj yoOoc0DEySXk6EohO+2jCt/oMwDNw+A3b1l6T53r4kO16TH8h5Ewu1TRO2MRHao6WTlAgC IPmzAwFWPMuh39OoGhIBjFBRn0hgP8hcaXyg65/LuqGgeByhcPi5xN+jbi6uAw== 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 4Vyf7j6T7WzZrm; Mon, 10 Jun 2024 17:34: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 45AHYfLV058108; Mon, 10 Jun 2024 17:34:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45AHYf4a058105; Mon, 10 Jun 2024 17:34:41 GMT (envelope-from git) Date: Mon, 10 Jun 2024 17:34:41 GMT Message-Id: <202406101734.45AHYf4a058105@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 7affbeeab1c9 - main - virstor: basic functional 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7affbeeab1c99685012df0d72df2d7a87e09e472 Auto-Submitted: auto-generated The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=7affbeeab1c99685012df0d72df2d7a87e09e472 commit 7affbeeab1c99685012df0d72df2d7a87e09e472 Author: Ryan Libby AuthorDate: 2024-06-10 17:32:22 +0000 Commit: Ryan Libby CommitDate: 2024-06-10 17:32:22 +0000 virstor: basic functional test Reviewed by: asomers, markj Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D45535 --- tests/sys/geom/class/Makefile | 1 + tests/sys/geom/class/virstor/Makefile | 9 ++++ tests/sys/geom/class/virstor/conf.sh | 31 ++++++++++++ tests/sys/geom/class/virstor/virstor_test.sh | 73 ++++++++++++++++++++++++++++ 4 files changed, 114 insertions(+) diff --git a/tests/sys/geom/class/Makefile b/tests/sys/geom/class/Makefile index 10b01a043ddf..b640b0b46859 100644 --- a/tests/sys/geom/class/Makefile +++ b/tests/sys/geom/class/Makefile @@ -19,6 +19,7 @@ TESTS_SUBDIRS+= shsec TESTS_SUBDIRS+= stripe TESTS_SUBDIRS+= union TESTS_SUBDIRS+= uzip +TESTS_SUBDIRS+= virstor ${PACKAGE}FILES+= geom_subr.sh diff --git a/tests/sys/geom/class/virstor/Makefile b/tests/sys/geom/class/virstor/Makefile new file mode 100644 index 000000000000..67242879e33f --- /dev/null +++ b/tests/sys/geom/class/virstor/Makefile @@ -0,0 +1,9 @@ +PACKAGE= tests + +TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} + +ATF_TESTS_SH+= virstor_test + +${PACKAGE}FILES+= conf.sh + +.include diff --git a/tests/sys/geom/class/virstor/conf.sh b/tests/sys/geom/class/virstor/conf.sh new file mode 100644 index 000000000000..46b0fd1308a3 --- /dev/null +++ b/tests/sys/geom/class/virstor/conf.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +class="virstor" +base=$(atf_get ident) +TEST_VIRSTOR_DEVS_FILE="${TMPDIR}/test_virstor_devs.$(basename $0)" + +gvirstor_dev_setup() +{ + # Pick a random name and record it for cleanup. + local vdevbase="$(mktemp -u virstor.XXXXXX)" || aft_fail "mktemp" + echo "$vdevbase" >> "$TEST_VIRSTOR_DEVS_FILE" + eval "${1}='${vdevbase}'" +} + +gvirstor_test_cleanup() +{ + local vdevbase + if [ -f "$TEST_VIRSTOR_DEVS_FILE" ]; then + while read vdevbase; do + if [ -c "/dev/$class/$vdevbase" ]; then + echo "# Destroying test virstor device:" \ + "$vdevbase" + gvirstor destroy "$vdevbase" + fi + done < "$TEST_VIRSTOR_DEVS_FILE" + fi + geom_test_cleanup +} + +ATF_TEST=true +. `dirname $0`/../geom_subr.sh diff --git a/tests/sys/geom/class/virstor/virstor_test.sh b/tests/sys/geom/class/virstor/virstor_test.sh new file mode 100644 index 000000000000..4f2047bffe97 --- /dev/null +++ b/tests/sys/geom/class/virstor/virstor_test.sh @@ -0,0 +1,73 @@ +# +# Copyright (c) 2024 Dell Inc. or its subsidiaries. All Rights Reserved. +# +# SPDX-License-Identifier: BSD-2-Clause +# + +. $(atf_get_srcdir)/conf.sh + +atf_test_case basic cleanup +basic_head() +{ + atf_set "descr" "geom virstor basic functional test" + atf_set "require.user" "root" +} +basic_body() +{ + geom_atf_test_setup + # Choose a virstor device name + gvirstor_dev_setup name + + # Create an md backing device and initialize it with junk + psecsize=512 + attach_md md -t swap -S $psecsize -s 5M || atf_fail "attach_md" + jot -b uninitialized 0 | dd status=none of=/dev/$md 2> /dev/null + + # Create a virstor device + vsizemb=64 + vsize=$((vsizemb * 1024 * 1024)) + atf_check -o ignore -e ignore \ + gvirstor label -v -s ${vsizemb}M -m 512 $name /dev/$md + devwait + vdev="/dev/$class/$name" + + ssize=$(diskinfo $vdev | awk '{print $2}') + atf_check_equal $psecsize $ssize + + size=$(diskinfo $vdev | awk '{print $3}') + atf_check_equal $vsize $size + + # Write the first and last sectors of the virtual address space + hasha=$(jot -b a 0 | head -c $ssize | sha1) + hashz=$(jot -b z 0 | head -c $ssize | sha1) + zsector=$((vsize / ssize - 1)) + jot -b a 0 | dd status=none of=$vdev bs=$ssize count=1 conv=notrunc + jot -b z 0 | dd status=none of=$vdev bs=$ssize count=1 conv=notrunc \ + seek=$zsector + + # Read back and compare + hashx=$(dd status=none if=$vdev bs=$ssize count=1 | sha1) + atf_check_equal $hasha $hashx + hashx=$(dd status=none if=$vdev bs=$ssize count=1 skip=$zsector | sha1) + atf_check_equal $hashz $hashx + + # Destroy, then retaste and reload + atf_check -o ignore gvirstor destroy $name + true > /dev/$md + devwait + + # Read back and compare + hashx=$(dd status=none if=$vdev bs=$ssize count=1 | sha1) + atf_check_equal $hasha $hashx + hashx=$(dd status=none if=$vdev bs=$ssize count=1 skip=$zsector | sha1) + atf_check_equal $hashz $hashx +} +basic_cleanup() +{ + gvirstor_test_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case basic +} From nobody Mon Jun 10 17:46: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 4VyfPT5FStz5ML0Z; Mon, 10 Jun 2024 17:46:37 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-oi1-f180.google.com (mail-oi1-f180.google.com [209.85.167.180]) (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 "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VyfPT0FT1z41Dw; Mon, 10 Jun 2024 17:46:37 +0000 (UTC) (envelope-from asomers@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of asomers@gmail.com designates 209.85.167.180 as permitted sender) smtp.mailfrom=asomers@gmail.com Received: by mail-oi1-f180.google.com with SMTP id 5614622812f47-3c9cc66c649so2492708b6e.1; Mon, 10 Jun 2024 10:46:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718041595; x=1718646395; h=content-transfer-encoding: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=2ESWg2qw2B3NhTH7SPlyI1u/Pfv9xEWpOKR8ooph3Ws=; b=qQDy3HrZlGyC5WbNrfRMsMxTzMgy0rcY3UVcIrnHaVvtshKH0ttacZoRLpnp34qVZq Mnx+WziBhu8ipsRtVWjkWygIsX2QPrxjUTt8Gp2gxClwnNZRdDtSrQboRyvHJM0+iiAq 4mNkQK9+CvPkPHgsXs4fzzqsmehBjFlpw8QIHZKCqoVsUCeDOsxO61pmQtCkd1cGsMYp c/fVHzTLAdIhJ5B5YyCiQiRtngDMkJZzO5HyhBUgeiPo38zu/zZi+VndJxRlMyXSg3tg v8O8LhEEZGf3zeyYB4MvUC8PFMUDUUBdj39qOX6U5WIB5w4clTmfDijLrLrTALWesEN9 corA== X-Forwarded-Encrypted: i=1; AJvYcCWtvNWM2jOrXPs1d9hsWDCh2oMYWuwxSeu9zfVFt7xtOslpvcxPZaQmzYPr8OGp/0FaXK35lMl935KM8dNusu7J+AIrz3ABfanMbZ7BhRBGvKZcbs6+rMUOin2BfVlntQIna4UZ1XONES79IztF1fZFQQ== X-Gm-Message-State: AOJu0YzjcDeQfhHKD8BTtszV9eT0dSdhXUDNHJ5oaK7i/3CqnEYBD9Cq 4GVxtiPEpih7dyxHB9Psz4bCho8wTqAXpeQ3g7ix90zgStcYfdk6KzFqJuHpbfyDz0AaYtn/i7R CvauYGgArfBtnSuxWOpV1mWk841etuw== X-Google-Smtp-Source: AGHT+IHFCY1jw482fEkrEFcrCfHhNjmRF1urZHKJkwsQH89H09vGqw7svWIGnSnVwMWznB7oZrd1SVvpDV1R1KKOSpQ= X-Received: by 2002:a05:6808:2206:b0:3d2:2084:3e33 with SMTP id 5614622812f47-3d220843f8dmr7194788b6e.40.1718041594804; Mon, 10 Jun 2024 10:46:34 -0700 (PDT) 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202404231227.43NCRKnq030628@gitrepo.freebsd.org> In-Reply-To: <202404231227.43NCRKnq030628@gitrepo.freebsd.org> From: Alan Somers Date: Mon, 10 Jun 2024 11:46:23 -0600 Message-ID: Subject: Re: git: 91d35fb663e0 - main - Remove WITHOUT_CAPSICUM build support To: Ed Maste Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.89 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.998]; NEURAL_HAM_MEDIUM(-0.99)[-0.989]; FORGED_SENDER(0.30)[asomers@freebsd.org,asomers@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FREEFALL_USER(0.00)[asomers]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_COUNT_ONE(0.00)[1]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.167.180:from]; RCVD_IN_DNSWL_NONE(0.00)[209.85.167.180:from]; R_DKIM_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[asomers@freebsd.org,asomers@gmail.com]; FROM_HAS_DN(0.00)[]; MISSING_XM_UA(0.00)[]; ARC_NA(0.00)[]; RCVD_TLS_LAST(0.00)[]; TO_MATCH_ENVRCPT_ALL(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: 4VyfPT0FT1z41Dw On Tue, Apr 23, 2024 at 6:27=E2=80=AFAM Ed Maste wrote= : > > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D91d35fb663e0276abc4963ae55= 9e4759ea929842 > > commit 91d35fb663e0276abc4963ae559e4759ea929842 > Author: Ed Maste > AuthorDate: 2024-04-23 11:20:59 +0000 > Commit: Ed Maste > CommitDate: 2024-04-23 12:26:28 +0000 > > Remove WITHOUT_CAPSICUM build support > > Capsicum is non-optional as of c24c117b9644 ("Remove > WITHOUT_{CAPSICUM,CASPER} options"). > > `#ifndef WITHOUT_CAPSICUM` is left in the source for the benefit of > downstream consumers, but is never defined in FreeBSD. > > Reviewed by: oshogbo > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D42077 Should we now remove the caph_enter family of functions? Or do they still have utility for downstream consumers? From nobody Mon Jun 10 18:58: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 4Vyh024Snzz5MwlS; Mon, 10 Jun 2024 18:58:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vyh023y3Tz46dK; Mon, 10 Jun 2024 18:58:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718045890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hWEnQDAoXxNNndyKGUVJHlnvlTQP8B33Rf7X8WEVxn0=; b=M+MRmGXazqOGpgDcv+8EDRkqeyLPkbmcSIWPZcXy02F/oTx/8a5JCp4Y6Ui0Rfc18Vwe7I AAFU/rgvjHmtqlT2+b4E9+BazY98mWmnzZ5Ux2/qfcQhXYVxHPQEWRACfQguSK5zhEEsaK JqcceHRRGWz/7lIi1AovCHL+8uYvBd/LWqzyPOendw63tYRnzzhknXb7IU671o4YqtdBmv 5M7z5/E4fdkNt+ApdNF6QdXz2YB+F0pG+dnu7dsaSPn9WFuGY+ZCJjMmCfX3eNv2DXtK8c y0qPideoywelQAcrmt8y97b996q5wECKfeMhHseGSpZ5YwmFdfbVcnBWyIrvkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718045890; a=rsa-sha256; cv=none; b=wbS+Fo4Pe7K1SA3n0wu1hyA3ZPd7JZ9ZUP2CuYJPnmX+m+9qtP79oMG0dYT35m2iAuoBMh 4hk+CHt98+e9MYc+oO+xQSdGXoO2FnAKi5DG2HlVmg7qmiVdbhVainwvzonmOqx8sHC5Xn ltNyj6QU1kYAvP9FvDgTIJ5lKiEvlFUulUm6UVP1yskw3wruzmB8mYXdGNsYiBIhXB/SVt godzH5o2N7k7l2ORvyjs4qAS2WJq9ut3g1+Kv0diO6BKPvpFNIE9GKBRdGdvn/TRfA/GxE GpoV+EQ77SPg6+ZuTSquN5Bn1gvxzp3yv0rN87iidVYnrEaXovSCowvhYNKfTQ== 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=1718045890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hWEnQDAoXxNNndyKGUVJHlnvlTQP8B33Rf7X8WEVxn0=; b=RwlQ30RU6mmeJbY5HaiqdgvFiqmlcxkpKDbd9iXmYmbgY5rAPgPvD2q8MW49SX1ka7zeJg IgUZFp8XziSO4m3ePuoFmGDwDpQIxgXooamGtK/UDcaNf5nMeytIL5/T1TpQv3oLkvE2NK nY8emToYfUfwIdnbZgKIJs8ti9XUHba3YUZ6nWhWcDzCGXdrguaQBJJvoeK4qrDEq+B0RW GR8i24vjfGyx0XmiEhW6mGWyqup6tHf8834nfx8vwtAzHq48Y30iu5WRs1AeiZVveOAxn6 rxpbLaK9+9B97WoaxZnZzojpnZpvKqrG2qzM3Vjk4mqsvHmEdfHnCwOTAFpG2Q== 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 4Vyh023RxpzcsW; Mon, 10 Jun 2024 18:58: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 45AIwAgi093120; Mon, 10 Jun 2024 18:58:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45AIwAam093117; Mon, 10 Jun 2024 18:58:10 GMT (envelope-from git) Date: Mon, 10 Jun 2024 18:58:10 GMT Message-Id: <202406101858.45AIwAam093117@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 0f409d2673f2 - main - BSD.tests.dist: add entry for virstor 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f409d2673f2b2f0958d66744f0a1dc877ce4ff0 Auto-Submitted: auto-generated The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=0f409d2673f2b2f0958d66744f0a1dc877ce4ff0 commit 0f409d2673f2b2f0958d66744f0a1dc877ce4ff0 Author: Ryan Libby AuthorDate: 2024-06-10 18:56:18 +0000 Commit: Ryan Libby CommitDate: 2024-06-10 18:56:18 +0000 BSD.tests.dist: add entry for virstor test Reviewed by: markj Fixes: 7affbeeab1c9 virstor: basic functional test Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D45551 --- etc/mtree/BSD.tests.dist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 92501766ef88..375e4900b5d5 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -835,6 +835,8 @@ etalon .. .. + virstor + .. .. .. kern From nobody Mon Jun 10 19:53: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 4VyjDc2k1hz5N29t; Mon, 10 Jun 2024 19:54:08 +0000 (UTC) (envelope-from oshogbo.vx@gmail.com) Received: from mail-oo1-f42.google.com (mail-oo1-f42.google.com [209.85.161.42]) (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 "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VyjDc0xMQz4DY5; Mon, 10 Jun 2024 19:54:08 +0000 (UTC) (envelope-from oshogbo.vx@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oo1-f42.google.com with SMTP id 006d021491bc7-5bad7941dcfso160397eaf.3; Mon, 10 Jun 2024 12:54:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718049246; x=1718654046; 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=Vy5RfWUHCX4RRoTwRBwDpJgTL24NLEl8YDrlT9TeScs=; b=e7kKS4FcTfp3a5LPG/TOx1lNJymyBBsdKxb5et13X3Txtfw0tdJ2PBtonW2jjeosSi t0lvxcErM68hcDRkKtpf+lcGD3I0WXm9YiB24gHfMqArXgeBFyr++/4m2xuCnOqj3sAX 2PPvYfqZU8n8e/o6IEDQ7nKSrqi/qlwlRWgDuhl5PRTHH8zstm00GDFKvIsOuC5LKjqR vcR4OJkxd4ENJW5O3kRf4RlNwSdQF3fW2EpHIrxFDfKdIxB6Zywuzpx6GgcpWjeWIXWD OWhNCkVtnqBhHoJqraKUZ5rRHxah4Zvmgmfqli8c4FVeUlnDE+1KOu6Li1h2cUGPwjqD BVZA== X-Forwarded-Encrypted: i=1; AJvYcCVvfpHAL2U4Fue9qxT7/r4q+Fa986kZgPrcUj1M6/Wpx1szskJZWXr/g+u4DLBrwx3VpHVal+3UYlRABfnSQhYzcyoRFJMal+QU7UTDU3e7g79edSYmwT2eYcSwwZiIBvDdlUaAzfFeArWgvzMna4k9+11hvRlS7rj327b2gWOovkskrk3NR+1kHDxUL20= X-Gm-Message-State: AOJu0YzrK82V0afREBclR0Qsefg9JJuV/domL4kGShLPqKf+1mCJGeRn GQiGChCnxXq7mZeGenN8RYBO0FIU/fc1+lEIZBTZQHsXh3R5Ts8sfGVLx+YGuNu379Vpb6TYja7 eVKBjcToeHA1k1u1cRcYGv855F5sxj/zI X-Google-Smtp-Source: AGHT+IFRmp5MrRgn76MEwis6EQDw3LK14ipaj66N0Op9F6n5R6Z8WlFVpEvExKNox7OohQ0hMchrai38akY+ORlfNd8= X-Received: by 2002:a4a:d483:0:b0:5ba:ef94:7dc3 with SMTP id 006d021491bc7-5baef94829bmr5237229eaf.1.1718049246307; Mon, 10 Jun 2024 12:54:06 -0700 (PDT) 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202404231227.43NCRKnq030628@gitrepo.freebsd.org> In-Reply-To: From: Mariusz Zaborski Date: Mon, 10 Jun 2024 21:53:55 +0200 Message-ID: Subject: Re: git: 91d35fb663e0 - main - Remove WITHOUT_CAPSICUM build support To: Alan Somers Cc: Ed Maste , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000086c87061a8e8308" 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)[]; TAGGED_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4VyjDc0xMQz4DY5 --000000000000086c87061a8e8308 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello Alan, Kernel still can be built without Capsicum support. So caph_* functions still are useful. Thanks, Mariusz On Mon, 10 Jun 2024 at 19:46, Alan Somers wrote: > On Tue, Apr 23, 2024 at 6:27=E2=80=AFAM Ed Maste wro= te: > > > > The branch main has been updated by emaste: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D91d35fb663e0276abc4963ae559e475= 9ea929842 > > > > commit 91d35fb663e0276abc4963ae559e4759ea929842 > > Author: Ed Maste > > AuthorDate: 2024-04-23 11:20:59 +0000 > > Commit: Ed Maste > > CommitDate: 2024-04-23 12:26:28 +0000 > > > > Remove WITHOUT_CAPSICUM build support > > > > Capsicum is non-optional as of c24c117b9644 ("Remove > > WITHOUT_{CAPSICUM,CASPER} options"). > > > > `#ifndef WITHOUT_CAPSICUM` is left in the source for the benefit of > > downstream consumers, but is never defined in FreeBSD. > > > > Reviewed by: oshogbo > > Sponsored by: The FreeBSD Foundation > > Differential Revision: https://reviews.freebsd.org/D42077 > > Should we now remove the caph_enter family of functions? Or do they > still have utility for downstream consumers? > --000000000000086c87061a8e8308 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello Alan,

Kernel still can be built without Capsi= cum support.
So caph_* functions still are useful.

Thanks,
Mar= iusz

On Mon, 10 Jun 2024 at 19:46, Alan Somers <asomers@freebsd.org> wrote:
On Tue, Apr 23, 2024 at 6:27=E2=80=AFAM Ed= Maste <emaste@f= reebsd.org> wrote:
>
> The branch main has been updated by emaste:
>
> URL: https://= cgit.FreeBSD.org/src/commit/?id=3D91d35fb663e0276abc4963ae559e4759ea929842<= /a>
>
> commit 91d35fb663e0276abc4963ae559e4759ea929842
> Author:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org>
> AuthorDate: 2024-04-23 11:20:59 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org>
> CommitDate: 2024-04-23 12:26:28 +0000
>
>=C2=A0 =C2=A0 =C2=A0Remove WITHOUT_CAPSICUM build support
>
>=C2=A0 =C2=A0 =C2=A0Capsicum is non-optional as of c24c117b9644 ("= Remove
>=C2=A0 =C2=A0 =C2=A0WITHOUT_{CAPSICUM,CASPER} options").
>
>=C2=A0 =C2=A0 =C2=A0`#ifndef WITHOUT_CAPSICUM` is left in the source fo= r the benefit of
>=C2=A0 =C2=A0 =C2=A0downstream consumers, but is never defined in FreeB= SD.
>
>=C2=A0 =C2=A0 =C2=A0Reviewed by:=C2=A0 =C2=A0 oshogbo
>=C2=A0 =C2=A0 =C2=A0Sponsored by:=C2=A0 =C2=A0The FreeBSD Foundation >=C2=A0 =C2=A0 =C2=A0Differential Revision:=C2=A0 https://revie= ws.freebsd.org/D42077

Should we now remove the caph_enter family of functions?=C2=A0 Or do they still have utility for downstream consumers?
--000000000000086c87061a8e8308-- From nobody Mon Jun 10 23:31: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 4Vyp3D3Lmmz5N7Yy; Mon, 10 Jun 2024 23:31:20 +0000 (UTC) (envelope-from rlibby@gmail.com) Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) (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 "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vyp3C3MNPz4bst; Mon, 10 Jun 2024 23:31:19 +0000 (UTC) (envelope-from rlibby@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=PPrsqTZf; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of rlibby@gmail.com designates 2a00:1450:4864:20::22e as permitted sender) smtp.mailfrom=rlibby@gmail.com Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2ebed33cbafso11372851fa.1; Mon, 10 Jun 2024 16:31:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718062275; x=1718667075; darn=freebsd.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=HR9RLGvpB6hmp5kvMy9vruVlowUG53VrVwT56QGrXdo=; b=PPrsqTZfYKrwruwqSC3qjD5UsvhDIiCKx6NK+goz1OzcBxpRqh8XFAjHcx0CSEWYsA busIevHCKy8a4LDLx7Eg7STbTvNesb0ZMWsgjmg9wET4Tfxm758T5lBDFGmtfmHpA4SN DALNoZydzopYKAlBzprCikw/UH04xvs/8pYOMz0/WJqcBEieFrtXUEAkzjyeKP0WNxsu Nv4QZ+7fmXu7tY6GRuS/b8GRh26bSESwCtL2nfHgcpivgs+SdpX1QDRJ12Wa10TJQNKf KNCa233HTVFYz5lxw7cbi643DvQucBg6/SXgO5l4HYW0uPv4Ak4PN865fhSdeJ8rGso4 LD3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718062275; x=1718667075; h=content-transfer-encoding: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=HR9RLGvpB6hmp5kvMy9vruVlowUG53VrVwT56QGrXdo=; b=Zkm9fDzTy3zJUcCNb955Zxpb6WtVyCTdaFEWqgAcQeSVYwbc6W0BsI423lykBT7ScX 2+OxU8YMGbQnoTqYDsQEtFZlgp7NRtmuRM7XjzrHJJf7Ddaw4PjRWcnU+Ifa6SbIFHj9 j3zIm4DvVD9AnsUzuoBXxaHqcaekvJC/j97n5fi3+HqXWSBlnALU1ytYDcx8fwR7MGrm vPD1548NWR+hkEY3DIRTXxzmOwGAssBXhJ/jj49gIQvsqznUDTNrvf+V6idbpOkLkLlc HUqameMG8+vg2Xky0B0Vi2noLDd8nVf00GRB4ByPWDASWAig1IMTsBIC+TrI4ppPkLzh DhRQ== X-Forwarded-Encrypted: i=1; AJvYcCVqUH/hJl9p94EGU2iin0hq+Fqe/htnQVWEs/zONHl7XZdJAnTt+3EBVJ3rIMYt6MFpx2u7m4zdJiO7BmOfg1RTqt42rXhk1LtBmlNAofFdDFeTlqw2reipeer1tmxV3GuUjK4lxN1T+VXOixALUlpS379yYZ+/vNXoDUsbUZjVp3XzfeY= X-Gm-Message-State: AOJu0Yyoq2enYEmEF0Cwtk/yKv5ciNDh8SfGbhG+WLLPW197jAil/2SM QFrfKI+qp14KSdtaodtlrAgvXipfG+sIbYMWdPhOqH4+/0YHAKyK/4ilajIkdahgA2oBDpwr7C/ pIADp2xu6PEfrA1YwtxAY+9EH65E5sDv+iOE= X-Google-Smtp-Source: AGHT+IFHF57uBrhTvu8f5ZlkpZEbN+EIKCOOrlJ/xDwGFjHlKczwnFciDWsBO7ej/2gsUL83YlaQtTNzXk+ATGYZekw= X-Received: by 2002:a05:6512:114a:b0:52c:8a39:83d7 with SMTP id 2adb3069b0e04-52c8a39846emr3026919e87.52.1718062274195; Mon, 10 Jun 2024 16:31:14 -0700 (PDT) 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202406081556.458FuJYN022360@gitrepo.freebsd.org> In-Reply-To: <202406081556.458FuJYN022360@gitrepo.freebsd.org> From: Ryan Libby Date: Mon, 10 Jun 2024 16:31:02 -0700 Message-ID: Subject: Re: git: 888796ade284 - main - libm: fma: correct zero sign with small inputs To: Ed Maste , kargl@freebsd.org Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: --- X-Spamd-Result: default: False [-4.00 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; R_SPF_ALLOW(-0.20)[+ip6:2a00:1450:4000::/36]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; RCVD_IN_DNSWL_NONE(0.00)[2a00:1450:4864:20::22e:from]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; MID_RHS_MATCH_FROMTLD(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_COUNT_ONE(0.00)[1]; FREEFALL_USER(0.00)[rlibby]; MISSING_XM_UA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com] X-Rspamd-Queue-Id: 4Vyp3C3MNPz4bst On Sat, Jun 8, 2024 at 8:56=E2=80=AFAM Ed Maste wrote: > > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D888796ade2842486d3167067e8= 034254c38aadd3 > > commit 888796ade2842486d3167067e8034254c38aadd3 > Author: Ed Maste > AuthorDate: 2024-03-19 14:31:39 +0000 > Commit: Ed Maste > CommitDate: 2024-06-08 15:55:36 +0000 > > libm: fma: correct zero sign with small inputs > > PR: 277783 > Reported by: Victor Stinner > Submitted by: kargl > MFC after: 1 week > Differential Revision: https://reviews.freebsd.org/D44433 > --- > lib/msun/src/s_fma.c | 4 +++- > lib/msun/src/s_fmal.c | 4 +++- > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/lib/msun/src/s_fma.c b/lib/msun/src/s_fma.c > index b8a342646d85..4d08b40cc71a 100644 > --- a/lib/msun/src/s_fma.c > +++ b/lib/msun/src/s_fma.c > @@ -267,7 +267,9 @@ fma(double x, double y, double z) > */ > fesetround(oround); > volatile double vzs =3D zs; /* XXX gcc CSE bug workaround= */ > - return (xy.hi + vzs + ldexp(xy.lo, spread)); > + xs =3D ldexp(xy.lo, spread); > + xy.hi +=3D vzs; > + return (xy.hi =3D=3D 0 ? xs : xy.hi + xs); > } > > if (oround !=3D FE_TONEAREST) { > diff --git a/lib/msun/src/s_fmal.c b/lib/msun/src/s_fmal.c > index 3d333632127c..12f9c364670b 100644 > --- a/lib/msun/src/s_fmal.c > +++ b/lib/msun/src/s_fmal.c > @@ -248,7 +248,9 @@ fmal(long double x, long double y, long double z) > */ > fesetround(oround); > volatile long double vzs =3D zs; /* XXX gcc CSE bug worka= round */ > - return (xy.hi + vzs + ldexpl(xy.lo, spread)); > + xs =3D ldexpl(xy.lo, spread); > + xy.hi +=3D vzs; > + return (xy.hi =3D=3D 0 ? xs : xy.hi + xs); > } > > if (oround !=3D FE_TONEAREST) { This seems to have caused the lib/msun/fma_tests:zeroes test to fail in the FE_ROUNDDOWN mode on amd64, now finding 0 while expecting -0. I don't know if the test is wrong or too strict, or if the new result is wrong. https://ci.freebsd.org/job/FreeBSD-main-amd64-test/25249/testReport/junit/l= ib.msun/fma_test/zeroes/ Reproduces with kyua debug -k /usr/tests/Kyuafile lib/msun/fma_test:zeroes Ryan From nobody Tue Jun 11 00:42: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 4Vyqcs3wzGz5NG8K; Tue, 11 Jun 2024 00:42: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 4Vyqcs3LTdz4gvM; Tue, 11 Jun 2024 00:42:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718066525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XWFV3eTLygesr5Ef65UtKkqdJertJNz8LE9gLwulYg=; b=CoTSL3XCuvgLtlHfL53/2o3mfYqEQ3SWmHfBUeeRWfMj+MZk0rcArKX70+fY/fAIX0RduH wxfoMd7l9agBPHN3AAbEBlHhz4SBvbEKOEC0riJ7WXzaY5TT6j3U4C8WKvz7yZDdoIlzEm MmUTOlZr4c4rP79HTiEDq9MYeFMd0OW7SGK//OG4tc22tKyYmUai2RAZMWJWTsHmxNJsZc WUo17mcDGy2r1X+0t6khTYd6IccLZIER+0cFYgo7tJnLj4F0RLJeduSEUL82lgz9uNqp8s 3M4FtlWgNUzIleXp2Mf8K7rQ1eCIFu7O4A2LuTfjN0mA6xaeHGGVQjneOfZivg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718066525; a=rsa-sha256; cv=none; b=SjT1ObU8U2k2S7ImfiqsBiYCGHJa6wafpbWTNCfnUZXN7CFQ3eBLRHZTTEMx7L99p0zopC 4ilSgBUoUisLgJ/qlvXrILCxJdwtAvbpCJ2IrVmQIFi+qDxlWzip+AI+tW2kDIPGRkkUtU 8TnAzstHhAkY/1gUlrAHEeBGA9mczNr97IIY188EAf2sWjj/vIAgg0ekCUldubkbRwl4B6 jJidfdRb8RH8UHLZpar2OiTMoiuJb7aEwBZUXdZhvuUhEVJP3hoo02YZnvf9XOrQSwWpjB jIp4f13aPbf29n5DDt4nTDns+BFHfKim/Qcx0k/eFfHkjXcnsEQTGi7QDnCazg== 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=1718066525; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XWFV3eTLygesr5Ef65UtKkqdJertJNz8LE9gLwulYg=; b=rbgJehzDbECDv7+MhHHV1/OBXfgEHC6ruGiV7pQGV6CEnZY5bwoXAakqz+n5gTbjs4+Cy1 AlyMOGmCfpi0pxyJAB011bd7TzZMzPUYR802GUi5tpqDJ1qn2tHLGKO8f4wraKP1/qudUe TIv6A0D7yxfPE6RGbN8SNGilo/YCnP+ZRV+fN9H3YVjdW9Ftlpp8hkut/gj6ClSjCvLLUQ gvHJM8mhPwI6cYkzOOllt34WfDBzxm0pjT+zi3XF8PTsW2g0EiZP6i0XWXolX1wnyIiyj9 Jm+USlvKIMX4ZAvMr10Za6BwBPcw5MAotTZYOh5Hh3zxm+3OhzrV6NavzNCS+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 4Vyqcs2xs8znhp; Tue, 11 Jun 2024 00:42: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 45B0g5gp082655; Tue, 11 Jun 2024 00:42:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45B0g5b2082652; Tue, 11 Jun 2024 00:42:05 GMT (envelope-from git) Date: Tue, 11 Jun 2024 00:42:05 GMT Message-Id: <202406110042.45B0g5b2082652@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: a2fda816eb05 - main - virstor: write large maps in chunks during label 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2fda816eb054d5873be223ef2461741dfcc253c Auto-Submitted: auto-generated The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=a2fda816eb054d5873be223ef2461741dfcc253c commit a2fda816eb054d5873be223ef2461741dfcc253c Author: Ryan Libby AuthorDate: 2024-06-11 00:36:20 +0000 Commit: Ryan Libby CommitDate: 2024-06-11 00:36:20 +0000 virstor: write large maps in chunks during label During the initial label of a virstor device, write out the allocation map in chunks if it is large (> 1 MB) in order to avoid large mallocs. Even though the kernel virstor geom may still do a large malloc to represent the allocation map, this may still be useful to avoid a ulimit. Reviewed by: markj Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D45517 --- lib/geom/virstor/geom_virstor.c | 59 ++++++++++++++++++++++++++++++----------- 1 file changed, 43 insertions(+), 16 deletions(-) diff --git a/lib/geom/virstor/geom_virstor.c b/lib/geom/virstor/geom_virstor.c index 131ece0107c7..6a7dfb27fe43 100644 --- a/lib/geom/virstor/geom_virstor.c +++ b/lib/geom/virstor/geom_virstor.c @@ -157,8 +157,7 @@ virstor_label(struct gctl_req *req) char param[32]; int hardcode, nargs, error; struct virstor_map_entry *map; - size_t total_chunks; /* We'll run out of memory if - this needs to be bigger. */ + size_t total_chunks, write_max_map_entries; unsigned int map_chunks; /* Chunks needed by the map (map size). */ size_t map_size; /* In bytes. */ ssize_t written; @@ -325,28 +324,56 @@ virstor_label(struct gctl_req *req) sprintf(param, "%s%s", _PATH_DEV, name); fd = open(param, O_RDWR); } - if (fd < 0) + if (fd < 0) { gctl_error(req, "Cannot open provider %s to write map", name); + return; + } - /* Do it with calloc because there might be a need to set up chunk flags - * in the future */ - map = calloc(total_chunks, sizeof(*map)); + /* + * Initialize and write the map. Don't malloc the whole map at once, + * in case it's large. Use calloc because there might be a need to set + * up chunk flags in the future. + */ + write_max_map_entries = 1024 * 1024 / sizeof(*map); + if (write_max_map_entries > total_chunks) + write_max_map_entries = total_chunks; + map = calloc(write_max_map_entries, sizeof(*map)); if (map == NULL) { gctl_error(req, "Out of memory (need %zu bytes for allocation map)", - map_size); + write_max_map_entries * sizeof(*map)); + close(fd); + return; } - - written = pwrite(fd, map, map_size, 0); - free(map); - if ((size_t)written != map_size) { - if (verbose) { - fprintf(stderr, "\nTried to write %zu, written %zd (%s)\n", - map_size, written, strerror(errno)); + for (size_t chunk = 0; chunk < total_chunks; + chunk += write_max_map_entries) { + size_t bytes_to_write, entries_to_write; + + entries_to_write = total_chunks - chunk; + if (entries_to_write > write_max_map_entries) + entries_to_write = write_max_map_entries; + bytes_to_write = entries_to_write * sizeof(*map); + for (size_t off = 0; off < bytes_to_write; off += written) { + written = write(fd, ((char *)map) + off, + bytes_to_write - off); + if (written < 0) { + if (verbose) { + fprintf(stderr, + "\nError writing map at offset " + "%zu of %zu: %s\n", + chunk * sizeof(*map) + off, + map_size, strerror(errno)); + } + gctl_error(req, + "Error writing out allocation map!"); + free(map); + close(fd); + return; + } } - gctl_error(req, "Error writing out allocation map!"); - return; } + free(map); + map = NULL; close (fd); if (verbose) From nobody Tue Jun 11 00:42: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 4Vyqct5wJWz5NG8M; Tue, 11 Jun 2024 00:42: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 4Vyqct4hgSz4hDr; Tue, 11 Jun 2024 00:42:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718066526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pYGvoGtTff2JVuVia+V1ajuwXIsxAkjQ8jqbJQwgDuU=; b=DrTTqsHVngCtFnAwAROnikbjpjppsihyGK6mOEODCGJVSXM7oCajN+pGknXBQUXw73A9ZQ 6FYyrdYkN2xZdNw1zV04ILfcY8+1FDga8W988O+4Fty21mdpmmxKYclmHbf727xy0hWmoe qQ+uobaaV2NFZwdfshXDUato+qJIuGJvSKwQzOWF1UiTGbA8M3nV6iqXu79sK4J7HYrZ96 hqZICJvWLGctXLVLxQ89J/jJH/wtXejNv9TV5k8+iY+Ehc8JnQDi3hmHoVuuuGvYiMjIKd YwnrbatopXIdPQsjTvMllngRNnm0lBRGkt+uPQlzMmqUVk6GmkYflaWcT9gjFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718066526; a=rsa-sha256; cv=none; b=M6JC2veTHDg129qv24oodZNyPjLbgI+h4cIcbEEuXHSHGdusbDjBUYFRGKjM1qhSSmZrvs cta+h7PwgbiNwe5DTMPcMlr32gWMVk72cX2jA9AhXBgCpOQEAZ/BNjA1XpN3q2ocBvgHXq jN+NPwjEbixlX+Zw8zUUsv4lZSyCUups5G4YRCZywRck6EitxQSavuD/xYA43SNITlMEOc MLPectT+R3h9Heb8UOazxOoLVC/Qir7CPyu1BIegF0+lkUNoDqFgH87cqmT5NcorsZaDMR UXhVLMWkgx185DVBL38O8RqDbvluWtQVNzJ2XrmQ5T9+84BwTrRZp1MfMM4Sxg== 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=1718066526; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pYGvoGtTff2JVuVia+V1ajuwXIsxAkjQ8jqbJQwgDuU=; b=lPTPldBlVDKDiEYU89fd9vPAoaXCgSpaqIu7yubERkXM422lw1WYbJFepWy9ess0n2nIFY Cp+/dLWomHd8G4jEiRhKpO178uQ8NcJ3GtD7IbR57/w5OWo5c4sEiwJBcOUdoi8x/iFLY7 GuerWJNbpNO0gafuSdlFy7Jk0WOui6WqLfOtzuzX6SKapN0Wj5kToXMFXTGaeK6Uf17840 4fOz9jvei1Lq4v9/NHLaj41NgWF4t5eI3mzC+rlhNCsCm0OhjByCo4Ajgi21PcnDnAslXA Ju+jWx21YLAzWfciBlZGpc87gwpkmWxYXeBCnzzYV0+cyjMReXW77jyFJTjgww== 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 4Vyqct4Jt9znhs; Tue, 11 Jun 2024 00:42: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 45B0g6tP082706; Tue, 11 Jun 2024 00:42:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45B0g6aJ082703; Tue, 11 Jun 2024 00:42:06 GMT (envelope-from git) Date: Tue, 11 Jun 2024 00:42:06 GMT Message-Id: <202406110042.45B0g6aJ082703@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: e754909cb0ae - main - virstor: remove relation between chunk size and MAXPHYS 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e754909cb0aeaf759cddf79c14a04a42f8d894bc Auto-Submitted: auto-generated The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=e754909cb0aeaf759cddf79c14a04a42f8d894bc commit e754909cb0aeaf759cddf79c14a04a42f8d894bc Author: Ryan Libby AuthorDate: 2024-06-11 00:38:17 +0000 Commit: Ryan Libby CommitDate: 2024-06-11 00:38:17 +0000 virstor: remove relation between chunk size and MAXPHYS There's no reason why the virstor chunk size needs to relate to MAXPHYS. Remove it. Instead, just make sure that the chunk size is a multiple of the sector size. Reviewed by: imp Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D45518 --- lib/geom/virstor/geom_virstor.c | 40 ++++++++++++++-------------------------- 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/lib/geom/virstor/geom_virstor.c b/lib/geom/virstor/geom_virstor.c index 6a7dfb27fe43..5f5087e99213 100644 --- a/lib/geom/virstor/geom_virstor.c +++ b/lib/geom/virstor/geom_virstor.c @@ -195,27 +195,6 @@ virstor_label(struct gctl_req *req) return; } - if (md.md_chunk_size % MAXPHYS != 0) { - /* XXX: This is not strictly needed, but it's convenient to - * impose some limitations on it, so why not MAXPHYS. */ - size_t new_size = rounddown(md.md_chunk_size, MAXPHYS); - if (new_size < md.md_chunk_size) - new_size += MAXPHYS; - fprintf(stderr, "Resizing chunk size to be a multiple of " - "MAXPHYS (%d kB).\n", MAXPHYS / 1024); - fprintf(stderr, "New chunk size: %zu kB\n", new_size / 1024); - md.md_chunk_size = new_size; - } - - if (md.md_virsize % md.md_chunk_size != 0) { - off_t chunk_count = md.md_virsize / md.md_chunk_size; - md.md_virsize = chunk_count * md.md_chunk_size; - fprintf(stderr, "Resizing virtual size to be a multiple of " - "chunk size.\n"); - fprintf(stderr, "New virtual size: %zu MB\n", - (size_t)(md.md_virsize/(1024 * 1024))); - } - msize = secsize = 0; for (i = 1; i < (unsigned)nargs; i++) { snprintf(param, sizeof(param), "arg%u", i); @@ -240,11 +219,20 @@ virstor_label(struct gctl_req *req) } if (md.md_chunk_size % secsize != 0) { - fprintf(stderr, "Error: chunk size is not a multiple of sector " - "size."); - gctl_error(req, "Chunk size (in bytes) must be multiple of %u.", - (unsigned int)secsize); - return; + size_t new_size = roundup(md.md_chunk_size, secsize); + fprintf(stderr, "Resizing chunk size to be a multiple of " + "sector size (%zu bytes).\n", secsize); + fprintf(stderr, "New chunk size: %zu kB\n", new_size / 1024); + md.md_chunk_size = new_size; + } + + if (md.md_virsize % md.md_chunk_size != 0) { + off_t chunk_count = md.md_virsize / md.md_chunk_size; + md.md_virsize = chunk_count * md.md_chunk_size; + fprintf(stderr, "Resizing virtual size to be a multiple of " + "chunk size.\n"); + fprintf(stderr, "New virtual size: %zu MB\n", + (size_t)(md.md_virsize / (1024 * 1024))); } total_chunks = md.md_virsize / md.md_chunk_size; From nobody Tue Jun 11 02:57: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 4VytfC0Jqnz5NSn2 for ; Tue, 11 Jun 2024 02:58:27 +0000 (UTC) (envelope-from kargls@comcast.net) Received: from resqmta-a2p-658918.sys.comcast.net (resqmta-a2p-658918.sys.comcast.net [IPv6:2001:558:fd01:2bb4::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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4VytfB5PzKz4vMr for ; Tue, 11 Jun 2024 02:58:26 +0000 (UTC) (envelope-from kargls@comcast.net) Authentication-Results: mx1.freebsd.org; none Received: from resomta-a2p-647655.sys.comcast.net ([96.103.145.235]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 256/256 bits) (Client did not present a certificate) by resqmta-a2p-658918.sys.comcast.net with ESMTPS id GepvsEP5waLJkGriEsT3hw; Tue, 11 Jun 2024 02:58:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=20190202a; t=1718074698; bh=9v6Xc2S/uuN2YQFOTqlYJeElIta2L0eczBP0+LNAxB4=; h=Received:Received:Message-ID:Date:MIME-Version:Subject:To:From: Content-Type:Xfinity-Spam-Result; b=R2zKg9uP6fNezuWB2t36v8mxGmPR6zGwfPk1jCRZvPL4Hoz0k+mc6CQxNJnQfm/ar WTqp+VOZh0AHu/UWdI6abtiFkIA52mbqC9cYzW0i/IdLI39nZo2YBLt+aUvwQYvztx 8X02rHGkwPHBsrZqCHTMSdYP2dcW9oUS37Ac0B7ZljBAeeG5/XIY8zcL0Os4TA0pi8 pqX8Nch+c8LDDkFVhb9jtx1wSla4Kpva9Oc1xTOH+3dSri0dLKyIt44vJAfFD4vMb3 U7eY4BRsZVyJgsCuR3/11tLbg6NoeSAOF0IDjRpK3BPSmtF4MB9QuHwx1ZuS6jd4SF afhnd4cklwoEA== Received: from [10.0.0.95] ([76.146.78.191]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 256/256 bits) (Client did not present a certificate) by resomta-a2p-647655.sys.comcast.net with ESMTPSA id GrhqsfSpcfo1cGrhrsObbb; Tue, 11 Jun 2024 02:57:57 +0000 Message-ID: <2f772a89-50c5-4005-876e-8893e9f59e7c@comcast.net> Date: Mon, 10 Jun 2024 19:57:52 -0700 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 888796ade284 - main - libm: fma: correct zero sign with small inputs To: Ryan Libby , Ed Maste , kargl@freebsd.org Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202406081556.458FuJYN022360@gitrepo.freebsd.org> Content-Language: en-US From: Steve Kargl In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-CMAE-Envelope: MS4xfKd+yzzCJ9ABzc10O3zITYWGm/c2nTGn3hm3LwnyFGTLWplepUZBriP1sQEYc2UF4/A2i1HE5Kb8xjPPFw5xbQRLYswr6A61V9rJiiSoNexvbISXbJkX tcwnfGT7JDkARuLiR7LQbtsnjyOYW7rpI0M/8QxiVSvLKXXXY3RmHGPiGWpTQ121WgrsHQiUsiqQK7DZPyH7nO5jxRdE2fQJAz/+JnXmSPiURoYyEyP085bC FG2zGPY/q7xBmm9CfP8YeyIU6tTH8SYjIS0JBdkGcNyM5JDtAc29+p2oFmpp9+glndfcRfDxqDqcPrnG09XLX8zLktsB5VgPwTrbhWU5tTcpwy4W86jcDns/ ThfqZGpGTqpuLWAYWrdvJxKoyTOISA== 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:7922, ipnet:2001:558::/29, country:US] X-Rspamd-Queue-Id: 4VytfB5PzKz4vMr On 6/10/24 16:31, Ryan Libby wrote: > On Sat, Jun 8, 2024 at 8:56 AM Ed Maste wrote: >> The branch main has been updated by emaste: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=888796ade2842486d3167067e8034254c38aadd3 >> >> commit 888796ade2842486d3167067e8034254c38aadd3 >> Author: Ed Maste >> AuthorDate: 2024-03-19 14:31:39 +0000 >> Commit: Ed Maste >> CommitDate: 2024-06-08 15:55:36 +0000 >> >> libm: fma: correct zero sign with small inputs >> >> PR: 277783 >> Reported by: Victor Stinner >> Submitted by: kargl >> MFC after: 1 week >> Differential Revision: https://reviews.freebsd.org/D44433 >> --- >> lib/msun/src/s_fma.c | 4 +++- >> lib/msun/src/s_fmal.c | 4 +++- >> 2 files changed, 6 insertions(+), 2 deletions(-) >> >> diff --git a/lib/msun/src/s_fma.c b/lib/msun/src/s_fma.c >> index b8a342646d85..4d08b40cc71a 100644 >> --- a/lib/msun/src/s_fma.c >> +++ b/lib/msun/src/s_fma.c >> @@ -267,7 +267,9 @@ fma(double x, double y, double z) >> */ >> fesetround(oround); >> volatile double vzs = zs; /* XXX gcc CSE bug workaround */ >> - return (xy.hi + vzs + ldexp(xy.lo, spread)); >> + xs = ldexp(xy.lo, spread); >> + xy.hi += vzs; >> + return (xy.hi == 0 ? xs : xy.hi + xs); >> } >> >> if (oround != FE_TONEAREST) { >> diff --git a/lib/msun/src/s_fmal.c b/lib/msun/src/s_fmal.c >> index 3d333632127c..12f9c364670b 100644 >> --- a/lib/msun/src/s_fmal.c >> +++ b/lib/msun/src/s_fmal.c >> @@ -248,7 +248,9 @@ fmal(long double x, long double y, long double z) >> */ >> fesetround(oround); >> volatile long double vzs = zs; /* XXX gcc CSE bug workaround */ >> - return (xy.hi + vzs + ldexpl(xy.lo, spread)); >> + xs = ldexpl(xy.lo, spread); >> + xy.hi += vzs; >> + return (xy.hi == 0 ? xs : xy.hi + xs); >> } >> >> if (oround != FE_TONEAREST) { > This seems to have caused the lib/msun/fma_tests:zeroes test to fail in > the FE_ROUNDDOWN mode on amd64, now finding 0 while expecting -0. I > don't know if the test is wrong or too strict, or if the new result is > wrong. > > https://ci.freebsd.org/job/FreeBSD-main-amd64-test/25249/testReport/junit/lib.msun/fma_test/zeroes/ > > Reproduces with > kyua debug -k /usr/tests/Kyuafile lib/msun/fma_test:zeroes The test is unreadable except by the original author. I'll note that there is a comment in fma_test.c /*  * This is needed because clang constant-folds fma in ways that are incorrect  * in rounding modes other than FE_TONEAREST.  */ static volatile double one = 1.0; and the failing tests are     testall(-one, one, one, rd ? -0.0 : 0.0, ALL_STD_EXCEPT, 0);     testall(one, -one, one, rd ? -0.0 : 0.0, ALL_STD_EXCEPT, 0);     testall(-one, -one, -one, rd ? -0.0 : 0.0, ALL_STD_EXCEPT, 0); If one compares against MPFR,    fesetround(FE_TONEAREST);    dx = -1;    dy = dz = 1;    mpfr_fma(a, x, y, z, MPFR_RNDN);    mpfr_printf("% Re % e\n", a, fma(dx, dy, dz));    fesetround(FE_DOWNWARD);    mpfr_fma(a, x, y, z, MPFR_RNDD);    mpfr_printf("% Re % e\n", a, fma(dx, dy, dz));    fesetround(FE_UPWARD);    mpfr_fma(a, x, y, z, MPFR_RNDU);    mpfr_printf("% Re % e\n", a, fma(dx, dy, dz));    fesetround(FE_TOWARDZERO);    mpfr_fma(a, x, y, z, MPFR_RNDZ);    mpfr_printf("% Re % e\n", a, fma(dx, dy, dz)); % gcc13 -fno-builtin -o z a.c -I/usr/local/include -L/usr/local/lib -lmpfr -lgmp -lm % ./z  0.0000000000000000e+00  0.000000e+00 -0.0000000000000000e+00 -0.000000e+00  0.0000000000000000e+00  0.000000e+00  0.0000000000000000e+00  0.000000e+00  0.0000000000000000e+00  0.000000e+00 -0.0000000000000000e+00 -0.000000e+00  0.0000000000000000e+00  0.000000e+00  0.0000000000000000e+00  0.000000e+00  0.0000000000000000e+00  0.000000e+00 -0.0000000000000000e+00 -0.000000e+00  0.0000000000000000e+00  0.000000e+00  0.0000000000000000e+00  0.000000e+00 cc gives a similar result. -- steve From nobody Tue Jun 11 03:13: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 4Vytzv4C56z5NV2F; Tue, 11 Jun 2024 03:13:47 +0000 (UTC) (envelope-from kevans@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 4Vytzv3Wnpz4wkj; Tue, 11 Jun 2024 03:13:47 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718075627; 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=mbzGZv4Mc49xYLdn58m9Gv92nckSMVhZxoVgPNAxedI=; b=kxmTaoLmZjcwohiseZDolek0VZMRVTfmp76W5P+bpie6e5tIvLuK3hEGjYjKrNo2jZb068 0+jHADVCS9ZovCaXji0LdqyRZPmMPALXJHW8Lzk/B6VMOgv1bPID2ftHTXlEJOu22ypi6e IsowlOjprl0TZ9n5fu6d5qtInTSE6/UyGKq0trUIzAZaoBZ6SPZgipXcnKeGDL/JvlWJX+ 8o1a6lnesrfAd7xMQxAWrgXy1VAsOT4fMDOInO5PfvIdSvfcMDdnnu/g9mVgD7tRVJo4gg F2zEDJCPskstIkgD4ZlqISscUtYeqy+cGLt2OvGRWxiyk3kMqTaJN8Wg2RMeuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718075627; a=rsa-sha256; cv=none; b=adxApBotX8DpfGSN2Dz124u/jFjOtSwBzvVxqC33qV29j+HPP80nSSd/HrgjhOI3q7igQX F1F9yXU6QbI0x/FC/xVq9wlvM9S4QYLvioOIO0vL1WAQ9B0k42MJa/Faxr6N6iHm1j7Vb1 +af6SX0s1W+UQzL6MmtYuPoudYVFEoWhSmhNMQGivKSbez/6dx8VSKLKPx+BRnVyeHPpg4 4GHjX+aPCpKR40G2p3uhgxTOTVjZbDw+Gj0d0Vzk6jaUXPjzvRNQSVAmhnRAln4AmCYKa/ kU3qL1NMjGmrsDhREV3ZBYkxIlio5S3DpmUokI2mUN0BxDxjT2FkV1oIX0gRQA== 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=1718075627; 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=mbzGZv4Mc49xYLdn58m9Gv92nckSMVhZxoVgPNAxedI=; b=kX9jPmZgPjYDiSNT7rpFK2kfyn3f0gE9c7SJumxKdd2rAft28puICrkFqxgJNSOe8wvVyR XAjaQdjB/DkLM9YvmRO8Mh6Y9j3VJZoardd1wqhR8XMdjtZugDu/OBQ2ZW9ewJeErn0wY3 3PgJoDB9tTPcrFnR7syTnOd4WmVO/7r5TXIkIAD9/POehqNIXbYmQ+p1VYN5pUzzLyEKRQ pEb6cq7XyymMHfi1AxPaD4Dkm6C2UWFpcQhmexq5aUdO/XGrRk6cgJtckwORDDWsieB0cs 83lVkhnMoZq8E84FM82yTQk8wMTn6cvKXGK6l0ZZPhUAUS7Uf9B4GBWUofYJMA== Received: from [10.9.4.95] (unknown [209.182.120.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Vytzv0H3tz1R1V; Tue, 11 Jun 2024 03:13:46 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: <58e93be2-d0bc-403c-8aaf-6d3f5e0dd069@FreeBSD.org> Date: Mon, 10 Jun 2024 22:13:45 -0500 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 6e824f371301 - main - time: siginfo_recvd needs to be marked volatile To: Konstantin Belousov Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202405220537.44M5bugu007292@gitrepo.freebsd.org> Content-Language: en-US From: Kyle Evans In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 5/31/24 14:52, Konstantin Belousov wrote: > On Wed, May 22, 2024 at 05:37:56AM +0000, Kyle Evans wrote: >> The branch main has been updated by kevans: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=6e824f3713011f7955a4f88fb16445e8e2cbe72c >> >> commit 6e824f3713011f7955a4f88fb16445e8e2cbe72c >> Author: Kyle Evans >> AuthorDate: 2024-05-22 05:36:29 +0000 >> Commit: Kyle Evans >> CommitDate: 2024-05-22 05:37:41 +0000 >> >> time: siginfo_recvd needs to be marked volatile > I do not think so. It happens to work with the compilers we currently use. > Sorry, I meant to respond but it got lost somewhere in the stack. Can you expand on this specifically a bit more? I was under the impression that we'd generally need volatility due to write from SIGINFO handler / read repeatedly from main(), which serves to demonstrate my ignorance here. Is it that there are sufficient side-effect-y things between loads in the wait4() loop that the compiler won't do anything hinky, or more that it's insufficient and should have been fenced as well? >> >> sig_atomic_t does not imply volatility, we must do it ourselves to avoid >> caching of siginfo_recvd loads. > For this purpose, standard provides atomic_signal_fence(). > > You would need to put it before read of siginfo_recvd (after wait4()), and > after update of siginfo_recvd in the signal handler. From nobody Tue Jun 11 05:56: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 4Vyybt5NXvz5NjwH for ; Tue, 11 Jun 2024 05:56:42 +0000 (UTC) (envelope-from kargls@comcast.net) Received: from resqmta-h2p-567353.sys.comcast.net (resqmta-h2p-567353.sys.comcast.net [IPv6:2001:558:fd02:2446::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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vyybs3SsGz3x9b for ; Tue, 11 Jun 2024 05:56:41 +0000 (UTC) (envelope-from kargls@comcast.net) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=comcast.net header.s=20190202a header.b=2yWC7pOz; dmarc=pass (policy=none) header.from=comcast.net; spf=pass (mx1.freebsd.org: domain of kargls@comcast.net designates 2001:558:fd02:2446::3 as permitted sender) smtp.mailfrom=kargls@comcast.net Received: from resomta-h2p-555359.sys.comcast.net ([96.102.179.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 256/256 bits) (Client did not present a certificate) by resqmta-h2p-567353.sys.comcast.net with ESMTPS id GuRfsRNqyTdNaGuUjsbJEp; Tue, 11 Jun 2024 05:56:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=20190202a; t=1718085393; bh=7vS0o2pEtJ4oUHOE2/uWA24W73x3CxZ60a+InyHxk4U=; h=Received:Received:Message-ID:Date:MIME-Version:Subject:From:To: Content-Type:Xfinity-Spam-Result; b=2yWC7pOzgz6iONvY/Psx0uHNphRin0QxuFtsY3lKOHSzgXB7pAlE2Geq3Yp6SDMg8 w8XYizJfMA+N0ZEAmSp0O7OdCYVDzz5+n+gCQSMJ1SPIVvgx4nDvLFA+2wmlD8BkAT s+914IKBqe1rI1xZBBTTiakY11gKieYp+5tjLQN7+aUqqCexLBTtXGFHJPGsHzZYJy HEQf+1gG53AUa1aLlJJkFvPlreAsOX3tZpM3bs1hZiUy4+bb6u9ngWqPrAMdaEpdDz 4Tt2Iy11EdNuhjGlqH3Jp1yRaZJYXlBhC1PBjvKRl15PeDS3V/o+dBBUndUa7gCL2N nedh7lWLlCIXA== Received: from [10.0.0.95] ([76.146.78.191]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 256/256 bits) (Client did not present a certificate) by resomta-h2p-555359.sys.comcast.net with ESMTPSA id GuUhs2vWhUCWWGuUisaIg1; Tue, 11 Jun 2024 05:56:33 +0000 Message-ID: Date: Mon, 10 Jun 2024 22:56:30 -0700 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 888796ade284 - main - libm: fma: correct zero sign with small inputs From: Steve Kargl To: Ryan Libby , Ed Maste , kargl@freebsd.org Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202406081556.458FuJYN022360@gitrepo.freebsd.org> <2f772a89-50c5-4005-876e-8893e9f59e7c@comcast.net> Content-Language: en-US In-Reply-To: <2f772a89-50c5-4005-876e-8893e9f59e7c@comcast.net> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-CMAE-Envelope: MS4xfGmDgPwnHk2ZNxkgKSgFgKMKZTHz6g+kxhGdmy5BXnrrqaasfBKknB0SZ+7SnJicP5kuK0WztNCzwt2ZHMYtf5ikmpCfQBojshS1vqNaAVvysBZhIlGD WGBnZ3j+1fZcD7eX2cnV0YQrGkV1UQhvNBsw8HyMtSYUKTXvPruI7DTxei9eblcIyEDmOSeXGIa4swiFMCVMaS6oRwPP0hdDffZiImH4n/br4ZxEGkSAFvmg sSPXBNZFLLD2sVdskqAh/TvHEBeBmArRqZoIxi4zv1mVqCpARF4v/qTN1XnX1XF6KoS11YZvVaP6dCyDnrB9Zj7aiDkM6hC8JHIrzg960qmHOm0lKXdf3643 z/Ie0dJlWHb+Zyp01JW8EfZw1JR+Hw== X-Spamd-Bar: / X-Spamd-Result: default: False [0.33 / 15.00]; HFILTER_HELO_5(3.00)[resqmta-h2p-567353.sys.comcast.net]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[comcast.net,none]; NEURAL_SPAM_SHORT(0.32)[0.317]; R_DKIM_ALLOW(-0.20)[comcast.net:s=20190202a]; R_SPF_ALLOW(-0.20)[+ip6:2001:558:fd02:2446::/64:c]; MIME_GOOD(-0.10)[text/plain]; XM_UA_NO_VERSION(0.01)[]; FREEMAIL_TO(0.00)[gmail.com,freebsd.org]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; FREEMAIL_FROM(0.00)[comcast.net]; FREEMAIL_ENVFROM(0.00)[comcast.net]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[comcast.net:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; DWL_DNSWL_NONE(0.00)[comcast.net:dkim]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:7922, ipnet:2001:558::/29, country:US]; RCPT_COUNT_FIVE(0.00)[6] X-Rspamd-Queue-Id: 4Vyybs3SsGz3x9b On 6/10/24 19:57, Steve Kargl wrote > > % gcc13 -fno-builtin -o z a.c -I/usr/local/include -L/usr/local/lib > -lmpfr -lgmp -lm > % ./z >  0.0000000000000000e+00  0.000000e+00 > -0.0000000000000000e+00 -0.000000e+00 >  0.0000000000000000e+00  0.000000e+00 >  0.0000000000000000e+00  0.000000e+00 I was in the wrong source tree.  Ryan is right that there seems to be an issue. I need to go back to the original test to see what corner fma[l] is hitting. -- steve From nobody Tue Jun 11 07:39: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 4Vz0tQ3hn7z5NrtT; Tue, 11 Jun 2024 07:39: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 4Vz0tQ2BJTz45r1; Tue, 11 Jun 2024 07:39:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718091566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JwKpq69yxlz18qgXNeDEvupfk9JvomfPXYFyTkK7+3E=; b=ADZtI2K932Rw3AUTBPM3yi6Prw7pT3GpKaZs0jPIazQVOm4zH8MxxjbwgxNGdc7RMeBVjL QQdku36OjQl0L+EykX4zsgUNzEa+XoZHG5tqvuUek9HhjkrZ3w5WU7lXP+tK5ozf0jz04A ZIRsA/nBITUUb545wHwUR6+g7Wk35pHjHgeQ9GJ9kw8IeH2YFXbGpeGpvBc/oEFNIHIrU2 qIlgWmKqYtC6FLdFNqr+9i3HOKvLAGqJL8OwXZzfqYtUgxFSIWiLD+PQQ8a1EKIv056IR+ uM1f+7c/QHTbPVrhw8RkymNZ+fF2N0ZqvmbDrBX0r4EMut9LksjfU7xDSiNJIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718091566; a=rsa-sha256; cv=none; b=NCssFBbRLFackfoOa1nSx37YsI5Y6xwcSkrP8uAmT0fF/voc96xKtvinAPqu6/ZxoxwCMi i5zZAx5RCh+ST12GuIPo7Rjb51J2bXX0ofa8zcpywb1mfmh6Ku9nj8btJhT209v9/U3CPt HWx963iPQt6/Vto2aig78rDfboL7lKqH+06NV9t4beCzBBCbWaurd2EvdqlKjHHX8imOKO oDVhERYca3UxC5MR7gO+2Fj99oDTXSAw8rV9CSSFFdXlPoGabZVCrDhA/Qpuj+UEgSsefE 6wKqFzFXwky6I6xa9u/gZSUFs106a15et22XlupLIq3qpzRfNHcXVPpMdmNDxw== 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=1718091566; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JwKpq69yxlz18qgXNeDEvupfk9JvomfPXYFyTkK7+3E=; b=hrlvKBhL9vVvu+OMylJqJw8TuLFC4SdXU8GFPQXN/cur53DdUGmhKZQfYo75Ou2KHAxe2G xDG9zUJUwhsqHHTlMfiHzP7yTKT8/sZxctpI8S7fh9kGRbmH7X83muecyRzKnor8LFCIHF EUZt/pbxHfZGcQyTEb+blrf9ES1eEDno3uhL5V8P7oIAfe8R0QyTLXC7q2RHtiG0Uq0k5R 04eTDDRVr+ns/V7HTO65Qz1PLrqcD6++0YC5gJpPm2ydCkmAHtrykbNcs/PKZ1QBynKJ75 e4i2Z63x5krz3PBuKcCkOa4ZxHsctKR6aT0Qi0fqKGRXo3NGB5+ENs+u1M5isA== 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 4Vz0tQ1cgsz10kR; Tue, 11 Jun 2024 07:39: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 45B7dQRs080010; Tue, 11 Jun 2024 07:39:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45B7dQfg080007; Tue, 11 Jun 2024 07:39:26 GMT (envelope-from git) Date: Tue, 11 Jun 2024 07:39:26 GMT Message-Id: <202406110739.45B7dQfg080007@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: f65d0b18d937 - main - stress2: Replace rename() with arc4random() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: f65d0b18d9372b522e247c7bd58422a7ab3d30d8 Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=f65d0b18d9372b522e247c7bd58422a7ab3d30d8 commit f65d0b18d9372b522e247c7bd58422a7ab3d30d8 Author: Peter Holm AuthorDate: 2024-06-11 07:38:13 +0000 Commit: Peter Holm CommitDate: 2024-06-11 07:38:13 +0000 stress2: Replace rename() with arc4random() --- tools/test/stress2/misc/nfsrename.sh | 4 ++-- tools/test/stress2/misc/umountf2.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/test/stress2/misc/nfsrename.sh b/tools/test/stress2/misc/nfsrename.sh index b6513fba1553..864c64aed8ac 100755 --- a/tools/test/stress2/misc/nfsrename.sh +++ b/tools/test/stress2/misc/nfsrename.sh @@ -137,7 +137,7 @@ write_file(void) unlink(path); } - fprintf(fp, "blah blah blah garbage %ld\n", random()); + fprintf(fp, "blah blah blah garbage %ld\n", (long)arc4random()); fclose(fp); if (rename(path, filename) < 0) { warn("rename"); @@ -150,7 +150,7 @@ random_sleep(int base, int slop) { long val; - val = random() % slop; + val = arc4random() % slop; usleep(base + val); } diff --git a/tools/test/stress2/misc/umountf2.sh b/tools/test/stress2/misc/umountf2.sh index 5018a804c403..cd5b53616f97 100755 --- a/tools/test/stress2/misc/umountf2.sh +++ b/tools/test/stress2/misc/umountf2.sh @@ -886,11 +886,12 @@ test(void) { unsigned long offset; unsigned long size = maxoplen; - unsigned long rv = random(); + unsigned long rv; unsigned long op = rv % (3 + !lite + mapped_writes); /* turn off the map read if necessary */ + arc4random_buf(&rv, sizeof(rv)); if (op == 2 && !mapped_reads) op = 0; From nobody Tue Jun 11 10:12: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 4Vz4H847vdz5P50p; Tue, 11 Jun 2024 10:12: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 4Vz4H83hvRz4NPt; Tue, 11 Jun 2024 10:12:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718100756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MwCHNiTKYqRpoO8WnuxdwxIuC7NTiYBoQH8yk2WnvoQ=; b=cF7IWw3/9E3VIraGN38/b86XMIp9eG5Sf4wYFgZ8FPd/xYsqLokLIYYqwA3Jeo4ak7Q39s sn6X7JTPRarldmTPh0eFK1StFSDfyPx/EimpS/nZ1z6eBbryj3/q0EC3DCjCO/a/FSps4q Da5QfA8zy1qqwiueMQoKcunfe6YxKzSDUGJrgDPKtAD93nS+O0oi7sI0pf+0UU4wi1Aix6 h0XAykyRoSx5eqavVU3tm3CQO2gOoWSOf7SUQi6JnqOx38sHarHjBNp+tN1ThFOKDx5jcC UN7c9bMS/dxguSxjbtbiyS6NHE7QgwO7EyeZaEi/f7GSXJ2IF0ZziJxhViZizQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718100756; a=rsa-sha256; cv=none; b=rLis9+6+NezpCWB9eMrHCeCWmTvfPC9sLjnV6XunFsG42GVBdWU2IlcltwfYw49dT5/9VS INxQyBRhvh1qDWhYHfGpNsqdagG4YKxF/xRG56gYTKyqTQJS3FmY3xZJySZ2LeaLsziGf3 56hM8ZIHzZUnGoSzGDMv2x3O9jpJEmXpQQkvrMSgpp1P/sY/9FhfSCIgRkCta5SpVlRave dq45oP0YsOBY5n0VtShSgvYLe/Ju1suaICNxMCFUffMIXOknceCMz4OP/sYpOXzaNkqLqW 0bsYBuafLcCYo5VJPFoVf9taDY/MirTaituY062qhT9K30jCJLY+im1VD+KpSw== 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=1718100756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MwCHNiTKYqRpoO8WnuxdwxIuC7NTiYBoQH8yk2WnvoQ=; b=X/Tj71fcCsD74GmT5FIaX9LHCw+qJs0FT07NIls9jnJogvQ/Xas/OMlZoC1n9B7veAY+FY 9WoNb6PpGri8/tYRFGLq9qm42OCSfk7DM6AZ5FztWBsw6JY/Uc8syPAyBoTFfjZAVtEGyk /2pv24w9cKVeh3489SfD6TDpuIO6zG+uNZwIJgfdaMOpmiMrmylIRf3W++FQV7J8r+j6VI fjkl2hcTG9V7yMYX8TOlU+ehMhnwHvhpzOxY5W/snqSoXnSQ/moZZwYY+rpofpnHI7x4EV HGT4pESrS54Fc91losGgsQ2cd0diKtLqedVvQBi9M1IX5+N6HuYAPIRdtqMj8g== 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 4Vz4H82vt4z14Hd; Tue, 11 Jun 2024 10:12: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 45BACaAm049928; Tue, 11 Jun 2024 10:12:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45BACaFw049925; Tue, 11 Jun 2024 10:12:36 GMT (envelope-from git) Date: Tue, 11 Jun 2024 10:12:36 GMT Message-Id: <202406111012.45BACaFw049925@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wei Hu Subject: git: e02d20ddff7f - main - Hyper_V: add a boot parameter to tlb flush hypercall 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e02d20ddff7f9f9509b28095459327bc183dab8a Auto-Submitted: auto-generated The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=e02d20ddff7f9f9509b28095459327bc183dab8a commit e02d20ddff7f9f9509b28095459327bc183dab8a Author: Wei Hu AuthorDate: 2024-06-11 10:05:21 +0000 Commit: Wei Hu CommitDate: 2024-06-11 10:05:21 +0000 Hyper_V: add a boot parameter to tlb flush hypercall Add boot parameter hw.vmbus.tlb_hcall for tlb flush hypercall. By default it is set to 1 to allow hyercall tlb flush. It can be set to 0 in loader.conf to turn off hypercall and use system provided tlb flush routine. The change also changes flag in the per cpu contiguous memory allocation to no wait to avoid panic happened some cases which there are no enough contiguous memery available at boot time. Reported by: gbe Tested by: whu MFC after: 1 week Fixes: 2b887687edc25bb4553f0d8a1183f454a85d413d Sponsored by: Microsoft --- sys/dev/hyperv/vmbus/vmbus.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/sys/dev/hyperv/vmbus/vmbus.c b/sys/dev/hyperv/vmbus/vmbus.c index c1fa9107d3c2..f55f0329b017 100644 --- a/sys/dev/hyperv/vmbus/vmbus.c +++ b/sys/dev/hyperv/vmbus/vmbus.c @@ -147,6 +147,13 @@ SYSCTL_NODE(_hw, OID_AUTO, vmbus, CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, static int vmbus_pin_evttask = 1; SYSCTL_INT(_hw_vmbus, OID_AUTO, pin_evttask, CTLFLAG_RDTUN, &vmbus_pin_evttask, 0, "Pin event tasks to their respective CPU"); + +#if defined(__x86_64__) +static int hv_tlb_hcall = 1; +SYSCTL_INT(_hw_vmbus, OID_AUTO, tlb_hcall , CTLFLAG_RDTUN, + &hv_tlb_hcall, 0, "Use Hyper_V hyercall for tlb flush"); +#endif + uint32_t vmbus_current_version; static const uint32_t vmbus_version[] = { @@ -756,8 +763,19 @@ vmbus_synic_setup(void *xsc) if (VMBUS_PCPU_GET(sc, vcpuid, cpu) > hv_max_vp_index) hv_max_vp_index = VMBUS_PCPU_GET(sc, vcpuid, cpu); hv_cpu_mem = DPCPU_ID_PTR(cpu, hv_pcpu_mem); - *hv_cpu_mem = contigmalloc(PAGE_SIZE, M_DEVBUF, M_WAITOK | M_ZERO, + *hv_cpu_mem = contigmalloc(PAGE_SIZE, M_DEVBUF, M_NOWAIT | M_ZERO, 0ul, ~0ul, PAGE_SIZE, 0); + +#if defined(__x86_64__) + if (*hv_cpu_mem == NULL && hv_tlb_hcall) { + hv_tlb_hcall = 0; + if (bootverbose && sc) + device_printf(sc->vmbus_dev, + "cannot alloc contig memory for hv_pcpu_mem, " + "use system provided tlb flush call.\n"); + } +#endif + /* * Setup the SynIC message. */ @@ -1502,7 +1520,8 @@ vmbus_doattach(struct vmbus_softc *sc) sc->vmbus_flags |= VMBUS_FLAG_SYNIC; #if defined(__x86_64__) - smp_targeted_tlb_shootdown = &hyperv_vm_tlb_flush; + if (hv_tlb_hcall) + smp_targeted_tlb_shootdown = &hyperv_vm_tlb_flush; #endif /* From nobody Tue Jun 11 13:12: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 4Vz8HC18XHz5Ldw2; Tue, 11 Jun 2024 13:12: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 4Vz8HC0WWgz4d3l; Tue, 11 Jun 2024 13:12:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718111575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HpKxnrp3lNs1s9NtP4I+KAK7UtHVeOzsmIPFP2iCrQw=; b=WAiZA8xxRImRGH8V3WP+AOQQmxq4mq6WKakOxjG0f+0dZ4CrpFA0o0geFsUPwiPSqWPjUz p4UsfRW9Gl7/YxDr8tVR2iocFvK82UddhchaqQf9fapqQ7YkVNUSKbBIJejV3WKRTpvXOY Ck07hpsEAS8WxLHywanXhMeGSHvZiWYWBxZqyxyfDA5QNEKjC3lgJ6A8jUVuGPccJ8BVD1 657d/M6UAD8lxeca3ab2bO/nfFbqNkOoUY9eBzEnpB+SSGhOFTMkg4i/Mcg109xsdg8XoF QZgXNj/uwW4TM9cV66aqHht+T3sSN8sUYtRrL9NDLM/HFQMV1oxWAdqL4765tA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718111575; a=rsa-sha256; cv=none; b=eNTRGP/jOWJzVqGbu1ZR2TKU+OJjmBtwFEq08JJJkvl+COBq4JQdNOmriZskuiFB16o9gT wLkAmAmimL7gmuzvs/uGlxVSnIL4aDR4/q68NbohriCNKpjyxwjqvdNbtdPJMO2bDgrTDc 7rysSHLFv8jgHVdkzEfkWZz2LJHzQORqRA/a+PY1Rpycjvc8gQNlppFa8OD7piCUFyxBHu P/O8uuv88V5tj8nhfEE8R6aCnkfJLI+Ix2nV6htFcNuH11FQM+Xi3EzNCHhugqORM+YDvu Z6J73VA1MiKtovMwa6pLNyCx8lHby6xOcyzrLrMzqTNSYEx1hQ/7KS84a6ULww== 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=1718111575; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HpKxnrp3lNs1s9NtP4I+KAK7UtHVeOzsmIPFP2iCrQw=; b=FSI8NkrMIhz/5qKhOWwitEeSr0X/tsdYrz+DK2MH/U6qN9t0c5eFY2LLOMQD8GNXiXKFLV HdRJ6YmzvUWUfjqF40nNCtiwpRMN5P62KhdBbO8+tsdfiqhQc1GHA2HZb+MybsNVoxKwGq 66oMGz5JOEEMfjD51GIk/XmCd6Bi1f+D4N6kgDX4IF+DM4IDNgF3oQ4Yr8wHAEQRDMLak4 Ikt0SK1r3W4LOLJa+FCuCXD1zhC2eoXf8MmiSN69dedZxn5Q/ceKXMRj0T4l6ttmIZ01e3 LpfX4Z73EdRNS1+pfgjhIp6PN+tr8r4Z6GJYy/DZVNBvXyBHsmEI7aCzr4VwGw== 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 4Vz8HC07Cqz191H; Tue, 11 Jun 2024 13:12: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 45BDCsDm054684; Tue, 11 Jun 2024 13:12:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45BDCsGI054681; Tue, 11 Jun 2024 13:12:54 GMT (envelope-from git) Date: Tue, 11 Jun 2024 13:12:54 GMT Message-Id: <202406111312.45BDCsGI054681@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: abf239cf097b - main - arm64/vmm: Add braces to fix the gcc build 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: abf239cf097b7a16defb9857027165427341c38c Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=abf239cf097b7a16defb9857027165427341c38c commit abf239cf097b7a16defb9857027165427341c38c Author: Andrew Turner AuthorDate: 2024-06-11 08:49:14 +0000 Commit: Andrew Turner CommitDate: 2024-06-11 13:12:43 +0000 arm64/vmm: Add braces to fix the gcc build Reviewed by: markj, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45548 --- sys/arm64/vmm/vmm_arm64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arm64/vmm/vmm_arm64.c b/sys/arm64/vmm/vmm_arm64.c index e0547bcef914..6b058a993cdd 100644 --- a/sys/arm64/vmm/vmm_arm64.c +++ b/sys/arm64/vmm/vmm_arm64.c @@ -1352,7 +1352,7 @@ vmmops_setcap(void *vcpui, int num, int val) switch (num) { case VM_CAP_BRK_EXIT: - if ((val != 0) == (hypctx->setcaps & (1ul << num)) != 0) + if ((val != 0) == ((hypctx->setcaps & (1ul << num)) != 0)) break; if (val != 0) hypctx->mdcr_el2 |= MDCR_EL2_TDE; @@ -1360,7 +1360,7 @@ vmmops_setcap(void *vcpui, int num, int val) hypctx->mdcr_el2 &= ~MDCR_EL2_TDE; break; case VM_CAP_SS_EXIT: - if ((val != 0) == (hypctx->setcaps & (1ul << num)) != 0) + if ((val != 0) == ((hypctx->setcaps & (1ul << num)) != 0)) break; if (val != 0) { @@ -1382,7 +1382,7 @@ vmmops_setcap(void *vcpui, int num, int val) } break; case VM_CAP_MASK_HWINTR: - if ((val != 0) == (hypctx->setcaps & (1ul << num)) != 0) + if ((val != 0) == ((hypctx->setcaps & (1ul << num)) != 0)) break; if (val != 0) { From nobody Tue Jun 11 13:12: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 4Vz8HD2R7bz5Ldn9; Tue, 11 Jun 2024 13:12:56 +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 4Vz8HD1X0wz4d8J; Tue, 11 Jun 2024 13:12:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718111576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MeEiukgf7ec9yqhbjHV1RM4cCw8WR9KtPHiqY20lbN8=; b=F3NCAQ6ZRBuV88QM/geIq0BOQAclj6KjuLld7qKpp9CSwuAuQaofpwWuyDOgj1MkSbFd2H 0rtT3uI5QdQwqlS+S/Te9YiWnboH1QrJm67EQGM/ujmnYskIF1MFfoFLqAsrcvxfExgGOZ M8R2jNayJYIHh+MJNnQ13lxlpYfzrRs0ZoiX65VTiIcGgoyjEw7z7Db1pK9Qt69P+Xvjer 3c9qXfrYkrmT/7VFve/N9x+G53kcRrVnf6vuR48B5AzmL02CW8dNJu6Gi6DCqxigO4jm9k guJWh7E5RITF49qiwg0JHx+8lPp7TjsI25V0pgu3hHyueErCAwz1cu+MuEX9dA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718111576; a=rsa-sha256; cv=none; b=jKUlOBd+rKLbiNEQM3ujvZ7of2qF51ZpUo2NCjRaVjMjL/LoXh4qDHCCz+Ecjui1QvikOC njBs6LyEOCTZnkbst5CZgXZPq645bT9L67bhFTJ1M5HAgI1JFuScTQD4FhKQkzPtw/uCCW lV7fQuJp0o7vE1vXryWBwMM8Ax9SWcxaF9/Bfe8Wqqhq46VaSZK7WzpCP+L/nJEdW4qGSG T19ar8jHO4zNtCLtQnv2hc3+cV/SPi2AE6yFHQYpNYwkDfEvlzG0ZeaY9Qdpw8LI9+rPHF d2hC9lK7WvG4E/+G28Byc7TLGhi9iCxgyG37/21TXStzK0RB9hiAsXrHg6PrVg== 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=1718111576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MeEiukgf7ec9yqhbjHV1RM4cCw8WR9KtPHiqY20lbN8=; b=NESnECreFea3SK4bjXaSuNP7a5Y+mfsopuh2dvh0cdGNMk9gau7dRT4MJW93X66hbtO9Ov u6BlU1ltjp7uVFItEgdLe31C7VGkOx/kWi2Av73CnwphCbpLeiWyAuzFRrLFikDyA8yMWN n7NtoGsd3+ogb7aHXKxYG7HwFy6FHUbPowc9KftM/0Dt9eo1Rqlj9k756GyBO9iktPMH4K mn/ES7iCUGu9tnfzhhdIDUMi9xLGGkIvaz2eZMOlszE2uMvOk9ESChpvzBO2G0qfFi3nTC 8AWbBMRr2RS3jN/YsIFPhHEhORbQZucedNClO5HCKOc4ZjEMAtgr1TGGuJJ1qA== 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 4Vz8HD17Nfz19Lc; Tue, 11 Jun 2024 13:12:56 +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 45BDCuP5054730; Tue, 11 Jun 2024 13:12:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45BDCuMc054727; Tue, 11 Jun 2024 13:12:56 GMT (envelope-from git) Date: Tue, 11 Jun 2024 13:12:56 GMT Message-Id: <202406111312.45BDCuMc054727@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: 9a4813e1dc17 - main - bhyve: Fix the build with gcc 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 9a4813e1dc1781d952d8db017fc7cc005095c6a0 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=9a4813e1dc1781d952d8db017fc7cc005095c6a0 commit 9a4813e1dc1781d952d8db017fc7cc005095c6a0 Author: Andrew Turner AuthorDate: 2024-06-11 08:49:32 +0000 Commit: Andrew Turner CommitDate: 2024-06-11 13:12:43 +0000 bhyve: Fix the build with gcc gcc doesn't like const and static to not be at the start of a variable declaration. Update the gdb_regset arrays to make it more obvious they are arrays of struct gdb_reg and to fix the gcc build. Reviewed by: corvink, markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45550 --- usr.sbin/bhyve/gdb.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/usr.sbin/bhyve/gdb.c b/usr.sbin/bhyve/gdb.c index 6df8026a0245..a13166e1e2c8 100644 --- a/usr.sbin/bhyve/gdb.c +++ b/usr.sbin/bhyve/gdb.c @@ -166,10 +166,10 @@ static bool gdb_active = false; struct gdb_reg { enum vm_reg_name id; int size; -} +}; #ifdef __amd64__ -static const gdb_regset[] = { +static const struct gdb_reg gdb_regset[] = { { .id = VM_REG_GUEST_RAX, .size = 8 }, { .id = VM_REG_GUEST_RBX, .size = 8 }, { .id = VM_REG_GUEST_RCX, .size = 8 }, @@ -212,7 +212,7 @@ static const gdb_regset[] = { { .id = VM_REG_GUEST_EFER, .size = 8 }, }; #else /* __aarch64__ */ -static const gdb_regset[] = { +static const struct gdb_reg gdb_regset[] = { { .id = VM_REG_GUEST_X0, .size = 8 }, { .id = VM_REG_GUEST_X1, .size = 8 }, { .id = VM_REG_GUEST_X2, .size = 8 }, From nobody Tue Jun 11 13:52: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 4Vz98d4FMwz5Lxwl; Tue, 11 Jun 2024 13:52: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 4Vz98d2JTxz4jCv; Tue, 11 Jun 2024 13:52:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718113937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T9HX3vOBq/AR7cQ+f9zgcxtz1udth20JzRFV5aPzJL4=; b=JAQgtHs+8bbrk1PYMoJYGlclmjtXgSTQ4cJ7tLMJwTKMG1Yh/JM54z1v8TVHwL+8PjIDOZ 5qiMnH104wGv8eAg4qGwaI9wNuncXY1vgHnZWap3n19od2xNnYk499m44rMTZ5SZLzAO6w kBIc00PeoSdtfcpAhEVRtYz5dSkrv3YnfMo60W63UYt50DoEOZs9cpIfaIdcWWbYu/22WK kkNvoG+V8s5R6X9uObbwN42I8A/RFttX3IRA7zkTPNDbELysCBUGR4EhxpbgvLFwSImnzW nXlcJcfYjfS1mSgb1g+pP37hW/K7+yrz2upwssgcmjkGI79akNR2bn9Kgo64eQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718113937; a=rsa-sha256; cv=none; b=YJCQZuHG+HRdORQ8KGre7Yfdvr6jpsHh4vWHsggk0+zZFez2nEAYVLrjpWezQxy7eBDAaZ 3RNc9KiFmJafNVBjxA37BpgJnj+ZftkhGG5KqVN8jOFdOMAnSj/XOWGKJVkzZGQVVLToYv 3FNrCK17Ul21VFbudUF3eQv8rG9Eqdtj4nmRFO7pAP1O2SGk3uYz9et7jJJlDEJIXnpj8X EJsoAuQIPLZ9kuWYYsUKoa2NCO3ct6oe7x2/ZWzvJIcPtooLK6v2LRgKkzvGMB6tIMLGyO hEzrbJBOcZmFgHguaU8uEw7XseKW9bBI5QPlhcl+1dHMkuVsGr7cd49pi2dIeg== 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=1718113937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T9HX3vOBq/AR7cQ+f9zgcxtz1udth20JzRFV5aPzJL4=; b=Sbe1bdB63Ms9Cv3L3EBz34jgcxKwc0rIIPWABF6iboLmht7EY7W7VMGtnhQPTncbF+FZV+ EBQqJgA0nUtCBRUxogRfN6DCBj0XzIi08xDXCazj+3oDYeWaWuX7q58Om0nTHDUfP9n61b I8PWruRlJK8jB9PjUhCNC8mz3Msfn9p9PscIk5P4qoHgzxfRhO2y91JE/FOCjrLWFDbgTh 8Aq4utBNoSYO7KWnv5ZvyjSYrMSfWSTBhVWEBtcqE0VaIFXZavlwUh7VaHdTZNYoJi1r3Q korsj25TdDZfgXEw1bwZ38fuBLUiksBrKybyWkxbYlEH0/9C0aYkoUAPuiL6Fw== 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 4Vz98d1wbVz19fK; Tue, 11 Jun 2024 13:52: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 45BDqHYo022142; Tue, 11 Jun 2024 13:52:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45BDqHoG022139; Tue, 11 Jun 2024 13:52:17 GMT (envelope-from git) Date: Tue, 11 Jun 2024 13:52:17 GMT Message-Id: <202406111352.45BDqHoG022139@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: cb53f83d8ad8 - main - Revert "stress2: Replace rename() with arc4random()" 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: cb53f83d8ad8ee6fd9778c38b30e71244254e5bb Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=cb53f83d8ad8ee6fd9778c38b30e71244254e5bb commit cb53f83d8ad8ee6fd9778c38b30e71244254e5bb Author: Peter Holm AuthorDate: 2024-06-11 13:51:21 +0000 Commit: Peter Holm CommitDate: 2024-06-11 13:51:21 +0000 Revert "stress2: Replace rename() with arc4random()" This reverts commit f65d0b18d9372b522e247c7bd58422a7ab3d30d8. Misleading commit message --- tools/test/stress2/misc/nfsrename.sh | 4 ++-- tools/test/stress2/misc/umountf2.sh | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/test/stress2/misc/nfsrename.sh b/tools/test/stress2/misc/nfsrename.sh index 864c64aed8ac..b6513fba1553 100755 --- a/tools/test/stress2/misc/nfsrename.sh +++ b/tools/test/stress2/misc/nfsrename.sh @@ -137,7 +137,7 @@ write_file(void) unlink(path); } - fprintf(fp, "blah blah blah garbage %ld\n", (long)arc4random()); + fprintf(fp, "blah blah blah garbage %ld\n", random()); fclose(fp); if (rename(path, filename) < 0) { warn("rename"); @@ -150,7 +150,7 @@ random_sleep(int base, int slop) { long val; - val = arc4random() % slop; + val = random() % slop; usleep(base + val); } diff --git a/tools/test/stress2/misc/umountf2.sh b/tools/test/stress2/misc/umountf2.sh index cd5b53616f97..5018a804c403 100755 --- a/tools/test/stress2/misc/umountf2.sh +++ b/tools/test/stress2/misc/umountf2.sh @@ -886,12 +886,11 @@ test(void) { unsigned long offset; unsigned long size = maxoplen; - unsigned long rv; + unsigned long rv = random(); unsigned long op = rv % (3 + !lite + mapped_writes); /* turn off the map read if necessary */ - arc4random_buf(&rv, sizeof(rv)); if (op == 2 && !mapped_reads) op = 0; From nobody Tue Jun 11 13:53: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 4Vz9BD5ZVqz5Ly8s; Tue, 11 Jun 2024 13:53: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 4Vz9BD51Bcz4jhg; Tue, 11 Jun 2024 13:53:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718114020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gqx9rxUu0kixtEs2AkdN9O9prToKqpYENgy09XKllo0=; b=PNAj/MOgSgOqB3FUW35FkUCiLQUUVd9h36m/qnPkbuhF0XC1QtOrRAzt1OZvuw05hB9GZt FZZxg/fFawRAVugVW+O8Tx8+zBP4COg6SVRSI9qainnrc/kaZR2jEmmYljG2VmygZ2iJ5k Lxkpj4VDNEiineIsBsDoDQmPorne+qUY8RQ312AjlDnioNcNA+ldthyasmRCBLvh14QxCQ YU8DCccqYsFY87ium1xhCig7ULrECmSSfzOSJdHoZ4gC898k2HkXnDlxS2Utl2s4ewmlBd 9RxRMywdaO2NyhqQQo6ELTPZLNJwKoUyI6xIawtjbrRbasDgpgdpHIgZb5AV9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718114020; a=rsa-sha256; cv=none; b=px8rjskrI61fOLPVYMPmVvHpmPJqvOPPW1qLW5POiwmOQB4OE+8FLTI3rmhnSTUe/OIF8r LW3oBfWBc8vOChsq8WnDAo3v4oCOo9N3nxbB4SA9xE0QGIKiHJRKmPTG3xpEkMn0fmzb/y fSmFhBJIIpNlde/42PGqQahjNCeg+P5SkbFexbS3QRZM5O8pcSiVBDWwhOgHVm0P80rUti tfNLL2NAm6BQ1+gMdyBqqS3MUD+hbPos8Qamwh3zNUsIFwxJmR70myf7toGN9pdFGyHpd/ RPJ8yRRyqEYrSr4iVGYo6HV8U42ALUKwS14VdF4IZVknmQx236enWs/nUVQDbA== 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=1718114020; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gqx9rxUu0kixtEs2AkdN9O9prToKqpYENgy09XKllo0=; b=ePgg3dr3pou7cwqk6wC1z9NYQHpcE4cRwh1nFUVFwKMW2OCUxaluXdPKMz9lQr6dS9s+H0 8og5qOlLuEeaa5G25Ra5wsqyC7i9njr0YLeTNRtlAC12zy7Sm9nPaIN/YAh7XDxe1E8GrE etmX2j9cF1GLieHTGI7BIZfqvRKVT8vTNQnYaf5EwMUiCqmG3KnxyDXEvFx9vgclvcxZSq +sPETcETccMQPshe5LmveAnCZ4wqjVJ+PfnPTNrutBqMv/656FgW6BgqlENezp0oRINW+/ vhpWgKWMFv9v1gl90JhZbzDh6i/q+YAyuGkf8Af3UXONHKwbpPLjWR4XNQf8wg== 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 4Vz9BD4SpYz1BKR; Tue, 11 Jun 2024 13:53: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 45BDreIe022473; Tue, 11 Jun 2024 13:53:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45BDremQ022470; Tue, 11 Jun 2024 13:53:40 GMT (envelope-from git) Date: Tue, 11 Jun 2024 13:53:40 GMT Message-Id: <202406111353.45BDremQ022470@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: ff4a72c159e0 - main - stress2: Replace random() with arc4random() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: ff4a72c159e06c15a4573b9a4b40f6dc55544538 Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=ff4a72c159e06c15a4573b9a4b40f6dc55544538 commit ff4a72c159e06c15a4573b9a4b40f6dc55544538 Author: Peter Holm AuthorDate: 2024-06-11 13:52:34 +0000 Commit: Peter Holm CommitDate: 2024-06-11 13:52:34 +0000 stress2: Replace random() with arc4random() --- tools/test/stress2/misc/nfsrename.sh | 4 ++-- tools/test/stress2/misc/umountf2.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/test/stress2/misc/nfsrename.sh b/tools/test/stress2/misc/nfsrename.sh index b6513fba1553..864c64aed8ac 100755 --- a/tools/test/stress2/misc/nfsrename.sh +++ b/tools/test/stress2/misc/nfsrename.sh @@ -137,7 +137,7 @@ write_file(void) unlink(path); } - fprintf(fp, "blah blah blah garbage %ld\n", random()); + fprintf(fp, "blah blah blah garbage %ld\n", (long)arc4random()); fclose(fp); if (rename(path, filename) < 0) { warn("rename"); @@ -150,7 +150,7 @@ random_sleep(int base, int slop) { long val; - val = random() % slop; + val = arc4random() % slop; usleep(base + val); } diff --git a/tools/test/stress2/misc/umountf2.sh b/tools/test/stress2/misc/umountf2.sh index 5018a804c403..cd5b53616f97 100755 --- a/tools/test/stress2/misc/umountf2.sh +++ b/tools/test/stress2/misc/umountf2.sh @@ -886,11 +886,12 @@ test(void) { unsigned long offset; unsigned long size = maxoplen; - unsigned long rv = random(); + unsigned long rv; unsigned long op = rv % (3 + !lite + mapped_writes); /* turn off the map read if necessary */ + arc4random_buf(&rv, sizeof(rv)); if (op == 2 && !mapped_reads) op = 0; From nobody Tue Jun 11 15:02: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 4VzBjL3ssrz5M4nZ; Tue, 11 Jun 2024 15:02: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 4VzBjL2Jfbz4rPs; Tue, 11 Jun 2024 15:02:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718118134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YxMg/QThTXuRykh+Q1LQbJP7h0XoMOeqeD1JWGCfqdk=; b=jptgu/AtE4JIaRBvP53dt7FMN1OuA30Sbl2alpWchCxE+z6G2l8WL94n6ROITseSU9pSD2 B7xMyabx3kFmf4FS/V0EE8tvt0KxEa1t9yGRUsDJzUR18eLoNs4T3ezgnSKwxwKfbkRjzC NOZnO8pm3UTAp9nUIch3KHzbX+iKsrz6lkXAF1m9J0PyvNk1HpIU5nTQ7+u2vwYMaYyhWz 0bCxa+Q1WT4Nxkhlglg2psvTGKl4YzyuNo1Q3K+KTJqeG/+ol/jv52tAXMMTXcWbOxNoi3 Z5/UdaLTfLpCFlF1CdPZRF3x9bdVPZqTpEe++zYezpV9slg+36HAZCJhO8FRAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718118134; a=rsa-sha256; cv=none; b=wdFjpjBn11EIBdS9XmTYnTPCAqHE8EWj4VwJYrb+IIjBpEPewStsrVdjolsxmFV4uGSM9l E2c5tOaxnbH/pD+kWxENQvtk0NPoYtmdU9ZNWXZ1n4X6YbgZDOzvAoZAs2LihameCJTxvy xdp8CkEsMClQI7Qsm4DID2exuoLHkoIYGeyYazjsPUdySTcclQ9cCD+BtmSxwtgssQBc8c deLvEmK8L2I5VnMgctDzJTndUcz1VIp8Qq6oH38mgNVpB1rnxyCnU/X3TJ/lSYPJmE/GlM 3mZWTidnh/G6cG5VWIXCeY/OHxyBsPG9dnnWlsx8IcQxN2l0+l4LjaE7dBVldw== 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=1718118134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YxMg/QThTXuRykh+Q1LQbJP7h0XoMOeqeD1JWGCfqdk=; b=jA5pJMYMIw6m8ebs2hZj/vMHiYXA9WbWg3iDDMFRDeQ0B7xdwzOqE6OleLm55w8X9FTOOJ K7hjDfY/uSUwd3fyrt6BTYBdpzVGrjqRtRkPgQRYgROEjaiZ4kaU77jP4uFtZibBcfsg3c m/J0nC3MRbZIZ4c1j5YSclmhA+KcLQ7KI4d/HKmbmpjpl9qE4/9husGq/owtRh2jD8fEKn EK7uMdMPiZLt35bT6Eu3Sp4+J37yhD19q4kXFpQCCJdIyAYdvhezckK5OPSGns9dlSL16Y B7J+orYBKHikPYjQ2cGMuLQykNPKD0lIoaQP+V8DqeIBe4E9WUB87tI0Y5uAjg== 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 4VzBjL1wRszDyl; Tue, 11 Jun 2024 15:02: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 45BF2Eau041814; Tue, 11 Jun 2024 15:02:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45BF2EQq041811; Tue, 11 Jun 2024 15:02:14 GMT (envelope-from git) Date: Tue, 11 Jun 2024 15:02:14 GMT Message-Id: <202406111502.45BF2EQq041811@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: 0277c0c6f72a - main - ktrace(1): add more xrefs 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 0277c0c6f72a964bf0439db1f4558551052e4f3b Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0277c0c6f72a964bf0439db1f4558551052e4f3b commit 0277c0c6f72a964bf0439db1f4558551052e4f3b Author: Ed Maste AuthorDate: 2024-06-11 00:31:08 +0000 Commit: Ed Maste CommitDate: 2024-06-11 15:02:00 +0000 ktrace(1): add more xrefs Following commit a87651e2ff18 add xrefs to intro(2) and sigaction(2), and use a consistent form. Suggested by: kib, arrowd Reviewed by: kib (earlier) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45555 --- usr.bin/ktrace/ktrace.1 | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/usr.bin/ktrace/ktrace.1 b/usr.bin/ktrace/ktrace.1 index 162706c65e6e..5cc6df52d69a 100644 --- a/usr.bin/ktrace/ktrace.1 +++ b/usr.bin/ktrace/ktrace.1 @@ -48,9 +48,13 @@ The utility enables kernel trace logging for the specified processes. Kernel trace data is logged to the file .Pa ktrace.out . -The kernel operations that are traced include system calls, -.Xr namei 9 -translations, signal processing, and +The kernel operations that are traced include system calls +.Pq see Xr intro 2 , +file system path lookups +.Pq Xr namei 9 , +signal processing +.Pq Xr sigaction 2 , +and .Tn I/O . .Pp Once tracing is enabled on a process, trace data will be logged until @@ -120,7 +124,9 @@ trace page faults trace .Tn I/O .It Cm n -trace namei translations +trace +.Xr namei 9 +translations .It Cm p trace capability check failures .It Cm s @@ -198,7 +204,9 @@ Disable tracing of all user-owned processes: .Xr dtrace 1 , .Xr kdump 1 , .Xr truss 1 , +.Xr intro 2 , .Xr ktrace 2 , +.Xr sigaction 2 , .Xr utrace 2 , .Xr capsicum 4 , .Xr namei 9 From nobody Tue Jun 11 16:38: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 4VzDrn2Ltnz5MG8d; Tue, 11 Jun 2024 16:38: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 4VzDrn1rM4z446Z; Tue, 11 Jun 2024 16:38:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718123929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X38Vb9Ae8sBST2naD9Wco9gIujfwVLxCgIiq+wxDbZo=; b=Hr7WkmXiVI9aRZgD56QWohYV7jWfBPNyHshdTS+RitGDZ5aY5HBJe5djAY6XN3lHTpDpxg 8+4EAL7zyAQHyvYjsGkzgR6kz++EKmx0PybznKIelQ215JUkin6GWvdNnLeb5iAhjvBs+e +ExBtBERTHEftb/FMWcbeF5+k7USZqem0aD6sE/dxgGkHUgnhH5vyyC4R9WYoDUH5K10jb BTA/fqI79c4LPOFdyatGBdezhkx1myw/+Ef0ADB0Rbcc1L3Au3QpXzx1EkH+dECLLJq9TY WiYYa2JFBxYNzZ4aFW1rvc+srH2ze9IKNm8M5hPh7j90S5xL3W6XVisrjsCbxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718123929; a=rsa-sha256; cv=none; b=uR4vV2goanb6NT4ovp15j/pobAGws4GfPm0KM5sXqTi2n7f2WyJv2DFPhMUk4NEs3r7BWr urgSeikNaFpSIaQKIXIHGaJwchtb540faEdjXB+oOHytp1Z79W63usPYOAbMWwOEt3arUw iy324MPNPH5/G7Nu0xjdpzenNf90lLlNtZ6x82Gy2SCmOFci4JyqCzjoTJijhk7YrDmlg5 y533GLUkKcDHHx1wPTLnRKFK5xJQBGZW+QOzFYKvJGxGDUavb2D1s6bSGM0tNt6h2pGqkt oIYCtdTiEwFpwBSNBeAsuMNUI+OEijp3vYToJYRN1l+817WoID0jMoHm4m0/eA== 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=1718123929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X38Vb9Ae8sBST2naD9Wco9gIujfwVLxCgIiq+wxDbZo=; b=u7Uvm0ezwDUx2EcsmrWQdpx4yUX9rhEkPp2IQkTRyRKneRB1NmGmgXws8mqu+fxHNkLwOA IPUVceEqlIsP6qSy0Ft0Sn/qj/hudP8jVSnm5Ue2MQY/5BHFf+SkIPZhNw/QbjLOIobsjU XXQyhg5uMpWHPyzjfTT/ZBw0fiiS1n9KTHKNKDXk4IpIRJFF3JyCS3O53iR9uBqOMr5+Fn 7LUqvlrKox94UcRbg4VsHsR/KuaLva3anQL0fBgzfAfQVjX/hCV/m8FfeZGBY1ZNKJGiNc ayMN3d9bpPtSxgi2ffKMWKlPWct1QV6zQ4BlI+rkgQHX6Y/Wqpt/Ji1Rt+ijkQ== 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 4VzDrn1KCHzHBX; Tue, 11 Jun 2024 16:38: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 45BGcnYx099473; Tue, 11 Jun 2024 16:38:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45BGcnhX099470; Tue, 11 Jun 2024 16:38:49 GMT (envelope-from git) Date: Tue, 11 Jun 2024 16:38:49 GMT Message-Id: <202406111638.45BGcnhX099470@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: dd0e5c02ab13 - main - swap_pager: small improvement to find_least 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd0e5c02ab13b9eb240d42a71a8f41a8b036bd33 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=dd0e5c02ab13b9eb240d42a71a8f41a8b036bd33 commit dd0e5c02ab13b9eb240d42a71a8f41a8b036bd33 Author: Doug Moore AuthorDate: 2024-06-11 16:36:23 +0000 Commit: Doug Moore CommitDate: 2024-06-11 16:36:23 +0000 swap_pager: small improvement to find_least Drop an unneeded test, a branch and a needless computation to save a few instructions. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D45558 --- sys/vm/swap_pager.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index a07a38481490..15f227457bba 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -2289,22 +2289,17 @@ swap_pager_find_least(vm_object_t object, vm_pindex_t pindex) VM_OBJECT_ASSERT_LOCKED(object); MPASS((object->flags & OBJ_SWAP) != 0); - if (pctrie_is_empty(&object->un_pager.swp.swp_blks)) - return (object->size); sb = SWAP_PCTRIE_LOOKUP_GE(&object->un_pager.swp.swp_blks, rounddown(pindex, SWAP_META_PAGES)); if (sb == NULL) return (object->size); - if (sb->p < pindex) { - for (i = pindex % SWAP_META_PAGES; i < SWAP_META_PAGES; i++) { - if (sb->d[i] != SWAPBLK_NONE) - return (sb->p + i); - } - sb = SWAP_PCTRIE_LOOKUP_GE(&object->un_pager.swp.swp_blks, - roundup(pindex, SWAP_META_PAGES)); - if (sb == NULL) - return (object->size); + for (i = pindex - sb->p; i < SWAP_META_PAGES; i++) { + if (sb->d[i] != SWAPBLK_NONE) + return (sb->p + i); } + sb = SWAP_PCTRIE_LOOKUP_GE(&object->un_pager.swp.swp_blks, pindex); + if (sb == NULL) + return (object->size); for (i = 0; i < SWAP_META_PAGES; i++) { if (sb->d[i] != SWAPBLK_NONE) return (sb->p + i); @@ -2314,7 +2309,7 @@ swap_pager_find_least(vm_object_t object, vm_pindex_t pindex) * We get here if a swblk is present in the trie but it * doesn't map any blocks. */ - MPASS(0); + __unreachable(); return (object->size); } From nobody Tue Jun 11 16:43: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 4VzDy53wVHz5MGq1; Tue, 11 Jun 2024 16:43: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 4VzDy536Trz44Zv; Tue, 11 Jun 2024 16:43:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718124205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+/op6jWVFt1MhhWmh0Kb+C0PO+NsZF3GQudXgYFRock=; b=bvkSI30x6yBnXIJuPYAZxkkGGmBl+jhx+4IXRfHSihWB9RtatsAKnELJC2YdFosX2LRMOm 12nVgM5TsUaVLqPW4V/MZ3sDUFO+2R3bggUvyjhDkEelxTJ3/4m6kBJ+t4gktQzSUTLLAD DSbBtGWNgI16q/d4FyXfhGP3zHo8THCyx/OJNZ09LiqWtVc9sv34FobXa4AVn+6AL9A+SZ JwBAE/71eBb6pvsJnta8VV8lEwut8BXjYOqv0hGUZfHSoDwY9nVPocmk2h/d+NQogAhwf8 HuWZ+b8bV3jrXm9Sjc+sgJUoN9S3Ln4hIZOWFgJqK3Oqd4MQpl8/zORJci34lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718124205; a=rsa-sha256; cv=none; b=UpO+Uqu16nOfZw+sstTJAdPA7O76lMMWq80Iue9Z40SSPaQni1BhmqDIBgK0AEkpoGk+Uo XIdkHJY5LJi5+S266kpgKYmSw4A1N52sd5WNnQw+fC/PkSIhytf9ckTqI0qLF82cwNI6Ts i1v/bNR4ewx3LZFE4oFUVAQtjA7mrrQlUgE3tcGh9Iy1RUeAnTNeVE0TByqV7fIlw4TtTU 56/Qb5mV3hSALw+2UjsLNPh0u4w5phwG7SsjykmUITETZseAwzkSpyLCq8QIZNhOOIphWs q6qYnPVlQaku9as8eLIRASibnrDYIyLAjEEwnGK3/a6gbTHK2b8hs4wUA9vkzw== 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=1718124205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+/op6jWVFt1MhhWmh0Kb+C0PO+NsZF3GQudXgYFRock=; b=BThHlTVcdmj3jR8A+QF6bAhszuUDgvPGx+sOBRVGBaotO8SZF3Y5kTO+aL/3D7ajq86H6o yPRpWFamJiD66U5fILDUZmQvr7Nr0nwPr4y6noFGiF7TI4Wrd8Y8ob72h1V0tLFX5vovz6 dKxI7pyDAVumWlnsv4H/zcRS4rxtD0wBajtqij+cRqM2NrB3uPsp6g9qAAL5jW12qgM8Jg rdGpPPoMGtnx+VMXyD0UdX8G+m8mhS7Thr8IaB21izATVETDNS8PsX/EvDgFWf7E1RMRi3 dsVpPNuIUYHqYG67q43ACCAudH4bG64gQBRukseNqjktcm36g+RYUD92cWHzew== 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 4VzDy52g2jzHC5; Tue, 11 Jun 2024 16:43: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 45BGhPPw015232; Tue, 11 Jun 2024 16:43:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45BGhP3k015229; Tue, 11 Jun 2024 16:43:25 GMT (envelope-from git) Date: Tue, 11 Jun 2024 16:43:25 GMT Message-Id: <202406111643.45BGhP3k015229@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: 703768a23590 - main - mx25l.4: Document the correct disk device 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 703768a23590d8faf65b0f16dd395248ff7273f6 Auto-Submitted: auto-generated The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=703768a23590d8faf65b0f16dd395248ff7273f6 commit 703768a23590d8faf65b0f16dd395248ff7273f6 Author: Jessica Clarke AuthorDate: 2024-06-11 16:43:18 +0000 Commit: Jessica Clarke CommitDate: 2024-06-11 16:43:18 +0000 mx25l.4: Document the correct disk device path This was true at time of commit, but the path was changed 2 weeks later to just be the /dev/flash/spiN name, without updating the manpage. Reported by: David Gilbert Fixes: 68dd77957786 ("Give the mx25l device sole ownership of the name /dev/flash/spi* ...") MFC after: 1 week --- share/man/man4/mx25l.4 | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/share/man/man4/mx25l.4 b/share/man/man4/mx25l.4 index ff2e78a8c5aa..5dffdebcf43e 100644 --- a/share/man/man4/mx25l.4 +++ b/share/man/man4/mx25l.4 @@ -22,7 +22,7 @@ .\" (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 26, 2019 +.Dd June 11, 2024 .Dt MX25L 4 .Os .Sh NAME @@ -60,7 +60,7 @@ such as block size, sector size, and device capacity. When a supported device is found, the .Nm driver creates a disk device and makes it accessible at -.Pa /dev/flash/mx25l? . +.Pa /dev/flash/spi? . The new disk device is then tasted by the available .Xr geom 4 modules as with any disk device. @@ -189,13 +189,9 @@ Set the high bit (1 << 31) to invert the logic level of the chip select line. The SPI mode (0-3) to use when communicating with this device. .El .Sh FILES -.Bl -tag -width /dev/flash/mx25l? -.It Pa /dev/flash/mx25l? -Provides read/write access to the storage device. +.Bl -tag -width /dev/flash/spi? .It Pa /dev/flash/spi? -An alias for the -.Pa /dev/mx25l? -device, for backwards compatibility with older versions of the driver. +Provides read/write access to the storage device. .El .Sh SEE ALSO .Xr fdt 4 , From nobody Wed Jun 12 00:30: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 4VzRK74YqMz5NKtm; Wed, 12 Jun 2024 00:30: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 4VzRK742sgz4mbH; Wed, 12 Jun 2024 00:30:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718152235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JRKbVD3dQ3xNwFCOc2SI/cRJwrYAE6F6g06U4wWX6bE=; b=M6cjWxodRcSkcUQPKBet0K5elqxhKjo1s2GN6LhuAKzXzMI3xlBP4+/NEg2Bf1DKKsTian PWf/RVv4QNdk3Mp8TZgqCGrMx2mINIQ63FlpOaqUXMvJDZgWrzAq/EwYNZOKHe2YNEuACt l0BkxhZSMQ+TN2pMIlEiK8b9fEKAevkLag7hLnPiAHtOHW27KOYCcCy9ZIGpfg2BaURKar hBv/WH8JKIEQeGX+oXSHm41VjhY0N3cuhGJt/JgUJtVhBfohneTP6MUpUtilBC0V0Ns44U VG2cZgtCoTW+iKXt0oZWhS/BSsboE4XSdk4IUgiRXGp8oU4DYoWyXNHZjk0IEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718152235; a=rsa-sha256; cv=none; b=icwCMPwa3tResbhvzcGOiPXvHGIepGiyk932pDqnt0tbsbWSDywno9owAsWeotF/gmTHuZ 2OCaMgCLtu0wmAbtLMtWmzgoexJdCzCC7P5pghLJOA1q2Wb5vHuzqtPx1FClDOQj5QA5JM 1zjHl2JYS/KVAAXnr+vP8FxyLkZLAkIv+raKPKpInmyDIj6E8XRBB4/CVrg7v8Uxg2Hdtm fxhvS7mlrTR2+sxHGorq8+O97M1W6EOBLv04kHwI480V0N3ycsGaW7sPEu1E18+aOfuAor EmJJ8d4vc5QZgeeFgX2T16EM1pA7zEVCry3M5IA4MXgc9xQ+hTcmws8Cam0p9w== 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=1718152235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JRKbVD3dQ3xNwFCOc2SI/cRJwrYAE6F6g06U4wWX6bE=; b=cWxOLcx849TDze3iNEH4/TO1TlJc4Z+P7ntvie8KYi2LDLD8lpXknrozBmiZJ4qmyDeDiQ c8IKPBAnaKu8Jyttc0fcBw8E/9Weg1H7AGBJ4ZSgSMh5NDlr07U4Mw8mnbk+sgCiNoPn3S 2AVqcdUDMj4gYkr/6Fl0otXW53A3gZRyMTFeAcbvVbjcV4kDTGhxZ01nN1gTR50j4hdOUv IhoKjAQ9c6DoVdwwZoy6Eyq2HefGvGDPQvjr5ouQab47g5MNh2Bpz+ppB2ns+dvJQ6REC3 NhF9/SzROXZTSn/1F25SycWiIwifACi9JDT4WB/bDJIpiOd6hzoZT/gEtWgfjg== 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 4VzRK73dg3zX5X; Wed, 12 Jun 2024 00:30: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 45C0UZw1001789; Wed, 12 Jun 2024 00:30:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45C0UZ2Q001786; Wed, 12 Jun 2024 00:30:35 GMT (envelope-from git) Date: Wed, 12 Jun 2024 00:30:35 GMT Message-Id: <202406120030.45C0UZ2Q001786@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: 92927b8bcf51 - main - msun: update Clang bug reference in fma 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 92927b8bcf51dcbcf99d633c1b3cab3cab2373ac Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=92927b8bcf51dcbcf99d633c1b3cab3cab2373ac commit 92927b8bcf51dcbcf99d633c1b3cab3cab2373ac Author: Ed Maste AuthorDate: 2024-06-12 00:23:44 +0000 Commit: Ed Maste CommitDate: 2024-06-12 00:29:27 +0000 msun: update Clang bug reference in fma test LLVM bugzilla bug 8100 became issue #8472 with the migration to GitHub. https://github.com/llvm/llvm-project/issues/8472 --- lib/msun/src/s_fma.c | 4 ++-- lib/msun/src/s_fmal.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/msun/src/s_fma.c b/lib/msun/src/s_fma.c index 4d08b40cc71a..686e80e66f5d 100644 --- a/lib/msun/src/s_fma.c +++ b/lib/msun/src/s_fma.c @@ -244,7 +244,7 @@ fma(double x, double y, double z) zs = copysign(DBL_MIN, zs); fesetround(FE_TONEAREST); - /* work around clang bug 8100 */ + /* work around clang issue #8472 */ volatile double vxs = xs; /* @@ -278,7 +278,7 @@ fma(double x, double y, double z) * rounding modes. */ fesetround(oround); - /* work around clang bug 8100 */ + /* work around clang issue #8472 */ volatile double vrlo = r.lo; adj = vrlo + xy.lo; return (ldexp(r.hi + adj, spread)); diff --git a/lib/msun/src/s_fmal.c b/lib/msun/src/s_fmal.c index 12f9c364670b..a53d85f5ca57 100644 --- a/lib/msun/src/s_fmal.c +++ b/lib/msun/src/s_fmal.c @@ -225,7 +225,7 @@ fmal(long double x, long double y, long double z) zs = copysignl(LDBL_MIN, zs); fesetround(FE_TONEAREST); - /* work around clang bug 8100 */ + /* work around clang issue #8472 */ volatile long double vxs = xs; /* @@ -259,7 +259,7 @@ fmal(long double x, long double y, long double z) * rounding modes. */ fesetround(oround); - /* work around clang bug 8100 */ + /* work around clang issue #8472 */ volatile long double vrlo = r.lo; adj = vrlo + xy.lo; return (ldexpl(r.hi + adj, spread)); From nobody Wed Jun 12 01:38: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 4VzSqP2Tc4z5NQm9; Wed, 12 Jun 2024 01:38: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 4VzSqP1psyz4rlk; Wed, 12 Jun 2024 01:38:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718156305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z5ZUCawdiz1kakdn1ERbDsO5LDDF/haEmFK/zuDPAMM=; b=bAIjXrhqKJRQoE7/fpb6UCXIhr2z4Z733IiQGL5KkYzLgvhuqjYTYlMHr1WLvyMzPDVwpq o1BYFK2c7wEszqlhJULLfmh4Zor70t9y2N6V4J4ytKDvAQ75ClUgjilXGzL5ubYHRDGNWs Bu5GeC+YGOh8wl+4W/7dGCaHG3bx1D0o03iwLwYEEnRutCX5QcIBWG7mE7ul7xnH8BEeK6 JiuCxJG9q3hXGWeEBwYbHjRP5DlvEtCnq7qimeg/NqnsR9gA17mZHsGYf5FBz5OMd2Oydj FtlxaNMNQOQW2Av2oHwY+t1/yn9XumXtuafbhOFW8qiCyqdIL8IC4GR6/454VA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718156305; a=rsa-sha256; cv=none; b=iOaTvudMez8tJrwIC2VMCu/e8WCHYHyltTug0lxVvXpfz4HdhWPHQKrW6BejnuaqmQsXmA TQvsmioTZWZk8kbMqrNfNMW0i/TiYQ1Fm8qomjFCExYxRS9/77vbgKnUlE0vgzGGhjYPEo tyodO7YVeGavAaqDBsUWsRVCveopZNMRoGkWoOm6eJs+CdZa+XblwQvCmpOHcHQh0K11hL tBwBiCVjbsq5Z2iYUMKm99npGy1vecb3Le/7/wZ5WdE1HmyoLQuaanZSd5SfvMWZavYoX8 nbEVRW42c5GL0h2qQ2Eg9g0FyIs+f7u5G4Ui1N/DAwNqn/phIAyyo0CZ98vp6A== 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=1718156305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z5ZUCawdiz1kakdn1ERbDsO5LDDF/haEmFK/zuDPAMM=; b=EeAdIIy4/hfegMTm4F+MWVga0kMJ1s3kfG/GOnsTBgmEjGkMbG62eJ6IuR4Uo2cOxq88Fv cYuQ9hUKonnBfH/2OVb/IhlpPcNVs/n8Eimr11th+XOFlHiMR9xW1oZJw5kN6RdmVfOweW zkiB9K8EgNONcxVbSf+JzUbpcyjukuiGXlx9m+btpkmJMTCeibh6EPtN32Qfy4a9j+Ms85 qEuMhVkWG7tJh2xLLD+PefWZSf2Z51rVYruyGfxHyj/B9TF7OxAJc3kY7Dym0AFbyx9GkM DHMSuPTlmSita5peFpiOYmZgznXRecFH6M6GRGNmCGgDG7cf121FKrTWNVV2Vg== 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 4VzSqP1PrkzYrb; Wed, 12 Jun 2024 01:38: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 45C1cPYW009738; Wed, 12 Jun 2024 01:38:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45C1cPvs009735; Wed, 12 Jun 2024 01:38:25 GMT (envelope-from git) Date: Wed, 12 Jun 2024 01:38:25 GMT Message-Id: <202406120138.45C1cPvs009735@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: e77ad954bb82 - main - Revert "libm: fma: correct zero sign with small inputs" 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: e77ad954bb825983b4346b9cc646c9c910b1be24 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e77ad954bb825983b4346b9cc646c9c910b1be24 commit e77ad954bb825983b4346b9cc646c9c910b1be24 Author: Ed Maste AuthorDate: 2024-06-12 01:34:02 +0000 Commit: Ed Maste CommitDate: 2024-06-12 01:36:12 +0000 Revert "libm: fma: correct zero sign with small inputs" This change introduced a test failure, so revert until that can be addressed. This reverts commit 888796ade2842486d3167067e8034254c38aadd3. PR: 277783 Reported by: rlibby Sponsored by: The FreeBSD Foundation --- lib/msun/src/s_fma.c | 4 +--- lib/msun/src/s_fmal.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/msun/src/s_fma.c b/lib/msun/src/s_fma.c index 686e80e66f5d..16902d321290 100644 --- a/lib/msun/src/s_fma.c +++ b/lib/msun/src/s_fma.c @@ -267,9 +267,7 @@ fma(double x, double y, double z) */ fesetround(oround); volatile double vzs = zs; /* XXX gcc CSE bug workaround */ - xs = ldexp(xy.lo, spread); - xy.hi += vzs; - return (xy.hi == 0 ? xs : xy.hi + xs); + return (xy.hi + vzs + ldexp(xy.lo, spread)); } if (oround != FE_TONEAREST) { diff --git a/lib/msun/src/s_fmal.c b/lib/msun/src/s_fmal.c index a53d85f5ca57..9d08bc72e12e 100644 --- a/lib/msun/src/s_fmal.c +++ b/lib/msun/src/s_fmal.c @@ -248,9 +248,7 @@ fmal(long double x, long double y, long double z) */ fesetround(oround); volatile long double vzs = zs; /* XXX gcc CSE bug workaround */ - xs = ldexpl(xy.lo, spread); - xy.hi += vzs; - return (xy.hi == 0 ? xs : xy.hi + xs); + return (xy.hi + vzs + ldexpl(xy.lo, spread)); } if (oround != FE_TONEAREST) { From nobody Wed Jun 12 02:00: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 4VzTJw3nhjz5NScb; Wed, 12 Jun 2024 02:00:32 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) (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 "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VzTJv4tXYz4vHW; Wed, 12 Jun 2024 02:00:31 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.49 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com Received: by mail-io1-f49.google.com with SMTP id ca18e2360f4ac-7eb6b1045f7so158971439f.3; Tue, 11 Jun 2024 19:00:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718157630; x=1718762430; h=content-transfer-encoding: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=adkH3B0P351fOCjwxemGWGrfCjIGNVmlsfWIbs7ua44=; b=Tvjx6qH0n87ENacRRxFPcKPNqpNxHJbfYESzk0KDnstB5VpWaXIEr/qSG7znbLej1G QZivKFYLTNPN5q6dZmllzVO3sVMLIOvycMKLhSXAlzUyF/z34cGu+0xh1HiStNRdWdyf l2Bx7k9yP+fiN924crtIJfkIxnlhJxq7CQ2S+hoqew0rSnHOwVF4RGivir61wJ2FTyNw RUwZM4ZonEDHqOYmDBl3XhNdIKDaN3vHzu5CKXVwaXfLW2i5z6u1yY17sDpuvADKLIPn GM46j1ww6TTVabxBIgdReYDiXc+LkFp8ktWnL6qvqxtU7cyeIxHTF5huWziAkSZo2NAz rHtQ== X-Forwarded-Encrypted: i=1; AJvYcCUKXWgW1HxjQeAwi7E/f0tHSuS4i4qowLwgZfrltPdlsdEO1iG5LKf0KbbIaqYZS+qjD0K8/tUzDp9jVGeHOLhoZfvHrcFRkzYyaU3lF/bQs5ZN7mm59qQ85s+4HliOnHF1aCFyvs/mYihLkbmL31GHZ9VKEIh1ct1J23GRLg6lyDfNx4MUkJmPOVP3Ri0= X-Gm-Message-State: AOJu0YxyVuFfqf7GYGQTJmDMrXrTuCZiQvE92debVFcWWg9Pj7pWcFOj rzk7QpPaSyBJ4OFeI9oA63VS4Alx4Hc3qW23SIKJkNlWkEE4lDcdBKIrAmRGcrO+n5jsJrMyLD6 24/S1QOK6RteHJ+/X8F1kLJ/SoX2lDQ== X-Google-Smtp-Source: AGHT+IFHnY/MmykvcAp/K70fUxb6B+vGwCoRtgpuw+rtPAi220Tx2ZstXCgeM61dK9T8DLJeLpEgd03kA2dq3nTixJg= X-Received: by 2002:a05:6602:14d4:b0:7eb:7df7:45fd with SMTP id ca18e2360f4ac-7ebcd1a1f5amr74923539f.21.1718157629719; Tue, 11 Jun 2024 19:00:29 -0700 (PDT) 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202406081556.458FuJYN022360@gitrepo.freebsd.org> In-Reply-To: From: Ed Maste Date: Tue, 11 Jun 2024 22:00:18 -0400 Message-ID: Subject: Re: git: 888796ade284 - main - libm: fma: correct zero sign with small inputs To: Ryan Libby Cc: kargl@freebsd.org, src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, Steve Kargl Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.89 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-0.995]; NEURAL_HAM_MEDIUM(-0.99)[-0.994]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), No valid DKIM,none]; MIME_GOOD(-0.10)[text/plain]; RCVD_TLS_LAST(0.00)[]; FREEMAIL_TO(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; FREEMAIL_CC(0.00)[freebsd.org,comcast.net]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.49:from]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; MISSING_XM_UA(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.49:from]; FREEFALL_USER(0.00)[carpeddiem]; RCPT_COUNT_FIVE(0.00)[6] X-Rspamd-Queue-Id: 4VzTJv4tXYz4vHW On Mon, 10 Jun 2024 at 19:31, Ryan Libby wrote: > > On Sat, Jun 8, 2024 at 8:56=E2=80=AFAM Ed Maste wrot= e: > > > > The branch main has been updated by emaste: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D888796ade2842486d3167067= e8034254c38aadd3 > > > > commit 888796ade2842486d3167067e8034254c38aadd3 > > Author: Ed Maste > > AuthorDate: 2024-03-19 14:31:39 +0000 > > Commit: Ed Maste > > CommitDate: 2024-06-08 15:55:36 +0000 > > > > ... > This seems to have caused the lib/msun/fma_tests:zeroes test to fail in > the FE_ROUNDDOWN mode on amd64, now finding 0 while expecting -0. I > don't know if the test is wrong or too strict, or if the new result is > wrong. Thanks - I have reverted the change for now to avoid leaving a failing test (even if it's actually the test at fault). I'll recommit it after the test situation is resolved. From nobody Wed Jun 12 03:23: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 4VzW9M3V6kz5NZJg; Wed, 12 Jun 2024 03:24:07 +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 4VzW9K5hHnz43dc; Wed, 12 Jun 2024 03:24:05 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=gmail.com (policy=none); spf=softfail (mx1.freebsd.org: 2001:470:d5e7:1::1 is neither permitted nor denied by domain of kostikbel@gmail.com) smtp.mailfrom=kostikbel@gmail.com 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 45C3NrdC017309; Wed, 12 Jun 2024 06:23:56 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 45C3NrdC017309 Received: (from kostik@localhost) by tom.home (8.18.1/8.18.1/Submit) id 45C3NraR017308; Wed, 12 Jun 2024 06:23:53 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Wed, 12 Jun 2024 06:23:53 +0300 From: Konstantin Belousov To: Kyle Evans Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 6e824f371301 - main - time: siginfo_recvd needs to be marked volatile Message-ID: References: <202405220537.44M5bugu007292@gitrepo.freebsd.org> <58e93be2-d0bc-403c-8aaf-6d3f5e0dd069@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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <58e93be2-d0bc-403c-8aaf-6d3f5e0dd069@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.1 X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on tom.home X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.80 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.80)[-0.801]; MIME_GOOD(-0.10)[text/plain]; DMARC_POLICY_SOFTFAIL(0.10)[gmail.com : No valid SPF, No valid DKIM,none]; ARC_NA(0.00)[]; ASN(0.00)[asn:6939, ipnet:2001:470::/32, country:US]; MIME_TRACE(0.00)[0:+]; MISSING_XM_UA(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; HAS_XAW(0.00)[]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[4] X-Rspamd-Queue-Id: 4VzW9K5hHnz43dc On Mon, Jun 10, 2024 at 10:13:45PM -0500, Kyle Evans wrote: > On 5/31/24 14:52, Konstantin Belousov wrote: > > On Wed, May 22, 2024 at 05:37:56AM +0000, Kyle Evans wrote: > > > The branch main has been updated by kevans: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=6e824f3713011f7955a4f88fb16445e8e2cbe72c > > > > > > commit 6e824f3713011f7955a4f88fb16445e8e2cbe72c > > > Author: Kyle Evans > > > AuthorDate: 2024-05-22 05:36:29 +0000 > > > Commit: Kyle Evans > > > CommitDate: 2024-05-22 05:37:41 +0000 > > > > > > time: siginfo_recvd needs to be marked volatile > > I do not think so. It happens to work with the compilers we currently use. > > > > Sorry, I meant to respond but it got lost somewhere in the stack. Can you > expand on this specifically a bit more? I was under the impression that > we'd generally need volatility due to write from SIGINFO handler / read > repeatedly from main(), which serves to demonstrate my ignorance here. Is > it that there are sufficient side-effect-y things between loads in the > wait4() loop that the compiler won't do anything hinky, or more that it's > insufficient and should have been fenced as well? Signal fence is provided by standard explicitly to handle the interaction between signal handler and 'main' code. On the other hand, description of the volatile semantic is vague and references possible side effects caused by something not known to the compiler, like memory-mapped device state. It happens that both gcc and clang effectively implement volatile accesses as relaxed atomics loads and stores. This is enough to ensure that the loop you wrote correctly interacts with the signal handler you wrote. But it is compiler-depended. It might be interesting to read gcc documentation about its implementation- dependent semantic of volaties, 'C implementation defined behavior-> Qualifiers' in the texinfo doc. > > > > sig_atomic_t does not imply volatility, we must do it ourselves to avoid > > > caching of siginfo_recvd loads. > > For this purpose, standard provides atomic_signal_fence(). > > > > You would need to put it before read of siginfo_recvd (after wait4()), and > > after update of siginfo_recvd in the signal handler. From nobody Wed Jun 12 03:54: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 4VzWrp2qjRz5Ncdt; Wed, 12 Jun 2024 03:54: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 4VzWrp1rr4z468T; Wed, 12 Jun 2024 03:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718164490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tX3lQ2WVcoB51bfG1ngqHvWsxHtQqnYlnrB8i8V7mLw=; b=Fp14KfoHDf+P9hgI2ffMgwkcR8/3kjHneIE86eDq/Hj8c+f2UZLP1Bh8f9pcyW6SJHfUzR 8SAF0pgsZjaHfnJksJVKL9/WmD9rX4iA/sTHKiSM1dopBKIQy5X7w2hxM3hGynCjgZ1Ic9 UgwwGLJ+PuXWr0K2+BQT4a4oOlTzZdQc/Fdg4u1kYRIQBN+qfYQYABDyQsSRNY5Jv0CDwy qGNnS3W/mfSsDEiVaZdFPFqSQnDFitc7qnSFWtyjRH9ciMq4o1rSS/oleAfIgQJtiu4EoO R07D2QPNRX+n5e9N8JmRc0T+ElBr5JYMFPQeO3DIZjdscWa6SKTkbQdXZ/Aggg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718164490; a=rsa-sha256; cv=none; b=XmDF38f7yPSSS5twWrnB18ONFlqY6gUp50mfaMpsDk4ElpyqW7xwAOa8ATvhOpuljB2AIv NEm8HHHylHwE1m0/+B0ZxztEL16/se5UIkWqDsVbnihLCDROHsTtLPiLbQ/JavGu1Pcz5M bmYd6wWvIggtIeqy8smTOpYre9zfpdggf7OXrpPt7rv50fwbl6lcWUB7O01AZ41Ybk9h8q YqxmdZw9cp3rqCA9tJrZ00J8Jpapkl4JXJWQlk2ddldETI/rVU5e+cIVSCL6oIkgvQsAn9 OjRugOpw+ucKca3LUCJoi4alHg2T20KG6WwMkqTWpxSMRTPdS2YzxEC6IvynEA== 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=1718164490; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tX3lQ2WVcoB51bfG1ngqHvWsxHtQqnYlnrB8i8V7mLw=; b=ZUb/bUeudWfleyOXXFdQb53jfWwd14NoVB6gb8B+c8b82m2kNJkv8mMyvpiYkLQK+a8DCi FWI+hJNqodWAzUa7olCuyXcJFu8PUi+TaSr2fYPd/at5P0k/8S/nMC+kbl7ciwgi7RW15d L2RFLoCj0c0FSW+LQmMRhopL0wIxCwWi5O2zjHyjWds007gAfWJyoxdIm741H8+bbF8WgI Wacyq2fqso1z8gsXLBBMhY41Ld75AEc2aSGQ1tqNcDq4cZY3YmU9poBzrOtrH3GsmynYvT D30CsgM7jxWaP5tFdwGMwUssidsCX//2gfcqOOrRqmFgyiKX7WaSomJluOsEaA== 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 4VzWrp13DczdPL; Wed, 12 Jun 2024 03:54: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 45C3sor1047138; Wed, 12 Jun 2024 03:54:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45C3soYJ047136; Wed, 12 Jun 2024 03:54:50 GMT (envelope-from git) Date: Wed, 12 Jun 2024 03:54:50 GMT Message-Id: <202406120354.45C3soYJ047136@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: a880104a21bf - main - swap_pager: add new page range struct 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a880104a21bf41ebbb4ead26e6d4adda32bad76c Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=a880104a21bf41ebbb4ead26e6d4adda32bad76c commit a880104a21bf41ebbb4ead26e6d4adda32bad76c Author: Doug Moore AuthorDate: 2024-06-12 03:51:40 +0000 Commit: Doug Moore CommitDate: 2024-06-12 03:54:39 +0000 swap_pager: add new page range struct Define a page_range struct to pair up the two values passed to freerange functions. Have swp_pager_freeswapspace also take a page_range argument rather than a pair of arguments. In swp_pager_meta_free_all, drop a needless test and use a new helper function to do the cleanup for each swap block. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D45562 --- sys/vm/swap_pager.c | 99 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 56 insertions(+), 43 deletions(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 15f227457bba..3bfda3eea169 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -142,6 +142,15 @@ struct swblk { daddr_t d[SWAP_META_PAGES]; }; +/* + * A page_range structure records the start address and length of a sequence of + * mapped page addresses. + */ +struct page_range { + daddr_t start; + daddr_t num; +}; + static MALLOC_DEFINE(M_VMPGDATA, "vm_pgdata", "swap pager private data"); static struct mtx sw_dev_mtx; static TAILQ_HEAD(, swdevt) swtailq = TAILQ_HEAD_INITIALIZER(swtailq); @@ -471,7 +480,7 @@ static int swapoff_one(struct swdevt *sp, struct ucred *cred, /* * Swap bitmap functions */ -static void swp_pager_freeswapspace(daddr_t blk, daddr_t npages); +static void swp_pager_freeswapspace(const struct page_range *range); static daddr_t swp_pager_getswapspace(int *npages); /* @@ -486,23 +495,21 @@ static void swp_pager_meta_free_all(vm_object_t); static daddr_t swp_pager_meta_lookup(vm_object_t, vm_pindex_t); static void -swp_pager_init_freerange(daddr_t *start, daddr_t *num) +swp_pager_init_freerange(struct page_range *range) { - - *start = SWAPBLK_NONE; - *num = 0; + range->start = SWAPBLK_NONE; + range->num = 0; } static void -swp_pager_update_freerange(daddr_t *start, daddr_t *num, daddr_t addr) +swp_pager_update_freerange(struct page_range *range, daddr_t addr) { - - if (*start + *num == addr) { - (*num)++; + if (range->start + range->num == addr) { + range->num++; } else { - swp_pager_freeswapspace(*start, *num); - *start = addr; - *num = 1; + swp_pager_freeswapspace(range); + range->start = addr; + range->num = 1; } } @@ -906,10 +913,13 @@ swp_pager_strategy(struct buf *bp) * This routine may not sleep. */ static void -swp_pager_freeswapspace(daddr_t blk, daddr_t npages) +swp_pager_freeswapspace(const struct page_range *range) { + daddr_t blk, npages; struct swdevt *sp; + blk = range->start; + npages = range->num; if (npages == 0) return; mtx_lock(&sw_dev_mtx); @@ -1004,11 +1014,12 @@ swap_pager_freespace_pgo(vm_object_t object, vm_pindex_t start, vm_size_t size) int swap_pager_reserve(vm_object_t object, vm_pindex_t start, vm_pindex_t size) { - daddr_t addr, blk, n_free, s_free; + struct page_range range; + daddr_t addr, blk; vm_pindex_t i, j; int n; - swp_pager_init_freerange(&s_free, &n_free); + swp_pager_init_freerange(&range); VM_OBJECT_WLOCK(object); for (i = 0; i < size; i += n) { n = MIN(size - i, INT_MAX); @@ -1022,11 +1033,10 @@ swap_pager_reserve(vm_object_t object, vm_pindex_t start, vm_pindex_t size) addr = swp_pager_meta_build(object, start + i + j, blk + j); if (addr != SWAPBLK_NONE) - swp_pager_update_freerange(&s_free, &n_free, - addr); + swp_pager_update_freerange(&range, addr); } } - swp_pager_freeswapspace(s_free, n_free); + swp_pager_freeswapspace(&range); VM_OBJECT_WUNLOCK(object); return (0); } @@ -1195,6 +1205,7 @@ swap_pager_haspage(vm_object_t object, vm_pindex_t pindex, int *before, static void swap_pager_unswapped(vm_page_t m) { + struct page_range range; struct swblk *sb; vm_object_t obj; @@ -1233,9 +1244,11 @@ swap_pager_unswapped(vm_page_t m) rounddown(m->pindex, SWAP_META_PAGES)); if (sb == NULL) return; - if (sb->d[m->pindex % SWAP_META_PAGES] == SWAPBLK_NONE) + range.start = sb->d[m->pindex % SWAP_META_PAGES]; + if (range.start == SWAPBLK_NONE) return; - swp_pager_freeswapspace(sb->d[m->pindex % SWAP_META_PAGES], 1); + range.num = 1; + swp_pager_freeswapspace(&range); sb->d[m->pindex % SWAP_META_PAGES] = SWAPBLK_NONE; swp_pager_free_empty_swblk(m->object, sb); } @@ -1480,8 +1493,9 @@ static void swap_pager_putpages(vm_object_t object, vm_page_t *ma, int count, int flags, int *rtvals) { + struct page_range range; struct buf *bp; - daddr_t addr, blk, n_free, s_free; + daddr_t addr, blk; vm_page_t mreq; int i, j, n; bool async; @@ -1492,7 +1506,7 @@ swap_pager_putpages(vm_object_t object, vm_page_t *ma, int count, VM_OBJECT_WUNLOCK(object); async = curproc == pageproc && (flags & VM_PAGER_PUT_SYNC) == 0; - swp_pager_init_freerange(&s_free, &n_free); + swp_pager_init_freerange(&range); /* * Assign swap blocks and issue I/O. We reallocate swap on the fly. @@ -1530,8 +1544,7 @@ swap_pager_putpages(vm_object_t object, vm_page_t *ma, int count, addr = swp_pager_meta_build(mreq->object, mreq->pindex, blk + j); if (addr != SWAPBLK_NONE) - swp_pager_update_freerange(&s_free, &n_free, - addr); + swp_pager_update_freerange(&range, addr); MPASS(mreq->dirty == VM_PAGE_BITS_ALL); mreq->oflags |= VPO_SWAPINPROG; } @@ -1603,7 +1616,7 @@ swap_pager_putpages(vm_object_t object, vm_page_t *ma, int count, */ swp_pager_async_iodone(bp); } - swp_pager_freeswapspace(s_free, n_free); + swp_pager_freeswapspace(&range); VM_OBJECT_WLOCK(object); } @@ -2131,9 +2144,9 @@ static void swp_pager_meta_transfer(vm_object_t srcobject, vm_object_t dstobject, vm_pindex_t pindex, vm_pindex_t count, vm_size_t *moved) { + struct page_range range; struct swblk *sb; vm_page_t m; - daddr_t n_free, s_free; vm_pindex_t offset, last; vm_size_t mc; int i, limit, start; @@ -2146,7 +2159,7 @@ swp_pager_meta_transfer(vm_object_t srcobject, vm_object_t dstobject, if (count == 0 || pctrie_is_empty(&srcobject->un_pager.swp.swp_blks)) goto out; - swp_pager_init_freerange(&s_free, &n_free); + swp_pager_init_freerange(&range); offset = pindex; last = pindex + count; for (;;) { @@ -2163,8 +2176,7 @@ swp_pager_meta_transfer(vm_object_t srcobject, vm_object_t dstobject, if (dstobject == NULL || !swp_pager_xfer_source(srcobject, dstobject, sb->p + i - offset, sb->d[i])) { - swp_pager_update_freerange(&s_free, &n_free, - sb->d[i]); + swp_pager_update_freerange(&range, sb->d[i]); } if (moved != NULL) { if (m != NULL && m->pindex != pindex + i - 1) @@ -2184,7 +2196,7 @@ swp_pager_meta_transfer(vm_object_t srcobject, vm_object_t dstobject, uma_zfree(swblk_zone, sb); } } - swp_pager_freeswapspace(s_free, n_free); + swp_pager_freeswapspace(&range); out: if (moved != NULL) *moved = mc; @@ -2207,6 +2219,16 @@ swp_pager_meta_free(vm_object_t object, vm_pindex_t pindex, vm_pindex_t count, swp_pager_meta_transfer(object, NULL, pindex, count, freed); } +static void +swp_pager_meta_free_block(struct swblk *sb, struct page_range *range) +{ + for (int i = 0; i < SWAP_META_PAGES; i++) { + if (sb->d[i] != SWAPBLK_NONE) + swp_pager_update_freerange(range, sb->d[i]); + } + uma_zfree(swblk_zone, sb); +} + /* * SWP_PAGER_META_FREE_ALL() - destroy all swap metadata associated with object * @@ -2217,28 +2239,19 @@ static void swp_pager_meta_free_all(vm_object_t object) { struct swblk *sb; - daddr_t n_free, s_free; + struct page_range range; vm_pindex_t pindex; - int i; VM_OBJECT_ASSERT_WLOCKED(object); - if (pctrie_is_empty(&object->un_pager.swp.swp_blks)) - return; - - swp_pager_init_freerange(&s_free, &n_free); + swp_pager_init_freerange(&range); for (pindex = 0; (sb = SWAP_PCTRIE_LOOKUP_GE( &object->un_pager.swp.swp_blks, pindex)) != NULL;) { pindex = sb->p + SWAP_META_PAGES; - for (i = 0; i < SWAP_META_PAGES; i++) { - if (sb->d[i] == SWAPBLK_NONE) - continue; - swp_pager_update_freerange(&s_free, &n_free, sb->d[i]); - } SWAP_PCTRIE_REMOVE(&object->un_pager.swp.swp_blks, sb->p); - uma_zfree(swblk_zone, sb); + swp_pager_meta_free_block(sb, &range); } - swp_pager_freeswapspace(s_free, n_free); + swp_pager_freeswapspace(&range); } /* From nobody Wed Jun 12 10:01: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 4VzgzN3HhPz5P7Pn; Wed, 12 Jun 2024 10:01: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 4VzgzN2PKJz4k5t; Wed, 12 Jun 2024 10:01:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718186464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wWUV6K9UNxCezBpjCNDfjJ8QLG+Tr1kzPLDBsQbcNhM=; b=puY/GWuTUGmyJpm1H4/m47ojeEvR89duHycCmnHoIFIyFt846gTsm9d/8/bDKidv8k8IJs aNqxJT/LOseBrZMw1MGPdfQgzVG3/W8lRL72vw6OUH+ac0ItPMHdxsqtYamDurFnNsrvBp pekTozVoZ4Co5PkmH4th39s9xNCQ+rqgE6QWmpGNME2ANGRRmn0TZDLbJ+h8BCa6FuOWka 4/Wt7z4YP422IaovXIe4rnJltq8pnokEowMJfbWPYliXT6Ywv/Q8DmVk3KaAuB0DrRYa2P Q0WR6FFy1a5Oy84YV3PgPHkNAgDHTXy7UsLC3f9qJYlSaRkMX4nmgPRRjEGh7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718186464; a=rsa-sha256; cv=none; b=h8yXjPm1BpX1b3OtOd7o8tzK0yAw+qP6jKGflAXuWbjbghZVu2AMfsVeK+jdzHlAfVBog5 r7PQJGJCoYa8HPpwWWvBna7ylsW72BcOhGTB7Mk5VqUOX9rkqloaqXt+xAPtZfksyl4hNS eXPktIbfcxxWhXX9KWkCYdA9GyZ77tXz21YUW0MkHr9E1KLTmEqZpXwGHMAENB0K+wTZNP sfDsLSpz8Ct1Zqk20d/f1iTMyN3gEsV937u6zZW1SplB4+L0PDjmNfIcU1dZoPNY4N+3qC ZlsjHRs6kWI2AgPI5P0fHfWN0GM3KEe/oI1B+UurIqslrKrknsrGL759ZwKLFw== 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=1718186464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wWUV6K9UNxCezBpjCNDfjJ8QLG+Tr1kzPLDBsQbcNhM=; b=h6cg4BAbjKCSi50E3uelj5wyhpmrDaJaaQbyU/Ob5vjqFtGNP1ZcWovyI45lUJvma28ukI g75ewO6A/g75hDIQlZWRYV9wwctCJt83OMmjpBwiOu7Mu58nTK2QIJTmC/Qmq90eo89BLC n/YJWth2oQoFLmpYYhxobBGBsz07ZnH6CP3UtbFwWF4Z9mfCasF0X1ZJnQ5JP9oulzbWkt kv0P8oivLmf4RVT82WLsXOO5HjzDicfO7ii7kOqUccS9/etP4eJpBxpL3XaxFTjyM6a8+J KRF4QvnGBt4S1CrgQKF3PO9WMiNRE6XHwSPdHNwz0KUThoSKjGKkM8MgY8JGjw== 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 4VzgzN1yFGzp4h; Wed, 12 Jun 2024 10:01: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 45CA14g7068427; Wed, 12 Jun 2024 10:01:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45CA14oS068424; Wed, 12 Jun 2024 10:01:04 GMT (envelope-from git) Date: Wed, 12 Jun 2024 10:01:04 GMT Message-Id: <202406121001.45CA14oS068424@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: f0a0420dfd36 - main - powerof2: replace loops with fls or ilog2 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f0a0420dfd36ae90f86cc9bfb1342b8862b8c9ec Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=f0a0420dfd36ae90f86cc9bfb1342b8862b8c9ec commit f0a0420dfd36ae90f86cc9bfb1342b8862b8c9ec Author: Doug Moore AuthorDate: 2024-06-12 09:26:42 +0000 Commit: Doug Moore CommitDate: 2024-06-12 10:00:48 +0000 powerof2: replace loops with fls or ilog2 In several places, a loop tests for powers of two, or iterates through powers of two. In those places, replace the loop with an invocation of fls or ilog2 without changing the meaning of the code. Reviewed by: alc, markj, kib, np, erj, avg (previous version) Differential Revision: https://reviews.freebsd.org/D45494 --- sys/dev/aic7xxx/aic79xx.c | 3 +-- sys/dev/cxgb/cxgb_sge.c | 7 ++----- sys/dev/cxgbe/t4_sge.c | 4 +--- sys/dev/irdma/irdma_ctrl.c | 16 +++++----------- sys/dev/mlx5/mlx5_en/mlx5_en_main.c | 4 +--- sys/netpfil/ipfw/ip_fw_table.c | 10 +--------- 6 files changed, 11 insertions(+), 33 deletions(-) diff --git a/sys/dev/aic7xxx/aic79xx.c b/sys/dev/aic7xxx/aic79xx.c index 0c4b615c5b24..ab68c3d8b088 100644 --- a/sys/dev/aic7xxx/aic79xx.c +++ b/sys/dev/aic7xxx/aic79xx.c @@ -8593,8 +8593,7 @@ ahd_loadseq(struct ahd_softc *ahd) if (sg_prefetch_align == 0) sg_prefetch_align = 8; /* Round down to the nearest power of 2. */ - while (powerof2(sg_prefetch_align) == 0) - sg_prefetch_align--; + sg_prefetch_align = 1 << ilog2(sg_prefetch_align); cacheline_mask = sg_prefetch_align - 1; diff --git a/sys/dev/cxgb/cxgb_sge.c b/sys/dev/cxgb/cxgb_sge.c index f57494065aec..0c5be9dd6614 100644 --- a/sys/dev/cxgb/cxgb_sge.c +++ b/sys/dev/cxgb/cxgb_sge.c @@ -553,9 +553,7 @@ t3_sge_prep(adapter_t *adap, struct sge_params *p) nqsets *= adap->params.nports; fl_q_size = min(nmbclusters/(3*nqsets), FL_Q_SIZE); - - while (!powerof2(fl_q_size)) - fl_q_size--; + fl_q_size = 1 << ilog2(fl_q_size); use_16k = cxgb_use_16k_clusters != -1 ? cxgb_use_16k_clusters : is_offload(adap); @@ -567,8 +565,7 @@ t3_sge_prep(adapter_t *adap, struct sge_params *p) jumbo_q_size = min(nmbjumbo9/(3*nqsets), JUMBO_Q_SIZE); jumbo_buf_size = MJUM9BYTES; } - while (!powerof2(jumbo_q_size)) - jumbo_q_size--; + jumbo_q_size = 1 << ilog2(jumbo_q_size); if (fl_q_size < (FL_Q_SIZE / 4) || jumbo_q_size < (JUMBO_Q_SIZE / 2)) device_printf(adap->dev, diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c index e1705ae063e2..505f2d1bf677 100644 --- a/sys/dev/cxgbe/t4_sge.c +++ b/sys/dev/cxgbe/t4_sge.c @@ -4220,9 +4220,7 @@ qsize_to_fthresh(int qsize) { u_int fthresh; - while (!powerof2(qsize)) - qsize++; - fthresh = ilog2(qsize); + fthresh = qsize == 0 ? 0 : fls(qsize - 1); if (fthresh > X_CIDXFLUSHTHRESH_128) fthresh = X_CIDXFLUSHTHRESH_128; diff --git a/sys/dev/irdma/irdma_ctrl.c b/sys/dev/irdma/irdma_ctrl.c index dc42b15392c5..6078ac43815e 100644 --- a/sys/dev/irdma/irdma_ctrl.c +++ b/sys/dev/irdma/irdma_ctrl.c @@ -4909,7 +4909,7 @@ irdma_cfg_fpm_val(struct irdma_sc_dev *dev, u32 qp_count) struct irdma_virt_mem virt_mem; u32 i, mem_size; u32 qpwanted, mrwanted, pblewanted; - u32 powerof2, hte; + u32 hte; u32 sd_needed; u32 sd_diff; u32 loop_count = 0; @@ -4938,12 +4938,8 @@ irdma_cfg_fpm_val(struct irdma_sc_dev *dev, u32 qp_count) hmc_info->sd_table.sd_cnt, max_sds); qpwanted = min(qp_count, hmc_info->hmc_obj[IRDMA_HMC_IW_QP].max_cnt); - - powerof2 = 1; - while (powerof2 <= qpwanted) - powerof2 *= 2; - powerof2 /= 2; - qpwanted = powerof2; + if (qpwanted != 0) + qpwanted = 1 << ilog2(qpwanted); mrwanted = hmc_info->hmc_obj[IRDMA_HMC_IW_MR].max_cnt; pblewanted = hmc_info->hmc_obj[IRDMA_HMC_IW_PBLE].max_cnt; @@ -4986,11 +4982,9 @@ irdma_cfg_fpm_val(struct irdma_sc_dev *dev, u32 qp_count) hmc_info->hmc_obj[IRDMA_HMC_IW_MR].cnt = mrwanted; hte = round_up(qpwanted + hmc_info->hmc_obj[IRDMA_HMC_IW_FSIMC].cnt, 512); - powerof2 = 1; - while (powerof2 < hte) - powerof2 *= 2; + hte = hte == 0 ? 1 : 1 << fls(hte - 1); hmc_info->hmc_obj[IRDMA_HMC_IW_HTE].cnt = - powerof2 * hmc_fpm_misc->ht_multiplier; + hte * hmc_fpm_misc->ht_multiplier; if (dev->hw_attrs.uk_attrs.hw_rev == IRDMA_GEN_1) cfg_fpm_value_gen_1(dev, hmc_info, qpwanted); else diff --git a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c index 962705e6d258..4d9d1048448b 100644 --- a/sys/dev/mlx5/mlx5_en/mlx5_en_main.c +++ b/sys/dev/mlx5/mlx5_en/mlx5_en_main.c @@ -2331,9 +2331,7 @@ mlx5e_get_wqe_sz(struct mlx5e_priv *priv, u32 *wqe_sz, u32 *nsegs) * Stride size is 16 * (n + 1), as the first segment is * control. */ - for (n = howmany(r, MLX5E_MAX_RX_BYTES); !powerof2(n + 1); n++) - ; - + n = (1 << fls(howmany(r, MLX5E_MAX_RX_BYTES))) - 1; if (n > MLX5E_MAX_BUSDMA_RX_SEGS) return (-ENOMEM); diff --git a/sys/netpfil/ipfw/ip_fw_table.c b/sys/netpfil/ipfw/ip_fw_table.c index b6847d43081b..5cf948ce39a2 100644 --- a/sys/netpfil/ipfw/ip_fw_table.c +++ b/sys/netpfil/ipfw/ip_fw_table.c @@ -1516,15 +1516,7 @@ static uint32_t roundup2p(uint32_t v) { - v--; - v |= v >> 1; - v |= v >> 2; - v |= v >> 4; - v |= v >> 8; - v |= v >> 16; - v++; - - return (v); + return (1 << fls(v - 1)); } /* From nobody Wed Jun 12 11:49: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 4VzkNS3hqQz5M4S1; Wed, 12 Jun 2024 11:49: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 4VzkNS2mFXz4vQL; Wed, 12 Jun 2024 11:49:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718192968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=86Zid2xS7c5HvhErU71LpIwsnHSEIiqrODELozBi3JY=; b=XESdT92N/onbUNd8maoXUuiMl8vxZSAUAeoed/KvMseLFSaBRx7fVX48e0gr1NIJCsfqU+ kQfZWO3QV5xgmuM2ANUBEjSWq6Ki++nf2GpttU3BtEH3p+fQxlYgoTaKZLVwzQXWRg94r8 c17jW04APojM2P2kg/COh48Utd+NHZOgI7N766/OG3XB0TBqSdMNVugmiuV0DiuBFAxHgT lpjF6gTGFoiw32sUw2DdlUpnvnAq1bLa2zk0qXXMyx4AwsAunwK0o9YHnDQxNGCl7B3Ckn qivH/y+Orj5dzvoVgOtbLppZHKAD3AAKYEtjGHivIkY14wtwLBMEXayKp7E5fA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718192968; a=rsa-sha256; cv=none; b=Jd1D5HmPn6Nasn1sK40q7qdCwl+9Pu5ASevef3DiwbKhQxMFMax5uRVsYwupkXMVs0KsOX HTdw3n3qCuZFj0rqhlNh1h01ya3lyfY6NxQr0PCypLTHaZ1sVNxpL271EqY+umWZME3GHA va7Owjy8d380Hivy4F5CLzmUQZDqdfUB+MpD46qRbFY0RvJx8jaM8HN1L8eWIEkUOBxiZj bT8xDWKmFQB6pOnqxYAFF6+V4EVI3dVOLVgFPs2OMmiWSXfvwV9Lcwt7E2Ik3t4ZKbdfYQ PXeI7RFn2eFQF6Di75iuqiWp7Club75U+d8M7Ye9zewYRv/c/6Jh4QSFiaAiqA== 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=1718192968; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=86Zid2xS7c5HvhErU71LpIwsnHSEIiqrODELozBi3JY=; b=NvAdZ8hczcWPVraNPWYVB1S/SBAuo94hFyvy4xgv4WEN6o/I+qtyTFxvkrEWYCaXhzKmAA Y/Axx+vFmVwKnDwXsLBH7dsLqhrl/VUnQZX1X9J0j8g/D7xnvZO6JuPLepHD4xhdLUYjq7 0o/QmOO7fpRYPaTuAfOofmJTEcnGLrVK86xlzhguJzwKtdOiqkmV+hlecTiRltSXIXcoAA kV00JiSXCqrMI3d1l4aHqih6h/iMk+U/1Z/8Hb9H/ba/OQzuJQ704tQv6u2goGIpSmZkb6 Jts/PrrYTqIZv7vdPaiPaGRfOpHmFG3QYWNnF0yrDhkz2zhIydmse4F7MBJFEg== 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 4VzkNS2MRGzrnX; Wed, 12 Jun 2024 11:49: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 45CBnSwS043158; Wed, 12 Jun 2024 11:49:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45CBnSLs043155; Wed, 12 Jun 2024 11:49:28 GMT (envelope-from git) Date: Wed, 12 Jun 2024 11:49:28 GMT Message-Id: <202406121149.45CBnSLs043155@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: b8a496dfb6df - main - lib: Remove __ARM_ARCH checks that are always true 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: b8a496dfb6df7b86e014d0d4476cd75850e060c1 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=b8a496dfb6df7b86e014d0d4476cd75850e060c1 commit b8a496dfb6df7b86e014d0d4476cd75850e060c1 Author: Andrew Turner AuthorDate: 2024-06-12 11:49:05 +0000 Commit: Andrew Turner CommitDate: 2024-06-12 11:49:05 +0000 lib: Remove __ARM_ARCH checks that are always true Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D45559 --- lib/libc/arm/aeabi/aeabi_vfp.h | 2 +- lib/libc/arm/gen/_setjmp.S | 8 ++++---- lib/libc/arm/gen/setjmp.S | 4 ++-- lib/libsys/arm/__vdso_gettc.c | 7 ------- lib/msun/arm/fenv.c | 6 +----- 5 files changed, 8 insertions(+), 19 deletions(-) diff --git a/lib/libc/arm/aeabi/aeabi_vfp.h b/lib/libc/arm/aeabi/aeabi_vfp.h index f87f9acfd0a2..3b70fe06fab3 100644 --- a/lib/libc/arm/aeabi/aeabi_vfp.h +++ b/lib/libc/arm/aeabi/aeabi_vfp.h @@ -65,7 +65,7 @@ * C Helper macros */ -#if __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC) +#if !defined(SOFTFLOAT_FOR_GCC) /* * Generate a function that will either call into the VFP implementation, * or the soft float version for a given __aeabi_* helper. The function diff --git a/lib/libc/arm/gen/_setjmp.S b/lib/libc/arm/gen/_setjmp.S index 19b8b6b07059..9e655d2e9e2e 100644 --- a/lib/libc/arm/gen/_setjmp.S +++ b/lib/libc/arm/gen/_setjmp.S @@ -58,12 +58,12 @@ ENTRY(_setjmp) ldr r1, .L_setjmp_magic -#if !defined(_STANDALONE) && __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC) +#if !defined(_STANDALONE) && !defined(SOFTFLOAT_FOR_GCC) add r2, r0, #(_JB_REG_D8 * 4) vstmia r2, {d8-d15} vmrs r2, fpscr str r2, [r0, #(_JB_REG_FPSCR * 4)] -#endif /* !_STANDALONE && __ARM_ARCH >= 6 */ +#endif /* !_STANDALONE && !SOFTFLOAT_FOR_GCC */ str r1, [r0] @@ -91,12 +91,12 @@ ENTRY(_longjmp) teq ip, r2 /* magic correct? */ bne botch /* no, botch */ -#if !defined(_STANDALONE) && __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC) +#if !defined(_STANDALONE) && !defined(SOFTFLOAT_FOR_GCC) add ip, r0, #(_JB_REG_D8 * 4) vldmia ip, {d8-d15} ldr ip, [r0, #(_JB_REG_FPSCR * 4)] vmsr fpscr, ip -#endif /* !_STANDALONE && __ARM_ARCH >= 6 */ +#endif /* !_STANDALONE && !SOFTFLOAT_FOR_GCC */ add r0, r0, #(_JB_REG_R4 * 4) /* Restore integer registers */ diff --git a/lib/libc/arm/gen/setjmp.S b/lib/libc/arm/gen/setjmp.S index 5a6c899e2b23..e7f8b788e878 100644 --- a/lib/libc/arm/gen/setjmp.S +++ b/lib/libc/arm/gen/setjmp.S @@ -61,7 +61,7 @@ ENTRY(setjmp) ldr r1, .Lsetjmp_magic -#if __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC) +#if !defined(SOFTFLOAT_FOR_GCC) add r2, r0, #(_JB_REG_D8 * 4) vstmia r2, {d8-d15} vmrs r2, fpscr @@ -102,7 +102,7 @@ ENTRY(__longjmp) bl PIC_SYM(_C_LABEL(sigprocmask), PLT) ldmfd sp!, {r0-r2, r14} -#if __ARM_ARCH >= 6 && !defined(SOFTFLOAT_FOR_GCC) +#if !defined(SOFTFLOAT_FOR_GCC) add ip, r0, #(_JB_REG_D8 * 4) vldmia ip, {d8-d15} ldr ip, [r0, #(_JB_REG_FPSCR * 4)] diff --git a/lib/libsys/arm/__vdso_gettc.c b/lib/libsys/arm/__vdso_gettc.c index ea70dec35cd8..cb4bdec1e8ef 100644 --- a/lib/libsys/arm/__vdso_gettc.c +++ b/lib/libsys/arm/__vdso_gettc.c @@ -37,7 +37,6 @@ #include #include "libc_private.h" -#if __ARM_ARCH >= 6 static inline uint64_t cp15_cntvct_get(void) { @@ -55,7 +54,6 @@ cp15_cntpct_get(void) __asm __volatile("mrrc\tp15, 0, %Q0, %R0, c14" : "=r" (reg)); return (reg); } -#endif #pragma weak __vdso_gettc int @@ -64,7 +62,6 @@ __vdso_gettc(const struct vdso_timehands *th, u_int *tc) if (th->th_algo != VDSO_TH_ALGO_ARM_GENTIM) return (ENOSYS); -#if __ARM_ARCH >= 6 /* * Userspace gettimeofday() is only enabled on ARMv7 CPUs, but * libc is compiled for ARMv6. Due to clang issues, .arch @@ -73,10 +70,6 @@ __vdso_gettc(const struct vdso_timehands *th, u_int *tc) __asm __volatile(".word\t0xf57ff06f" : : : "memory"); /* isb */ *tc = th->th_physical == 0 ? cp15_cntvct_get() : cp15_cntpct_get(); return (0); -#else - *tc = 0; - return (ENOSYS); -#endif } #pragma weak __vdso_gettimekeep diff --git a/lib/msun/arm/fenv.c b/lib/msun/arm/fenv.c index 9f172d5fd7c9..05b3adb05f81 100644 --- a/lib/msun/arm/fenv.c +++ b/lib/msun/arm/fenv.c @@ -32,10 +32,6 @@ #include -#if __ARM_ARCH >= 6 -#define FENV_ARMv6 -#endif - /* When SOFTFP_ABI is defined we are using the softfp ABI. */ #if defined(__VFP_FP__) && !defined(__ARM_PCS_VFP) #define SOFTFP_ABI @@ -52,7 +48,7 @@ const fenv_t __fe_dfl_env = 0; /* If this is a non-mangled softfp version special processing is required */ -#if defined(FENV_MANGLE) || !defined(SOFTFP_ABI) || !defined(FENV_ARMv6) +#if defined(FENV_MANGLE) || !defined(SOFTFP_ABI) /* * The following macros map between the softfloat emulator's flags and From nobody Wed Jun 12 11:49: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 4VzkNT4M8Fz5M4pL; Wed, 12 Jun 2024 11:49: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 4VzkNT3Vhjz4v91; Wed, 12 Jun 2024 11:49:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718192969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LrL/1MNDR84ZpMF1qMHRjz5dwfA0v5VLrZsLvSbl3rc=; b=nADg8x1YyqnJ+MdBdil7K4qgUvo4gH30kxDKtbXpUBdOjWl3jroR4H8UxXJEPWiOi5rwZ6 f9Cgnurf9had740oIov6ZHFbA0gsWCzfa5r+fpAP8yovAQpXboswbrTUQtVL8QsdupmAqH HibVwxjizIV6m9KY2SByyW4+btk3WBpxLLT850eqpD1iwGrsTdpsOK2nfAloTHixOe7gge W+EmYGcI68TCcl1qSFngdmX7WEDBoq+XYfcH2tMpLD69ZhK7XPN3BC3iRSx4ZgNx2Xi7lV DOVCM+6LIdyUsiCfH+4ro1miMFH3XkeEfrPY97u4RGrt/ALqYq0SP7tz7i3Dxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718192969; a=rsa-sha256; cv=none; b=PXgcVLyJ0saOF5RRc3NMMOYOimViA6O4lh/MzEwwKtusKChcE8TmRxcbegOzqqZMrlAMFQ qeR4kbdlc7uGezY9ua3zwROb9nqmcVcGh3Q7vu5BK0fLBfws+qLHM8JhL1M2+SiCqPMod9 wSLvxdo9aGOEgWzOSomkYCrjJl6RN+BN/dZWDsTNOKPUhjJvnDofvGj0ho2quzMZq6dgCl yuKzDYx1niemHE1JfSCUE1CmiU0S3CXklYB0MJGcwrI1sziAn01yADsdWVoFn6CYixYEOs 2bHyBhA6lGZAMFqHXUbyMnLhtOwmXI1CzyCHq01VcxfFUAYYBetetUxjh0AvJQ== 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=1718192969; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LrL/1MNDR84ZpMF1qMHRjz5dwfA0v5VLrZsLvSbl3rc=; b=D7RKRMhSs9dTYDoVA3W1Yx2ElMMniZEkk/BhLGLNNLmZ/uVFWhBYnqw4TEyG2ZQf8JJEtO DcXaD6SWnIX87fBnv+P8DNuKOA52fYd0sn9xXlFxVnYuavgdhAqniq/8Xd0ekxpqvmhlNf gNm1xLNc7WLeBjiQ9LprXWCUOUsmOP0oS1dqWJyGjTy5JKDg3fJymMHODSXEMxEPKEAXef rvR8XsClBu9tNGMtRPTlxDvPUJ8i13xyZnT3pJGrDXccb347ayB09s+veFZbawfaxoUiuY G7q1tW7KzjwQt3xpF5giWaKhGPxanSfxvGWj/CfxFYT8pjh2jW074pPsNfNAUg== 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 4VzkNT376bzrsL; Wed, 12 Jun 2024 11:49: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 45CBnTme043202; Wed, 12 Jun 2024 11:49:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45CBnTA7043199; Wed, 12 Jun 2024 11:49:29 GMT (envelope-from git) Date: Wed, 12 Jun 2024 11:49:29 GMT Message-Id: <202406121149.45CBnTA7043199@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: bbdf32d94c2f - main - nanobsd: Remove pre-armv6 support 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: bbdf32d94c2f746b914aa87b1104b579426d8100 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=bbdf32d94c2f746b914aa87b1104b579426d8100 commit bbdf32d94c2f746b914aa87b1104b579426d8100 Author: Andrew Turner AuthorDate: 2024-06-12 11:49:13 +0000 Commit: Andrew Turner CommitDate: 2024-06-12 11:49:13 +0000 nanobsd: Remove pre-armv6 support Remove support for pre-armv6 from nanobsd. It was removed from FreeBSD in 2020. Reviewed by: imp, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45560 --- tools/tools/nanobsd/embedded/common | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common index bcb1061df629..4f5eac7806f2 100644 --- a/tools/tools/nanobsd/embedded/common +++ b/tools/tools/nanobsd/embedded/common @@ -51,7 +51,6 @@ # o documentation for how to run the qemu images # o msdos mtools fallback # o special boot for !x86 !arm platforms -# o qemu image for arm # o qemu image for aarch64 # o qemu image for armv6/armv7 # o easy support for different image / vm formats @@ -503,9 +502,6 @@ std_amd64 ( ) { std_i386 } -std_arm ( ) { -} - std_armv6 ( ) { } From nobody Wed Jun 12 12:41: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 4VzlXg5Rp9z5M996; Wed, 12 Jun 2024 12:41: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 4VzlXg510Dz43wb; Wed, 12 Jun 2024 12:41:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718196099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KN3HDSYzh3h5V0hbZOWwi4e/QB3hKfaftMezO5Y0cqQ=; b=SAeM8sXESYUClxV0coDCO1O3Qq2K4B7E2qvB95bNrQXEcfBrZ4sGVRPgCrSfoqE58PJXO1 wJQwT/u1Xlzni+eaaY63cvD/144dzCaOSUxGpnGX7zQk/2HMlCwEHEmU7n9jt0jxrM01Ag RL3S94PSiYop8PGZSC5Ssx9gCL9bXWJEeo/phVXJRtPFw0uilQtM2nQ/m/Iyyx+2tHHxT8 i+k4QLOHLnh5L64n1XYxjUjFVHOEYU0XghH7JVUnJyPeh6P9M1jF5p0GhmouDBvH3WH6NO qSRj2Y95K7y6/qcVeHuoafR0hOOCwMc9bb699YaTOEVH+nlDKChD9TaTabsBwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718196099; a=rsa-sha256; cv=none; b=FL2rqLzmhs/np8OIIl5nPHUbhxOvifLFVhulNzNLq48JceBQwTwT0aBfifbUlSj6KtKjx1 0J8Z14LfZ4kwJDwhv49rrFWbkKne6Eo/u1KPiMy7ZdqlRaMYixyuRRsID/1tlBdm/OSy09 r/cr22hyAPhmwqk1zqAM+5TSgPQ2toANsT8d+ws1gyD1zdsPIqm7LXha/MUQKg8/+5QZOD 3BIMvMQqJFJdUI+pLjx4DLlntKG8vqKsA2d4mBKvVK4JN3h7SEs1DtvYGwUKSpIXeE1DQ3 tOGtDl3SrZUMMPLFia/dtUekcHs9GV0wTz8U0oQZr+mOtzvHDQsap12dbz1m+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=1718196099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KN3HDSYzh3h5V0hbZOWwi4e/QB3hKfaftMezO5Y0cqQ=; b=s5Of93VVgr0vq2vVFk3q50gyWN384YvS5txtlIrwbwkQhsm4ZyrcjqNj1n7fWfhg4rwT49 6CCQcw+B/QgkWRyrNmFJn7Zae5hzx8Ac6ViZnc6SnhNrFZhCqcmrxGYeQkdkWJcjXcUmpn d2gCINV398o33g6TRc+C6SEw+4fkVUvQV06NUvkOuQurF60FWWXwZ4goLOXvBNH3+Yql1f E9E6Jqmz8ChtjJiekSeYZWmy/4OSxtBuSORSRtyIKyWk3mPymDdV0x6GOBljMFmpP3RUPa 48xLwEE9p5hY3yxBoQ3uL207sh6bYOzFDR8WnpClbpr2m6KxP6xLQT1QM1zxYw== 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 4VzlXg4c3dzsVJ; Wed, 12 Jun 2024 12:41: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 45CCfdsY041805; Wed, 12 Jun 2024 12:41:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45CCfdw0041802; Wed, 12 Jun 2024 12:41:39 GMT (envelope-from git) Date: Wed, 12 Jun 2024 12:41:39 GMT Message-Id: <202406121241.45CCfdw0041802@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: 62cb671705eb - main - riscv: include ahci device to GENERIC. 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 62cb671705eb561d5a56c1c2dd2aff2ef984d035 Auto-Submitted: auto-generated The branch main has been updated by br: URL: https://cgit.FreeBSD.org/src/commit/?id=62cb671705eb561d5a56c1c2dd2aff2ef984d035 commit 62cb671705eb561d5a56c1c2dd2aff2ef984d035 Author: Ruslan Bukin AuthorDate: 2024-06-12 12:36:05 +0000 Commit: Ruslan Bukin CommitDate: 2024-06-12 12:40:50 +0000 riscv: include ahci device to GENERIC. This is needed for bhyve guest VM. Reviewed by: mhorne Sponsored by: UKRI Differential Revision: https://reviews.freebsd.org/D45497 --- sys/riscv/conf/GENERIC | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/riscv/conf/GENERIC b/sys/riscv/conf/GENERIC index 52edc01b5c89..ce9038cee4a9 100644 --- a/sys/riscv/conf/GENERIC +++ b/sys/riscv/conf/GENERIC @@ -93,6 +93,7 @@ device riscv_syscon device pci # Block devices +device ahci device scbus device da From nobody Wed Jun 12 15:51: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 4VzqlB39yHz5Mxc8; Wed, 12 Jun 2024 15:51: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 4VzqlB2lBhz4Yl5; Wed, 12 Jun 2024 15:51:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718207462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PfStr5x6YKtunz+h8qBVsH7bwK0Re2e3rJRPzGrjdZ0=; b=E9c1nF/5SUA34iTnDht+Ac7WKPD9vqS4IilTXlPopuI2x99keUTUPP69r31c9YOoa2Q1ud wZh6gAwN69PPi507kvp0Rvqe0G21gPXWzYnOrmNvD6UJL0hK7TqtXQtFcAEJ4fcd+I24W+ aqfYg2lq2MY4ENzGS/144SAgiBkIiztOHZprWKGFb3sAFevautliX+PduhkXtyc7wLu9v5 8hrzdSatYLNbXxXBlgFVnjKyXSYsC76eccvTbxn3KVOHdObTIvknlO7GAddj0hcBB1TmoZ qy4xn8B4HX4BKHPy2XyQgHKJLQP97nUNFtZ1Z/R1WbiqbAmCO7Dl8vmlJtl0iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718207462; a=rsa-sha256; cv=none; b=jScQguO8EyueeH3gTvi+ABOxsQKqGfrMg49Uq7ba9UsruohJfAe51OqwnvnXViKAt1/ojo 4yegx+pep0b2nRPqHaLEJUOMan5DduIDWmk1vuOb0T+KvnWR7V3zg2Me4uOpxL5Dx/wvyf niYXBCf/xrsJ8H8EHi/H2YeodtIPxZZIm3RbxQKPBkCbLH9qCqyicRfKcN32OH1acWbhgM U2GcHuiBXkGg+kVHKlBP41V6jIwkBfqedrpMbZI5MX9V4yhAdaaGxRO4Tc6ucQDNNJ+uUi vIeujQA4fsBbKnM9cFP0vNaaNY2wmEH2IlfD/RT2afWOWO+FQitcje5XRKoUlA== 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=1718207462; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PfStr5x6YKtunz+h8qBVsH7bwK0Re2e3rJRPzGrjdZ0=; b=SAsBp4EKqApHpwPZ4g/AUKwzPehnpDE/so12TcHZ86P4vSmubI1du2FXu7pUalWh9a0FyL ix2l+z//SoH8ReqjyjpoEJz6kfhS/Ih1ZIXkwuKbIgO4JSwX+uW1iDr4NHRKFw37QprX7S HTE81BPl8YD7fRJb2S6wvGONIwf90mbBr0g0VREBclml8v94Nh73hRUH0dEODrI5Hw0p1O pv+14s9lqBh1hNT+Cpo5mA5BLGvLR0YZiL+10PeRtzmbvVOI38O6sOKBewu4Mzk1K5o+3D TBGsfO8SqHuAHwqHdJMsb7MxPC0RHfSKJanXt93UFsBMa9fGy7H0juGYwk012w== 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 4VzqlB2LqpzySG; Wed, 12 Jun 2024 15:51: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 45CFp21N057431; Wed, 12 Jun 2024 15:51:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45CFp29C057428; Wed, 12 Jun 2024 15:51:02 GMT (envelope-from git) Date: Wed, 12 Jun 2024 15:51:02 GMT Message-Id: <202406121551.45CFp29C057428@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: a7ae78caaa17 - main - cdefs: Add __writeonly to mark write only vars 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: a7ae78caaa17ff840da844c1dcaa780d194c9e20 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a7ae78caaa17ff840da844c1dcaa780d194c9e20 commit a7ae78caaa17ff840da844c1dcaa780d194c9e20 Author: Andrew Turner AuthorDate: 2024-06-12 13:04:13 +0000 Commit: Andrew Turner CommitDate: 2024-06-12 13:04:13 +0000 cdefs: Add __writeonly to mark write only vars When a variable in write only and can't be removed, e.g. for API reasons, it is useful to document this fact similar to __diagused and __witness_used. Add __writeonly to tell the compiler and anyone looking at the code that this variable is expected to only be written to, and to not raise and error. Reviewed by: imp, kib Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45561 --- sys/sys/cdefs.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 037dfa55f923..c3268791787f 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -180,6 +180,7 @@ #define __aligned(x) __attribute__((__aligned__(x))) #define __section(x) __attribute__((__section__(x))) #endif +#define __writeonly __unused #if __GNUC_PREREQ__(4, 3) || __has_attribute(__alloc_size__) #define __alloc_size(x) __attribute__((__alloc_size__(x))) #define __alloc_size2(n, x) __attribute__((__alloc_size__(n, x))) From nobody Wed Jun 12 15:51: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 4VzqlC4cZ7z5MxZc; Wed, 12 Jun 2024 15:51: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 4VzqlC3kM5z4Ywc; Wed, 12 Jun 2024 15:51:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718207463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qRGhfW0rxgv9/6q7RuI2ynOBM8WSYVV9uyz2A38/uFo=; b=X19Co20vScXC48NaOj0kpt2Pf2ff7wckux4OqcFmHPzHlpE+Z5Hc1klGq+erYXegyoLKom NqbBV3mED4Q2HGJZrQ3DZWfJBoxhGeizJgkbGTSXH8jIB11rW3lIiIu8gnLtwPjdwPPaat fC6MMAGouYWXDuRQOVZGku0bTiA5Y1b07VSuSTutYvSuq+OVjFFZ11cx9eUOLbh7PQto6Y TIJSLLBcco1ZzvsQ9oc8g0f/r5sKdEMl6nwrO/0U0J0X3h5irbuLfhkf6Is+11c1qfmgYA PVsgmeYPvoHmaHeAIKjFHpyH4uPwlhZprs6gS+a+mL1PHJxYU5U/p3hzZjXLYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718207463; a=rsa-sha256; cv=none; b=WCpv2Ync4td9kT5+eNAND5XRDaa0V8GwFhx22n/Lo5lm0wqTZcHEScTK/zj3kCvohmSi4V tG8E0vsW/25A0EeQsTlAu4MmjSywNBdfGYp4Aqf67IzqjDPKXzzfXMcnWai0E/7Urkzn+9 zgIAg4xvPl6g5AE6CmHTkZiz/BvT3afZFoTnm7rwXqrkReMXU92h5hbLXkbiY7vpBKJMd8 lyDcuxXV9Orm71evVhMdcpsZ8UEt0QflRLN6LH1QZtCaZDZnxAWokRdMkCDsCsl7aLiESV qrE5QUIArIZsRZzVHjS57Il3sl9i5N7ufhEyBXrdpNQsSvo3FyT0mdCS6jPF2A== 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=1718207463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qRGhfW0rxgv9/6q7RuI2ynOBM8WSYVV9uyz2A38/uFo=; b=yvPhyw43p3daqZoUnDJQf8GtJZgVRCfCxRzJPH/m6FJiXwRFC5680IaYxZm+tdu++Fs58Z 6ogAB5Dtvbrkvh1StEA2U7Idvf5FG5DrZLXpNQZY4Q80zfbHij6V2ussoO6ZSlZLeRy/k0 qmR044uVkL6NhkpdupFXVJhE5ijDyqHnnL46IMN01Tf+1Hj8SJeNYVdGwS2t8MBdLQ8GJr kx9vsbI5hUzOEhE9TWTYXOq+7zIl/8bSYrqamZrgzfPYYczSJkYLZA1MXeG5nlZ/8mKhGL v2dkS3D1D6nPBmLaPepzlWqIiviDc/rRKr1jHE+591ePsGwp8oSwoGus44qjsg== 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 4VzqlC3Kpmz101s; Wed, 12 Jun 2024 15:51: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 45CFp3un057470; Wed, 12 Jun 2024 15:51:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45CFp3Nl057467; Wed, 12 Jun 2024 15:51:03 GMT (envelope-from git) Date: Wed, 12 Jun 2024 15:51:03 GMT Message-Id: <202406121551.45CFp3Nl057467@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: 19782e5bef34 - main - ibcore: Mark write-only variables 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 19782e5bef3403a6ed65d46653f2e70f81dced37 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=19782e5bef3403a6ed65d46653f2e70f81dced37 commit 19782e5bef3403a6ed65d46653f2e70f81dced37 Author: Andrew Turner AuthorDate: 2024-06-12 13:04:45 +0000 Commit: Andrew Turner CommitDate: 2024-06-12 13:04:45 +0000 ibcore: Mark write-only variables Some LinuxKPI lock macros pass need a flags field passed in. This is written to but never read from so gcc complains. Fix this by marking the flags variables as unused to quieten the compiler. Reviewed by: brooks (earlier version), kib Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D45303 --- sys/ofed/drivers/infiniband/core/ib_cache.c | 16 ++++++++-------- sys/ofed/drivers/infiniband/core/ib_cm.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/ofed/drivers/infiniband/core/ib_cache.c b/sys/ofed/drivers/infiniband/core/ib_cache.c index b170f2b637f9..d2cc680796ef 100644 --- a/sys/ofed/drivers/infiniband/core/ib_cache.c +++ b/sys/ofed/drivers/infiniband/core/ib_cache.c @@ -465,7 +465,7 @@ static int _ib_cache_gid_table_find(struct ib_device *ib_dev, struct ib_gid_table *table; u8 p; int local_index; - unsigned long flags; + unsigned long flags __writeonly; for (p = 0; p < ib_dev->phys_port_cnt; p++) { table = ports_table[p]; @@ -514,7 +514,7 @@ int ib_find_cached_gid_by_port(struct ib_device *ib_dev, unsigned long mask = GID_ATTR_FIND_MASK_GID | GID_ATTR_FIND_MASK_GID_TYPE; struct ib_gid_attr val = {.ndev = ndev, .gid_type = gid_type}; - unsigned long flags; + unsigned long flags __writeonly; if (!rdma_is_port_valid(ib_dev, port)) return -ENOENT; @@ -570,7 +570,7 @@ static int ib_cache_gid_find_by_filter(struct ib_device *ib_dev, struct ib_gid_table **ports_table = ib_dev->cache.gid_cache; struct ib_gid_table *table; unsigned int i; - unsigned long flags; + unsigned long flags __writeonly; bool found = false; if (!ports_table) @@ -879,7 +879,7 @@ int ib_get_cached_gid(struct ib_device *device, struct ib_gid_attr *gid_attr) { int res; - unsigned long flags; + unsigned long flags __writeonly; struct ib_gid_table **ports_table = device->cache.gid_cache; struct ib_gid_table *table = ports_table[port_num - rdma_start_port(device)]; @@ -929,7 +929,7 @@ int ib_get_cached_pkey(struct ib_device *device, u16 *pkey) { struct ib_pkey_cache *cache; - unsigned long flags; + unsigned long flags __writeonly; int ret = 0; if (!rdma_is_port_valid(device, port_num)) @@ -956,7 +956,7 @@ int ib_find_cached_pkey(struct ib_device *device, u16 *index) { struct ib_pkey_cache *cache; - unsigned long flags; + unsigned long flags __writeonly; int i; int ret = -ENOENT; int partial_ix = -1; @@ -997,7 +997,7 @@ int ib_find_exact_cached_pkey(struct ib_device *device, u16 *index) { struct ib_pkey_cache *cache; - unsigned long flags; + unsigned long flags __writeonly; int i; int ret = -ENOENT; @@ -1027,7 +1027,7 @@ int ib_get_cached_lmc(struct ib_device *device, u8 port_num, u8 *lmc) { - unsigned long flags; + unsigned long flags __writeonly; int ret = 0; if (!rdma_is_port_valid(device, port_num)) diff --git a/sys/ofed/drivers/infiniband/core/ib_cm.c b/sys/ofed/drivers/infiniband/core/ib_cm.c index 3ee17a847720..7ace287b1c88 100644 --- a/sys/ofed/drivers/infiniband/core/ib_cm.c +++ b/sys/ofed/drivers/infiniband/core/ib_cm.c @@ -4057,7 +4057,7 @@ static void cm_add_one(struct ib_device *ib_device) struct ib_port_modify port_modify = { .set_port_cap_mask = IB_PORT_CM_SUP }; - unsigned long flags; + unsigned long flags __writeonly; int ret; int count = 0; u8 i; @@ -4150,7 +4150,7 @@ static void cm_remove_one(struct ib_device *ib_device, void *client_data) struct ib_port_modify port_modify = { .clr_port_cap_mask = IB_PORT_CM_SUP }; - unsigned long flags; + unsigned long flags __writeonly; int i; if (!cm_dev) From nobody Wed Jun 12 15: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 4VzqlF17g3z5MxwW; Wed, 12 Jun 2024 15:51: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 4VzqlD4jz9z4Yhf; Wed, 12 Jun 2024 15:51:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718207464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/H4aLiNbYgZ2xDWFjvzDLQ/xhXg0+nMwYKpMyzENFi0=; b=SuehpNAobRNOMgo6WLjeP8tmX0FmE0U70ri6P+zsX9GUWe4YNej07COW1djcNwpmY791TE +HmEEvi8KUo6sReplOL2O6+CnSvXk3VnlO0F30dXqM3VElGyt3qaIeXMa/VIB9cYLVMZ31 mA4wXkpNTDtq6u8EmREs/vtijOh01F/UxKQAgcgEl+D+2X3312JZVIBj0hARma+IuHjj6C rj2C6xa4dwNQ5afv2IiHw02gWtrEWpN7g0aK8+KwqJCTXx+e7Z2riNd4IDnQsyt2ef/g5z FER9OsR4uIijGPWxw69hceMpCyhtjmbXjvnZJgzDtwAtZ8trrW1qFK5oY5CmRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718207464; a=rsa-sha256; cv=none; b=NEnyx2jFCuGHhdnb2Z8gU38X7mVNlKipQn09EW8as5iVBSjTOsYv39UUeCsum79h21lfW7 8C+tSvB/xedNBmW/kki447fLkLkIbh3dTtSj2fPH6D6idMs+nu5XDCeJ9SNXjQm8z5NKaw 4oB7+Mk0/8HPCr/k6sPIMAGDIyy2xh0DZpkimye1MjlnYUFDglLAEO4YsYcCv37PGt2tpy oooNTlZaaOnd00SaXuPJh2DAU/FyZIAMCM+fExyFk1SwzV/tbBfZA8Eyd+XO3EdFGWvugf /K9+absB4UQ/82PUpAWrdlMuFpLvTzLyk65MYhMRTLXwjCOmF+lqeBELvfI5+w== 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=1718207464; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/H4aLiNbYgZ2xDWFjvzDLQ/xhXg0+nMwYKpMyzENFi0=; b=uO3DhS1bXNLLto/DIZLSsRm9AH4EGO+paVbK7ynwJX0N5fsPbWm0vx3pTgL8KJ12QTKX8X DlKKLmTdKFlVZ2hDBQ2R7KKAWkLYJDKQRr1k5bMOeK3YUbBYm0Etk14RFSv5XmcJq0XFrB 2fLY3xgfy1Jvl3FMJRvTMNZ3gyL8fBhEpXpwh44Oi3VBXTisMQk44gcX5BuIbwjatxkvK2 zqz1F64U6RyF5GAL69pCkiuqj/p2g7eTjhMiHDHT/Ebf9bFfAxZ9gt49QgQLmxY1EiWLlq RGXjQM0XXg2WgOImkhnLIV5lCXIOOYX5YvqxyTSzLNEpx+uW5aGSZvBQ2ciReA== 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 4VzqlD47grzySK; Wed, 12 Jun 2024 15:51: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 45CFp48g057519; Wed, 12 Jun 2024 15:51:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45CFp4pB057516; Wed, 12 Jun 2024 15:51:04 GMT (envelope-from git) Date: Wed, 12 Jun 2024 15:51:04 GMT Message-Id: <202406121551.45CFp4pB057516@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: 4eec584d79c1 - main - arm64: Clear td_frame when returning to userspace 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 4eec584d79c1e8375d863c7eec7229ac7ec3f13b Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=4eec584d79c1e8375d863c7eec7229ac7ec3f13b commit 4eec584d79c1e8375d863c7eec7229ac7ec3f13b Author: Andrew Turner AuthorDate: 2024-06-12 13:08:13 +0000 Commit: Andrew Turner CommitDate: 2024-06-12 13:08:13 +0000 arm64: Clear td_frame when returning to userspace When returning from an exception to userspace clear the saved td_frame. On the next exception this should point to the frame, however this is not guaranteed. To ensure the trap frame pointer is either valid or NULL clear it before returning to userspace in the EL0 synchronous exception handler. Reviewed by: kib, markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D44807 --- sys/arm64/arm64/exception.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/arm64/arm64/exception.S b/sys/arm64/arm64/exception.S index 662684588e0c..3dff834e27a2 100644 --- a/sys/arm64/arm64/exception.S +++ b/sys/arm64/arm64/exception.S @@ -252,9 +252,11 @@ ENTRY(handle_el0_sync) KMSAN_ENTER ldr x0, [x18, #PC_CURTHREAD] mov x1, sp + mov x22, x0 str x1, [x0, #TD_FRAME] bl do_el0_sync do_ast + str xzr, [x22, #TD_FRAME] KMSAN_LEAVE restore_registers 0 ERET From nobody Wed Jun 12 15:51: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 4VzqlG0sFcz5Mxlk; Wed, 12 Jun 2024 15:51: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 4VzqlF5bQgz4YsT; Wed, 12 Jun 2024 15:51:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718207465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M5iQbyXcI/ur+4ygYGe6W0/oBTCCLvEyVLaNXvvWmB4=; b=X2hz3gaiHkbEiwi9BOBOdaqdVwOuSwKCaqD2jD48niq9+DBilosQasvrQuqK92b/k2tWOj FvjVjwUE00HChuk0d5q2G4rW+tOcGkXELdWvwZ/gOQcUoG6q4wTOi9+cn7Lj6G7DE7t28V 89dQIPHF2rGyKjPTEUBq+T5JjFlT4PWx9No9lG2sG7VOfr4UTUE+WdhKLsW18jhwBWvvgp 4CNoor7Va4K9BYIrmf7CnfqiDQa3NV1eyhWOHmTylR+X6RRJ4F3FSQqEtPhwzfHq4qwjS7 mwF3OFUu4D814cW6dgNDenO8UFDCL5lf5TQA6yB+n+7vlf8t+7gusbi7lciTYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718207465; a=rsa-sha256; cv=none; b=jkhyu1MAKXYv11PvneRJcxVQiOxRalCLYYxycfXBrP+f9is3wDfeDzOwuXtepPuKataV4y N4v2ClJ4DSZIcGLG1yCUBf9iOhXMm/1V4byker23Z0gClN8ODT4Ky8UjB5yTerrfe0lyPF MTlCZNCb5sUmcO7bnjvRevKB4jBHKeqIH4VchwDGKEp4OH5NUfIap6NvCXzhKEmt2Iwt0e cOvWPOqgYbgfMR2TFAZM+2hQ2KCOKM/m/AnB63KmQD1XeO25Ey3XYTcd668WwaOcGPPzDJ WVio5Ivap2d9joP+y2xOyDyGw41RByszJnbSk1l9zBVexxwUtMrpUaU+CUZjCQ== 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=1718207465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M5iQbyXcI/ur+4ygYGe6W0/oBTCCLvEyVLaNXvvWmB4=; b=t6T06iRpCNNYsheuGMj8wZzmZHthkFcjI7RTwwfaY6G3BFqxYJUniWoficsOWapJhleGwC 5OPOR2JnN/vxtHpO/0dsJcSfNuW+CIhmOPJcAE4SWJsav/BKN98eIUZENb+TZCiqvev7cT UTxGNu6ydUZCOYdjrEv7919Li0L7QDQRC2gF0R952vTwvMo4B4RLMJeQrnFgUceVH3XqBS GO/rnJQgWDYkWjxGDFNszx0JXUyXpuJXfVVO76qvN6WRj8vSuLDQrMAkpJbM4+o1G0VkUt 4SblF+3DCiQQmsqLzLVP5QXxL+GSsNXldzkTcyUy+jEakmkMHWVQKuA78CTjyQ== 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 4VzqlF59cCzyYf; Wed, 12 Jun 2024 15:51: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 45CFp5nG057576; Wed, 12 Jun 2024 15:51:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45CFp5Ta057573; Wed, 12 Jun 2024 15:51:05 GMT (envelope-from git) Date: Wed, 12 Jun 2024 15:51:05 GMT Message-Id: <202406121551.45CFp5Ta057573@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: a30149b2a9c6 - main - arm64: Create a version of vfp_save_state for cpu_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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: a30149b2a9c6ac5280523eea9570e5b5e5f1fdf8 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=a30149b2a9c6ac5280523eea9570e5b5e5f1fdf8 commit a30149b2a9c6ac5280523eea9570e5b5e5f1fdf8 Author: Andrew Turner AuthorDate: 2024-06-12 13:09:14 +0000 Commit: Andrew Turner CommitDate: 2024-06-12 13:09:14 +0000 arm64: Create a version of vfp_save_state for cpu_switch This will be used when we add SVE support to reduce the registers needed to be saved on context switch. Reviewed by: imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D43305 --- sys/arm64/arm64/swtch.S | 4 +--- sys/arm64/arm64/vfp.c | 8 ++++++++ sys/arm64/include/vfp.h | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/swtch.S b/sys/arm64/arm64/swtch.S index ca00d473fd47..6af70ca839a0 100644 --- a/sys/arm64/arm64/swtch.S +++ b/sys/arm64/arm64/swtch.S @@ -148,9 +148,7 @@ ENTRY(cpu_switch) mov x21, x2 #ifdef VFP - /* Load the pcb address */ - mov x1, x4 - bl vfp_save_state + bl vfp_save_state_switch mov x0, x20 #else mov x0, x1 diff --git a/sys/arm64/arm64/vfp.c b/sys/arm64/arm64/vfp.c index f35cd960702b..c65108a83399 100644 --- a/sys/arm64/arm64/vfp.c +++ b/sys/arm64/arm64/vfp.c @@ -216,6 +216,14 @@ vfp_save_state_savectx(struct pcb *pcb) vfp_save_state_common(curthread, pcb); } +void +vfp_save_state_switch(struct thread *td) +{ + KASSERT(td != NULL, ("NULL vfp thread")); + + vfp_save_state_common(td, td->td_pcb); +} + /* * Update the VFP state for a forked process or new thread. The PCB will * have been copied from the old thread. diff --git a/sys/arm64/include/vfp.h b/sys/arm64/include/vfp.h index 7f4c86e7737d..47d068d6050c 100644 --- a/sys/arm64/include/vfp.h +++ b/sys/arm64/include/vfp.h @@ -79,6 +79,7 @@ void vfp_reset_state(struct thread *, struct pcb *); void vfp_restore_state(void); void vfp_save_state(struct thread *, struct pcb *); void vfp_save_state_savectx(struct pcb *); +void vfp_save_state_switch(struct thread *); struct fpu_kern_ctx; From nobody Wed Jun 12 18:11: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 4Vztsg5q0tz5N9vg; Wed, 12 Jun 2024 18:11: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 4Vztsg5B1pz4y7L; Wed, 12 Jun 2024 18:11:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718215911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vRApA9KRTMxSSfVExWHkNhd6j5y0u5UuChn3JBrLenE=; b=HvNCDJB5r03dtEs5GO1sf8+ExhJpEoDnAGkfH6Fc1AxXnaSJCQWye1Ld//6HyJVV4c4Cct Vu02OoMeVkxBq2xt3gMu5nIa60kjWvj9RbLsr4hmMM/EbSaVz3iAs7L/rDg/Zd9Wny4gu0 JcQteT8mhuyaOlA9lXr7W1N64Nf0owONbNZfzcjp/fo0B3wCrh8dt0arRVQ98WdCNZIszZ 5YflI1Dr+vMuzxa/fazqqIn3B5YICbKHii/HcO8uhmmzunjcE0/r6m2jc5pNe46VIWNXDk VGr3SrJHhiwXUQtJq9O/ElWjBH7vwi/4uxSdLvimIXqvgzHseMdLnrvJkyJKdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718215911; a=rsa-sha256; cv=none; b=AzU8KHEs2MIXpBK7lN5i1ABlvzRykycBjINbrCg9nnqOKERGjN5yDJ54mKGsCbXZ7a6U1B vP/CKzPdz/acDiYxMUmP9zZ0J3ZMRdN7//qXm2Eblt9zLYqUcSmFzHyMRvve34nNEjtavb kINhN+xU7xJssCeXWu1/URKdgTA4e6c8dKHgFv/6Oqk/sjncVReUbTluyQdhGvng2lxkEa zxz+87TUnj/+RcedhDRHWT8jaSxAzEsNiZ7oULnFYSY7dWCJ5zAqLQqeVELah5bLretTQW OkWJvhqM5yVqdJi+hB2sNugP1MZee7qdsNCSP3bVwnPh6/K89ezDyAI0URnZgQ== 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=1718215911; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vRApA9KRTMxSSfVExWHkNhd6j5y0u5UuChn3JBrLenE=; b=jdvKNv6EfVq+xFxaeaxSOrIUboxr4Y5VixIeqYKRaqKvYEAoNNTh0pgVRV1coaT6dBFJot 5rkM6uTHSzn41y7W65HoOtzqMjp6Qwkcleu4+kdtNcbqF7hAjDJPhdV01LBYM/lVxVfUnL GEgpdf7ofpN9zXU3dPdNZ81EFAU8oP9y0zdsu2X1YWXqb/+4Vt2QPjY1aysLAhpKbs5BOU 8foSc9kRc1e7vJ5gBYj5xkr9Qbc7xbcaoYH0SioaXQN8CblSUPTzkMUoZ3ZdGGZd1IfO0g gaGa3myOygmWEno6PELB60ceS8502FhIqWJnptK9nJTy/lhFcMpcprvJ2Rc2nw== 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 4Vztsg4nQ4z13lW; Wed, 12 Jun 2024 18:11: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 45CIBp7L097993; Wed, 12 Jun 2024 18:11:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45CIBpmf097990; Wed, 12 Jun 2024 18:11:51 GMT (envelope-from git) Date: Wed, 12 Jun 2024 18:11:51 GMT Message-Id: <202406121811.45CIBpmf097990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Gmelin Subject: git: 8a9f0fa42b1c - main - ifconfig: Fix default netmask calculation 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: grembo X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a9f0fa42b1c6cffd45459bb552e138083b00369 Auto-Submitted: auto-generated The branch main has been updated by grembo: URL: https://cgit.FreeBSD.org/src/commit/?id=8a9f0fa42b1c6cffd45459bb552e138083b00369 commit 8a9f0fa42b1c6cffd45459bb552e138083b00369 Author: Michael Gmelin AuthorDate: 2024-06-12 16:11:52 +0000 Commit: Michael Gmelin CommitDate: 2024-06-12 18:10:13 +0000 ifconfig: Fix default netmask calculation Reported by: phk Reviewed by: emaste, kp MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D45570 --- sbin/ifconfig/af_inet.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sbin/ifconfig/af_inet.c b/sbin/ifconfig/af_inet.c index 5e3084165b33..e21956cfc4fd 100644 --- a/sbin/ifconfig/af_inet.c +++ b/sbin/ifconfig/af_inet.c @@ -440,7 +440,7 @@ in_exec_nl(if_ctx *ctx, unsigned long action, void *data) static void in_setdefaultmask_nl(void) { - struct in_px *px = sintab_nl[ADDR]; + struct in_px *px = sintab_nl[ADDR]; in_addr_t i = ntohl(px->addr.s_addr); @@ -451,11 +451,11 @@ in_setdefaultmask_nl(void) * we should return an error rather than warning. */ if (IN_CLASSA(i)) - px->plen = IN_CLASSA_NSHIFT; + px->plen = 32 - IN_CLASSA_NSHIFT; else if (IN_CLASSB(i)) - px->plen = IN_CLASSB_NSHIFT; + px->plen = 32 - IN_CLASSB_NSHIFT; else - px->plen = IN_CLASSC_NSHIFT; + px->plen = 32 - IN_CLASSC_NSHIFT; px->maskset = true; } #endif From nobody Wed Jun 12 21:33: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 4VzzLb39xLz5NTr0; Wed, 12 Jun 2024 21:33: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 4VzzLb2fCvz4L4l; Wed, 12 Jun 2024 21:33:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718228023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fke0ydwoRpnNgIkCFYykOxf2ywKRSGXfpJ2+Dxv6cKU=; b=Lm4ZlPhHONV7BeN0s22VYKHaYw8Wwojurvb6Ik+r8IvG7w7NCXS+qjouKHMqXVxZ+ysi1T 7rWodLTuh1d6NJo2Ii6oMJDAInUAFTchmewrD+0UhafmGkdzdg9M6dVy7RaYqGDarsA3Bq l2i2XzvTjDHljCGUG/CyMRXWBDDWAkMkTwqmJZaFN5jcgvKYQbyZf6SloUdTCfY0oHka1u a/jWRyf0nII1fpbtBvPodt8FkN0eWzcJhGMU+CO1XXhlcbbkeL2XC8xxEf+dBG+pO9JSUT vZQlMcbesnHLjSZDUBnn1eeGRuj1CGg80iPN0tmyR6YjVvtFSQl3Orxh+rXYrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718228023; a=rsa-sha256; cv=none; b=pALV1EyZvRH0g4DsnrX7et4RUlw7gJQS3r9jbgCSAcUDA20Wt+2zytmmb/mON4VHyfkzXc w6doKuyuqbyDNbSBhzztsIxZQj2jhCukjqLhI/JXlHeJgHmpnqE0QulpAjq0lWD64xJYIG tqixybQ+I0BiyB2Ed00EBoeQAZW6kj5P+pX5sNwGuS7ZFZHpyQueKTBilLVUIJy4XQTmvo Ku5zM89wczcks13keSlJOfVJLOC3WAg5qB28pHB4d1vIHwY/IbaotNF6QR6TOk3Gtmb9KW 2uyXjUueat31lN8RRRlpDX/tmkOeYgHLwgKqP5AXd3mPAb8ItSGHpNxGLR7mfQ== 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=1718228023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fke0ydwoRpnNgIkCFYykOxf2ywKRSGXfpJ2+Dxv6cKU=; b=g62XOrUYxP3M8ag0prJ1aGc1uh53dUM+YxazZ7rH0pjPk6INCw45VYHqMNAGpTNHV5xJyC doRhZvU8Xk7YhM206JlBl4RkpZHJCGfhUx6aN1vyW1fRzB4WFJ9dITzsIKalLNueK4AesP gB2pcDDuPxqpXMKWsk7Glm/i4HG4l5LhUWi83hSEkG3P6sDBaPrm6KeEYY1BbrwwzM+Q6q nad/dM6fMjBaxW5TN50VThqd3PofP+a723SPe7WlvH5hzoZ72+W2UxhUhzz0PQ28uhaAKc 1XpHWmbOZ8pyQpikcLjBwICj/l4aYp8SvFa0qZi+nYPWVicjLLQywLlUJVlqdw== 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 4VzzLb2FwDz18dT; Wed, 12 Jun 2024 21:33: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 45CLXh7l040868; Wed, 12 Jun 2024 21:33:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45CLXhgi040865; Wed, 12 Jun 2024 21:33:43 GMT (envelope-from git) Date: Wed, 12 Jun 2024 21:33:43 GMT Message-Id: <202406122133.45CLXhgi040865@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 20a2fe68faac - main - pf: correctly reset max_win if the SYN-ACK lacks a wscale option. 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20a2fe68faacb98b3c87ce7ea46a16b0d6c2462b Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=20a2fe68faacb98b3c87ce7ea46a16b0d6c2462b commit 20a2fe68faacb98b3c87ce7ea46a16b0d6c2462b Author: Kristof Provost AuthorDate: 2024-06-12 18:01:58 +0000 Commit: Kristof Provost CommitDate: 2024-06-12 21:33:11 +0000 pf: correctly reset max_win if the SYN-ACK lacks a wscale option. pf was setting max_win to 0 and discarded retransmitted SYN-ACK segments without wscale if the original SYN contained a wscale option. with gerhard@, ok henning@ Obtained From: OpenBSD Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 8c97d1bf200d..c635251c3490 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5315,8 +5315,9 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, dws = dst->wscale & PF_WSCALE_MASK; } else { /* fixup other window */ - dst->max_win <<= dst->wscale & - PF_WSCALE_MASK; + dst->max_win = MIN(TCP_MAXWIN, + (u_int32_t)dst->max_win << + (dst->wscale & PF_WSCALE_MASK)); /* in case of a retrans SYN|ACK */ dst->wscale = 0; } From nobody Wed Jun 12 21:33: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 4VzzLc4HZBz5NTr2; Wed, 12 Jun 2024 21:33: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 4VzzLc3mR0z4Kvt; Wed, 12 Jun 2024 21:33:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718228024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+olA5DU8Lo9+5Ma1mCdaKbwt820TrNVc4//bKtVdrOI=; b=oqPcxIjLYseYbWHzYwD/K4JH1I3tgNtoQyNXKKNxdM0i9TBALX+Olbur3RV/BPmT9HwbHP 9E/HpG/CZrt799ikPxxfdTrWqSVEAZBSbCvumS5swPSmpu4eOCQKinb/8iPe69Kiz8VG0Z tg68WnP/jxBgE5gYB2p6dblyz7JlnehhlpuzsMNKhky1xwEQds/Cwbh8iJnk5iKcdgYoLU g/RFdcIcOYpUnPhBy3oH3dsrJb1tMjU7SXfLGzBH0mxT+GfnRpg7zPhMC9fXndB5V8XxBu BZUKrE2P37NehZxK8HcJTmndKzw11H4dAXFxKSOhTFnzVORhiwW8MH0/g8Bp9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718228024; a=rsa-sha256; cv=none; b=BSl9ImnHpg90/jfgdV+rHLmLzzYIvo/Er5DN99TxYp5n4/3yneTahZsV+T36OXFKeUsj+O g1Vje9Z1E3uoP3GSlSaAPzJRVI3+ybH/Eu7IHD73KySoDzgE/vRjwoqPSZJ36BP5FZjlva 6VAXPGtGiOFZvthiFY5Dw4NEllq6hgR/TjsHkdze1eBGmCsPe4dCmQB2YkTvd8FxjBJk4M C+XNpx/uR1oSbPAyKwwHkcfOP+Q7y+e/V78tw70CaRWT56323w7FtnjaAiyuZXoRFi7ug0 GP+G9GeP/i/RlKtYW139d7lwWCEbu+0qXAFnHZ2ci4Qjov5zE+t1kxfzMk5CFw== 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=1718228024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+olA5DU8Lo9+5Ma1mCdaKbwt820TrNVc4//bKtVdrOI=; b=UpJ/sAPprqA7PRIwqhn5p2hD9FWZitL4Vcly99xINHcvabNmfdLV8KI25lhZIBs5bwhn+t v98ALgIXrzJtY+bvG1PCuVNzzWHrx2xROyKp18fIv1//QULaZjDAZE5JXTarU095VPLIgA wjnhSg7SrHW5dVINGXccAzk4517fQl+H+JzRxFy9MabAId8cOzUj3Zc1sp+W8CUeFsVmcp o6EmR6+saW7yj4TAjHPHeN4yeDk7S5ykcbdnzn0g7HoQ9LVVyao4OLxfhJiayiFiEs6SN0 zbjfWg1+sTLpTflTNH8FoYWjH2uUxFwfjJjzdtDkFS9RyytNEKpBLKyMvKmYbw== 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 4VzzLc3MXCz18dV; Wed, 12 Jun 2024 21:33: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 45CLXirH040937; Wed, 12 Jun 2024 21:33:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45CLXicU040934; Wed, 12 Jun 2024 21:33:44 GMT (envelope-from git) Date: Wed, 12 Jun 2024 21:33:44 GMT Message-Id: <202406122133.45CLXicU040934@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 07ed2396985f - main - pf: make TCP sequence number tracking less strict by one octet for FIN packets 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 07ed2396985f211a1f9c2f84da99f955650df696 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=07ed2396985f211a1f9c2f84da99f955650df696 commit 07ed2396985f211a1f9c2f84da99f955650df696 Author: Kristof Provost AuthorDate: 2024-06-12 18:05:22 +0000 Commit: Kristof Provost CommitDate: 2024-06-12 21:33:11 +0000 pf: make TCP sequence number tracking less strict by one octet for FIN packets The data of a TCP packet must fit into the announced window, but this is not required for the sequence number of the FIN. A packet with the FIN bit set and containing data that fits exactly into the announced window was blocked. Our stack generates such packets when the receive buffer size is set to 1024. Now pf uses only the data lenght for window comparison. OK henning@ Obtained From: OpenBSD Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index c635251c3490..edb95d7ef0ec 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -5246,7 +5246,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, struct tcphdr *th = &pd->hdr.tcp; struct pf_state_peer *src, *dst; u_int16_t win = ntohs(th->th_win); - u_int32_t ack, end, seq, orig_seq; + u_int32_t ack, end, data_end, seq, orig_seq; u_int8_t sws, dws, psrc, pdst; int ackskew; @@ -5323,6 +5323,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, } } } + data_end = end; if (th->th_flags & TH_FIN) end++; @@ -5353,6 +5354,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, end = seq + pd->p_len; if (th->th_flags & TH_SYN) end++; + data_end = end; if (th->th_flags & TH_FIN) end++; } @@ -5374,7 +5376,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, if (seq == end) { /* Ease sequencing restrictions on no data packets */ seq = src->seqlo; - end = seq; + data_end = end = seq; } ackskew = dst->seqlo - ack; @@ -5397,7 +5399,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, } #define MAXACKWINDOW (0xffff + 1500) /* 1500 is an arbitrary fudge factor */ - if (SEQ_GEQ(src->seqhi, end) && + if (SEQ_GEQ(src->seqhi, data_end) && /* Last octet inside other's window space */ SEQ_GEQ(seq, src->seqlo - (dst->max_win << dws)) && /* Retrans: not more than one window back */ @@ -5471,7 +5473,7 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, } else if ((dst->state < TCPS_SYN_SENT || dst->state >= TCPS_FIN_WAIT_2 || src->state >= TCPS_FIN_WAIT_2) && - SEQ_GEQ(src->seqhi + MAXACKWINDOW, end) && + SEQ_GEQ(src->seqhi + MAXACKWINDOW, data_end) && /* Within a window forward of the originating packet */ SEQ_GEQ(seq, src->seqlo - MAXACKWINDOW)) { /* Within a window backward of the originating packet */ @@ -5564,12 +5566,12 @@ pf_tcp_track_full(struct pf_kstate **state, struct pfi_kkif *kif, pd->dir == PF_IN ? "in" : "out", pd->dir == (*state)->direction ? "fwd" : "rev"); printf("pf: State failure on: %c %c %c %c | %c %c\n", - SEQ_GEQ(src->seqhi, end) ? ' ' : '1', + SEQ_GEQ(src->seqhi, data_end) ? ' ' : '1', SEQ_GEQ(seq, src->seqlo - (dst->max_win << dws)) ? ' ': '2', (ackskew >= -MAXACKWINDOW) ? ' ' : '3', (ackskew <= (MAXACKWINDOW << sws)) ? ' ' : '4', - SEQ_GEQ(src->seqhi + MAXACKWINDOW, end) ?' ' :'5', + SEQ_GEQ(src->seqhi + MAXACKWINDOW, data_end) ?' ' :'5', SEQ_GEQ(seq, src->seqlo - MAXACKWINDOW) ?' ' :'6'); } REASON_SET(reason, PFRES_BADSTATE); From nobody Wed Jun 12 23:12: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 4W01Xh4yJCz5NfTY; Wed, 12 Jun 2024 23:12: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 4W01Xh4WH6z4Zx4; Wed, 12 Jun 2024 23:12:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718233956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gcvZwy4BiUlDcaS5FeBMuswpaEdgkzI7ygHLnc7nfls=; b=pPEwmrbMjEtIibjhcH/fTgy63GNVQ74QZxgxxW0JMpopeOiZEmlwjDUubKsKUgf2AtU3uw nHchC/YcK4CrDUciSv3bKjSpR5QF87h5VMsx09Q1X+UxcpK5+E/dG8YqEIqZD6+lUrJqKM CuJhVu+rX/pk15Aa2GRyqP7d2kCJo8GWF9QouCfyYxWUSaVrLKpLz/7Ns8+Zx9a2NISJeb ioJ378517fiEOqQ8XvG1evcJThSHOxefqcnEzlNzfACWJa7xoikLgL7vad44GhtlCGOam0 m4wo9d402PfJDLm1zPqk3Q3+FoucLlPJMuwHanqJR5dhXrTsA28b0wFb7bsezQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718233956; a=rsa-sha256; cv=none; b=DChWFgIuJ6pkV0idOmdjcwdN2iJe92hsBbst9JoFREQrnXxXXniqKp8SD5F6G3XW98+qSW Fcmic05jdxAC//G/jYsew52ICw9UYl2BF3ULl6XbqXQAQBHunkXfm3Du+XLHJjqcqVzWcY gxl5yS41g5DASEBzMwcsvn2fZOGGFAMeZFO0k8HADutVKfjZk9O2IyDwfUJMkxhsqv5N9H SrYutKhwKUyC8Dtp2GiM+6EqH9d+BYpjpPA++WL4KPZ6bshOC2KbIteQ0YXDq0BDwibeO3 DB3GW7BLcWB/U9rZUXWFyAUTguZP+04WC5pr52YIO7kIa5Zt+UXJOBNoSGZKUA== 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=1718233956; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gcvZwy4BiUlDcaS5FeBMuswpaEdgkzI7ygHLnc7nfls=; b=PK1+Pt3HUAiS6BytnUr+SPoW7G4dqrb0FuayHMIf5j5wP4yBz6o3Eslu8Jkf6lKXYmGe0y HIAWUfT+itzekdlPkeGM9K1vAJJvUC0gFcTpfoegZexTcWTzbSp3e/eRDVKFF4efY5CBGm zeFuE/H3B72h05TD9p1lEn5n29qEucA6e+kghXK2xC45spI8dJTwQ+TLnXvX0ebNxaACnE gdOFqjMyQU7NlqXgzqRifg625vbafPUE22EhBSEbO+QVv1dK5aOAPk4eDZRD0zQdg+Sg2F HcDpvgWG2QMpvxxJEiwpX3ec0Kn/ARRIgERg/qe9mmi/xftK8v0HCdHCNC7MFQ== 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 4W01Xh46fBz1Bgq; Wed, 12 Jun 2024 23:12: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 45CNCakh011186; Wed, 12 Jun 2024 23:12:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45CNCafr011183; Wed, 12 Jun 2024 23:12:36 GMT (envelope-from git) Date: Wed, 12 Jun 2024 23:12:36 GMT Message-Id: <202406122312.45CNCafr011183@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: ec1f285f2e63 - main - nfscl: Add support for the NFSv4.1/4.2 WANT_xxx 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ec1f285f2e631b8aae3e08b3f68c6451a45c0941 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=ec1f285f2e631b8aae3e08b3f68c6451a45c0941 commit ec1f285f2e631b8aae3e08b3f68c6451a45c0941 Author: Rick Macklem AuthorDate: 2024-06-12 23:11:10 +0000 Commit: Rick Macklem CommitDate: 2024-06-12 23:11:10 +0000 nfscl: Add support for the NFSv4.1/4.2 WANT_xxx flags NFSv4.1/4.2 defined new OPEN_WANT_xxx flags that a client can use to hint to the server that delegations are or are not wanted. This patch adds use of those delegations to the client. This patch should only affect the NFSv4.1/4.2 behaviour when delegations are enabled, which is not the default. MFC after: 1 month --- sys/fs/nfsclient/nfs_clrpcops.c | 77 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 68 insertions(+), 9 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 8c5532268287..13bdc74655dd 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -389,13 +389,24 @@ nfsrpc_open(vnode_t vp, int amode, struct ucred *cred, NFSPROC_T *p) mode |= NFSV4OPEN_ACCESSREAD; if (amode & FWRITE) mode |= NFSV4OPEN_ACCESSWRITE; + if (NFSHASNFSV4N(nmp)) { + if (!NFSHASPNFS(nmp) && nfscl_enablecallb != 0 && + nfs_numnfscbd > 0) { + if ((mode & NFSV4OPEN_ACCESSWRITE) != 0) + mode |= NFSV4OPEN_WANTWRITEDELEG; + else + mode |= NFSV4OPEN_WANTANYDELEG; + } else + mode |= NFSV4OPEN_WANTNODELEG; + } nfhp = np->n_fhp; retrycnt = 0; do { dp = NULL; - error = nfscl_open(vp, nfhp->nfh_fh, nfhp->nfh_len, mode, 1, - cred, p, NULL, &op, &newone, &ret, 1, true); + error = nfscl_open(vp, nfhp->nfh_fh, nfhp->nfh_len, + (mode & NFSV4OPEN_ACCESSBOTH), 1, cred, p, NULL, + &op, &newone, &ret, 1, true); if (error) { return (error); } @@ -547,7 +558,8 @@ nfsrpc_openrpc(struct nfsmount *nmp, vnode_t vp, u_int8_t *nfhp, int fhlen, cred); NFSM_BUILD(tl, u_int32_t *, 5 * NFSX_UNSIGNED); *tl++ = txdr_unsigned(op->nfso_own->nfsow_seqid); - *tl++ = txdr_unsigned(mode & NFSV4OPEN_ACCESSBOTH); + *tl++ = txdr_unsigned(mode & (NFSV4OPEN_ACCESSBOTH | + NFSV4OPEN_WANTDELEGMASK)); *tl++ = txdr_unsigned((mode >> NFSLCK_SHIFT) & NFSV4OPEN_DENYBOTH); tsep = nfsmnt_mdssession(nmp); *tl++ = tsep->nfsess_clientid.lval[0]; @@ -664,6 +676,13 @@ nfsrpc_openrpc(struct nfsmount *nmp, vnode_t vp, u_int8_t *nfhp, int fhlen, &ret, &acesize, p); if (error) goto nfsmout; + } else if (deleg == NFSV4OPEN_DELEGATENONEEXT && + NFSHASNFSV4N(nmp)) { + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); + deleg = fxdr_unsigned(uint32_t, *tl); + if (deleg == NFSV4OPEN_CONTENTION || + deleg == NFSV4OPEN_RESOURCE) + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); } else if (deleg != NFSV4OPEN_DELEGATENONE) { error = NFSERR_BADXDR; goto nfsmout; @@ -1546,7 +1565,7 @@ nfsrpc_lookup(vnode_t dvp, char *name, int len, struct ucred *cred, NFSM_BUILD(tl, uint32_t *, 6 * NFSX_UNSIGNED); *tl++ = txdr_unsigned(NFSV4OP_OPEN); *tl++ = 0; /* seqid, ignored. */ - *tl++ = txdr_unsigned(openmode); + *tl++ = txdr_unsigned(openmode | NFSV4OPEN_WANTNODELEG); *tl++ = txdr_unsigned(NFSV4OPEN_DENYNONE); *tl++ = 0; /* ClientID, ignored. */ *tl = 0; @@ -1668,6 +1687,13 @@ nfsrpc_lookup(vnode_t dvp, char *name, int len, struct ucred *cred, ndp->nfsdl_stateid.other[0] = *tl++; ndp->nfsdl_stateid.other[1] = *tl++; ndp->nfsdl_stateid.other[2] = *tl++; + } else if (deleg == NFSV4OPEN_DELEGATENONEEXT && + NFSHASNFSV4N(nmp)) { + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); + deleg = fxdr_unsigned(uint32_t, *tl); + if (deleg == NFSV4OPEN_CONTENTION || + deleg == NFSV4OPEN_RESOURCE) + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); } else if (deleg != NFSV4OPEN_DELEGATENONE) { error = NFSERR_BADXDR; goto nfsmout; @@ -2595,8 +2621,17 @@ nfsrpc_createv4(vnode_t dvp, char *name, int namelen, struct vattr *vap, */ NFSM_BUILD(tl, u_int32_t *, 5 * NFSX_UNSIGNED); *tl++ = txdr_unsigned(owp->nfsow_seqid); - *tl++ = txdr_unsigned(NFSV4OPEN_ACCESSWRITE | - NFSV4OPEN_ACCESSREAD); + if (NFSHASNFSV4N(nmp)) { + if (!NFSHASPNFS(nmp) && nfscl_enablecallb != 0 && + nfs_numnfscbd > 0) + *tl++ = txdr_unsigned(NFSV4OPEN_ACCESSWRITE | + NFSV4OPEN_ACCESSREAD | NFSV4OPEN_WANTWRITEDELEG); + else + *tl++ = txdr_unsigned(NFSV4OPEN_ACCESSWRITE | + NFSV4OPEN_ACCESSREAD | NFSV4OPEN_WANTNODELEG); + } else + *tl++ = txdr_unsigned(NFSV4OPEN_ACCESSWRITE | + NFSV4OPEN_ACCESSREAD); *tl++ = txdr_unsigned(NFSV4OPEN_DENYNONE); tsep = nfsmnt_mdssession(nmp); *tl++ = tsep->nfsess_clientid.lval[0]; @@ -2714,6 +2749,13 @@ nfsrpc_createv4(vnode_t dvp, char *name, int namelen, struct vattr *vap, &ret, &acesize, p); if (error) goto nfsmout; + } else if (deleg == NFSV4OPEN_DELEGATENONEEXT && + NFSHASNFSV4N(nmp)) { + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); + deleg = fxdr_unsigned(uint32_t, *tl); + if (deleg == NFSV4OPEN_CONTENTION || + deleg == NFSV4OPEN_RESOURCE) + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); } else if (deleg != NFSV4OPEN_DELEGATENONE) { error = NFSERR_BADXDR; goto nfsmout; @@ -8109,7 +8151,8 @@ nfsrpc_openlayoutrpc(struct nfsmount *nmp, vnode_t vp, u_int8_t *nfhp, 0, 0, cred); NFSM_BUILD(tl, uint32_t *, 5 * NFSX_UNSIGNED); *tl++ = txdr_unsigned(op->nfso_own->nfsow_seqid); - *tl++ = txdr_unsigned(mode & NFSV4OPEN_ACCESSBOTH); + *tl++ = txdr_unsigned(mode & (NFSV4OPEN_ACCESSBOTH | + NFSV4OPEN_WANTDELEGMASK)); *tl++ = txdr_unsigned((mode >> NFSLCK_SHIFT) & NFSV4OPEN_DENYBOTH); tsep = nfsmnt_mdssession(nmp); *tl++ = tsep->nfsess_clientid.lval[0]; @@ -8210,6 +8253,13 @@ nfsrpc_openlayoutrpc(struct nfsmount *nmp, vnode_t vp, u_int8_t *nfhp, &ret, &acesize, p); if (error != 0) goto nfsmout; + } else if (deleg == NFSV4OPEN_DELEGATENONEEXT && + NFSHASNFSV4N(nmp)) { + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); + deleg = fxdr_unsigned(uint32_t, *tl); + if (deleg == NFSV4OPEN_CONTENTION || + deleg == NFSV4OPEN_RESOURCE) + NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED); } else if (deleg != NFSV4OPEN_DELEGATENONE) { error = NFSERR_BADXDR; goto nfsmout; @@ -8301,8 +8351,17 @@ nfsrpc_createlayout(vnode_t dvp, char *name, int namelen, struct vattr *vap, */ NFSM_BUILD(tl, u_int32_t *, 5 * NFSX_UNSIGNED); *tl++ = txdr_unsigned(owp->nfsow_seqid); - *tl++ = txdr_unsigned(NFSV4OPEN_ACCESSWRITE | - NFSV4OPEN_ACCESSREAD); + if (NFSHASNFSV4N(nmp)) { + if (!NFSHASPNFS(nmp) && nfscl_enablecallb != 0 && + nfs_numnfscbd > 0) + *tl++ = txdr_unsigned(NFSV4OPEN_ACCESSWRITE | + NFSV4OPEN_ACCESSREAD | NFSV4OPEN_WANTWRITEDELEG); + else + *tl++ = txdr_unsigned(NFSV4OPEN_ACCESSWRITE | + NFSV4OPEN_ACCESSREAD | NFSV4OPEN_WANTNODELEG); + } else + *tl++ = txdr_unsigned(NFSV4OPEN_ACCESSWRITE | + NFSV4OPEN_ACCESSREAD); *tl++ = txdr_unsigned(NFSV4OPEN_DENYNONE); tsep = nfsmnt_mdssession(nmp); *tl++ = tsep->nfsess_clientid.lval[0]; From nobody Wed Jun 12 23:18: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 4W01gP1JKQz5KxBF; Wed, 12 Jun 2024 23:18: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 4W01gP0rGpz4bGC; Wed, 12 Jun 2024 23:18:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718234305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mRvCl+6b5p8C552Nn8R5vVBqAGhUXkbf/f5dKWUFbyk=; b=G1wUoO8Md4BqJ7U2ZNITidP3SijF9n3M5B/AohTVi6r+AN90ZEeFwMHyTHy7kYkhhiA3UP 0QD+Ql5lWJ4Sa/WEgWtS1m9XiZwbvzm5Zxx0zgcCbhc820sHelb33c0g63RCurPaLPz70m SKLNE064hy0dBcjLqXxYqS5qo46a9IGU1g1R6oHlUFyq5N68iRtHsvn0nhlSbIroUVLttr r3DLjXOwIundVrMJVeWUs7iWK01tlFkqwJlS7jW/it6xDY3/OpXuYrsrMEnfUfmA0RvG6U xisA9wq8i3iApJpBe+ZzBCDvfYiTHnDceREWH6OtaPfK3X/x3ATFRNIlwv9QeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718234305; a=rsa-sha256; cv=none; b=CrQ2IhXVH2HRCJy2SsKvQwGNGGU4u95aEDrjK3omBv/63fndIOIkfbSbE4+Sz11I6x+CqR g2VGmp4KZ0I3hJRwqDXf5+a/JKORLx2pWQOGR9djxnikgX0nflM4IWIDuptTFeOQqAfGhB 6pDL2nGu5zXASXE1hwrB0a3s9UupRV0CA7f6G/sgoBse8eV1SzCKs/p5sVF0L7ZqYmtnOL vJF9N4TGJUCrRPwhWfsLZ4HfOdJW1kQ5GlZ5qrbTlci3M0YH27GyxVojcg0AiZGjl5cKO4 sC8qVzkbmjDj20PIZMY7/O/yjMA+xpqwtR9C0bP/qm9BMOFMgN9hia6ts0pvMA== 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=1718234305; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mRvCl+6b5p8C552Nn8R5vVBqAGhUXkbf/f5dKWUFbyk=; b=bcWn9jky5NLjwoaBb6DaNEJtZY8ujJxG2a13kGwnbL7GH3Zt78qy3jrPZudavXrI73REGX rTuxw+ZMoanT+lIQc+amYzrN05OqJJ0mvGr3OVmZA7EvzdQjAb7M715+qL5Be1qvBA3Q7O buSPFkvxlT3hhsOrS+CO7/cn+ALfHLcDJqctyjCKdR7n3IXm/MaNpmPkpO0IcHDNJtP4Yd UMNAwmwowOVyX3sQ0dwI04UTlims3OpuVzzQLVS7iGKh8cV/UZgztjqzwl8H1apLsJy7sb aULX83D2RobMVHp3HmVBNdoz5wZRR1tWjBaGmkixrXPnoPpfAk2JGHaatGDMHg== 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 4W01gP0KKMz1Bcx; Wed, 12 Jun 2024 23:18: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 45CNIOx1012078; Wed, 12 Jun 2024 23:18:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45CNIOVa012075; Wed, 12 Jun 2024 23:18:24 GMT (envelope-from git) Date: Wed, 12 Jun 2024 23:18:24 GMT Message-Id: <202406122318.45CNIOVa012075@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 4308d6e0fc09 - main - nfscl: Add a check for VREG for delegations 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4308d6e0fc09c807483f09b8fea7f5182d19fd01 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=4308d6e0fc09c807483f09b8fea7f5182d19fd01 commit 4308d6e0fc09c807483f09b8fea7f5182d19fd01 Author: Rick Macklem AuthorDate: 2024-06-12 23:17:23 +0000 Commit: Rick Macklem CommitDate: 2024-06-12 23:17:23 +0000 nfscl: Add a check for VREG for delegations Since delegations are only issued for regular files, check v_type to see if the query is for a regular file. This is a simple optimization for the non-VREG case. While here, fix a couple of global variable declarations. This patch should only affect the NFSv4.1/4.2 behaviour when delegations are enabled, which is not the default. MFC after: 1 month --- sys/fs/nfsclient/nfs_clstate.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index 9fbaa6e63a56..aef5d71592af 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -93,9 +93,8 @@ NFSREQSPINLOCK; NFSCLSTATEMUTEX; int nfscl_inited = 0; struct nfsclhead nfsclhead; /* Head of clientid list */ -int nfscl_deleghighwater = NFSCLDELEGHIGHWATER; -int nfscl_layouthighwater = NFSCLLAYOUTHIGHWATER; +static int nfscl_deleghighwater = NFSCLDELEGHIGHWATER; static int nfscl_delegcnt = 0; static int nfscl_layoutcnt = 0; static int nfscl_getopen(struct nfsclownerhead *, struct nfsclopenhash *, @@ -4647,7 +4646,7 @@ nfscl_mustflush(vnode_t vp) np = VTONFS(vp); nmp = VFSTONFS(vp->v_mount); - if (!NFSHASNFSV4(nmp)) + if (!NFSHASNFSV4(nmp) || vp->v_type != VREG) return (1); NFSLOCKMNT(nmp); if ((nmp->nm_privflag & NFSMNTP_DELEGISSUED) == 0) { @@ -4687,7 +4686,7 @@ nfscl_nodeleg(vnode_t vp, int writedeleg) np = VTONFS(vp); nmp = VFSTONFS(vp->v_mount); - if (!NFSHASNFSV4(nmp)) + if (!NFSHASNFSV4(nmp) || vp->v_type != VREG) return (1); NFSLOCKMNT(nmp); if ((nmp->nm_privflag & NFSMNTP_DELEGISSUED) == 0) { From nobody Wed Jun 12 23:42: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 4W02CP6DF7z5L0Mw; Wed, 12 Jun 2024 23:42: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 4W02CP5lnWz4fY4; Wed, 12 Jun 2024 23:42:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718235761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I7YEmVkBbSUH633CwiItCt8TxIV+9Hsis/xlbz6f0Tw=; b=qoLBqpbqAriQXEDS3udLEIlbduofNNAmimVQdw9AL6eHsjDiStAC5ozGLNTUl+CqX6QtAV XM5BIf6ee2jO3ociYIYVKaFhcdzFQRRZxhlkDKByD9lBK6iW1gDBH8cySfvqJXxBh3QBKw AHfG5qxRG8pmdlOqZOX1FOT2LuH3Q76QQE3mfjWKOwfZPmd+b0frE0mS+7C4hAspeeWcTT 1xgRFOMpn38Hl7yoV/9Ucnuw3x+ET8+94kHUJZbxh2blFByZEb5OsUno53QsLMtp9rY6zM jdwrNx2o0Sp1tAYc+2Bdn7dVzWILKgf3hsVINdIYqxDvp9Id3NxN4OK4YUnmwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718235761; a=rsa-sha256; cv=none; b=Dwg8z+sWfyd4qVU2o4QtXK9BOPGtSIrn1z2ikYon1tiLuP8NRWeAy/qQrL6S6wIuFw5qsB WA60HIvEgQF+8zJIa2tZ3syf+tFYPfmKgulCcrSD+SD2uycr1Vn/q5oWP1ZDDQevBumGcm P/KC+MFGpSwjpEbEzHqYNW5WJkoMwaaEHYwTGcu5hRv1E4iJfDHE5pKNha9rHqo5xSWSTP uX6aUl9fRaZxJV8QvBJB0JZzF0AQPcNTcZfW+qsEY91LE2E1LgGFJ+7/AVlYyHfr09P0PS 2AxL2vPKWk4zVbQ2cTBKt6Lt4UG7TUnof6g0iswVok6KdSi2rFZ3KKbDEzsWuw== 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=1718235761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I7YEmVkBbSUH633CwiItCt8TxIV+9Hsis/xlbz6f0Tw=; b=sOSFjxEI5vCSE7uw+dqIYdo2KcZm415e9nP6VAm4ZYNaHh/tOg1iHsX2w+dq4/pMJeBipZ vFGDwjhygt15ZEFCC0LcgzFE14eLdgvqewc0gdUeiSwGrV6IKN7sv5mb4L6S9kpW0zljq7 iHiDyUSNyJ9yA0Vq2bb6SfulmWk0Gf2XFblOCOiMMRD1cqpvSCBQAb1gA0+rjpByQE5PlH PXdPx+YfkxT9IrQ4XJ3rieiqJ4KH2JO8tyr7bC3zqFSUAT62dSZtZexzkfMckCnccX2vzb 05ZUNTbffSkk1BmJ7SXQ4PO8gDrAijvqLaKcUhFFxMTIAOZ6XUkdBh4eOB95EQ== 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 4W02CP4qgrz1Ckk; Wed, 12 Jun 2024 23:42: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 45CNgfSG061390; Wed, 12 Jun 2024 23:42:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45CNgfXJ061387; Wed, 12 Jun 2024 23:42:41 GMT (envelope-from git) Date: Wed, 12 Jun 2024 23:42:41 GMT Message-Id: <202406122342.45CNgfXJ061387@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: bb53f071e85a - main - nfscl: Add support for read delegations and atomic upgrade 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb53f071e85a2ebb5b405e7fec4661a725b7caf5 Auto-Submitted: auto-generated The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=bb53f071e85a2ebb5b405e7fec4661a725b7caf5 commit bb53f071e85a2ebb5b405e7fec4661a725b7caf5 Author: Rick Macklem AuthorDate: 2024-06-12 23:41:12 +0000 Commit: Rick Macklem CommitDate: 2024-06-12 23:41:12 +0000 nfscl: Add support for read delegations and atomic upgrade For NFSv4.1/4.2, an atomic upgrade of a delegation from a read delegation to a write delegation is allowed and can result in significantly improved performance. This patch adds this upgrade to the NFSv4.1/4.2 client and enables use of read delegations. For a test case of building a FreeBSD kernel (sources and output objects) over a NFSv4.2 mount, these changes reduced the elapsed time by 30% and included a reduction of 80% for RPC counts when delegations were enabled. As such, with this patch there are at least certain cases where enabling delegations seems to be worth the increased complexity they bring. This patch should only affect the NFSv4.1/4.2 behaviour when delegations are enabled, which is not the default. MFC after: 1 month --- sys/fs/nfsclient/nfs_clstate.c | 38 ++++++++++++++++++++++---------------- sys/fs/nfsclient/nfs_clsubs.c | 6 +++--- sys/fs/nfsclient/nfs_clvnops.c | 2 +- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index aef5d71592af..0a1eb51e279f 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -439,18 +439,6 @@ nfscl_deleg(mount_t mp, struct nfsclclient *clp, u_int8_t *nfhp, KASSERT(mp != NULL, ("nfscl_deleg: mp NULL")); nmp = VFSTONFS(mp); - /* - * First, if we have received a Read delegation for a file on a - * read/write file system, just return it, because they aren't - * useful, imho. - */ - if (dp != NULL && !NFSMNT_RDONLY(mp) && - (dp->nfsdl_flags & NFSCLDL_READ)) { - nfscl_trydelegreturn(dp, cred, nmp, p); - free(dp, M_NFSCLDELEG); - *dpp = NULL; - return (0); - } /* * Since a delegation might be added to the mount, @@ -478,17 +466,35 @@ nfscl_deleg(mount_t mp, struct nfsclclient *clp, u_int8_t *nfhp, nfscl_delegcnt++; } else { /* - * Delegation already exists, what do we do if a new one?? + * A delegation already exists. If the new one is a Write + * delegation and the old one a Read delegation, return the + * Read delegation. Otherwise, return the new delegation. */ if (dp != NULL) { - printf("Deleg already exists!\n"); - free(dp, M_NFSCLDELEG); - *dpp = NULL; + if ((dp->nfsdl_flags & NFSCLDL_WRITE) != 0 && + (tdp->nfsdl_flags & NFSCLDL_READ) != 0) { + TAILQ_REMOVE(&clp->nfsc_deleg, tdp, nfsdl_list); + LIST_REMOVE(tdp, nfsdl_hash); + *dpp = NULL; + TAILQ_INSERT_HEAD(&clp->nfsc_deleg, dp, + nfsdl_list); + LIST_INSERT_HEAD(NFSCLDELEGHASH(clp, nfhp, + fhlen), dp, nfsdl_hash); + dp->nfsdl_timestamp = NFSD_MONOSEC + 120; + } else { + *dpp = NULL; + tdp = dp; /* Return this one. */ + } } else { *dpp = tdp; + tdp = NULL; } } NFSUNLOCKCLSTATE(); + if (tdp != NULL) { + nfscl_trydelegreturn(tdp, cred, nmp, p); + free(tdp, M_NFSCLDELEG); + } return (0); } diff --git a/sys/fs/nfsclient/nfs_clsubs.c b/sys/fs/nfsclient/nfs_clsubs.c index 80ab979d22d7..8bb51e29e1d1 100644 --- a/sys/fs/nfsclient/nfs_clsubs.c +++ b/sys/fs/nfsclient/nfs_clsubs.c @@ -188,7 +188,7 @@ ncl_getattrcache(struct vnode *vp, struct vattr *vaper) np = VTONFS(vp); vap = &np->n_vattr.na_vattr; nmp = VFSTONFS(vp->v_mount); - mustflush = nfscl_mustflush(vp); /* must be before mtx_lock() */ + mustflush = nfscl_nodeleg(vp, 0); /* must be before mtx_lock() */ NFSLOCKNODE(np); /* XXX n_mtime doesn't seem to be updated on a miss-and-reload */ timeo = (time_second - np->n_mtime.tv_sec) / 10; @@ -221,8 +221,8 @@ ncl_getattrcache(struct vnode *vp, struct vattr *vaper) (time_second - np->n_attrstamp), timeo); #endif - if ((time_second - np->n_attrstamp) >= timeo && - (mustflush != 0 || np->n_attrstamp == 0)) { + if (mustflush != 0 && (np->n_attrstamp == 0 || + time_second - np->n_attrstamp >= timeo)) { nfsstatsv1.attrcache_misses++; NFSUNLOCKNODE(np); KDTRACE_NFS_ATTRCACHE_GET_MISS(vp); diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 76a3cdf9281e..13341dfc26e0 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -940,7 +940,7 @@ nfs_close(struct vop_close_args *ap) /* * Get attributes so "change" is up to date. */ - if (error == 0 && nfscl_mustflush(vp) != 0 && + if (error == 0 && nfscl_nodeleg(vp, 0) != 0 && vp->v_type == VREG && (VFSTONFS(vp->v_mount)->nm_flag & NFSMNT_NOCTO) == 0) { ret = nfsrpc_getattr(vp, cred, ap->a_td, &nfsva); From nobody Thu Jun 13 00:24: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 4W038B4Tm7z5L3TV; Thu, 13 Jun 2024 00:24: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 4W038B3tmxz4jx8; Thu, 13 Jun 2024 00:24:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718238298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aEoJDBtzQ94yHiI3JSBqOhlPpYSPoSYItZAztl4fqII=; b=B2REi+ZgW2OpP/nr9DvMxv5X3kWTqOF6q52foH50YhpROEa46pQGz6Zx8c6kHh+QmPbeKx 8qZS0r3i0tru/64y8tphiJnA8lF88TirljYKVSSEk/8Ti+8FY+uqDU8VOPwmI6hN/vkaxH y1YvpIJRweMotW52vjqU1TjIj95kNm9s2z5kuJtbEaR7/Ij1uv+WEBVNYY5/y6IanK8NQ9 m1QtI7ObYPRWt0QhcZG0wTca5DxYMWIXHPeN4zcaxSRuLhoHBl3Dzvb/IytywM6ppt4Orp 1O+SIV1lX+XNig7tPJHax0+RtnTu9zoApsNTZSmtVHXI+0uRd4x4lprmPCW6fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718238298; a=rsa-sha256; cv=none; b=Jn+SyrKwdbg24vtlgvRbG2+5/6vl9gqAIRFff0z8/auuMGzNh0oVF2iXFrMMHvOmOJqvvg 1T2jeV2NeGEjYF91wOqH6k5DaDKUBkcuqXC8pzyl0RvP6+m7TlBgWbj/glZ5xsBk+KU/G4 qkucwMuM64V17AtWkhAe0qCcxdBdVbunncFcJt+R8RAo0lrGqE6vtL010D+ydHjlM+CR3N +p+hmQLiDG2q6dBw+oGWRnWQk7Z+5FNz0zlcjUUXav8euZMBixeptv/L7Ouw7eQc1Gs1Zw j5iD7+B0OmxzzUYOU1AbsS/dmKWBbvLQ2tsA17kdqnu12QktRUjiPf7JnI2K9w== 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=1718238298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aEoJDBtzQ94yHiI3JSBqOhlPpYSPoSYItZAztl4fqII=; b=D1cLeXhaGcBAU92kSZl2IzwuJuhApUFqqZZQ4+2JX6+6gFHLH5+GeH6JuZVuQAfi1xhRe7 XQQxRD/7Lh3+eYJ97ugGGU2E8rZU7lt0lRA1wQ00rap8k08Uth3jdekugaKKFwpzgTt+w+ +V7GRAV8RaEc0WasJqrAK0WI/DW339pmsHS1yz80qz/sD7Lkz2Fm0XSq6IG/+PcrBW/AbO k0e/W3Qw3Dv7w7qW77JR1Ctn8IXRs/XStcqZzPsrYMcGp7CbYMBi0tVMjupBQgWW1x6Dmj D9g8SMuJ8Nm1ggaelkB/11WnaJgF4SzEdHgxKV6YUXcg992nYGNV8nPuHJ4GWA== 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 4W038B3VLXzFSl; Thu, 13 Jun 2024 00:24: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 45D0Owed029922; Thu, 13 Jun 2024 00:24:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45D0OwO9029919; Thu, 13 Jun 2024 00:24:58 GMT (envelope-from git) Date: Thu, 13 Jun 2024 00:24:58 GMT Message-Id: <202406130024.45D0OwO9029919@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: a16cb8709de7 - main - tzsetup: Correct UTC description 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: a16cb8709de7ddc6dd6ab71918af9fc5fd96f377 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a16cb8709de7ddc6dd6ab71918af9fc5fd96f377 commit a16cb8709de7ddc6dd6ab71918af9fc5fd96f377 Author: Ed Maste AuthorDate: 2024-06-13 00:08:04 +0000 Commit: Ed Maste CommitDate: 2024-06-13 00:24:49 +0000 tzsetup: Correct UTC description UTC is Coordinated Universal Time, not Greenwich Mean Time. Reviewed by: imp, allanjude MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45573 --- usr.sbin/tzsetup/tzsetup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c index fee5762b6fa6..617de4efb765 100644 --- a/usr.sbin/tzsetup/tzsetup.c +++ b/usr.sbin/tzsetup/tzsetup.c @@ -957,7 +957,7 @@ main(int argc, char **argv) "If it is set to local time,\n" "or you don't know, please choose NO here!"); - conf.title = "Select local or UTC (Greenwich Mean Time) clock"; + conf.title = "Select local or UTC (Coordinated Universal Time) clock"; if (bsddialog_yesno(&conf, prompt, 7, 73) == BSDDIALOG_YES) { if (reallydoit) unlink(path_wall_cmos_clock); From nobody Thu Jun 13 16:48: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 4W0Syq5HYcz5NyH3; Thu, 13 Jun 2024 16:48: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 4W0Syq4Sq4z4Vj6; Thu, 13 Jun 2024 16:48:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718297299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RtPkCY0tBNDiVMfw2jwCDmKW5u1ZKt2Aa5KEIsdF9wg=; b=Iq/eQ0HOItDT8ZXx5jUeAjpt86hNagFmQpmRvZXO8UcNzV5h+XJWOSMw9DS4jOpTtLEtuy h4VZY3+S9ZIBGVVsmYpbHF3U3K6UrsomgJJt/Q1qMHnp8zI0Nhp/VWPMd8SCEcK5fVr4Ql z/Rvv9yVUIifdLWB2y7+K9tSgHUUq8TT3ngUo4v82eSVNIBkAx8cvwK2wiDmPE5Nse5zfB n1rekkslwVx+2QcxBfigK3AbhcgOYGwgA7oI0YKUhzNWkdhmxQdkFVJUeO5w9xkQrCZSfS BV3hufZGOAc5q/3lHivf6eO6B22lewWUHXjSDzUUzAMzGMd8VbD7OZWoDxnApQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718297299; a=rsa-sha256; cv=none; b=g45JIlKublHSx4mOJm9joQgIuUcTM/BJPSanqS8dfHcWicrsKweeDR3Z4PUShF+S1Rbni5 fle6tc/Enwd5d20sxg/bgVaa9RYpuKFTIVN80VXztGVlyVtq3rCIQTY5gsMWy5hQH9UpY/ Hb8+v3wGac5jbeQsTCivq8pvbv5kEDW9PXEw+zh30FJ1qCMiGhNJryWX9Ov2vIpF55RtZH aEGyrOuw6tjvAZW7u4NsNl+R/EvqyG6tC9r9VuNjgXNptBJO+mEj/Fh772bPb1Pj3g6dGl /37R8JQO8f11mSloknmwGO1Qn28whWtGNZBnIHIrnFPOM5CZbs06dsSofER1yA== 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=1718297299; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RtPkCY0tBNDiVMfw2jwCDmKW5u1ZKt2Aa5KEIsdF9wg=; b=b26H5PX1K2gp7pjTuq4jl+EZas0jzuKveVuxw3XgAFFndVV/+MlOpZ1EBiT+3t+zH6sNr5 x132jKdyX5bwRKEgC5FGcAwvFKesUb9q6sBffY2RhXMp5peQ/i3ApUxL9TxsA+rHLNd0y2 qfMyHhaPT5kBEKsDshPHP0MBfa3AUfiko0RWuwRPzZnecVzfmSsBXF5kpcQmm2+Vk1sZMw gEzqucavUTbGMTk6L17zUIF4p2+tsicRK4e0dV1VPoGlUOC+AV5mmQBDXH6/VNyHZ8dI7+ ITLBVK01lQCbegevXk2CPUMquHHPAOMt51XpuWE5u+auOHxCXpE31v/g8nM+RQ== 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 4W0Syq43rgzknH; Thu, 13 Jun 2024 16:48: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 45DGmJDw086087; Thu, 13 Jun 2024 16:48:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45DGmJlv086084; Thu, 13 Jun 2024 16:48:19 GMT (envelope-from git) Date: Thu, 13 Jun 2024 16:48:19 GMT Message-Id: <202406131648.45DGmJlv086084@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: c0d0bc2bed80 - main - subr_pctrie: add leaf callbacks to pctrie_reclaim 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c0d0bc2bed8003d2f2b24c3c29ce971ca8dfc556 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=c0d0bc2bed8003d2f2b24c3c29ce971ca8dfc556 commit c0d0bc2bed8003d2f2b24c3c29ce971ca8dfc556 Author: Doug Moore AuthorDate: 2024-06-13 16:44:38 +0000 Commit: Doug Moore CommitDate: 2024-06-13 16:48:09 +0000 subr_pctrie: add leaf callbacks to pctrie_reclaim PCTRIE_RECLAIM frees all the interior nodes in a pctrie, but is little used because most trie-destroyers want to free leaves of the tree too. Add PCTRIE_RECLAIM_CALLBACK, with two extra arguments, a callback function and an auxiliary argument, that is invoked on every non-NULL leaf in the tree as the tree is destroyed. Reviewed by: rlibby, kib (previous version) Differential Revision: https://reviews.freebsd.org/D45565 --- sys/kern/subr_pctrie.c | 78 ++++++++++++++++++++++++++++++++++++++------------ sys/sys/pctrie.h | 25 ++++++++++++++++ 2 files changed, 85 insertions(+), 18 deletions(-) diff --git a/sys/kern/subr_pctrie.c b/sys/kern/subr_pctrie.c index 4017f98c207d..347c2bffd503 100644 --- a/sys/kern/subr_pctrie.c +++ b/sys/kern/subr_pctrie.c @@ -198,7 +198,6 @@ pctrie_root_store(struct pctrie *ptree, struct pctrie_node *node, static __inline bool pctrie_isleaf(struct pctrie_node *node) { - return (((uintptr_t)node & PCTRIE_ISLEAF) != 0); } @@ -217,10 +216,18 @@ pctrie_toleaf(uint64_t *val) static __inline uint64_t * pctrie_toval(struct pctrie_node *node) { - return ((uint64_t *)((uintptr_t)node & ~PCTRIE_FLAGS)); } +/* + * Returns the associated pointer extracted from node and field offset. + */ +static __inline void * +pctrie_toptr(struct pctrie_node *node, int keyoff) +{ + return ((void *)(((uintptr_t)node & ~PCTRIE_FLAGS) - keyoff)); +} + /* * Make 'child' a child of 'node'. */ @@ -792,14 +799,14 @@ pctrie_remove_lookup(struct pctrie *ptree, uint64_t index, } /* - * Prune all the leaves of 'node' before its first non-leaf child, make child - * zero of 'node' point up to 'parent', make 'node' into 'parent' and that - * non-leaf child into 'node'. Repeat until a node has been stripped of all - * children, and mark it for freeing, returning its parent. + * Walk the subtrie rooted at *pnode in order, invoking callback on leaves and + * using the leftmost child pointer for path reversal, until an interior node + * is stripped of all children, and returned for deallocation, with *pnode left + * pointing the parent of that node. */ -static struct pctrie_node * -pctrie_reclaim_prune(struct pctrie_node **pnode, - struct pctrie_node *parent) +static __always_inline struct pctrie_node * +pctrie_reclaim_prune(struct pctrie_node **pnode, struct pctrie_node *parent, + pctrie_cb_t callback, int keyoff, void *arg) { struct pctrie_node *child, *node; int slot; @@ -812,8 +819,11 @@ pctrie_reclaim_prune(struct pctrie_node **pnode, PCTRIE_UNSERIALIZED); pctrie_node_store(&node->pn_child[slot], PCTRIE_NULL, PCTRIE_UNSERIALIZED); - if (pctrie_isleaf(child)) + if (pctrie_isleaf(child)) { + if (callback != NULL) + callback(pctrie_toptr(child, keyoff), arg); continue; + } /* Climb one level down the trie. */ pctrie_node_store(&node->pn_child[0], parent, PCTRIE_UNSERIALIZED); @@ -827,8 +837,9 @@ pctrie_reclaim_prune(struct pctrie_node **pnode, /* * Recover the node parent from its first child and continue pruning. */ -struct pctrie_node * -pctrie_reclaim_resume(struct pctrie_node **pnode) +static __always_inline struct pctrie_node * +pctrie_reclaim_resume_compound(struct pctrie_node **pnode, + pctrie_cb_t callback, int keyoff, void *arg) { struct pctrie_node *parent, *node; @@ -839,24 +850,55 @@ pctrie_reclaim_resume(struct pctrie_node **pnode) parent = pctrie_node_load(&node->pn_child[0], NULL, PCTRIE_UNSERIALIZED); pctrie_node_store(&node->pn_child[0], PCTRIE_NULL, PCTRIE_UNSERIALIZED); - return (pctrie_reclaim_prune(pnode, parent)); + return (pctrie_reclaim_prune(pnode, parent, callback, keyoff, arg)); } /* * Find the trie root, and start pruning with a NULL parent. */ -struct pctrie_node * -pctrie_reclaim_begin(struct pctrie_node **pnode, - struct pctrie *ptree) +static __always_inline struct pctrie_node * +pctrie_reclaim_begin_compound(struct pctrie_node **pnode, + struct pctrie *ptree, + pctrie_cb_t callback, int keyoff, void *arg) { struct pctrie_node *node; node = pctrie_root_load(ptree, NULL, PCTRIE_UNSERIALIZED); pctrie_root_store(ptree, PCTRIE_NULL, PCTRIE_UNSERIALIZED); - if (pctrie_isleaf(node)) + if (pctrie_isleaf(node)) { + if (callback != NULL && node != PCTRIE_NULL) + callback(pctrie_toptr(node, keyoff), arg); return (NULL); + } *pnode = node; - return (pctrie_reclaim_prune(pnode, NULL)); + return (pctrie_reclaim_prune(pnode, NULL, callback, keyoff, arg)); +} + +struct pctrie_node * +pctrie_reclaim_resume(struct pctrie_node **pnode) +{ + return (pctrie_reclaim_resume_compound(pnode, NULL, 0, NULL)); +} + +struct pctrie_node * +pctrie_reclaim_begin(struct pctrie_node **pnode, struct pctrie *ptree) +{ + return (pctrie_reclaim_begin_compound(pnode, ptree, NULL, 0, NULL)); +} + +struct pctrie_node * +pctrie_reclaim_resume_cb(struct pctrie_node **pnode, + pctrie_cb_t callback, int keyoff, void *arg) +{ + return (pctrie_reclaim_resume_compound(pnode, callback, keyoff, arg)); +} + +struct pctrie_node * +pctrie_reclaim_begin_cb(struct pctrie_node **pnode, struct pctrie *ptree, + pctrie_cb_t callback, int keyoff, void *arg) +{ + return (pctrie_reclaim_begin_compound(pnode, ptree, + callback, keyoff, arg)); } /* diff --git a/sys/sys/pctrie.h b/sys/sys/pctrie.h index 06b9fca79528..4e1d8c7f8617 100644 --- a/sys/sys/pctrie.h +++ b/sys/sys/pctrie.h @@ -36,6 +36,8 @@ #ifdef _KERNEL +typedef void (*pctrie_cb_t)(void *ptr, void *arg); + #define PCTRIE_DEFINE_SMR(name, type, field, allocfn, freefn, smr) \ PCTRIE_DEFINE(name, type, field, allocfn, freefn) \ \ @@ -218,6 +220,24 @@ name##_PCTRIE_RECLAIM(struct pctrie *ptree) \ freefn(ptree, freenode); \ } \ \ +/* \ + * While reclaiming all internal trie nodes, invoke callback(leaf, arg) \ + * on every leaf in the trie, in order. \ + */ \ +static __inline __unused void \ +name##_PCTRIE_RECLAIM_CALLBACK(struct pctrie *ptree, \ + pctrie_cb_t callback, void *arg) \ +{ \ + struct pctrie_node *freenode, *node; \ + \ + for (freenode = pctrie_reclaim_begin_cb(&node, ptree, \ + callback, __offsetof(struct type, field), arg); \ + freenode != NULL; \ + freenode = pctrie_reclaim_resume_cb(&node, \ + callback, __offsetof(struct type, field), arg)) \ + freefn(ptree, freenode); \ +} \ + \ static __inline __unused struct type * \ name##_PCTRIE_REPLACE(struct pctrie *ptree, struct type *ptr) \ { \ @@ -269,6 +289,11 @@ uint64_t *pctrie_lookup_unlocked(struct pctrie *ptree, uint64_t key, struct pctrie_node *pctrie_reclaim_begin(struct pctrie_node **pnode, struct pctrie *ptree); struct pctrie_node *pctrie_reclaim_resume(struct pctrie_node **pnode); +struct pctrie_node *pctrie_reclaim_begin_cb(struct pctrie_node **pnode, + struct pctrie *ptree, + pctrie_cb_t callback, int keyoff, void *arg); +struct pctrie_node *pctrie_reclaim_resume_cb(struct pctrie_node **pnode, + pctrie_cb_t callback, int keyoff, void *arg); uint64_t *pctrie_remove_lookup(struct pctrie *ptree, uint64_t index, struct pctrie_node **killnode); uint64_t *pctrie_replace(struct pctrie *ptree, uint64_t *newval); From nobody Thu Jun 13 18: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 4W0WkS0V5Nz5P9Ch; Thu, 13 Jun 2024 18: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 4W0WkS004wz4n2L; Thu, 13 Jun 2024 18: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=1718304768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eioNDVLCcJ6QLuoriRY+xUbid493fojn0JBFKEnjqdk=; b=j+ld5/nKW8+XnsfIz/RvIrcVrcugqM+VO4De5wVEiu41PGh845iKes9C+ZLDL3txlzoKUl IyKKy2WDemzWZgU4hnkS+XNknfZw/D10e7grEFOiHgV/XiTsQ9D+ByW3Kv+xW9QgX7SWxn iT1XXsTJkDWOKBglfV3E47dpxlOeC0PwJmuZZv9kM6SIN5P+1PTxLPdpFLlCkY8JGS8gBQ 1XwOtahQSagmRPyQHM8ea9htPoOFuYdUQ461jH28pSBhHGjdDYj1iXzEy8IyAE14bx3x6U sdsU1xSpCoHHxuGAYXeNnadIDJRAXLRbg8CD9+l9A+79Wl0i71patUVwR0LD0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718304768; a=rsa-sha256; cv=none; b=n8Nj3ZYfdV1rAMfPM5xGJk3lDVqPXeW+wqjEIr64WTLHBuARaRB1eJB7mory3pvYhGJ1Hx xe5eWsirCiUx4Oyh3dnALAYUfHRd5dlkBx8/A85ZqdsORt3SZsMlQraeXIxhUXteDXTgiU yWUtbzTezibJ+mFEGWzStRQtEHxdSFRJvZGDoVYLQVgy1UncZZAv7+nOvUZjM7U2YXOkdS 3AOx21/cP4n/ZyXqRrRhQaolpyTI/U5Ln17D5BPxo47NnTyvI10ho+HDglgthnXicL0dOM QUx/REhaGRbEoAYIwtDjXx0ss9tcF5avC3VxSWpGI7P33DDexlIgLw9q3cZVoQ== 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=1718304768; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eioNDVLCcJ6QLuoriRY+xUbid493fojn0JBFKEnjqdk=; b=OPhFL2+woN+HeJmlB3IotYCQ1kRULk3B35lLs4ydJrUr6NycWAMFEcfw2nCGKZi5afqIom JtiiFOin6lk2FYGcaTCryPuSk3VISs0Hx0kpm7TZtEZVPKf0oSW/F8/Iu+X+0v0w+qMoIg o6hGx9RwMVIcZWUQCQCOfedJfp5B+kcj9LXwFq/5XLrna79uVEHM/nVpIT7ZvMOiBkWKQ6 UC7J41oG1VjbpVaPJMLdX/+TdozTusv++UzLoSkRwZlxJmf9pAMEeGKgSrAozGhm42JF1g pyK1+l+MN18s9ccijcLOf7slKbWDpbIvMhIdzuz/gIImMPw55Yd+rFXdBW/DEg== 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 4W0WkR6jHczpMl; Thu, 13 Jun 2024 18: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 45DIqlNf004454; Thu, 13 Jun 2024 18: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 45DIqlnB004450; Thu, 13 Jun 2024 18:52:47 GMT (envelope-from git) Date: Thu, 13 Jun 2024 18:52:47 GMT Message-Id: <202406131852.45DIqlnB004450@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: d2acf0a44709 - main - swap_pager: pctrie_reclaim_cb in meta_free_all 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2acf0a447093dcf0805c75490e1cd989bc8c36c Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=d2acf0a447093dcf0805c75490e1cd989bc8c36c commit d2acf0a447093dcf0805c75490e1cd989bc8c36c Author: Doug Moore AuthorDate: 2024-06-13 18:47:54 +0000 Commit: Doug Moore CommitDate: 2024-06-13 18:52:25 +0000 swap_pager: pctrie_reclaim_cb in meta_free_all Replace the lookup-remove loop in swp_pager_meta_free_all with a call to SWAP_PCTRIE_RECLAIM_CALLBACK, to eliminate repeated trie searches. Reviewed by: rlibby Differential Revision: https://reviews.freebsd.org/D45583 --- sys/vm/swap_pager.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 3bfda3eea169..c339f70ddea1 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -2220,8 +2220,11 @@ swp_pager_meta_free(vm_object_t object, vm_pindex_t pindex, vm_pindex_t count, } static void -swp_pager_meta_free_block(struct swblk *sb, struct page_range *range) +swp_pager_meta_free_block(void *sbv, void *rangev) { + struct swblk *sb = sbv; + struct page_range *range = rangev; + for (int i = 0; i < SWAP_META_PAGES; i++) { if (sb->d[i] != SWAPBLK_NONE) swp_pager_update_freerange(range, sb->d[i]); @@ -2238,19 +2241,13 @@ swp_pager_meta_free_block(struct swblk *sb, struct page_range *range) static void swp_pager_meta_free_all(vm_object_t object) { - struct swblk *sb; struct page_range range; - vm_pindex_t pindex; VM_OBJECT_ASSERT_WLOCKED(object); swp_pager_init_freerange(&range); - for (pindex = 0; (sb = SWAP_PCTRIE_LOOKUP_GE( - &object->un_pager.swp.swp_blks, pindex)) != NULL;) { - pindex = sb->p + SWAP_META_PAGES; - SWAP_PCTRIE_REMOVE(&object->un_pager.swp.swp_blks, sb->p); - swp_pager_meta_free_block(sb, &range); - } + SWAP_PCTRIE_RECLAIM_CALLBACK(&object->un_pager.swp.swp_blks, + swp_pager_meta_free_block, &range); swp_pager_freeswapspace(&range); } From nobody Thu Jun 13 18:52: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 4W0WkT1wMWz5P8wk; Thu, 13 Jun 2024 18:52: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 4W0WkT0q8Dz4mwl; Thu, 13 Jun 2024 18:52:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718304769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0dWE8kdb7tJ9de+EOK9KGl4XrRUI0MecbSh+Z6BOsf0=; b=FUrywa3JhFUK63HSpBiNBht0p+/7B6x5ou21fbq7KORqmkhnfAMCEck3Vfw7VM6DjrQgu7 sdXofDoLd/rO+9cuevnAOheq2LxBVEyuhzYAOQ0/kE6kkRcxN9BFoEL//nO++6oP6ajtSF DfWlvezRROVPCzK5Z3g3D2yDSG6z1E2S69tk4VdG1GRvLJEEjJJUuPSlNnnyeOlmT+AosZ mOy5aznk2QSIH452IHhKh0+rsRcPTwGTz/G2xSXgMWqvVm63FJFwFjP5ct4nz/nm6xg1jE SXB4y31DdhU6vN1EKYQTT+mH56+eBuqaXvQqzWp3tG7GYAErSnzmOAEm/lhFTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718304769; a=rsa-sha256; cv=none; b=bZ81sLqZNuHbwo4zrYFRO1McONQNvfLBFcUIKflxlQNPssl88ymKbHsdPSszGdQUbkAnTB cGZkcvyenX97e4S1X8F4Ix8+t9TIRv5oKQqZ87vxf3XmVMhI7J8J41cLIgF2pJuRvtncpw aYGGHmg1iyyaglevDzZYqWQDkkxlSXG87klAva9QQgbl2tGTpcSKyrLhgjXToq284YfZ+p MDa2dEMiLhYFrJdcDbP4ic8MjiF7pKuR9L+ic6jBRQbJohWNqj4gxk3GIFpU00g/S2euZj uL3zv1gsMGy445w5UmVa3InWLD7y40Dcm43hjY380Gt841ccFEFWplnXsqVaiw== 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=1718304769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0dWE8kdb7tJ9de+EOK9KGl4XrRUI0MecbSh+Z6BOsf0=; b=KumA8L+/vI1AKgnhTifKeor5J7esAVCV0hJXhb7g8d0I7vaSmj6JulxvJRxhk56212/vPp qRZLvSxBE5RUduZjI+oWNHx3Zd8zsU5r+AvFLYhYmDCtmCRGokMDF278FFLV2QbQkf3e19 gsa437ih2/fgSMXjQHSxaMv3N8E4UbUDQECvyQSH/Hupt2e8jZL714eUrET7LwMJBixzo/ a6hl6BVf807wUTWkLFGd5zdjbdTSA3o4y3dWojAWYJLXGz2e9Fkbq15Chg9gSUBH3ys/MW 4qsoTE/giHdFlQtHVJ83pSxWLEM9yDfU3QdAJU6urZvZrQkrV02qXa0AfDC9hg== 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 4W0WkT0PjJznqx; Thu, 13 Jun 2024 18:52: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 45DIqmG5004506; Thu, 13 Jun 2024 18:52:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45DIqmxu004503; Thu, 13 Jun 2024 18:52:48 GMT (envelope-from git) Date: Thu, 13 Jun 2024 18:52:48 GMT Message-Id: <202406131852.45DIqmxu004503@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: a7f67ebd8275 - main - subr_rangeset: use pctrie_reclaim_cb in remove_all 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a7f67ebd8275165b2f6099de20790e112f8b1433 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=a7f67ebd8275165b2f6099de20790e112f8b1433 commit a7f67ebd8275165b2f6099de20790e112f8b1433 Author: Doug Moore AuthorDate: 2024-06-13 18:49:43 +0000 Commit: Doug Moore CommitDate: 2024-06-13 18:52:25 +0000 subr_rangeset: use pctrie_reclaim_cb in remove_all Replace the lookup-remove loop in rangeet_remove_all with a call to SWAP_PCTRIE_RECLAIM_CALLBACK, to eliminate repeated trie searches. Reviewed by: rlibby Differential Revision: https://reviews.freebsd.org/D45584 --- sys/kern/subr_rangeset.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/sys/kern/subr_rangeset.c b/sys/kern/subr_rangeset.c index 0a675b4a2fce..94b77a449d22 100644 --- a/sys/kern/subr_rangeset.c +++ b/sys/kern/subr_rangeset.c @@ -232,18 +232,20 @@ rangeset_remove(struct rangeset *rs, uint64_t start, uint64_t end) return (rangeset_remove_pred(rs, start, end, rangeset_true_pred)); } +static void +rangeset_remove_leaf(void *rv, void *rsv) +{ + struct rs_el *r = rv; + struct rangeset *rs = rsv; + + rs->rs_free_data(rs->rs_data_ctx, r); +} + void rangeset_remove_all(struct rangeset *rs) { - struct rs_el *r; - - for (;;) { - r = RANGESET_PCTRIE_LOOKUP_GE(&rs->rs_trie, 0); - if (r == NULL) - break; - RANGESET_PCTRIE_REMOVE(&rs->rs_trie, r->re_start); - rs->rs_free_data(rs->rs_data_ctx, r); - } + RANGESET_PCTRIE_RECLAIM_CALLBACK(&rs->rs_trie, + rangeset_remove_leaf, rs); } void * From nobody Thu Jun 13 20:15: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 4W0YYY0l22z5PHLn; Thu, 13 Jun 2024 20:15: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 4W0YYY0HLbz40br; Thu, 13 Jun 2024 20:15:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718309713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=demhMVI7uRLdVdBgxafaLz12L2SGi1p3tlcAF0noQOY=; b=cJIWBFLAz5LC3CnyBZoE9FBZy0blvWiCKEpscB+4RXrwoBHF/w/IIuwhNowhyqc8M1t9qS xlNqDLwkhBREBYb4d6Eqo1IghyHvlYYSr30/80ArcxfD/jSkhySvCfsE1miHF5m6g1gDly N7+L6ToAMzKXcK40lNlJZrjbP+9tA+4jPm3uUP/xthvg2NvTK9txwVoxAYlj+sBuvKtNYU u2WBTCWm0SO1YZ9+1KHo8kkz9QffCj27HqrFwZzNB4F/vYiE6R4ZsDiZMuqByzkSXmbv0Z vbr3a/gIRMyhPSfCOG822gl2J2lgmP+8TmVXjbrWvw7Ms59iwgNh6lmq6AWZPw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718309713; a=rsa-sha256; cv=none; b=CKgjuG2HdhTTOweFruHOQdJ8e6BlkPlirL3TuJj0ORz6ieuUn4QKYbRP/+BPB+p449AuzA +18oqqsjLzKkguQBIrCsrcyXXX+d8rKvtKz6T6SnqwPbdfED0LYYo5ljK/ORYxCnLgTqlg mA38ATlWVGy3oqQzuH/EEYy7kP3iYN1C43P/4uLPmqIoy2h9v57Q7b5xbCE6N1/C7RQXhQ 5zoxBDDV0E1gM9IwRVIEQMUc4xXT4JJYN9FCYbI+jpp3rRcGA8cu5s/1dUEaEV0IOHPF/0 hYirBgvWEj3xyA7di/patoY8hsWaMa0eijNIP8j5DXpTX3/maqoN4MwU7J+xIQ== 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=1718309713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=demhMVI7uRLdVdBgxafaLz12L2SGi1p3tlcAF0noQOY=; b=QyFcWQENWLByJnT5sVoyAW92tgispXI11/RDx3zfgAX7ExlNb1KCBvuF6468iRNjebUGxJ L/d+uJhp/vvRs/3/teDYPWfm+SVZ+fDMi91YNyQ+VastQ2FM2hPY2u2dk10CD19/LlQbnh SA+ncgbHi4hO4YLQs2IrDTZOusBsxmPYc9xaT5oJZdSz5hDnOT24kYvPBmC5+EfK+xej49 teW5ZZHQ0JJmNIWFAvxWxCHUHOJiziUT4I2rBftdFJFXkWPuoLgnoNHFs9ilRGK5sxjoO6 A1tYVDnVDpe3SJ1c9Q3H3+I3EcdJPXKIvQofcD2Q/SMmwfGtb2/i3/e6PV7JqQ== 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 4W0YYX70ZkzrGG; Thu, 13 Jun 2024 20:15: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 45DKFCww041099; Thu, 13 Jun 2024 20:15:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45DKFCaX041096; Thu, 13 Jun 2024 20:15:12 GMT (envelope-from git) Date: Thu, 13 Jun 2024 20:15:12 GMT Message-Id: <202406132015.45DKFCaX041096@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Cox Subject: git: 268f19aacc6a - main - vm: Reduce address space fragmentation 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 268f19aacc6af8f64c438e8515213023a2e66ed7 Auto-Submitted: auto-generated The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=268f19aacc6af8f64c438e8515213023a2e66ed7 commit 268f19aacc6af8f64c438e8515213023a2e66ed7 Author: Alan Cox AuthorDate: 2024-06-09 16:58:27 +0000 Commit: Alan Cox CommitDate: 2024-06-13 20:13:45 +0000 vm: Reduce address space fragmentation jemalloc performs two types of virtual memory allocations: (1) large chunks of virtual memory, where the chunk size is a multiple of a superpage and explicitly aligned, and (2) small allocations, mostly 128KB, where no alignment is requested. Typically, it starts with a small allocation, and over time it makes both types of allocation. With anon_loc being updated on every allocation, we wind up with a repeating pattern of a small allocation, a large gap, and a large, aligned allocation. (As an aside, we wind up allocating a reservation for these small allocations, but it will never fill because the next large, aligned allocation updates anon_loc, leaving a gap that will never be filled with other small allocations.) With this change, anon_loc isn't updated on every allocation. So, the small allocations will be clustered together, the large allocations will be clustered together, and there will be fewer gaps between the anonymous memory allocations. In addition, I see a small reduction in reservations allocated (e.g., 1.6% during buildworld), fewer partially populated reservations, and a small increase in 64KB page promotions on arm64. Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39845 --- sys/vm/vm_map.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 3c7afcb6642f..fa71bb8a01d6 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -2247,8 +2247,15 @@ again: rv = vm_map_insert(map, object, offset, *addr, *addr + length, prot, max, cow); } - if (rv == KERN_SUCCESS && update_anon) - map->anon_loc = *addr + length; + + /* + * Update the starting address for clustered anonymous memory mappings + * if a starting address was not previously defined or an ASLR restart + * placed an anonymous memory mapping at a lower address. + */ + if (update_anon && rv == KERN_SUCCESS && (map->anon_loc == 0 || + *addr < map->anon_loc)) + map->anon_loc = *addr; done: vm_map_unlock(map); return (rv); @@ -4041,9 +4048,6 @@ vm_map_delete(vm_map_t map, vm_offset_t start, vm_offset_t end) entry->object.vm_object != NULL) pmap_map_delete(map->pmap, entry->start, entry->end); - if (entry->end == map->anon_loc) - map->anon_loc = entry->start; - /* * Delete the entry only after removing all pmap * entries pointing to its pages. (Otherwise, its From nobody Thu Jun 13 20:28:59 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 4W0YsR5kwDz5PJ6V; Thu, 13 Jun 2024 20:28:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W0YsR5593z418L; Thu, 13 Jun 2024 20:28:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718310539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lu2nCs/p6DKkDMwzxSyg4cQsywLH34pcxV1Ew64/flw=; b=yhcazvw9ez8lUebaox5A04PkiEbzqwXeqqem3mXJq8FH0D+XkPugOhgK9xHcKgScKVmlah 6xJql2Bb/8/oaIydbSadVEHxIZi0ghDrwJRgPIAhaS/wYnMOG1R1kkuODtVUFrcBF07tAS VekMzw6yvy/TMESytZZXLNtHzs+GnWPeaoQfJ62SFifNazY12gUqOCxNtxAorY2A/Jo0oL Vp1UoyqG7ytTr5MRRqiqH76WYdY5u0HsrIK0t5Q8vSgyRVR/C9dmsjBaVP2zqHtE0vh7EF 1tko52vhwaep0poZUafVoqclZvCcl4mlgZpIpxX8PPALylJ/TmQiZOI0ICo5JA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718310539; a=rsa-sha256; cv=none; b=CONfYth8I8rkeUNoXfDbfkGbCwVTAK5DvqNnVfw1BxFQyByBnFGXM0J2Coy4RfAv8yAzjO IA25SSwSGoRPDhO7Ow6JKZLu28/A6U2VuAKqMEiSq6dtzjXpNUtQHNmlk5Ymg/CToga7Fd 2f71qKU2GyYU6MZiqsGOzKRDkvd8myZVK32Zeu/NuQjpHCVWYDHev+2EraR/OBL6OIMOfL gt1dGWEQDjk5r+iFEChnAFyxYSCKx6oHRFnk9L30OmD5w1nQVQQqfyl6DqLmmDYL8kxfBw oxr7eN6iG1ecLGNMNef9hZMBI+XdgUSR2cQWYXeY7hs+urOVQSCp8mEdM6lmNA== 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=1718310539; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lu2nCs/p6DKkDMwzxSyg4cQsywLH34pcxV1Ew64/flw=; b=hCEaUu13494k+6I9uajOOve0fNMbf6TD+ySJJiwDAH/wFzM56WeIwPocVnIw2bcqZBenMv L7z/+CKZoEGjsirByD8ulm1TxvYtzap2ioZvztkE04RAsMSadMU8gSxQD9rJO1FzBkf0/1 /ci0Z0p0jvCeXdSDeWdZ1bKQxsV9NXpmmMi9ld/2ldBf7j5qYhjQv2+2nxS6MhmBGKShHn S1PTR06KP5qelS2vMi8fvQZxUuZvQhBy+MQ8vJl0XQumyhujJjyYF1bCdwf3K8HZsDkWbo cnofRaNmTpsXHZUrnP55G+ZddzysebP4RArbJEK4kmX3pwz2SPLqaR8d0n8W7w== 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 4W0YsR4hTxzrR6; Thu, 13 Jun 2024 20:28: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 45DKSxKY058630; Thu, 13 Jun 2024 20:28:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45DKSxBC058627; Thu, 13 Jun 2024 20:28:59 GMT (envelope-from git) Date: Thu, 13 Jun 2024 20:28:59 GMT Message-Id: <202406132028.45DKSxBC058627@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: d19851f00286 - main - subr_pctrie: add a word to a 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d19851f002862a5510bf31fae4083fab979258be Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=d19851f002862a5510bf31fae4083fab979258be commit d19851f002862a5510bf31fae4083fab979258be Author: Doug Moore AuthorDate: 2024-06-13 20:28:15 +0000 Commit: Doug Moore CommitDate: 2024-06-13 20:28:15 +0000 subr_pctrie: add a word to a comment No functional changes. Reported by: alc --- sys/kern/subr_pctrie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_pctrie.c b/sys/kern/subr_pctrie.c index 347c2bffd503..6949e3de99bf 100644 --- a/sys/kern/subr_pctrie.c +++ b/sys/kern/subr_pctrie.c @@ -802,7 +802,7 @@ pctrie_remove_lookup(struct pctrie *ptree, uint64_t index, * Walk the subtrie rooted at *pnode in order, invoking callback on leaves and * using the leftmost child pointer for path reversal, until an interior node * is stripped of all children, and returned for deallocation, with *pnode left - * pointing the parent of that node. + * pointing to the parent of that node. */ static __always_inline struct pctrie_node * pctrie_reclaim_prune(struct pctrie_node **pnode, struct pctrie_node *parent, From nobody Fri Jun 14 01:21:13 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 4W0hLd5nZVz5N2sh; Fri, 14 Jun 2024 01:21: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 4W0hLd59hNz4VP0; Fri, 14 Jun 2024 01:21:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718328073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cYR6Hzpv16ZSLzq6Z/KgjdsuY47Iaj/Hl+m6s5pSjJY=; b=ik7cZmPkszlWuJjJivekkhzrXZUrtziQbXam6eyvCYKNvkPcffEbAwyQ+X2kAGcj7asSgJ Xu8VUptAmC+qzFgDStfS3sOZe+ks6vN4ZXN3jvFN/isscug3BAg3NE3A1WvkGklGBdb9+i BFrzJ0mZb4qMOKlLqCa8TavexsGXY4RbB4c/u/o+mgCwW1CbdJRxLpkW699JjhQKJ5WlgG O8L58s7o4P2mEvqlQN/8a6ESHOacWVdtdFT1wz3oLI/XeKuVlx9rYvpuUyQHnbhmYN6rM0 NkLCm06SFCWz68VIabKeVzHLkPSGRl/sc05EFrJrQ2tLfe4bceQ/fY0uDIXymw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718328073; a=rsa-sha256; cv=none; b=Fecpagyn4++tXEUA8gYdJ5YLLJKx6Tm5xKrr8hMP6xynDsE2nQKWmiRk0UuZzmJIdJ7qtA PJaEphvPT4YYuk3efsfeVFMjJvAG3/9vSM89Rf33l+le+cx3NCQB5Gl/Ygs/k9EbPb8Pqc Bd8wCLrk/k8TxMdp2kaLzvwO7fvwPriBujs6G8IQ47ksqEcTfa106HC3IGwuicW0mwu6Bo E0dAlMepYYvO7qEexBsGI+2mhipIxKPwHtN2Zdi5lvel6j6/0JljANyNDkfMGdOxSyN4nq 6Jsyst+uSNr7ogEDZ2B06N7qFiyjyx8z8n1xYiW25+TSBcL/KlDMCPzCER/+6A== 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=1718328073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cYR6Hzpv16ZSLzq6Z/KgjdsuY47Iaj/Hl+m6s5pSjJY=; b=DyeTAJWejMWE74iYW+i3NCW6ZTrV8bZUe6bNDiJjGEw1987f+lfP8Ro1wSYq4+XBqBLQ7a hn46nK0W4O7ZcXHYrSYmBF+GLutn69GGnJbdTLVodvG3s+ixUcUhP4Vvzq5n2H60sqXlDc ZvXtREOq/LLlOQaBLmZQXqzD/DDj7KQeGRP0sDlz39un3iC/XYCrOGZ+/dAc184/FBJxRd oIzFIQRRGafLD5hZUV+WMiuVXU7MRtdYLam4iKuAPVVFC4jxcXzfFZG2vvk9t5GZ4uASoU NVokqzlseVCBFwAtGgrB53QIulUJCyKb/xvPuRXKPSbUCOfHoc+DXocBeNScpQ== 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 4W0hLd4n4pz10xf; Fri, 14 Jun 2024 01:21: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 45E1LDxC054561; Fri, 14 Jun 2024 01:21:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45E1LDgQ054558; Fri, 14 Jun 2024 01:21:13 GMT (envelope-from git) Date: Fri, 14 Jun 2024 01:21:13 GMT Message-Id: <202406140121.45E1LDgQ054558@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: d9220f64da8b - main - uniq tests: Make uniq_test:stdout more reliable 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: d9220f64da8b1d55b15259e8b266b50371ed4f47 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d9220f64da8b1d55b15259e8b266b50371ed4f47 commit d9220f64da8b1d55b15259e8b266b50371ed4f47 Author: Mark Johnston AuthorDate: 2024-06-14 00:00:47 +0000 Commit: Mark Johnston CommitDate: 2024-06-14 00:00:47 +0000 uniq tests: Make uniq_test:stdout more reliable When running regression tests in paralle, this one occasionally fails because uniq exits with status 0. I believe this is because the test is a bit racy: it assumes that true(1) will exit before uniq writes to standard out. Just sleep for a bit to give the other end of the pipe to exit. Reviewed by: des MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45534 --- usr.bin/uniq/tests/uniq_test.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/usr.bin/uniq/tests/uniq_test.sh b/usr.bin/uniq/tests/uniq_test.sh index 804e82ce7766..9d37245dee4e 100755 --- a/usr.bin/uniq/tests/uniq_test.sh +++ b/usr.bin/uniq/tests/uniq_test.sh @@ -167,6 +167,8 @@ stdout_head() { stdout_body() { ( trap "" PIPE + # Give true(1) some time to exit. + sleep 1 echo a | uniq 2>stderr echo $? >result ) | true From nobody Fri Jun 14 01:21: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 4W0hLf6gxNz5N2qK; Fri, 14 Jun 2024 01:21: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 4W0hLf63QVz4VBL; Fri, 14 Jun 2024 01:21:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718328074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n4MP8LsOJEc/y11Uo8eNgqUjfi14KVp71WT1ASszL4w=; b=ypF2v/JwiDeftOSZAd2H3FZ3U5OyOGc37mFzXEApSXgCwocbyqLcyc82DaXLLSJ7UaNxg+ N+I9yjWVIhsBt1pIhyWVfdKy5o6NIrbMnGJWUxfXXhnbuawrLpw5OIh9K972W0YANMwhla qXag/2u4MOrCQYdyd7Uoxy87OEyD2WISrIe5ynIg1sl2O9HzfSh5mTWmmRMtDUAN4GRjwV BQ08hM+uIAHqxC+U4f1B/InD+7iv9pJAcLsWWXEKs2H8pe8kQ9KzA4QprUSl+wMASgCT3y DEG8hbw3iW0YWWeiXiRz0CqqrhEzKW5TTExUC4Dtzw8TAYv9dALrWqKIaA5llA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718328074; a=rsa-sha256; cv=none; b=eoazZITf/N/E++Fw3wJrf3qKzMckX1ye27EUwo6u/yNcZ8290yHkSaMJMj1QoqMH9AXcVK bzlIAepumDq12XBMjVTK8jUXpptBOtIVRVzDIAu5i9lKaCDhp8yh3BnUSFrtdev6fgkmzQ z9EOfv9wufL15Cw1ndA5j+iK36L9PGS//yT+cZBRd+z5xNQCE9StrvBsdZ86LWWvlgNrTz 5kxeff1bnG1M91CInT70bb9vrMn/LuyqwFlaHYuQQX0Ob4tHnK1HoadCO3khvjJf9jjB4Z Ga9XzRCW437Qr62tcIIz12BXI2Yl+zGg2pJ+NUWjEx6lu7sCPUbO5163BHvIVA== 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=1718328074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n4MP8LsOJEc/y11Uo8eNgqUjfi14KVp71WT1ASszL4w=; b=V7zIEp17tnJbGCZ1rb0u6j817fqz86QxCUIVPv9Jt+AXo7KgcBDhgkW6BUF7UcRm5nmiLa Hhstd3aMo+T8gDOBweT84uaKkwJV9N0aFnQ4Yw/7R1inFffadZ5SNJOhdLH4o3qa3JEBjL khBmRNGwVipyiP/Jxh5DIPAcq2uk8jHYLC6Mhn30oTOZ4pihJlzdIKYObdWwc0537i3xNZ nCHXmPFeVG2sYTDCs9IGfApCFq4/7MWAXjeZMUX/hB8DX4ow1wke4dphMjeL77UhkADwEG mCbWnAhabOtxkomzN9DeUAJOwbYBssDukZAo+O7Z0nHduj23bVTrQIpgkvp/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 4W0hLf5frkz10vd; Fri, 14 Jun 2024 01:21: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 45E1LE1k054612; Fri, 14 Jun 2024 01:21:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45E1LEn1054609; Fri, 14 Jun 2024 01:21:14 GMT (envelope-from git) Date: Fri, 14 Jun 2024 01:21:14 GMT Message-Id: <202406140121.45E1LEn1054609@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: ab250b02ba4c - main - bnxt: Use a simpler test for 32-bit platforms 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: ab250b02ba4ca29572a29dedc9e6276cba5a66db Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ab250b02ba4ca29572a29dedc9e6276cba5a66db commit ab250b02ba4ca29572a29dedc9e6276cba5a66db Author: Mark Johnston AuthorDate: 2024-06-14 00:02:32 +0000 Commit: Mark Johnston CommitDate: 2024-06-14 01:18:26 +0000 bnxt: Use a simpler test for 32-bit platforms Suggested by: jrtc27 Fixes: c867ba72889d ("bnxt: Do not compile on 32-bit platforms") --- sys/modules/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/modules/Makefile b/sys/modules/Makefile index d3ef4c63a41c..7ce956957fd5 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -442,8 +442,7 @@ SUBDIR+= dtrace SUBDIR+= opensolaris .endif -.if ${MACHINE_ARCH} != "i386" && ${MACHINE_CPUARCH} != "arm" && \ - ${MACHINE_ARCH} != "powerpc" && ${MACHINE_ARCH} != "powerpcspe" +.if !${MACHINE_ABI:Mlong32} _bnxt= bnxt .endif From nobody Fri Jun 14 01:21: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 4W0hLh10lnz5N2qT; Fri, 14 Jun 2024 01:21: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 4W0hLh0BK0z4VBQ; Fri, 14 Jun 2024 01:21:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718328076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6plyWhQabunl3dW5/Xq+rFUKNIU/dM9HtCR7DNbrMb4=; b=GDcRf/aEDx12s/CAr8aRtDwIHy0Z0/oTM1pssfSmIIv6VAVPlKX5fw4ng8Z2t4s9ipEj9t qjghWyw8esiaTUE4NDFbxkGoIvSo1RrpsOExGukdaux7Ag3N1GWNGPq40KtrHcI7NQ3Tgs InSYMGJ17IJ/lCWl+4fXrqXS/loHyGe+SsdXxUynpxqZ7X5gmp6zULhYxiw4KXWzhU0b2B VIB8FwAwZQ8gIzDvktwxwpTuisOy8A97Y/4iskpT36+tAuzdi9F3cb2/2YeNn7yqIeeMtX dlIf+CRX+b5d7MhluKJZzr9eWln/7SLi3Po7XBnA8ll5189d1C5Dn9p6rdHxBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718328076; a=rsa-sha256; cv=none; b=E83Nqxn3pfyIpZ+q9UvKCH0e1W9fUDSQUF9/E+M2XyRGl/lyxuwmmLq7EN5QdeUx+4647G gY5L+8zjDHkuSnjva5Qp3tEqKGJ3zwkVJBBsKxpoVodZXLvUAkMefrgRMCWGOkzcQ+5t/l XptLDLSL5AD9A8OXTLdTXPFGRLNTPTVXhxcGsEEFXux4vYOpl3N+rQRXQIFaqtmd+oUdg0 U8ZFrZn7oT6fXUkNGEc+5F6Kz8yxcZlcXFtV85+Dz+0VG7zJzerKPLGMGClxuDQxrEyLZ6 BB6hYpNBbcYXX3U3Cu0zYZ21Tml1Xgqh/Kj5tjyfZSjwHsivURGTPDlwzbOf1A== 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=1718328076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6plyWhQabunl3dW5/Xq+rFUKNIU/dM9HtCR7DNbrMb4=; b=uR+LZr+w1XNtEWNOWBgru8z93yjV0118OqODzOfOnN4IxkgBnc8Ae51LhFGym8DBYDzhSW cAy7QRIJsubRvgWEuPSZzAobsts/Mf/En1ad++agsfMwT3ZIjct7HkkE6ZdYYa0XADsh3g /12DlSaGOpMdeKvXGjovfJdavlQv57mzISKnl32nkvQ1T/iCoSvcD+eqRYosqgiTQ8IlFL 1yEV8ClWXUJm1S5uXBdU8dcEUNuE/YbnccGNoPINOqBD2rzi5tCO/On9CYl1iY80Mfk1a7 zBGrkaT4Qs1wLftoikep91fb+a89i5pwPxeT8ZwPlQ+q5oipawv068BmVdiwkg== 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 4W0hLg6Smpz10ct; Fri, 14 Jun 2024 01:21:15 +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 45E1LFso054664; Fri, 14 Jun 2024 01:21:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45E1LFXI054661; Fri, 14 Jun 2024 01:21:15 GMT (envelope-from git) Date: Fri, 14 Jun 2024 01:21:15 GMT Message-Id: <202406140121.45E1LFXI054661@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: 69ccea1c89da - main - vm_page: Let vm_page_init_page() take a pool parameter 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 69ccea1c89da82cbb772ac4cca62c1067346fe95 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=69ccea1c89da82cbb772ac4cca62c1067346fe95 commit 69ccea1c89da82cbb772ac4cca62c1067346fe95 Author: Mark Johnston AuthorDate: 2024-06-14 00:11:03 +0000 Commit: Mark Johnston CommitDate: 2024-06-14 01:18:59 +0000 vm_page: Let vm_page_init_page() take a pool parameter This is useful for a subsequent patch which implements lazy initialization of vm_page structures using a dedicate vm_phys free page pool. No functional change intended. Reviewed by: alc, kib, emaste MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D40399 --- sys/amd64/amd64/efirt_machdep.c | 3 ++- sys/vm/vm_page.c | 10 +++++----- sys/vm/vm_page.h | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/sys/amd64/amd64/efirt_machdep.c b/sys/amd64/amd64/efirt_machdep.c index 5d0106e2aa88..2c00a16b1499 100644 --- a/sys/amd64/amd64/efirt_machdep.c +++ b/sys/amd64/amd64/efirt_machdep.c @@ -245,7 +245,8 @@ efi_create_1t1_map(struct efi_md *map, int ndesc, int descsz) m = PHYS_TO_VM_PAGE(va); if (m != NULL && VM_PAGE_TO_PHYS(m) == 0) { - vm_page_init_page(m, va, -1); + vm_page_init_page(m, va, -1, + VM_FREEPOOL_DEFAULT); m->order = VM_NFREEORDER + 1; /* invalid */ m->pool = VM_NFREEPOOL + 1; /* invalid */ pmap_page_set_memattr_noflush(m, mode); diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 4b97637668b4..3077b023754a 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -497,9 +497,8 @@ vm_page_domain_init(int domain) * lists. */ void -vm_page_init_page(vm_page_t m, vm_paddr_t pa, int segind) +vm_page_init_page(vm_page_t m, vm_paddr_t pa, int segind, int pool) { - m->object = NULL; m->ref_count = 0; m->busy_lock = VPB_FREED; @@ -509,7 +508,7 @@ vm_page_init_page(vm_page_t m, vm_paddr_t pa, int segind) m->psind = 0; m->segind = segind; m->order = VM_NFREEORDER; - m->pool = VM_FREEPOOL_DEFAULT; + m->pool = pool; m->valid = m->dirty = 0; pmap_page_init(m); } @@ -756,7 +755,8 @@ vm_page_startup(vm_offset_t vaddr) #if defined(__i386__) && defined(VM_PHYSSEG_DENSE) for (ii = 0; ii < vm_page_array_size; ii++) { m = &vm_page_array[ii]; - vm_page_init_page(m, (first_page + ii) << PAGE_SHIFT, 0); + vm_page_init_page(m, (first_page + ii) << PAGE_SHIFT, 0, + VM_FREEPOOL_DEFAULT); m->flags = PG_FICTITIOUS; } #endif @@ -765,7 +765,7 @@ vm_page_startup(vm_offset_t vaddr) seg = &vm_phys_segs[segind]; for (m = seg->first_page, pa = seg->start; pa < seg->end; m++, pa += PAGE_SIZE) - vm_page_init_page(m, pa, segind); + vm_page_init_page(m, pa, segind, VM_FREEPOOL_DEFAULT); /* * Add the segment's pages that are covered by one of diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index 221f58b8fb04..5422f8df89a0 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -645,7 +645,7 @@ void vm_page_free_invalid(vm_page_t); vm_page_t vm_page_getfake(vm_paddr_t paddr, vm_memattr_t memattr); void vm_page_initfake(vm_page_t m, vm_paddr_t paddr, vm_memattr_t memattr); void vm_page_init_marker(vm_page_t marker, int queue, uint16_t aflags); -void vm_page_init_page(vm_page_t m, vm_paddr_t pa, int segind); +void vm_page_init_page(vm_page_t m, vm_paddr_t pa, int segind, int pool); int vm_page_insert (vm_page_t, vm_object_t, vm_pindex_t); void vm_page_invalid(vm_page_t m); void vm_page_launder(vm_page_t m); From nobody Fri Jun 14 01:21:16 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 4W0hLj69Dwz5N2nL; Fri, 14 Jun 2024 01:21: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 4W0hLj0wPhz4VV0; Fri, 14 Jun 2024 01:21:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718328077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yvntLzBnE5ANynjvuPP4z1JWBn8WoWn+EwJPNTVzD/M=; b=VqNEZ5rokGWOd1ZFgSJ9Jgb/EDLJtiiI1fHtivZOTizxOQ7PF7HSOczfO+TI0FD3QElGfY UqXKMy4xu3SP3zXjw9Ut91G+P7N6bbqRifJRWthj3LsvAhOh5b5w1ANAfDkZ/H8+mHaakn KYOzAFEiATqs8gfdg4Ayrq29y3B6rAEuI1jFJbEZOBXj1VfZZmmVPNNCl1YR2XBGEp8jXt Q7b8QGhEEWkYW2tl3f4TJ1ZT5asNZPh+g8vfgLtyIFy0IpMBV6vr9fJQu633WjOlJzIkOf X92f9E/gXc/KrJsySDbFpL/XtjPV40BjGYbwOAoj0S32yScDZeUN/I5cv4cJsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718328077; a=rsa-sha256; cv=none; b=sflXfj/HhAxWVKFPmwQcR663PA9iiMED4hyyo6msNiDJUFW4w07iXlBVxArdE7i8H42/2d 8cpW6RPm1sJBcH14l0N1YI8HQeChG2mm/b272GI1G5FCMJW1G/eIMrV/0sOhokhn+PpTi3 7OxXhqkvOnW1pjOF4nL3T8yWSzfpDXTDR2hBNmQMkdF+b1XsW69VWdmTBUWYHY+aNJpoOo VX59Tkx6JhvOLTRyIsjLGmWle/gSkOqshFFeeeLy1OxFRhbOlsA2YuqsrhhPRdxiVor07u K22DRjjYnSzuG5o1CzTSiC4nZlJ4s/6GMghsUjFxJeuINRRyoFo8h50u2lvrkw== 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=1718328077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yvntLzBnE5ANynjvuPP4z1JWBn8WoWn+EwJPNTVzD/M=; b=YOufWXnb0pVxQuZTlKfq4yFYmn2pflBRrk/x2WteNmwz6o1nlUxw8KmwawKQ7vT4GC7viQ EgwIKanAzOidBQ693VqZJ8lV/5FHaFs5rWw8Ryn9tu/GNdrE9zfPJjJuG6KYiBa0utf821 gHsv4eQeArsp7WYKUAFWT2ZZdPr17e5lgDgSZ30/tAG90qrVPX3CMf4IC0107Wxr8mc++Y blJAif9soDvWfBo1TIDKISmL1h5jVKAJSdq51cwmsj7GgIYRr6y6jmiPCnS0d2xaOxJHqy F5en3kIfzsEtdZH0GlhxixNL8+W9twYbJw+A59mUnj5/jHcP+xub0mPXNncF2A== 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 4W0hLj0KD9z10vf; Fri, 14 Jun 2024 01:21: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 45E1LGfU054716; Fri, 14 Jun 2024 01:21:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45E1LGmD054713; Fri, 14 Jun 2024 01:21:16 GMT (envelope-from git) Date: Fri, 14 Jun 2024 01:21:16 GMT Message-Id: <202406140121.45E1LGmD054713@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: d7ec4a8859b4 - main - vm_phys: Factor out some calls to vm_freelist_add() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: d7ec4a8859b44beb9ef69620134ba5c5ce4d598c Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d7ec4a8859b44beb9ef69620134ba5c5ce4d598c commit d7ec4a8859b44beb9ef69620134ba5c5ce4d598c Author: Mark Johnston AuthorDate: 2024-06-14 00:11:15 +0000 Commit: Mark Johnston CommitDate: 2024-06-14 01:18:59 +0000 vm_phys: Factor out some calls to vm_freelist_add() A subsequent patch will make this factoring more worthwhile. No functional change intended. Reviewed by: dougm, alc, kib, emaste MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D40400 --- sys/vm/vm_phys.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index 62e84a5b52bd..6323fb484030 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -680,6 +680,15 @@ vm_phys_split_pages(vm_page_t m, int oind, struct vm_freelist *fl, int order, } } +static void +vm_phys_enq_chunk(struct vm_freelist *fl, vm_page_t m, int order, int tail) +{ + KASSERT(order >= 0 && order < VM_NFREEORDER, + ("%s: invalid order %d", __func__, order)); + + vm_freelist_add(fl, m, order, tail); +} + /* * Add the physical pages [m, m + npages) at the beginning of a power-of-two * aligned and sized set to the specified free list. @@ -706,13 +715,13 @@ vm_phys_enq_beg(vm_page_t m, u_int npages, struct vm_freelist *fl, int tail) KASSERT(m->order == VM_NFREEORDER, ("%s: page %p has unexpected order %d", __func__, m, m->order)); - order = ilog2(npages); + order = ilog2(npages); KASSERT(order < VM_NFREEORDER, ("%s: order %d is out of range", __func__, order)); - vm_freelist_add(fl, m, order, tail); + vm_phys_enq_chunk(fl, m, order, tail); m += 1 << order; - npages -= 1 << order; - } + npages -= 1 << order; + } } /* @@ -743,9 +752,7 @@ vm_phys_enq_range(vm_page_t m, u_int npages, struct vm_freelist *fl, int tail) ("vm_phys_enq_range: page %p has unexpected order %d", m, m->order)); order = ffs(npages) - 1; - KASSERT(order < VM_NFREEORDER, - ("vm_phys_enq_range: order %d is out of range", order)); - vm_freelist_add(fl, m, order, tail); + vm_phys_enq_chunk(fl, m, order, tail); m += 1 << order; npages -= 1 << order; } @@ -1203,7 +1210,7 @@ vm_phys_enqueue_contig(vm_page_t m, u_long npages) KASSERT(seg == &vm_phys_segs[m->segind], ("%s: page range [%p,%p) spans multiple segments", __func__, m_end - npages, m)); - vm_freelist_add(fl, m, order, 1); + vm_phys_enq_chunk(fl, m, order, 1); m += 1 << order; } /* Free blocks of diminishing size. */ From nobody Fri Jun 14 01:21: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 4W0hLk3ndPz5N2nQ; Fri, 14 Jun 2024 01:21: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 4W0hLk1Rj6z4VXc; Fri, 14 Jun 2024 01:21:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718328078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uKuRpM+N+htlSfH3g7fL+mavSA+u22ASK9EHBIFfcZ0=; b=T3RQQwGZxxQ7qAYKyUgalY6G2IvV6kcopdslzqVv2h9QDgpSzi6K/yrAufG1MTV8t2L3HA bOtyzsh88bNwv4zub1/EnYjNH78QjxR41LqkmcbNSZko3N7zesKgcLWLn4CtVgteHYbBzd UFvOYt9Nc2o707yHhKNA52uH/7uGcMQwvnNIKDgf/q7uwznBKtStARg+EJn590CBdF04Gz PNBekGaYJYVjvc7LHn8Fx9K+/QmvQorjmg571Pce6d8NvG6tnKAKnIoIBewiR3cHMe0lga nr1/N73ng++bH6194wnwrI1bLgnKVbNlmbQyLswqQs5ysjR8d3RgBy3UP/t08w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718328078; a=rsa-sha256; cv=none; b=IA7jIA3np1St0FY+poVyBJAR/gRom3B0Cr14YIevGag48gwTjIYt/Uc4Z1NU6OUHm1IPFq jnwfNgqVNWYypeopS00lWttnUcWroerJOtQmuprbXzlPUNsoSwgx3Q4fc3geC2JUB6lFy/ 01VRfgRBzwijTj5jKuwseQdXM+ndjDY/0P5BJnjNLsewDZCmstKO81Imo6xJzvFuprNaFp UPI8Hoz63JT6SeoUBNdOC8Vk4Y7f5LHngZ7e41NBJPOnbUkqdX1Xl9r/2ZEKS4+oycWUU2 xz6RjsELbOuGzTqld++ig7XMBmVmX/rXIbCBnz3RG3Y1QpzHVWMv8msQSg3iag== 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=1718328078; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uKuRpM+N+htlSfH3g7fL+mavSA+u22ASK9EHBIFfcZ0=; b=tWRws/1/HmqlRESHcbs0IZ0BslndSlGOswDMr17A49dxeij+Oq1MPet8QQZix6c2HISAA6 Ueyt6dn9wHVuMj0ajmiyChNgkESOglCictq6NfRm8C5KKdCEhaH4K/YdlgsR04rgEkQBhc 8YpOYlqP9ebTjlygSeXChCxkYBGhcTXCCp0ZsxTBzIF3z6/tug2D/n2h20VQTcHTd5KbbE BkwerZia24OcN9eHDgdJFJlWDEeIcq1xVc2bUnNMcdZxJ/2ow3IoBTS0SEbdm5Fkz8Ovym G0bwJsHHaydHEOt9fMWozMGM2DP+Z6dsnJpSU8bf3f0LSAR5hMBC6B41wvc8lQ== 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 4W0hLk10hpz10Rj; Fri, 14 Jun 2024 01:21: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 45E1LIVE054761; Fri, 14 Jun 2024 01:21:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45E1LIQv054758; Fri, 14 Jun 2024 01:21:18 GMT (envelope-from git) Date: Fri, 14 Jun 2024 01:21:18 GMT Message-Id: <202406140121.45E1LIQv054758@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: 69cbb18746b6 - main - vm_phys: Add a vm_phys_seg_paddr_to_vm_page() helper 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 69cbb18746b69cbcdf79f1728d0435a1c86fff58 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=69cbb18746b69cbcdf79f1728d0435a1c86fff58 commit 69cbb18746b69cbcdf79f1728d0435a1c86fff58 Author: Mark Johnston AuthorDate: 2024-06-14 00:11:36 +0000 Commit: Mark Johnston CommitDate: 2024-06-14 01:18:59 +0000 vm_phys: Add a vm_phys_seg_paddr_to_vm_page() helper No functional change intended. Suggested by: alc Reviewed by: dougm, alc, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D43636 --- sys/vm/vm_page.c | 2 +- sys/vm/vm_phys.c | 29 +++++++++++++++++++++-------- sys/vm/vm_phys.h | 1 + 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 3077b023754a..37149cb660cb 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -782,7 +782,7 @@ vm_page_startup(vm_offset_t vaddr) if (pagecount == 0) continue; - m = seg->first_page + atop(startp - seg->start); + m = vm_phys_seg_paddr_to_vm_page(seg, startp); vmd = VM_DOMAIN(seg->domain); vm_domain_free_lock(vmd); vm_phys_enqueue_contig(m, pagecount); diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index 6323fb484030..35e544708c84 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -932,6 +932,19 @@ vm_phys_alloc_freelist_pages(int domain, int freelist, int pool, int order) return (NULL); } +/* + * Find the vm_page corresponding to the given physical address, which must lie + * within the given physical memory segment. + */ +vm_page_t +vm_phys_seg_paddr_to_vm_page(struct vm_phys_seg *seg, vm_paddr_t pa) +{ + KASSERT(pa >= seg->start && pa < seg->end, + ("%s: pa %#jx is out of range", __func__, (uintmax_t)pa)); + + return (&seg->first_page[atop(pa - seg->start)]); +} + /* * Find the vm_page corresponding to the given physical address. */ @@ -941,7 +954,7 @@ vm_phys_paddr_to_vm_page(vm_paddr_t pa) struct vm_phys_seg *seg; if ((seg = vm_phys_paddr_to_seg(pa)) != NULL) - return (&seg->first_page[atop(pa - seg->start)]); + return (vm_phys_seg_paddr_to_vm_page(seg, pa)); return (NULL); } @@ -1157,7 +1170,7 @@ vm_phys_free_pages(vm_page_t m, int order) pa ^= ((vm_paddr_t)1 << (PAGE_SHIFT + order)); if (pa < seg->start || pa >= seg->end) break; - m_buddy = &seg->first_page[atop(pa - seg->start)]; + m_buddy = vm_phys_seg_paddr_to_vm_page(seg, pa); if (m_buddy->order != order) break; fl = (*seg->free_queues)[m_buddy->pool]; @@ -1166,7 +1179,7 @@ vm_phys_free_pages(vm_page_t m, int order) vm_phys_set_pool(m->pool, m_buddy, order); order++; pa &= ~(((vm_paddr_t)1 << (PAGE_SHIFT + order)) - 1); - m = &seg->first_page[atop(pa - seg->start)]; + m = vm_phys_seg_paddr_to_vm_page(seg, pa); } while (order < VM_NFREEORDER - 1); } fl = (*seg->free_queues)[m->pool]; @@ -1278,8 +1291,8 @@ vm_phys_find_range(vm_page_t bounds[], int segind, int domain, pa_end = MIN(high, seg->end); if (pa_end - pa_start < ptoa(npages)) continue; - bounds[0] = &seg->first_page[atop(pa_start - seg->start)]; - bounds[1] = &seg->first_page[atop(pa_end - seg->start)]; + bounds[0] = vm_phys_seg_paddr_to_vm_page(seg, pa_start); + bounds[1] = vm_phys_seg_paddr_to_vm_page(seg, pa_end); return (seg - vm_phys_segs); } return (-1); @@ -1313,7 +1326,7 @@ vm_phys_unfree_page(vm_page_t m) order++; pa = m->phys_addr & (~(vm_paddr_t)0 << (PAGE_SHIFT + order)); if (pa >= seg->start) - m_set = &seg->first_page[atop(pa - seg->start)]; + m_set = vm_phys_seg_paddr_to_vm_page(seg, pa); else return (false); } @@ -1338,10 +1351,10 @@ vm_phys_unfree_page(vm_page_t m) order--; pa_half = m_set->phys_addr ^ (1 << (PAGE_SHIFT + order)); if (m->phys_addr < pa_half) - m_tmp = &seg->first_page[atop(pa_half - seg->start)]; + m_tmp = vm_phys_seg_paddr_to_vm_page(seg, pa_half); else { m_tmp = m_set; - m_set = &seg->first_page[atop(pa_half - seg->start)]; + m_set = vm_phys_seg_paddr_to_vm_page(seg, pa_half); } vm_freelist_add(fl, m_tmp, order, 0); } diff --git a/sys/vm/vm_phys.h b/sys/vm/vm_phys.h index 1f502ad745c4..300443accdb6 100644 --- a/sys/vm/vm_phys.h +++ b/sys/vm/vm_phys.h @@ -77,6 +77,7 @@ void vm_phys_free_contig(vm_page_t m, u_long npages); void vm_phys_free_pages(vm_page_t m, int order); void vm_phys_init(void); vm_page_t vm_phys_paddr_to_vm_page(vm_paddr_t pa); +vm_page_t vm_phys_seg_paddr_to_vm_page(struct vm_phys_seg *seg, vm_paddr_t pa); void vm_phys_register_domains(int ndomains, struct mem_affinity *affinity, int *locality); bool vm_phys_unfree_page(vm_page_t m); From nobody Fri Jun 14 01:21: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 4W0hLl2wLjz5N2qZ; Fri, 14 Jun 2024 01:21: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 4W0hLl22PVz4VGw; Fri, 14 Jun 2024 01:21:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718328079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mW6wBZ6cq7N0s9CXPfB4o+z+Ozil2JYI9SINgkMER4Q=; b=SGQClL512BrdekMXNMgvJVj4DXuL28/q3Og7gOmze+LeXkZCG2DQ3N1+FMup/Nhgm2fXkf 3xv9qziOUYG21ZcRwQEG0OYVbIUW1E4i/CDjKuul9Y4YnXizc+DElgG0WyT2OUlyzVQppk LAqKlKoJwjCGa9oGfcbTrAAMQTMnutdLw+Rx2BBMYsd9jGHoFUb/f7J3zigPyFda5vQqxf WXPtbg8AU/IC4ku+HFlhxKbEaPulqBjuxnFVhDB/c5uzk3EKpi/clkbkVxWKOvV8nvVp1T ysHsGpMSdOStkwydzuzDPttVaIxBTwWB2t3dpX+ZnacJV5xXl0nDz3MYGMDRiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718328079; a=rsa-sha256; cv=none; b=lD9Ctlqb/tR+hPCrXBbjziRXC8Dah8OxYeqgbzfW6mN8nYyRdrnF3Po3l5DlAuyx3FdXMB 5yaJoN5vY4XM2oBnjSaoX7K4ZUflqEf14Jsi1swFIbbI3GVTqR0HGWYPzjSqP+dhAnY96S 7VAEv0vZ9a7+B7Rqd3V4wFIxjt65Uz+RSlaD9huPfR3ZjPIoyL+FkSsDxt7K70DCbKDIAa pH//alMmC8qnO5EDn6T/kHaBGSvlLfKakephgEWJGjB0p2We0YEGkRja2BEidx3Qs4OHTu 0MXEBF+RRPc2aM7gZ3Z0TBmYQiGk919mGF3hDDW3ccW2tQHh5/4x9H/anCU8Ow== 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=1718328079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mW6wBZ6cq7N0s9CXPfB4o+z+Ozil2JYI9SINgkMER4Q=; b=yUk2g0pAtHRHJXlYi5RAfHZYwj5RtBaIC587N0SxfqvMyepBEYpXUfR8wFPcuNHuTROho0 je5Tit9Hc4FCyWKQ+NyeIfrt8uQvEWpixqxYQrSasfnQ450UeFhfpb5AELe0NjAD/NAf3j RYnGy2gYAecJ+RiXB9QxsLnJggJCarrduDTwy8szGjDhyoPNYqIWpGlijDaAJP45DHx3j3 6oqU4QtfdPZylgwteDbVn3pSk8ATV86O/Du2DDl6+spX5N7kK87MzKSXbs/f5tzJSWo88y X2yjP/fpBJF/hzUxN5w/cy4ZZrLbWoT30m3cs635Ilem379+fFPOF9sZcJ+eAQ== 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 4W0hLl1dddz10Rk; Fri, 14 Jun 2024 01:21: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 45E1LJWt054806; Fri, 14 Jun 2024 01:21:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45E1LJt2054803; Fri, 14 Jun 2024 01:21:19 GMT (envelope-from git) Date: Fri, 14 Jun 2024 01:21:19 GMT Message-Id: <202406140121.45E1LJt2054803@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: b16b4c22d2d1 - main - vm_page: Implement lazy page 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: b16b4c22d2d19bfb3d8e0fcce9e83b9d69f915e8 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b16b4c22d2d19bfb3d8e0fcce9e83b9d69f915e8 commit b16b4c22d2d19bfb3d8e0fcce9e83b9d69f915e8 Author: Mark Johnston AuthorDate: 2024-06-14 00:11:47 +0000 Commit: Mark Johnston CommitDate: 2024-06-14 01:19:00 +0000 vm_page: Implement lazy page initialization FreeBSD's boot times have decreased to the point where vm_page array initialization represents a significant fraction of the total boot time. For example, when booting FreeBSD in Firecracker (a VMM designed to support lightweight VMs) with 128MB and 1GB of RAM, vm_page initialization consumes 9% (3ms) and 37% (21.5ms) of the kernel boot time, respectively. This is generally relevant in cloud environments, where one wants to be able to spin up VMs as quickly as possible. This patch implements lazy initialization of (most) page structures, following a suggestion from cperciva@. The idea is to introduce a new free pool, VM_FREEPOOL_LAZYINIT, into which all vm_page structures are initially placed. For this to work, we need only initialize the first free page of each chunk placed into the buddy allocator. Then, early page allocations draw from the lazy init pool and initialize vm_page chunks (up to 16MB, 4096 pages) on demand. Once APs are started, an idle-priority thread drains the lazy init pool in the background to avoid introducing extra latency in the allocator. With this scheme, almost all of the initialization work is moved out of the critical path. A couple of vm_phys operations require the pool to be drained before they can run: vm_phys_find_range() and vm_phys_unfree_page(). However, these are rare operations. I believe that vm_phys_find_freelist_contig() does not require any special treatment, as it only ever accesses the first page in a power-of-2-sized free page chunk, which is always initialized. For now the new pool is only used on amd64 and arm64, since that's where I can easily test and those platforms would get the most benefit. Reviewed by: alc, kib Differential Revision: https://reviews.freebsd.org/D40403 --- sys/amd64/include/vmparam.h | 16 ++-- sys/arm64/include/vmparam.h | 16 ++-- sys/vm/vm_page.c | 65 ++++++++++++-- sys/vm/vm_phys.c | 201 ++++++++++++++++++++++++++++++++++++++++---- sys/vm/vm_phys.h | 2 +- 5 files changed, 263 insertions(+), 37 deletions(-) diff --git a/sys/amd64/include/vmparam.h b/sys/amd64/include/vmparam.h index 93c2648e8fac..2ffa51d9021c 100644 --- a/sys/amd64/include/vmparam.h +++ b/sys/amd64/include/vmparam.h @@ -94,14 +94,16 @@ #define VM_PHYSSEG_MAX 63 /* - * Create two free page pools: VM_FREEPOOL_DEFAULT is the default pool - * from which physical pages are allocated and VM_FREEPOOL_DIRECT is - * the pool from which physical pages for page tables and small UMA - * objects are allocated. + * Create three free page pools: VM_FREEPOOL_DEFAULT is the default pool from + * which physical pages are allocated and VM_FREEPOOL_DIRECT is the pool from + * which physical pages for page tables and small UMA objects are allocated. + * VM_FREEPOOL_LAZINIT is a special-purpose pool that is populated only during + * boot and is used to implement deferred initialization of page structures. */ -#define VM_NFREEPOOL 2 -#define VM_FREEPOOL_DEFAULT 0 -#define VM_FREEPOOL_DIRECT 1 +#define VM_NFREEPOOL 3 +#define VM_FREEPOOL_LAZYINIT 0 +#define VM_FREEPOOL_DEFAULT 1 +#define VM_FREEPOOL_DIRECT 2 /* * Create up to three free page lists: VM_FREELIST_DMA32 is for physical pages diff --git a/sys/arm64/include/vmparam.h b/sys/arm64/include/vmparam.h index 0e93e4026d4a..08a3b18da64e 100644 --- a/sys/arm64/include/vmparam.h +++ b/sys/arm64/include/vmparam.h @@ -73,14 +73,16 @@ #define VM_PHYSSEG_MAX 64 /* - * Create two free page pools: VM_FREEPOOL_DEFAULT is the default pool - * from which physical pages are allocated and VM_FREEPOOL_DIRECT is - * the pool from which physical pages for small UMA objects are - * allocated. + * Create three free page pools: VM_FREEPOOL_DEFAULT is the default pool from + * which physical pages are allocated and VM_FREEPOOL_DIRECT is the pool from + * which physical pages for page tables and small UMA objects are allocated. + * VM_FREEPOOL_LAZINIT is a special-purpose pool that is populated only during + * boot and is used to implement deferred initialization of page structures. */ -#define VM_NFREEPOOL 2 -#define VM_FREEPOOL_DEFAULT 0 -#define VM_FREEPOOL_DIRECT 1 +#define VM_NFREEPOOL 3 +#define VM_FREEPOOL_LAZYINIT 0 +#define VM_FREEPOOL_DEFAULT 1 +#define VM_FREEPOOL_DIRECT 2 /* * Create two free page lists: VM_FREELIST_DMA32 is for physical pages that have diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 37149cb660cb..8e94c02089ae 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -333,9 +333,9 @@ vm_page_blacklist_add(vm_paddr_t pa, bool verbose) if (m == NULL) return (true); /* page does not exist, no failure */ - vmd = vm_pagequeue_domain(m); + vmd = VM_DOMAIN(vm_phys_domain(pa)); vm_domain_free_lock(vmd); - found = vm_phys_unfree_page(m); + found = vm_phys_unfree_page(pa); vm_domain_free_unlock(vmd); if (found) { vm_domain_freecnt_inc(vmd, -1); @@ -568,6 +568,9 @@ vm_page_startup(vm_offset_t vaddr) #if defined(__i386__) && defined(VM_PHYSSEG_DENSE) long ii; #endif +#ifdef VM_FREEPOOL_LAZYINIT + int lazyinit; +#endif vaddr = round_page(vaddr); @@ -748,6 +751,11 @@ vm_page_startup(vm_offset_t vaddr) */ vm_phys_init(); +#ifdef VM_FREEPOOL_LAZYINIT + lazyinit = 1; + TUNABLE_INT_FETCH("debug.vm.lazy_page_init", &lazyinit); +#endif + /* * Initialize the page structures and add every available page to the * physical memory allocator's free lists. @@ -763,9 +771,50 @@ vm_page_startup(vm_offset_t vaddr) vm_cnt.v_page_count = 0; for (segind = 0; segind < vm_phys_nsegs; segind++) { seg = &vm_phys_segs[segind]; - for (m = seg->first_page, pa = seg->start; pa < seg->end; - m++, pa += PAGE_SIZE) - vm_page_init_page(m, pa, segind, VM_FREEPOOL_DEFAULT); + + /* + * If lazy vm_page initialization is not enabled, simply + * initialize all of the pages in the segment. Otherwise, we + * only initialize: + * 1. Pages not covered by phys_avail[], since they might be + * freed to the allocator at some future point, e.g., by + * kmem_bootstrap_free(). + * 2. The first page of each run of free pages handed to the + * vm_phys allocator, which in turn defers initialization + * of pages until they are needed. + * This avoids blocking the boot process for long periods, which + * may be relevant for VMs (which ought to boot as quickly as + * possible) and/or systems with large amounts of physical + * memory. + */ +#ifdef VM_FREEPOOL_LAZYINIT + if (lazyinit) { + startp = seg->start; + for (i = 0; phys_avail[i + 1] != 0; i += 2) { + if (startp >= seg->end) + break; + + if (phys_avail[i + 1] < startp) + continue; + if (phys_avail[i] <= startp) { + startp = phys_avail[i + 1]; + continue; + } + + m = vm_phys_seg_paddr_to_vm_page(seg, startp); + for (endp = MIN(phys_avail[i], seg->end); + startp < endp; startp += PAGE_SIZE, m++) { + vm_page_init_page(m, startp, segind, + VM_FREEPOOL_DEFAULT); + } + } + } else +#endif + for (m = seg->first_page, pa = seg->start; + pa < seg->end; m++, pa += PAGE_SIZE) { + vm_page_init_page(m, pa, segind, + VM_FREEPOOL_DEFAULT); + } /* * Add the segment's pages that are covered by one of @@ -783,6 +832,12 @@ vm_page_startup(vm_offset_t vaddr) continue; m = vm_phys_seg_paddr_to_vm_page(seg, startp); +#ifdef VM_FREEPOOL_LAZYINIT + if (lazyinit) { + vm_page_init_page(m, startp, segind, + VM_FREEPOOL_LAZYINIT); + } +#endif vmd = VM_DOMAIN(seg->domain); vm_domain_free_lock(vmd); vm_phys_enqueue_contig(m, pagecount); diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index 35e544708c84..a28b3a40691e 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -47,14 +47,18 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include #include +#include +#include #include #include @@ -141,6 +145,7 @@ vm_paddr_t dump_avail[PHYS_AVAIL_COUNT]; * Provides the mapping from VM_FREELIST_* to free list indices (flind). */ static int __read_mostly vm_freelist_to_flind[VM_NFREELIST]; +static int __read_mostly vm_default_freepool; CTASSERT(VM_FREELIST_DEFAULT == 0); @@ -184,6 +189,16 @@ static void vm_phys_create_seg(vm_paddr_t start, vm_paddr_t end); static void vm_phys_split_pages(vm_page_t m, int oind, struct vm_freelist *fl, int order, int tail); +static bool __diagused +vm_phys_pool_valid(int pool) +{ +#ifdef VM_FREEPOOL_LAZYINIT + if (pool == VM_FREEPOOL_LAZYINIT) + return (false); +#endif + return (pool >= 0 && pool < VM_NFREEPOOL); +} + /* * Red-black tree helpers for vm fictitious range management. */ @@ -621,6 +636,12 @@ vm_phys_init(void) } } +#ifdef VM_FREEPOOL_LAZYINIT + vm_default_freepool = VM_FREEPOOL_LAZYINIT; +#else + vm_default_freepool = VM_FREEPOOL_DEFAULT; +#endif + rw_init(&vm_phys_fictitious_reg_lock, "vmfctr"); } @@ -687,6 +708,17 @@ vm_phys_enq_chunk(struct vm_freelist *fl, vm_page_t m, int order, int tail) ("%s: invalid order %d", __func__, order)); vm_freelist_add(fl, m, order, tail); +#ifdef VM_FREEPOOL_LAZYINIT + if (__predict_false(m->pool == VM_FREEPOOL_LAZYINIT)) { + vm_page_t m_next; + int npages; + + npages = 1 << order; + m_next = m + npages; + vm_page_init_page(m_next, m->phys_addr + ptoa(npages), m->segind, + VM_FREEPOOL_LAZYINIT); + } +#endif } /* @@ -760,15 +792,33 @@ vm_phys_enq_range(vm_page_t m, u_int npages, struct vm_freelist *fl, int tail) } /* - * Set the pool for a contiguous, power of two-sized set of physical pages. + * Set the pool for a contiguous, power of two-sized set of physical pages. + * + * If the pages currently belong to the lazy init pool, then the corresponding + * page structures must be initialized. In this case it is assumed that the + * first page in the run has already been initialized. */ static void vm_phys_set_pool(int pool, vm_page_t m, int order) { - vm_page_t m_tmp; - - for (m_tmp = m; m_tmp < &m[1 << order]; m_tmp++) - m_tmp->pool = pool; +#ifdef VM_FREEPOOL_LAZYINIT + if (__predict_false(m->pool == VM_FREEPOOL_LAZYINIT)) { + vm_paddr_t pa; + int segind; + + m->pool = pool; + + TSENTER(); + pa = m->phys_addr + PAGE_SIZE; + segind = m->segind; + for (vm_page_t m_tmp = m + 1; m_tmp < &m[1 << order]; + m_tmp++, pa += PAGE_SIZE) + vm_page_init_page(m_tmp, pa, segind, pool); + TSEXIT(); + } else +#endif + for (vm_page_t m_tmp = m; m_tmp < &m[1 << order]; m_tmp++) + m_tmp->pool = pool; } /* @@ -792,7 +842,7 @@ vm_phys_alloc_npages(int domain, int pool, int npages, vm_page_t ma[]) KASSERT(domain >= 0 && domain < vm_ndomains, ("vm_phys_alloc_npages: domain %d is out of range", domain)); - KASSERT(pool < VM_NFREEPOOL, + KASSERT(vm_phys_pool_valid(pool), ("vm_phys_alloc_npages: pool %d is out of range", pool)); KASSERT(npages <= 1 << (VM_NFREEORDER - 1), ("vm_phys_alloc_npages: npages %d is out of range", npages)); @@ -821,7 +871,8 @@ vm_phys_alloc_npages(int domain, int pool, int npages, vm_page_t ma[]) } } for (oind = VM_NFREEORDER - 1; oind >= 0; oind--) { - for (pind = 0; pind < VM_NFREEPOOL; pind++) { + for (pind = vm_default_freepool; pind < VM_NFREEPOOL; + pind++) { alt = vm_phys_free_queues[domain][flind][pind]; while ((m = TAILQ_FIRST(&alt[oind].pl)) != NULL) { @@ -888,7 +939,7 @@ vm_phys_alloc_freelist_pages(int domain, int freelist, int pool, int order) KASSERT(freelist < VM_NFREELIST, ("vm_phys_alloc_freelist_pages: freelist %d is out of range", freelist)); - KASSERT(pool < VM_NFREEPOOL, + KASSERT(vm_phys_pool_valid(pool), ("vm_phys_alloc_freelist_pages: pool %d is out of range", pool)); KASSERT(order < VM_NFREEORDER, ("vm_phys_alloc_freelist_pages: order %d is out of range", order)); @@ -917,7 +968,7 @@ vm_phys_alloc_freelist_pages(int domain, int freelist, int pool, int order) * use them to satisfy the allocation. */ for (oind = VM_NFREEORDER - 1; oind >= order; oind--) { - for (pind = 0; pind < VM_NFREEPOOL; pind++) { + for (pind = vm_default_freepool; pind < VM_NFREEPOOL; pind++) { alt = &vm_phys_free_queues[domain][flind][pind][0]; m = TAILQ_FIRST(&alt[oind].pl); if (m != NULL) { @@ -1157,7 +1208,7 @@ vm_phys_free_pages(vm_page_t m, int order) KASSERT(m->order == VM_NFREEORDER, ("vm_phys_free_pages: page %p has unexpected order %d", m, m->order)); - KASSERT(m->pool < VM_NFREEPOOL, + KASSERT(vm_phys_pool_valid(m->pool), ("vm_phys_free_pages: page %p has unexpected pool %d", m, m->pool)); KASSERT(order < VM_NFREEORDER, @@ -1186,6 +1237,107 @@ vm_phys_free_pages(vm_page_t m, int order) vm_freelist_add(fl, m, order, 1); } +#ifdef VM_FREEPOOL_LAZYINIT +/* + * Initialize all pages lingering in the lazy init pool of a NUMA domain, moving + * them to the default pool. This is a prerequisite for some rare operations + * which need to scan the page array and thus depend on all pages being + * initialized. + */ +static void +vm_phys_lazy_init_domain(int domain, bool locked) +{ + static bool initdone[MAXMEMDOM]; + struct vm_domain *vmd; + struct vm_freelist *fl; + vm_page_t m; + int pind; + bool unlocked; + + if (__predict_true(atomic_load_bool(&initdone[domain]))) + return; + + vmd = VM_DOMAIN(domain); + if (locked) + vm_domain_free_assert_locked(vmd); + else + vm_domain_free_lock(vmd); + if (atomic_load_bool(&initdone[domain])) + goto out; + pind = VM_FREEPOOL_LAZYINIT; + for (int freelist = 0; freelist < VM_NFREELIST; freelist++) { + int flind; + + flind = vm_freelist_to_flind[freelist]; + if (flind < 0) + continue; + fl = vm_phys_free_queues[domain][flind][pind]; + for (int oind = 0; oind < VM_NFREEORDER; oind++) { + if (atomic_load_int(&fl[oind].lcnt) == 0) + continue; + while ((m = TAILQ_FIRST(&fl[oind].pl)) != NULL) { + /* + * Avoid holding the lock across the + * initialization unless there's a free page + * shortage. + */ + vm_freelist_rem(fl, m, oind); + unlocked = vm_domain_allocate(vmd, + VM_ALLOC_NORMAL, 1 << oind); + if (unlocked) + vm_domain_free_unlock(vmd); + vm_phys_set_pool(VM_FREEPOOL_DEFAULT, m, oind); + if (unlocked) { + vm_domain_freecnt_inc(vmd, 1 << oind); + vm_domain_free_lock(vmd); + } + vm_phys_free_pages(m, oind); + } + } + } + atomic_store_bool(&initdone[domain], true); +out: + if (!locked) + vm_domain_free_unlock(vmd); +} + +static void +vm_phys_lazy_init(void) +{ + for (int domain = 0; domain < vm_ndomains; domain++) + vm_phys_lazy_init_domain(domain, false); + atomic_store_int(&vm_default_freepool, VM_FREEPOOL_DEFAULT); +} + +static void +vm_phys_lazy_init_kthr(void *arg __unused) +{ + vm_phys_lazy_init(); + kthread_exit(); +} + +static void +vm_phys_lazy_sysinit(void *arg __unused) +{ + struct thread *td; + int error; + + error = kthread_add(vm_phys_lazy_init_kthr, NULL, curproc, &td, + RFSTOPPED, 0, "vmlazyinit"); + if (error == 0) { + thread_lock(td); + sched_prio(td, PRI_MIN_IDLE); + sched_add(td, SRQ_BORING); + } else { + printf("%s: could not create lazy init thread: %d\n", + __func__, error); + vm_phys_lazy_init(); + } +} +SYSINIT(vm_phys_lazy_init, SI_SUB_SMP, SI_ORDER_ANY, vm_phys_lazy_sysinit, + NULL); +#endif /* VM_FREEPOOL_LAZYINIT */ + /* * Free a contiguous, arbitrarily sized set of physical pages, without * merging across set boundaries. @@ -1291,6 +1443,12 @@ vm_phys_find_range(vm_page_t bounds[], int segind, int domain, pa_end = MIN(high, seg->end); if (pa_end - pa_start < ptoa(npages)) continue; +#ifdef VM_FREEPOOL_LAZYINIT + /* + * The pages on the free lists must be initialized. + */ + vm_phys_lazy_init_domain(domain, false); +#endif bounds[0] = vm_phys_seg_paddr_to_vm_page(seg, pa_start); bounds[1] = vm_phys_seg_paddr_to_vm_page(seg, pa_end); return (seg - vm_phys_segs); @@ -1306,21 +1464,30 @@ vm_phys_find_range(vm_page_t bounds[], int segind, int domain, * The free page queues must be locked. */ bool -vm_phys_unfree_page(vm_page_t m) +vm_phys_unfree_page(vm_paddr_t pa) { struct vm_freelist *fl; struct vm_phys_seg *seg; - vm_paddr_t pa, pa_half; - vm_page_t m_set, m_tmp; + vm_paddr_t pa_half; + vm_page_t m, m_set, m_tmp; int order; + seg = vm_phys_paddr_to_seg(pa); + vm_domain_free_assert_locked(VM_DOMAIN(seg->domain)); + + /* + * The pages on the free lists must be initialized. + */ +#ifdef VM_FREEPOOL_LAZYINIT + vm_phys_lazy_init_domain(seg->domain, true); +#endif + /* * First, find the contiguous, power of two-sized set of free * physical pages containing the given physical page "m" and * assign it to "m_set". */ - seg = &vm_phys_segs[m->segind]; - vm_domain_free_assert_locked(VM_DOMAIN(seg->domain)); + m = vm_phys_paddr_to_vm_page(pa); for (m_set = m, order = 0; m_set->order == VM_NFREEORDER && order < VM_NFREEORDER - 1; ) { order++; @@ -1459,7 +1626,7 @@ vm_phys_find_queues_contig( /* Search for a large enough free block. */ size = npages << PAGE_SHIFT; for (oind = order; oind < VM_NFREEORDER; oind++) { - for (pind = 0; pind < VM_NFREEPOOL; pind++) { + for (pind = vm_default_freepool; pind < VM_NFREEPOOL; pind++) { fl = (*queues)[pind]; TAILQ_FOREACH(m_ret, &fl[oind].pl, listq) { /* @@ -1479,7 +1646,7 @@ vm_phys_find_queues_contig( if (order < VM_NFREEORDER) return (NULL); /* Search for a long-enough sequence of max-order blocks. */ - for (pind = 0; pind < VM_NFREEPOOL; pind++) { + for (pind = vm_default_freepool; pind < VM_NFREEPOOL; pind++) { fl = (*queues)[pind]; m_ret = vm_phys_find_freelist_contig(fl, npages, low, high, alignment, boundary); diff --git a/sys/vm/vm_phys.h b/sys/vm/vm_phys.h index 300443accdb6..bd086fd5571f 100644 --- a/sys/vm/vm_phys.h +++ b/sys/vm/vm_phys.h @@ -80,7 +80,7 @@ vm_page_t vm_phys_paddr_to_vm_page(vm_paddr_t pa); vm_page_t vm_phys_seg_paddr_to_vm_page(struct vm_phys_seg *seg, vm_paddr_t pa); void vm_phys_register_domains(int ndomains, struct mem_affinity *affinity, int *locality); -bool vm_phys_unfree_page(vm_page_t m); +bool vm_phys_unfree_page(vm_paddr_t pa); int vm_phys_mem_affinity(int f, int t); void vm_phys_early_add_seg(vm_paddr_t start, vm_paddr_t end); vm_paddr_t vm_phys_early_alloc(int domain, size_t alloc_size); From nobody Fri Jun 14 01:21: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 4W0hLm4Fyhz5N2lS; Fri, 14 Jun 2024 01:21: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 4W0hLm2gbBz4VHB; Fri, 14 Jun 2024 01:21:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718328080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WOPF2D5O9Uvz5PRNJUqmew1E4pMLeX6JlCmZoy+4ZuM=; b=lrop7gJdKYrWnXi7XeWqcwJ66KZKQvVD8mexMb14gecYWsuy3pcJmaEich4/g9XK91tSIn 5myh8r5vPo4nuOGDTjqbDOhhbIFGcEzPLpd38W8pWW7Xc1Emf2jVSYZ9W68Qsf2vzfW6GB vhI6ueWfNhUZH6Lyep2Bk8msiCNpNdc2uhDap/1iXdZ8HIJWKp4L4mCjx6KI8NC8W+R6US EmkDOQKAweJTEjU44q1B0iU5+Q+XWSS/J0pytvgTA1UJ8ONYm/mkAfAK7RYW27bVDzGtHR 4N/1Di6zgmsqrq77nmNmMGDvwh95lc91sOBmtZqpIhLRX4FmQFxkYF0R7e6uxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718328080; a=rsa-sha256; cv=none; b=FDWakaIrsl63KkGmU+T31PndlAYciTFyNZZf0gpdZ18gLkIptbNISsMol0HofQeq9M6p0U kLWe9aMLvSUlHKZn6ujmoyDJDYn5y0iTcYoST7t9BNMlRTrtr18kD6+cGM1xnnFBJk4ymK nGKxW/QzPXzPDUL8cV2nS5t+lpCftzJ74BCUjJV3UZ8NCun2jzPYOV5HBnK7sXmGltrejr p2tvVVWGCTlZeYMfo7Ey+jtg4THg/fZp+4mKopw9qp4Rww7jXZhwp+SmgDR5G61YlAKRmc +LHPdckiNFBZwMMtqsXswSii7oZozUO01SQdgxcBZ6AtV0kXYRyVBRDTbVYlng== 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=1718328080; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WOPF2D5O9Uvz5PRNJUqmew1E4pMLeX6JlCmZoy+4ZuM=; b=XiXtbOYEbHnMrR4ZMKCkRlBCR57uEs03vBrLeqteXsUplP9sxKCrtU9f2YX3YlBcwtlbWZ cCdVRfjmnGC2UDOXZ0mZk/UMG8asUQvCG/9g6WFt+RScS9OyyeB1+LnPa3xITfiK//iLcM 2EyoA/AaWo9F8sFv9/chc1E5nNqH1Vf5SBrCRY4LVgOpAp9bGrfNdD7YVZ4kT1ITPUB2GS GZo9ns3Yi/IeziaAqM4qasOFvi0JxX6EVguxPUhiJLPba8w9wkSsbVHAORQiDvTVWvoa7A PPkQ5kB1DD74VlDFWpG5OsfJ6mSeXFMUx+0lwxbfuaSJ7jEvTZsJaZLMMpSc9w== 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 4W0hLm2G7Bz1097; Fri, 14 Jun 2024 01:21: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 45E1LK8f054993; Fri, 14 Jun 2024 01:21:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45E1LKZN054979; Fri, 14 Jun 2024 01:21:20 GMT (envelope-from git) Date: Fri, 14 Jun 2024 01:21:20 GMT Message-Id: <202406140121.45E1LKZN054979@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: a03354b00238 - main - arm64/vmm: Implement vm_disable_vcpu_creation() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: a03354b00238b73568efe225c754cba197393f77 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a03354b00238b73568efe225c754cba197393f77 commit a03354b00238b73568efe225c754cba197393f77 Author: Mark Johnston AuthorDate: 2024-06-14 00:16:28 +0000 Commit: Mark Johnston CommitDate: 2024-06-14 01:19:00 +0000 arm64/vmm: Implement vm_disable_vcpu_creation() No functional change intended. Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D45556 --- sys/arm64/include/vmm.h | 1 + sys/arm64/vmm/vmm.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/sys/arm64/include/vmm.h b/sys/arm64/include/vmm.h index c06d2ad947e4..cf00dd60a43f 100644 --- a/sys/arm64/include/vmm.h +++ b/sys/arm64/include/vmm.h @@ -127,6 +127,7 @@ struct vm_eventinfo { int vm_create(const char *name, struct vm **retvm); struct vcpu *vm_alloc_vcpu(struct vm *vm, int vcpuid); +void vm_disable_vcpu_creation(struct vm *vm); void vm_slock_vcpus(struct vm *vm); void vm_unlock_vcpus(struct vm *vm); void vm_destroy(struct vm *vm); diff --git a/sys/arm64/vmm/vmm.c b/sys/arm64/vmm/vmm.c index a2cc63448f19..c6a49ebc4b03 100644 --- a/sys/arm64/vmm/vmm.c +++ b/sys/arm64/vmm/vmm.c @@ -141,6 +141,7 @@ struct vm { volatile cpuset_t active_cpus; /* (i) active vcpus */ volatile cpuset_t debug_cpus; /* (i) vcpus stopped for debug */ int suspend; /* (i) stop VM execution */ + bool dying; /* (o) is dying */ volatile cpuset_t suspended_cpus; /* (i) suspended vcpus */ volatile cpuset_t halted_cpus; /* (x) cpus in a hard halt */ struct mem_map mem_maps[VM_MAX_MEMMAPS]; /* (i) guest address space */ @@ -405,6 +406,14 @@ vm_init(struct vm *vm, bool create) } } +void +vm_disable_vcpu_creation(struct vm *vm) +{ + sx_xlock(&vm->vcpus_init_lock); + vm->dying = true; + sx_xunlock(&vm->vcpus_init_lock); +} + struct vcpu * vm_alloc_vcpu(struct vm *vm, int vcpuid) { @@ -423,7 +432,7 @@ vm_alloc_vcpu(struct vm *vm, int vcpuid) sx_xlock(&vm->vcpus_init_lock); vcpu = vm->vcpu[vcpuid]; - if (vcpu == NULL/* && !vm->dying*/) { + if (vcpu == NULL && !vm->dying) { vcpu = vcpu_alloc(vm, vcpuid); vcpu_init(vcpu); From nobody Fri Jun 14 01:21: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 4W0hLn5BZkz5N2sv; Fri, 14 Jun 2024 01:21: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 4W0hLn3N6Hz4VbX; Fri, 14 Jun 2024 01:21:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718328081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dlgC+ADtc1bFEAM3h4zpb+e/Wg/vTleAtqBrYFj+PeA=; b=UBL0fVpRbInPM+rVQkf0RhUVxqHBTnDLKGej20ZgquytzXZwqeR1n0GsProl06DVQ9kH1+ 7nVqVttINBuf3JSz2CcpCh+AQrFRbtquZmLhofV/p8hGrHZrAB40xFmFuAonpj/yL2o35V E3BG9H7rFEvBGx6j+U3kB53SK0FZ8RXD0tBP6pbsQRAoSKWCYpQCDV/znEk+s0YFNSfnnC 2WTlGeD4cbzCQNwHXOxSOPdSH8DBA1Csx8lOJXnsUy3cnCiPpvwra8/dk4PxUvmmqeLAfa lfMZGwkBN9x73Ur6OYrRM1qHDLLFcvOAqD+2OXDurysi9KS+B2FuNosKXhBcZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718328081; a=rsa-sha256; cv=none; b=nbWlqCFQtjaGMegUROEVJG3mhiDvRB60d27V2fT/Kj+xFDIU3CD7svFRtS1MH0hOdGowZG aFAIo6UsIh4CgTRQQ3ZOPe8PPVXfDSj83yKt9/IX3O8al7eabl4QCMGSgDR7xQ2ARDnReB uFlA7j4d0qJpanzogh0iOu7v1Fxms5VwEosAZlirQvdaoXyL896auBaHdssIMY5gMIkAAq FyGUr/3J5Otm+zqa1SDHUF/2O9Z26cgxSLlawpXDa5twq0obYHuFBDOVImR2eVYH6Dq/io pFQ7XnPnoj/Jb+Psqt7ZxZ910mKC/bvF+Slrd+Dm0Vl/SjSIVDFf3BE+WUUMjA== 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=1718328081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dlgC+ADtc1bFEAM3h4zpb+e/Wg/vTleAtqBrYFj+PeA=; b=AJYmCzFaY6LvCsdw0VveJTSN7iDm9q14/8Nmbiy4Ey6K3+QcsKN8bWNz84+7OWeLPN+h58 rQ46/8BQJqvY00y0wVd6jKLtTAtTrIQxdR6gS8cFoAd//YwYWRTcMvD7ULn5RSUefFeMKb KIGQM/YUGY0Dmyw8sv2Sl85ZaMgWo5AK02qvWJDkJfMrgLjs3Pi8ZApfsbnpajnaJkhdgW fAguowAys5cEOesHae1PcEt4aop9n91nh/Av6e5ETQNTTSiaJHYKHtX3qNGDVl2WjSDMac tjZPU/ED/AfedDVNWZufaQ40elGn2KXHnLRNL6+7XjQYiQFgduOFGI34BeeVpA== 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 4W0hLn2wzZz10m3; Fri, 14 Jun 2024 01:21: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 45E1LL6B055879; Fri, 14 Jun 2024 01:21:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45E1LL3e055867; Fri, 14 Jun 2024 01:21:21 GMT (envelope-from git) Date: Fri, 14 Jun 2024 01:21:21 GMT Message-Id: <202406140121.45E1LL3e055867@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: d730cdea2ab3 - main - arm64/vmm: Avoid unnecessary indirection in vmmops_modinit() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: d730cdea2ab32750e45955dd2e570152b6f81def Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d730cdea2ab32750e45955dd2e570152b6f81def commit d730cdea2ab32750e45955dd2e570152b6f81def Author: Mark Johnston AuthorDate: 2024-06-14 00:16:57 +0000 Commit: Mark Johnston CommitDate: 2024-06-14 01:19:00 +0000 arm64/vmm: Avoid unnecessary indirection in vmmops_modinit() Most of vmm.h is machine-independent. Simplify merging amd64 and arm64 vmm code by removing this machine-dependent routine from arm64's vmm.h. No functional change intended. Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D45557 --- sys/arm64/include/vmm.h | 7 ------- sys/arm64/vmm/vmm_arm64.c | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/sys/arm64/include/vmm.h b/sys/arm64/include/vmm.h index cf00dd60a43f..05b013557c06 100644 --- a/sys/arm64/include/vmm.h +++ b/sys/arm64/include/vmm.h @@ -201,13 +201,6 @@ 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) { diff --git a/sys/arm64/vmm/vmm_arm64.c b/sys/arm64/vmm/vmm_arm64.c index 6b058a993cdd..1b61871014a7 100644 --- a/sys/arm64/vmm/vmm_arm64.c +++ b/sys/arm64/vmm/vmm_arm64.c @@ -239,7 +239,7 @@ vmmops_modinit(int ipinum) int cpu, i; bool rv __diagused; - if (!virt_enabled()) { + if (!has_hyp()) { printf( "vmm: Processor doesn't have support for virtualization\n"); return (ENXIO); From nobody Fri Jun 14 01:21: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 4W0hLq05sJz5N2qt; Fri, 14 Jun 2024 01:21: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 4W0hLp3rFlz4VQh; Fri, 14 Jun 2024 01:21:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718328082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zk5Q9bUxQ+KLI5xwHbHaJouO0twxQdeVUJCOE1q0vWw=; b=CCtL6hT0qs7gId5H7WElIB02J9SWWp3U77dOYMxY0AVp0zupMK96BithjliGbhlvECzKp7 TtjYzgytpyYgMUnk9eNZnfONgMIIINwZRR7tR8KS7kVi280QIbPN9xWV/6Vsx4i30PmIol 0OOiiTmJA/UYz2jl9fsn1iGaicKu8HFK16y3rxhSiTraUAwDJiIE7sz9G3om8gKcpU4OhB v9X2qIvF0pXyXJIOWrOF/RShU6SjznhBYG2fUnFdm9qmVgX0epq/a8IkBysXVD0z5kN9w8 +5RlIU8OibeGnWulz7J5yGX7Qv4UTO3ic9D9KuKDYrwHm3YuWFNPUGiwCekI8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718328082; a=rsa-sha256; cv=none; b=A7BBcEYH+uFd+DqMCm9fEvaE/1ag/c0BchOc7Zfx8xGXh5gY90TMShkNRW+sCfmTTx41/w D1DZ6iScYM4Hw/1i23+pr9Ui0HK3flH8ghSLvjdZt8UHGlxfjKRWzWm72ckrrlPDdxe8WD WymRg0cHeo/JAhbvsNJGORpuxYZ8PgGoegi06HiK9ADggh2/fLiMLkXi25yyqwk8jHP0xy dKWpl6spTTLkheeXDRHNhktMoofUiyzWWoCAUHBI34AMO4PWHQGFogzPbYt7Q97AHsfGch 1aucAzQevRd4Y9XVYJcU/0cLYjgW5s8KBCoAhSqPYo6M1cB42HTqvQiJrfXbIA== 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=1718328082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Zk5Q9bUxQ+KLI5xwHbHaJouO0twxQdeVUJCOE1q0vWw=; b=UQaOEmmF04PNiqWjWsrRYMVImedu+oztEF1f1WwbTCFcjdHdwGvMwGGzA3TbUcGAbKoXX1 iMrfk8wWVtPUTRC9WFVGJGBpld9WAvBWxZrELi2LfvjBlqvnaciXGXBuJEbfMY4GgVPat7 V/X3CupZZaHD0T0PsurVngg6IspEv66LQ2WZKanEFKJu2NUPyewTunc27snhAaJPXnYw/k bL345zmGKpTtnBRqXGfegU/VRUjfJoz8nE3K6xcyLgeEqY1n4b0D5mEf7TqAWRwmvaFKFe a5CUOPwInMndNuS7lExZ8fkzHNqRhkGvCP25bYTlRY8BIw2w563bSnamE5Uuig== 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 4W0hLp3SZJz10m4; Fri, 14 Jun 2024 01:21: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 45E1LM73057375; Fri, 14 Jun 2024 01:21:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45E1LMGk057361; Fri, 14 Jun 2024 01:21:22 GMT (envelope-from git) Date: Fri, 14 Jun 2024 01:21:22 GMT Message-Id: <202406140121.45E1LMGk057361@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: aede0d3badd1 - main - amd64/vmm: Make vmm.h more self-contained 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: aede0d3badd1be92b57deb14c494785ab61022d4 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=aede0d3badd1be92b57deb14c494785ab61022d4 commit aede0d3badd1be92b57deb14c494785ab61022d4 Author: Mark Johnston AuthorDate: 2024-06-14 00:17:07 +0000 Commit: Mark Johnston CommitDate: 2024-06-14 01:19:00 +0000 amd64/vmm: Make vmm.h more self-contained CTASSERT is defined in kassert.h, so include that here. No functional change intended. MFC after: 1 week --- sys/amd64/include/vmm.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h index 08c54ed7c49b..37972d54bd99 100644 --- a/sys/amd64/include/vmm.h +++ b/sys/amd64/include/vmm.h @@ -144,6 +144,8 @@ enum x2apic_state { (SPECNAMELEN - VM_MAX_PREFIXLEN - VM_MAX_SUFFIXLEN - 1) #ifdef _KERNEL +#include + CTASSERT(VM_MAX_NAMELEN >= VM_MIN_NAMELEN); struct vm; From nobody Fri Jun 14 04:19: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 4W0mHr6Mxjz5NKT2; Fri, 14 Jun 2024 04:19: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 4W0mHr5kj4z4mGP; Fri, 14 Jun 2024 04:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718338744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5B5VvieNBc+S4Q+9qQ+mmxV7FUWT9vxOV+BN05682Lk=; b=ZdnFvL5XWxKpZfonOuoHyImxsprkpvpQl/cRv1W9Y34gynUVkRrDYWHVsR1pzcH01T9p3u YTrFSjK5GoLPbfjjhQRs8KAu8z5Rzqei1HU6Nh9Qac1Lx5MaE4q8Jhu+0s2gApPG+Nta9r Tg9rHZBPq8/+BQnyuKDLMMess/zNGUbRUTNxfcYV83vJcX1w7eoOM1Oqd5il4Lh1Hc7uYN KEuFLj0Rw25lsD5BFIdhoAHKTtgTIrjEbdFhArn2/zLLMsPNsuCn8ZHNFiZQpcFmwiOItQ h5O8t3Ci2wUqlVmBeTOu/4E/WkhFDs0Dk7BvO/BVEhVdYj6yfs6i5v1HxxQ56A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718338744; a=rsa-sha256; cv=none; b=MZUFpAJeBPtyTkRgiSLn6G75fNEkeKV4OiqHi0DONHLarnsvPlQblu4CRPSFydlyB/+iBX lnyh9rAqvT4iPbHnrYg4bYNh0clueuz0KRcRN/Q4B41MR52rGcmD2Hg/eRTMIRnLOW7P2J 0IznQT88qb5zdLdQiX5ly1lwR5DShaL7bODoe1+5Qia9z14b2/KyHK0bNxYBVDbcJO5ULG qs2EAiw6VXrA//Q6bDuVN2MtN7QnzxkBzrKcpRYawnqRePmXz06UOp64hPRASSD7Lw2znc LLCOylTa9JPxdzCWKaVk4IDgYx21pWnezdxi5vIEhWkpiy5XZSnhrRlm26ZPyw== 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=1718338744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5B5VvieNBc+S4Q+9qQ+mmxV7FUWT9vxOV+BN05682Lk=; b=MFiFWbA/tZhCOXkPmwaMFrBfyrLuxP/KGzsIbdJPolvpCbcnN0tfgkOYQ4a2Dm3GsU7MHd NQRNmGjYzyEM976eeo8+QAetp+C2DG5ZSucTNXXCikE8FBS4dY2noeFGvGwtbSsCVpYctB MGhwS5c2lIBiWzdBHvcV2bcOSn1z0r+pfNtqth2cq0akSC9ILZ7fWbjy5M19gPXM2/bM1Y pVhix0JSmFcC4+5mUiFUwuvQOA3xyW6imJpsT5ffIryGZpB9JkmWMIwtjrCxy3PpqMmwR/ 5wE6kGfQDv1wdjWAm/SMArw3IJlZ/SRFheDwjgmY+99q58DGfPJbQJPNMgeWeg== 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 4W0mHr5L6Yz14vr; Fri, 14 Jun 2024 04:19: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 45E4J46V050323; Fri, 14 Jun 2024 04:19:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45E4J4Tx050320; Fri, 14 Jun 2024 04:19:04 GMT (envelope-from git) Date: Fri, 14 Jun 2024 04:19:04 GMT Message-Id: <202406140419.45E4J4Tx050320@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: fbff6d54da14 - main - vm_phys: Fix vm_phys_find_range() after commit 69cbb18746b6 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: fbff6d54da146e98ec2ce4ebfbb86339d4f9fa21 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fbff6d54da146e98ec2ce4ebfbb86339d4f9fa21 commit fbff6d54da146e98ec2ce4ebfbb86339d4f9fa21 Author: Mark Johnston AuthorDate: 2024-06-14 04:09:45 +0000 Commit: Mark Johnston CommitDate: 2024-06-14 04:18:26 +0000 vm_phys: Fix vm_phys_find_range() after commit 69cbb18746b6 vm_phys_seg_paddr_to_vm_page() expects a PA that's in bounds, but vm_phys_find_range() purposefully returns a pointer to the end of the last page in a segment. Fixes: 69cbb18746b6 ("vm_phys: Add a vm_phys_seg_paddr_to_vm_page() helper") --- sys/vm/vm_phys.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index a28b3a40691e..53e58283eb9f 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -1450,7 +1450,7 @@ vm_phys_find_range(vm_page_t bounds[], int segind, int domain, vm_phys_lazy_init_domain(domain, false); #endif bounds[0] = vm_phys_seg_paddr_to_vm_page(seg, pa_start); - bounds[1] = vm_phys_seg_paddr_to_vm_page(seg, pa_end); + bounds[1] = &seg->first_page[atop(pa_end - seg->start)]; return (seg - vm_phys_segs); } return (-1); From nobody Fri Jun 14 07:20: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 4W0rJh4bwFz5Nb4S; Fri, 14 Jun 2024 07:20: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 4W0rJh3s1nz54wK; Fri, 14 Jun 2024 07:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718349604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yqwWq/rkBOJojdceA6PFXoUFEYYrnZMEiTdj9CgHmHc=; b=HhOhFLb8dQM6biOFFKcT43qWfm4ocB1IVYJtwdqrO/oNuLH02fxwhDt4vPf4ooj5p0+yoR RtbbEal5vJbmJk2Q+KbpmJ6o0qj6kKrCJdwwdgnVYYuJUHJHvzC88z7xYyvvgNWUb1fpE0 jc//O6FlTnaEVOKJeSK7Ojk45tN1vPWk5IZkd+JGjAwWUsRw/3vKItY3MpavqeVp9Wr9VT vmKxwuPgU9BIiw89Bi/qQ0CVL3yI8MUrENBjp2ktmJzOThHnKH+i/uv8w8vgqYXSHPk1dM 2An5U1VB2exKVQhRQC4kpm/sVWDCJaTq9vzFhrhyomaPxjjYQdTNo94zvjrUAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718349604; a=rsa-sha256; cv=none; b=rMIc1kjFNFWSkKndNoeYiWjISHPV2jnigvE7h5yv7sz6Yw4zYS+KzIAQ1B1V2KmLq6/ySd 6+OVYZXIBhWm9XYBNFMyrixE7DjLmSvgFg6zghTL+LQBE6+aVpAw76FGGn/ofv+kYZKAe5 iiVjK5insKJzTkxzEhBIb8uruRCm+DyN1KmROmmmnn1ckLN+jbgqx3kHU9Zhey++Epyv03 JOHB0krsqKIT4uhZ9JEMuDQPTNXppPzWUS/G0nmdYVImmcV0vJJncBj5quBUxya4DIIx/2 dgjRRW21GgNvR5EMeTGVRLMPKrMAXPgHUEuWKWd7D8xGszAJVon8Wkm20VyaPQ== 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=1718349604; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yqwWq/rkBOJojdceA6PFXoUFEYYrnZMEiTdj9CgHmHc=; b=obgODbx64U86OBdBJKBF7DojmBpRLuwKxU8NIxipGVQNDYe3OqjIYut5L34xPq9AgKKr/n oNU3c4xOwN4B/IBrLLvDa5hR1TFd3Edj4PlOSg/ves8V7JODCadcBkTzFDq0e1jzbqUDLQ P/t2fXRc2n92wnhDhkZZGw0XoyewIwHHyBq5VGyYguxAFCo1qhNxVpWVeXY67oLbvDeVlu noZZE6IW67t0XnraKO/9Lv61uqIQYx3zjM8kP8JciYCOlYq7fjJwGQdThBoJKCqTC5zEHA Mte6wu7g0YQ/2BlngyLt0eCcD4UnastqPYpNJkP5Gnf9hB8sd2jTWT80siavFw== 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 4W0rJh3L9Rz19l7; Fri, 14 Jun 2024 07:20: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 45E7K4qk058064; Fri, 14 Jun 2024 07:20:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45E7K4aZ058059; Fri, 14 Jun 2024 07:20:04 GMT (envelope-from git) Date: Fri, 14 Jun 2024 07:20:04 GMT Message-Id: <202406140720.45E7K4aZ058059@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 2a21cfe60fcf - main - pctrie: avoid typecast 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a21cfe60fcf8e49dad60a9a40d2fc9e62cda563 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=2a21cfe60fcf8e49dad60a9a40d2fc9e62cda563 commit 2a21cfe60fcf8e49dad60a9a40d2fc9e62cda563 Author: Doug Moore AuthorDate: 2024-06-14 07:19:03 +0000 Commit: Doug Moore CommitDate: 2024-06-14 07:19:03 +0000 pctrie: avoid typecast Have PCTRIE_RECLAIM_CALLBACK typecast one function pointer type to another, to relieve the writer of the call back function from having to cast its first argument from void* to member type. Reviewed by: rlibby Differential Revision: https://reviews.freebsd.org/D45586 --- sys/kern/subr_rangeset.c | 3 +-- sys/sys/pctrie.h | 3 ++- sys/vm/swap_pager.c | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/kern/subr_rangeset.c b/sys/kern/subr_rangeset.c index 94b77a449d22..ddb1839531ea 100644 --- a/sys/kern/subr_rangeset.c +++ b/sys/kern/subr_rangeset.c @@ -233,9 +233,8 @@ rangeset_remove(struct rangeset *rs, uint64_t start, uint64_t end) } static void -rangeset_remove_leaf(void *rv, void *rsv) +rangeset_remove_leaf(struct rs_el *r, void *rsv) { - struct rs_el *r = rv; struct rangeset *rs = rsv; rs->rs_free_data(rs->rs_data_ctx, r); diff --git a/sys/sys/pctrie.h b/sys/sys/pctrie.h index 4e1d8c7f8617..d06b533a54b7 100644 --- a/sys/sys/pctrie.h +++ b/sys/sys/pctrie.h @@ -226,9 +226,10 @@ name##_PCTRIE_RECLAIM(struct pctrie *ptree) \ */ \ static __inline __unused void \ name##_PCTRIE_RECLAIM_CALLBACK(struct pctrie *ptree, \ - pctrie_cb_t callback, void *arg) \ + void (*typed_cb)(struct type *, void *), void *arg) \ { \ struct pctrie_node *freenode, *node; \ + pctrie_cb_t callback = (pctrie_cb_t)typed_cb; \ \ for (freenode = pctrie_reclaim_begin_cb(&node, ptree, \ callback, __offsetof(struct type, field), arg); \ diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index c339f70ddea1..455c39ab6fd7 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -2220,9 +2220,8 @@ swp_pager_meta_free(vm_object_t object, vm_pindex_t pindex, vm_pindex_t count, } static void -swp_pager_meta_free_block(void *sbv, void *rangev) +swp_pager_meta_free_block(struct swblk *sb, void *rangev) { - struct swblk *sb = sbv; struct page_range *range = rangev; for (int i = 0; i < SWAP_META_PAGES; i++) { From nobody Fri Jun 14 14:03: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 4W11Fv6rzFz5Nvdw; Fri, 14 Jun 2024 14:03: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 4W11Fv6QDlz4YfY; Fri, 14 Jun 2024 14:03:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718373795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WU7M6oER3D7Yv9NE2QzdAPee4kzEINgp8J87ZbK0o9g=; b=NUzCmZ3xg6P5AjKq21wld46QAEn6Wv2Y3/rKfgM0JCxNqsGHbckn/V9jDr9kUutb5VM0pI SYJhGw3+T2wpoKFP5mDUgoofR/rm948gqROisdBxzLHlFYImT9BDEPtkbnrgSwdhulFPCe 2UMpJI7QkKCq1Jn3pbUFT7yf8EYBNWpLSin/FcLGPjTZpjosCB2lnN+k/lKGTXWdcZwnP3 xrAEo3Ag+Z2GymeffgbuMmVke67M9UaXN8jDP46pV6nR47SDx9t2024P56zX82L7cligXU lQw8I2BqN8Ep4ZsBcUnAdj0RzhIbaD5LH/qefmwX27vkrkm+wGpOpr8qMB7UCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718373795; a=rsa-sha256; cv=none; b=RKXj3Ra39x2+YV/FNWRaJ45EAnoojaxTm3K/EKsTjrj91xH+95+SssytUKqn2t2L+yjUn9 dJvGPJdr0b0xm5qYlEMAaP3DdxfS26mZUCqVY1owpLMOev7Auf1hFdEtR2GONdQILnjmqg febWNMD+LY3S1O8O5ruXPnagadPsm/yMCukCcI/jDOCuqw1jzm00QgDkxE1qsAhLdCOGYH fR8PDPm6pWsPiHIr0JP42VPP0Sq5ToPHVW8jqbtm7lcwEYKRemblxpOFEO1hZ2A5P7vlRD jPnFochlQQyUXN+3wUmTPnq0SeoMuH0uoSuUizo5hOt0/JU4eERjewdsocqaBA== 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=1718373795; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WU7M6oER3D7Yv9NE2QzdAPee4kzEINgp8J87ZbK0o9g=; b=ypZse7ekEd/Pq9vLeCerEUJFsvicF8qfmZdnzFxbKnLKpUeO/8T6g4pTJm6jF9JoPyKYyJ 9l3aU8MvaxTx/91Nqf/an09TEqpniLN4fPhWkdoYumJqwhZKVIXG0ztRG/IOncwm3Ia/NX KQEv2B3DMbuFtRK+RrBjNPo1NgWcDZl3wnJuft/iCj2d6QDeWP1GJPKX6TpTfvITpzrt5K Py7UGFcvqXv3gBUj95AFdCupFKGO2L6fhTQiXk374wyH+DcpApADiQ8wv+Uky6wQDRsn2B Wvvc7KTQmw+bm9ST0sQODFvQtswLXdb2zbtduLIj18HIdZKGQOJQbuioqoNsGQ== 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 4W11Fv61WNzNbJ; Fri, 14 Jun 2024 14:03:15 +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 45EE3FqB045746; Fri, 14 Jun 2024 14:03:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45EE3FdZ045743; Fri, 14 Jun 2024 14:03:15 GMT (envelope-from git) Date: Fri, 14 Jun 2024 14:03:15 GMT Message-Id: <202406141403.45EE3FdZ045743@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: 70e3e1bde9bf - main - tzsetup: add detail for -s option 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 70e3e1bde9bf0ddf7fc18b97487fe2d23d4fc5ed Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=70e3e1bde9bf0ddf7fc18b97487fe2d23d4fc5ed commit 70e3e1bde9bf0ddf7fc18b97487fe2d23d4fc5ed Author: Ed Maste AuthorDate: 2024-06-13 15:23:26 +0000 Commit: Ed Maste CommitDate: 2024-06-14 14:02:31 +0000 tzsetup: add detail for -s option Skipping the UTC question via -s will not create or delete /etc/wall_cmos_clock. Reported by: Tomoaki AOKI Reviewed by: imp, allanjude, jrm Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45576 --- usr.sbin/tzsetup/tzsetup.8 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/usr.sbin/tzsetup/tzsetup.8 b/usr.sbin/tzsetup/tzsetup.8 index 60461363da9a..499d25765541 100644 --- a/usr.sbin/tzsetup/tzsetup.8 +++ b/usr.sbin/tzsetup/tzsetup.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 18, 2023 +.Dd June 14, 2024 .Dt TZSETUP 8 .Os .Sh NAME @@ -59,6 +59,10 @@ The name is obtained from .Pa /var/db/zoneinfo . .It Fl s Skip the initial question about adjusting the clock if not set to UTC. +.Nm +will neither create nor delete +.Pa /etc/wall_cmos_clock . +On a newly installed system the hardware clock will keep UTC. .El .Pp It is possible to short-circuit the menu system by specifying the From nobody Fri Jun 14 15: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 4W139J5127z5P30P; Fri, 14 Jun 2024 15:29: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 4W139J4GyTz4kY6; Fri, 14 Jun 2024 15: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=1718378964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qb0/z8uhH3D0xC/XbBzBMQDyxEGm8jOx1Jqu0EhoSBc=; b=G7pc6pU514s0wu3W864Rm212/R0rDjIzIrwtxg53adF1mzTcxjy1mjZcDGK5/oxRHa32o9 IkQHG1HqEJk1luoWvyhUge1aVyFFaUJLQF3ahf3lRPx5Tz2iogRgPylS07z7UjRMlxbo/U UIZk1LnqOIs2M8tOuLkxqV1sxLSsK34viQts5lMuIoxz3E+Z/15VcaMCHgemaPRfA+XMTh 589RO9Laqq9zdCzAIWdogsmEcX3U1Vnhtw3rUM2fH03dnHfjfOdrUEoACzvNsp6biCTNJl emkRiLX8E3bhAQWG+8nFHiwhWhNYiWBjwFJ68IZAm26ORXObq6LjB2hptCj5rQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718378964; a=rsa-sha256; cv=none; b=Fe0YDgEfL7TgSM1KjBBjuhboceHAfrpgpkMYdKbvaxyE9oWIHK3EEbQxCPpz1Kb3Sif5vg bqwF++Pp335jY4ONIwwXyxPpC50gULrqDb0crdpP0TdXutl8GdgJStFw5hcCcBpdOy9LcX Bv3V5p6H2FtPtUR5sezx8esCiUkshJ0EG5WMFL+m5ojqgcta6vB4hRKjgLHLpNAKTqLgGB ly0CVTjNzOtI/Npd4k0maBvtnmlFnJPGkpMkiBAr0Glo0AOzdzgFComXIwS0mmPvVDy2Hg pSzsBkoPTttaWsbJSCJ77NrOpCd7YNE5MWaL0rSOQae5ku/cVP+Nh623ATII7A== 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=1718378964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qb0/z8uhH3D0xC/XbBzBMQDyxEGm8jOx1Jqu0EhoSBc=; b=tKYqfxd4JusNhVh0wbTD6/wZIzgiZ8zbHanh9dGlAXmN9tzt81ZDgZC342833DKHikGB6+ xDQd+olCJsG0Ns4HqV9b0JX59I08DAi8Z2jqOgqbOHjTX/h/kPUiKUFL0WRjucNQODRYve 0H3A6V+HbTDC+X5FSXumHSKNi1zk12IPZThyiI0erH/n9sX2DOcurDJoHnE2VHLwDzFQeR /GaTt8GyZFpJNhXnhMzXRFLUYSXAmPEBcxFRE4Y1en5/9Zau8I3LYT5YYxJ0cWqv4XWGB+ 023Tmo7JT/ZPT3DxByIR2qM9v1xm1W2kHoL9AcOUf6/VYp9j0GLSkJGpqjRYdw== 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 4W139J3t1ZzQmF; Fri, 14 Jun 2024 15: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 45EFTOLV081352; Fri, 14 Jun 2024 15: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 45EFTOSd081349; Fri, 14 Jun 2024 15:29:24 GMT (envelope-from git) Date: Fri, 14 Jun 2024 15:29:24 GMT Message-Id: <202406141529.45EFTOSd081349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: de4bfd6b9987 - main - udp_var: correct intoudpcb macro unintended identifier dependency 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de4bfd6b9987987f82485e582beaa26338ed01d2 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=de4bfd6b9987987f82485e582beaa26338ed01d2 commit de4bfd6b9987987f82485e582beaa26338ed01d2 Author: Reid Linnemann AuthorDate: 2024-05-07 22:46:35 +0000 Commit: Kristof Provost CommitDate: 2024-06-14 15:28:28 +0000 udp_var: correct intoudpcb macro unintended identifier dependency Change 483fe9651 embedded struct inpcb into struct udpcb and updated the intoudpcb macro to use __containerof to locate it. This change accidentally introduced a dependency on the identifier inp being defined in the block the macro is expanded in. This should have been the macro argument ip. This change makes this simple correction. No functional change intended. Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netinet/udp_var.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/udp_var.h b/sys/netinet/udp_var.h index 0d70bad91df4..2528e4fcb30f 100644 --- a/sys/netinet/udp_var.h +++ b/sys/netinet/udp_var.h @@ -120,7 +120,7 @@ struct udpcb { void *u_tun_ctx; /* Tunneling callback context. */ }; -#define intoudpcb(ip) __containerof((inp), struct udpcb, u_inpcb) +#define intoudpcb(ip) __containerof((ip), struct udpcb, u_inpcb) #define sotoudpcb(so) (intoudpcb(sotoinpcb(so))) VNET_PCPUSTAT_DECLARE(struct udpstat, udpstat); From nobody Fri Jun 14 15:35: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 4W13Ht6cbsz5P3lQ; Fri, 14 Jun 2024 15:35: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 4W13Ht60zbz4ldY; Fri, 14 Jun 2024 15:35:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718379306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lXiLzaGfUM9XqSzhIT57b9faQO6vZrXIS0bfDNgPKXI=; b=T0DvqEy+j9vvMLjGUbBvjk6wHbkwv2ZzEdKoKQrJFd3woUmoyz/gWx/ANzZwl/pomSe6jF TB5NMLeLO4r9b0TNOXBd73LCxHkNI5x6xbxgL4Y/ECl9NHfMZfvff2jhyaZE23hniF8b9X 01e3jfoJwkhicltcOvXpUA9IIzDUZJrXVDJCjcp7eR7p2GVwqcxtgxH1KD2irg5QIbBiss 0/+epeWr4Ys5wWW7PJuTsrf4Aez+wcVYtS3euvrKrrLBmu2PWxytwOlnIrNH5fPtc7TwWC gE4HoxqF5mJXuDfCK5LlBlQgrACv0ynOSpJAUqHLETPtH1oUfu+ZKuk0B6Hi4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718379306; a=rsa-sha256; cv=none; b=R1/sqAsVKMUYctCh1j71v9YgsFS++xCqKT2+HesNb8tatpOJyifea/vzRWygsdJ82y8NkX kW2NANXRr25pvSpl4Lir12rh648rwxf00DoD0SmmeCkgp6iXoGtVSJ+PQ1zXcL9cJcSn62 PGHKMzfa+66puzN+8EoTOxRPEP0vLXhsFv9fOHjO7k8bRocbAECznsg7Gz1Gb0KNw2Wr1/ 65BLCXv6PXDmk66SbYv+Nkz4RdBguLDHjzv1yyeqApL9q/iwfG7Ya/hX3inyiidKBxIdH7 A9iCxv2geiCevRjgd7qj2TJvNoOpLoBhGFnxr66EhJo7nVTzX4WDNTU4i9cTNQ== 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=1718379306; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lXiLzaGfUM9XqSzhIT57b9faQO6vZrXIS0bfDNgPKXI=; b=i6NhfWfwOd2fWzQQmn0D+/EkZ8zOPLeamh44Tg1J376OFwDcBQlorblCH7S7vKvKTKIibU iP7BinWm0NktzMX2ps1wRzPIH/qsPmdb0iCh9uLDFuXQkWbeMfSWPFkWwl8EAOA2PI66YX 3jW/Tl7Y9HsJOX1bsduYBRVV3J3eDbL/vsXIuCEpbAG2Qz2A23TmhErT9UJPCVR5EuKEf8 WYhUPLzxzOMUmKj6EtwlW7tmg9/3eGoEuIhRLp9jlKVN5t4IhF+iUl4ls0IuFturiVAliy yi6CY1DaW80FkOfrMEvLt3z2zhiDT0sEap27TV6WJLuea+/luEnzob+6Hx5NVg== 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 4W13Ht5ZZKzQXb; Fri, 14 Jun 2024 15:35: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 45EFZ6K7097630; Fri, 14 Jun 2024 15:35:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45EFZ64g097627; Fri, 14 Jun 2024 15:35:06 GMT (envelope-from git) Date: Fri, 14 Jun 2024 15:35:06 GMT Message-Id: <202406141535.45EFZ64g097627@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: ec7358885de0 - main - libkern.h: Make more self-sufficient 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: ec7358885de020711b30114df59f21c6bf042639 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ec7358885de020711b30114df59f21c6bf042639 commit ec7358885de020711b30114df59f21c6bf042639 Author: Warner Losh AuthorDate: 2024-06-14 14:29:08 +0000 Commit: Warner Losh CommitDate: 2024-06-14 15:34:05 +0000 libkern.h: Make more self-sufficient libkern.h uses KASSERT, which fails when building in the boot loader. This is hacked around in a number of other places, but it's easier to just include sys/kassert.h here. Those other hacks still work, but are no longer really needed and can be torn down over time. Reviewed by: emaste Sponsored by: Netflix --- sys/sys/libkern.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/sys/libkern.h b/sys/sys/libkern.h index afdfe7346b28..6dc4bc87c3fe 100644 --- a/sys/sys/libkern.h +++ b/sys/sys/libkern.h @@ -36,6 +36,7 @@ #ifdef _KERNEL #include #endif +#include #ifndef LIBKERN_INLINE #define LIBKERN_INLINE static __inline From nobody Fri Jun 14 15:35: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 4W13Hw1Dr4z5P3nb; Fri, 14 Jun 2024 15:35:08 +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 4W13Hv63kKz4lXp; Fri, 14 Jun 2024 15:35:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718379307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QGhyu8piTzrYrZG+dV92UggQMjg82uofwCHS5v2jPjU=; b=xuCcLNqHoyVPIOjgUhIDvdcCvJSIMWtwXRArIQ/CxOTyiK+AIV4fb97F3UBZ4CTt+FJJUG Bq6dMJyOgonAvqqMScOqVmX85MQi4t6zNPJzQzwdbi+69Dq5IvUdVOFoaKB9TGuktofqVF 93ntkCm/ZR2IpIfpyLXeQQ8r/h5QOTxzc1tWn8wYvFDHw63NaNv4imtSX7VRbkP0FaMq5H axvDytfA/vK3rrgLvqQxtckb9AoCkdmuQVDDY9BTDHp5ISYWaNHSP1hP2IjrogunbvCrY+ w/w/XeRgVxsBwUbW47UcSxVsq02nJZXevw+/miTjtaxglUu0SKoCG0KuaRJ2Bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718379307; a=rsa-sha256; cv=none; b=Am7bdFfonvFLrOZyo3GTPrEE8rA4DsvmFBVzwEjo9+BV54DMxUUTrwH1k7jArvHIMNK7nK 6JFysWl86RAXAlpsvgeIJVWQv4WHijN2tLLAmTtE7oigKRsc53BZDQZBYhmaznWzy89av0 Q//yeMD2vNCGjDnJnRIL0mMUj3IswU91+9EMA1HXrZcJ/7hd6jeWYgz4eKNafprKJCI6Ef qDd0ncn/f5oLp1wcwM/Rdq5yWTzpnGwzadTc909c//rEuwbeRo9EGavXLsMyqz648LTgmY ytUFWNka91smXf9kfhvwKZ3wmQknDmW/Tz9mDDJeXqT2F/57mAu6LRrJCWATFQ== 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=1718379307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QGhyu8piTzrYrZG+dV92UggQMjg82uofwCHS5v2jPjU=; b=h37iPWwwns6Xt9Mx51w9ms1EYMTnZTrjSSbAz6vW0QvLrvRf6XqdmCFr7ZDbbGWfkbHd+/ jm7rXWhghUuvlbHAO6LSWpow41VKYek2Qf4lKKdutK4kBimB4xcu+EziBqA/cFy9IOFB6t 9AaGwGc79BMnfaGEpJw8p42I62d29L5fzpWhcj2O9P9Di+kiquLaxnov4NVXZehvz+bc55 VAvPcd/r+GOTKBlGbDHlV9cmzdY6IrHa0PM570TLTsKzGO53yK2MyARA5yb3ab7HVd4io+ PKigm591vXZef8ZTQdfpKDteI6/FZVM6L9ihbyeW8Qi9FQRr+e9KUbXi/y0N6A== 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 4W13Hv5hCZzR0n; Fri, 14 Jun 2024 15:35: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 45EFZ7db097675; Fri, 14 Jun 2024 15:35:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45EFZ7sr097672; Fri, 14 Jun 2024 15:35:07 GMT (envelope-from git) Date: Fri, 14 Jun 2024 15:35:07 GMT Message-Id: <202406141535.45EFZ7sr097672@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: 4fd5b8aed896 - main - boot1.chrp: Include memset 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 4fd5b8aed89643707556fa859ba58bcfd335f6f7 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=4fd5b8aed89643707556fa859ba58bcfd335f6f7 commit 4fd5b8aed89643707556fa859ba58bcfd335f6f7 Author: Warner Losh AuthorDate: 2024-06-14 14:30:30 +0000 Commit: Warner Losh CommitDate: 2024-06-14 15:34:05 +0000 boot1.chrp: Include memset Normally, memset isn't used. However for OPT_INIT_ALL=zero it is. Always include it since we're not space constrained and latter-day loaders won't include a copy if it's not actually used. Reviewed by: emaste Sponsored by: Netflix --- stand/powerpc/boot1.chrp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/powerpc/boot1.chrp/Makefile b/stand/powerpc/boot1.chrp/Makefile index 22a3f983affd..11b9e356219b 100644 --- a/stand/powerpc/boot1.chrp/Makefile +++ b/stand/powerpc/boot1.chrp/Makefile @@ -6,7 +6,7 @@ NEWVERSWHAT= "Open Firmware boot block" ${MACHINE_ARCH} INSTALLFLAGS= -b FILES= boot1.hfs -SRCS= boot1.c ashldi3.c syncicache.c +SRCS= boot1.c ashldi3.c syncicache.c memset.c CFLAGS+=-I${LDRSRC} # Load boot1.elf below kernel. From nobody Fri Jun 14 16:16: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 4W14CB6GWGz5P6N1; Fri, 14 Jun 2024 16:16: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 4W14CB5hX3z4rZZ; Fri, 14 Jun 2024 16:16:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718381766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HuefF3V4hF41ed7som96ZkokQvEJf2mU0aDdmdVNYFI=; b=WmpcHYThsUYSzqTuyPnQMAa5CjCNi4gL7tozD3b4ZK8FzWcu0LbCbRy5XuXU2FbTwOasAw xRVemH9IETUVIiw3Ob8S6behxE+czHybo9EpK26OhwCu4SjDH3962oEuYhE0QCtUdBrcjy dATS3pPw9JnXpFhOaZYZYevETK/2RWZII6Q9Kcr9eXdk3I7XIMuU9RjYIPw42pY8w4AyHo v9u3sXofr3XqIkMSUa0x/6qIihsZWPFLsCWAU7cG/oX3xhispOVsUOww9oJzSsQoc6S8KO 4M3WXucxohqxCyX3V36TdQ/hsdq/KjUjGJbcf4J84+ZYOgKq/ksGeW+zihJ9QQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718381766; a=rsa-sha256; cv=none; b=mq7gHqzpxRe6DpP373MILTkiDbupPKiaJZuf/QfRBv2OyxhTBXZs6E0FLTEjyO5Qga8NIB 8Q2OPVT6YMlOuqpjrNPhE24fQ9q82P5x5o3+ShHk8YYDe9ssCCYwtKO8SoKBhx/lnC/Hht 3OyCEnaZ5d1lJ/Py0jEBTOg+tt+15LzL6JB4IxZip0m9jxCO26JC1r8H0LgcqUKwwZcZXD mRLP+m8PP6+il6C0EBcAhBS2UvtgncsqejeIANWj4LOistlNpkEj5QCuLKvejIiojNDm+l UbGbNTXSgNlFWFIs0cKILRXW12xCiA01HpHfdhmFoTJs0n0+kbV5ZjzcggUhaA== 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=1718381766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HuefF3V4hF41ed7som96ZkokQvEJf2mU0aDdmdVNYFI=; b=QTtT/4yLJ6T/SVkSF60c1Fv7Xx0LFvA+oumm/FpUYfX07/U/aro7WiF+1kTM5HzjxCFkEg dpYVz//pXqYKqGWCTL4O7YgbG7Cnommp+FAvUDCsmdjwtSXOnJKa7lCjXEPSbHJdSRJWAJ ZfEW/Rvm1WCGjjzQ6NUpe9jchz8TSrGsdbf8lgGLuW/1syQTHlW5b5mXe23yAk+l2xNJJE FokmmNEthk3NyEVCmMRYKCvCaQ3++dbYui88RAf76FzdeJQRewA6aICCv8Ia7TFmUgVbDt g/n9f6bP99H3osUO87skCfkRm6qGgmlAWxQb/HtqAir06vKentzzDJl4I8h48A== 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 4W14CB59PszR61; Fri, 14 Jun 2024 16:16: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 45EGG621065858; Fri, 14 Jun 2024 16:16:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45EGG6U9065855; Fri, 14 Jun 2024 16:16:06 GMT (envelope-from git) Date: Fri, 14 Jun 2024 16:16:06 GMT Message-Id: <202406141616.45EGG6U9065855@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: aa6fb1d277be - main - tzsetup: ask local/UTC question only on x86 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: aa6fb1d277be47c51abc309ac9305def0fce7f9d Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=aa6fb1d277be47c51abc309ac9305def0fce7f9d commit aa6fb1d277be47c51abc309ac9305def0fce7f9d Author: Ed Maste AuthorDate: 2024-06-12 23:48:24 +0000 Commit: Ed Maste CommitDate: 2024-06-14 16:15:48 +0000 tzsetup: ask local/UTC question only on x86 Storing local time in the RTC is a legacy of 1990s PCs; it's not relevant on other platforms of interest to FreeBSD. While here switch to C99 bool. Sponsored by: The FreeBSD Foundation Reviewed by: allanjude (earlier), imp (earlier) Differential Revision: https://reviews.freebsd.org/D45575 --- usr.sbin/tzsetup/tzsetup.8 | 3 ++- usr.sbin/tzsetup/tzsetup.c | 25 +++++++++++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/usr.sbin/tzsetup/tzsetup.8 b/usr.sbin/tzsetup/tzsetup.8 index 499d25765541..4e70875ec74b 100644 --- a/usr.sbin/tzsetup/tzsetup.8 +++ b/usr.sbin/tzsetup/tzsetup.8 @@ -62,7 +62,8 @@ Skip the initial question about adjusting the clock if not set to UTC. .Nm will neither create nor delete .Pa /etc/wall_cmos_clock . -On a newly installed system the hardware clock will keep UTC. +On a newly installed system, the hardware clock will keep UTC. +This option is enabled automatically on non-x86 hardware. .El .Pp It is possible to short-circuit the menu system by specifying the diff --git a/usr.sbin/tzsetup/tzsetup.c b/usr.sbin/tzsetup/tzsetup.c index 617de4efb765..6629dd81f250 100644 --- a/usr.sbin/tzsetup/tzsetup.c +++ b/usr.sbin/tzsetup/tzsetup.c @@ -826,23 +826,28 @@ main(int argc, char **argv) char prompt[128]; int fd; #endif - int c, rv, skiputc; + int c, rv; + bool skiputc; + char *dztpath; +#if defined(__i386__) || defined(__amd64__) char vm_guest[16] = ""; size_t len = sizeof(vm_guest); - char *dztpath; + skiputc = false; + + /* Default skiputc to true for VM guests */ + if (sysctlbyname("kern.vm_guest", vm_guest, &len, NULL, 0) == 0 && + strcmp(vm_guest, "none") != 0) + skiputc = true; +#else + skiputc = true; +#endif dztpath = NULL; - skiputc = 0; #ifdef HAVE_BSDDIALOG setlocale(LC_ALL, ""); #endif - /* Default skiputc to 1 for VM guests */ - if (sysctlbyname("kern.vm_guest", vm_guest, &len, NULL, 0) == 0 && - strcmp(vm_guest, "none") != 0) - skiputc = 1; - while ((c = getopt(argc, argv, "C:d:nrs")) != -1) { switch (c) { case 'C': @@ -861,7 +866,7 @@ main(int argc, char **argv) #endif break; case 's': - skiputc = 1; + skiputc = true; break; default: usage(); @@ -951,7 +956,7 @@ main(int argc, char **argv) if (bsddialog_init() == BSDDIALOG_ERROR) errx(1, "Error bsddialog: %s\n", bsddialog_geterror()); - if (skiputc == 0) { + if (!skiputc) { snprintf(prompt, sizeof(prompt), "Is this machine's CMOS clock set to UTC? " "If it is set to local time,\n" From nobody Fri Jun 14 16:25: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 4W14Pq58mNz5P7JS; Fri, 14 Jun 2024 16:25: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 4W14Pq4WvVz4sbd; Fri, 14 Jun 2024 16:25:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718382319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rJTI2odQjv+5jak2iZLptIML+4/kRWkKNLLYI513pBA=; b=DT7UDfy6X9ZuciTr9S6SO3r2pxaiAXyLZbYvjMZSYX5q2IhiuFs04zCj9X+cw635iBt6Hl c//9bOA9dsnOVwmbLip4hvGRg9re0NXIainPh4lBDuOHt41mCHySMPK402l8fWd/G4SZCv 678iv1fHnSiChKcc2n1lwXmtYIWx4bv/AXJhqr7ZXPg5A+ylKxnkudrBvh8RZo3ReI1B2j 5f472Ex3OyyP5l9SH6YPSvGZvO3B0Lr6wQCAZPT8XAiDi16L4FEe+gQtcIQKWuf4PMGxhV GsAWqQhsrrBtDObKMkwcROYfTSay5Lrd52XpIvI9XFI43nPjLo/NJ/duHHn2EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718382319; a=rsa-sha256; cv=none; b=QeF0pQpyksqoG1wNDpQtRxwmm53b4B8s8CwOSpL13dOcgROAv4jt87tPVYVfFVVXgDxjkd ubuYWcRGXw1YRs6hCbrbFTs4DXnwafjmsWVacpiRY3WMYmhmZATcnp+jVNC5Pm0gTIPpUG cWzQysOgXqiSHSVtY7g4Gyoj0IoykNY8uOy8Vbud0ib7iUOgaXEN2Jbw4kq0vNGowhMGkR vRVjz1n0iS0zhvSni1RabRmtGXI0GuJrNy7l5UbGxeJxCEy5D6BRt2+iYTTDpc6GS/zplM EC7TvKwSWC5xeT4ETyxnTE2Xll1FMtm5SLJXIWv9nh3IzZYxe9uwVP+zviec2g== 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=1718382319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rJTI2odQjv+5jak2iZLptIML+4/kRWkKNLLYI513pBA=; b=DfOXAt8zfXv8Nvi6Z8VEDmFtUtnYc9iMWbXHW7qTguZ3yaCqkbkt4uHFc6mAplZgtpGR2g 1Z/zHI3/XNi6IPqHtcQeFVb0RBWEUR8doV5Ej2BML02m+cuBuPzAGIMQriavqXSlQnxcLL TqHFdvtw34uvO1ju+FU6v/gxAvzv3TyvPNyA0pnleoEyfmbkFBTdbsmOdqlfwi8kQ6+6Gt /AFgR3rojxg85t9du9xUeB8UkYtQWJ1k5490PnLtTm1AENxA04+6Fq7waTu0hdWo59q+zm ie/cU9E/lLloLWZoVbCtlEfBoBriZHmE+lqT21rgXRbC9mXyUETpC0G08UD4fg== 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 4W14Pq3qWPzRLq; Fri, 14 Jun 2024 16:25: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 45EGPJpE082012; Fri, 14 Jun 2024 16:25:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45EGPJj1082009; Fri, 14 Jun 2024 16:25:19 GMT (envelope-from git) Date: Fri, 14 Jun 2024 16:25:19 GMT Message-Id: <202406141625.45EGPJj1082009@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: fb1028dcd4ae - main - hda: add support for Tiger Lake-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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: fb1028dcd4aedc4d48dbd97314f008c663b2e711 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fb1028dcd4aedc4d48dbd97314f008c663b2e711 commit fb1028dcd4aedc4d48dbd97314f008c663b2e711 Author: Adam Retter AuthorDate: 2024-06-14 15:57:15 +0000 Commit: Ed Maste CommitDate: 2024-06-14 16:24:59 +0000 hda: add support for Tiger Lake-H PR: 272682 Reported by: Miguel Salcedo Reviewed by: emaste --- sys/dev/sound/pci/hda/hdac.c | 1 + sys/dev/sound/pci/hda/hdac.h | 2 ++ sys/dev/sound/pci/hda/hdacc.c | 1 + 3 files changed, 4 insertions(+) diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c index e45c121eb10b..336602b6bbf4 100644 --- a/sys/dev/sound/pci/hda/hdac.c +++ b/sys/dev/sound/pci/hda/hdac.c @@ -109,6 +109,7 @@ static const struct { { HDA_INTEL_CMLKLP, "Intel Comet Lake-LP", 0, 0 }, { HDA_INTEL_CMLKH, "Intel Comet Lake-H", 0, 0 }, { HDA_INTEL_TGLK, "Intel Tiger Lake", 0, 0 }, + { HDA_INTEL_TGLKH, "Intel Tiger Lake-H", 0, 0 }, { HDA_INTEL_GMLK, "Intel Gemini Lake", 0, 0 }, { HDA_INTEL_ALLK, "Intel Alder Lake", 0, 0 }, { HDA_INTEL_ALLKM, "Intel Alder Lake-M", 0, 0 }, diff --git a/sys/dev/sound/pci/hda/hdac.h b/sys/dev/sound/pci/hda/hdac.h index b40bfc7f6da3..4b4bd70f800f 100644 --- a/sys/dev/sound/pci/hda/hdac.h +++ b/sys/dev/sound/pci/hda/hdac.h @@ -98,6 +98,7 @@ #define HDA_INTEL_CMLKLP HDA_MODEL_CONSTRUCT(INTEL, 0x02c8) #define HDA_INTEL_CMLKH HDA_MODEL_CONSTRUCT(INTEL, 0x06c8) #define HDA_INTEL_TGLK HDA_MODEL_CONSTRUCT(INTEL, 0xa0c8) +#define HDA_INTEL_TGLKH HDA_MODEL_CONSTRUCT(INTEL, 0x43c8) #define HDA_INTEL_MTL HDA_MODEL_CONSTRUCT(INTEL, 0x7e28) #define HDA_INTEL_ARLS HDA_MODEL_CONSTRUCT(INTEL, 0x7f50) #define HDA_INTEL_ARL HDA_MODEL_CONSTRUCT(INTEL, 0x7728) @@ -911,6 +912,7 @@ #define HDA_CODEC_INTELGMLK1 HDA_CODEC_CONSTRUCT(INTEL, 0x280d) #define HDA_CODEC_INTELICLK HDA_CODEC_CONSTRUCT(INTEL, 0x280f) #define HDA_CODEC_INTELTGLK HDA_CODEC_CONSTRUCT(INTEL, 0x2812) +#define HDA_CODEC_INTELTGLKH HDA_CODEC_CONSTRUCT(INTEL, 0x2814) #define HDA_CODEC_INTELALLK HDA_CODEC_CONSTRUCT(INTEL, 0x2815) #define HDA_CODEC_INTELJLK HDA_CODEC_CONSTRUCT(INTEL, 0x281a) #define HDA_CODEC_INTELELLK HDA_CODEC_CONSTRUCT(INTEL, 0x281b) diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hdacc.c index 009c9098ac3b..81395a1a9ae7 100644 --- a/sys/dev/sound/pci/hda/hdacc.c +++ b/sys/dev/sound/pci/hda/hdacc.c @@ -393,6 +393,7 @@ static const struct { { HDA_CODEC_INTELGMLK1, 0, "Intel Gemini Lake" }, { HDA_CODEC_INTELICLK, 0, "Intel Ice Lake" }, { HDA_CODEC_INTELTGLK, 0, "Intel Tiger Lake" }, + { HDA_CODEC_INTELTGLKH, 0, "Intel Tiger Lake-H" }, { HDA_CODEC_INTELALLK, 0, "Intel Alder Lake" }, { HDA_CODEC_SII1390, 0, "Silicon Image SiI1390" }, { HDA_CODEC_SII1392, 0, "Silicon Image SiI1392" }, From nobody Fri Jun 14 16: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 4W14pB1hxqz5P8NF; Fri, 14 Jun 2024 16: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 4W14pB0nBkz4vD7; Fri, 14 Jun 2024 16: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=1718383378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ne2u0aYBH+UyxGxSUpJVKi+fVro1XgWLmpSbwsrVGI0=; b=TYaxUB9fsnZsTLN86mgAcRWE/OTydinJsN0Prv2HUwKcbKrfRDyXIb6DQgeP+nKf53zvQu 5UVkzj6vm7vPzcaXbwCNZulvEQIRuW6VxPbvaYjL6ZTl5FCX4dAcrGjM5S0wJ2mhsFLQ4w VO/Cemsyw0oXiwOiSzrWzzl7KwAAGv7uOa4VSbdYxpcCVEeBlDUZj/ctgXJqcHag4Z0YUv 3Xug65ZpizKG9KsZ6u6DGR0jZzPl4NyGwkPdJ9nNDzyuBwzf0IsPccHueCwpqcoQDuQ3kv vFIjxF6cmY+vL06YB6iKzDGXgWHMz41J4YDfRgIpIBK1dBUSKsReS0kh7JVNkw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718383378; a=rsa-sha256; cv=none; b=iJ21Bh9X/VecvjsS7niNvPC5L6UrKPs9PJ6eYTlOeIOoMTMej6VrMMvP8faXtCIPmUj0QE WfBNmtKzgVDc2EcElNZlukIs+jJ8M1O6TSU745ZuPFRoqM9l97tAevYn5DG8IWD99BM62f Smq+3rOn2B6/aIGxwm732efsEjFgD45SfWcvNSn3kQXFIxe6BmUJV2qJ+xuPQyfPwP5i+4 xcfWF1VLdviEcp8Moj66uzKgnWEZ7ShABLd01Bn/wvdWyTA/866i6fTstHRdCZjHovoJpS 5kYOc1wMLWiNgpaNSkR0cUi+wLrLw6ZT8lwNuh27hWjRqnXNkT1bQgvbBcSw0Q== 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=1718383378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ne2u0aYBH+UyxGxSUpJVKi+fVro1XgWLmpSbwsrVGI0=; b=TWKup2YQQt4SeOPpma3dKh/qqL35cM2FJqsb38WiimpkzJO9u1iFxBQbGgONzfCUm6r9ZH mgaak0kVjJ6fW6LdRLPg7L3SNFXmCRT6wZoy6V82RL3+6OuSmg7I+lB8W6BrpRHyf4LWXD S2ccfRmvG/QmspcIwkw3IyXyY+RePLe7WJmj6ibGWt6Mrzn8TGJVjwbOIdvT6ThkI+HUJC 9av/eQEbclaptR3acYD4+Pw7gpZ+zTp796sg2sIIP4el2KdR4gvpfPxSUpCFSuXlcKXnDt G44AMJ44FbLPZO85tVznfEtY01tJxv0tQ6qkFztRuZwicK381NTU3o/2fruOxg== 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 4W14pB0NYfzShF; Fri, 14 Jun 2024 16: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 45EGgvVV015807; Fri, 14 Jun 2024 16: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 45EGgvmP015804; Fri, 14 Jun 2024 16:42:57 GMT (envelope-from git) Date: Fri, 14 Jun 2024 16:42:57 GMT Message-Id: <202406141642.45EGgvmP015804@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 97ab935d566c - main - rk_pinctrl: fix error 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97ab935d566c85458bc7cab99c402f026d704eff Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=97ab935d566c85458bc7cab99c402f026d704eff commit 97ab935d566c85458bc7cab99c402f026d704eff Author: John F. Carr AuthorDate: 2024-06-14 16:37:06 +0000 Commit: Mitchell Horne CommitDate: 2024-06-14 16:42:27 +0000 rk_pinctrl: fix error check The parse_bias method returns a signed int, with a value of -1 when the device tree reports nothing of the bias configuration. Convert the local 'bias' from unsigned to signed to properly check this condition. PR: 229721 Reviewed by: mhorne MFC after: 3 days --- sys/arm64/rockchip/rk_pinctrl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/rockchip/rk_pinctrl.c b/sys/arm64/rockchip/rk_pinctrl.c index 4892b0bf236c..6137f7f0d50a 100644 --- a/sys/arm64/rockchip/rk_pinctrl.c +++ b/sys/arm64/rockchip/rk_pinctrl.c @@ -1141,9 +1141,9 @@ rk_pinctrl_configure_pin(struct rk_pinctrl_softc *sc, uint32_t *pindata) { phandle_t pin_conf; struct syscon *syscon; - uint32_t bank, subbank, pin, function, bias; + uint32_t bank, subbank, pin, function; uint32_t bit, mask, reg, drive; - int i, rv; + int i, rv, bias; bank = pindata[0]; pin = pindata[1]; From nobody Fri Jun 14 17:12: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 4W15Rp1hD8z5PBM5; Fri, 14 Jun 2024 17:12: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 4W15Rp1246z40s9; Fri, 14 Jun 2024 17:12:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718385126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dj+h5tXCw17ytnq3r02UomjLAdvCYSrihiaw3GI30/k=; b=OPPS0laJX2bHvp/usbtvUAfZ0h8PabwQXGSLoQCmqZT4YWOw07q8T6a3jrh/WnhRXNSXoY uWfc/TW0LCiIFR0NVqz7fdmE30af+tQTgQNprCY5cfLWFV60/fd+sWgM5Z52KNId4DRgdx L21n9nouLIWHlqfXEXwPdIohTfriZlNe7oZavYP420UVWgzf1BOZXbTJVkCtZwVVL7K1eL uZ1ZYhwMjUD95/EF6vWGKBJc4/tmnJWLfHOJLFiCC1EveAh2r6/jehXeXFM4FsWrZV8B32 VQg7Wuo3V8KbICDSR2pmSufJjd0fp3qmHiaUdpufwly/w7IlCQDnrMWxf21xCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718385126; a=rsa-sha256; cv=none; b=TCZ1YL6c5E3mk4djo8wNwhNClTZHmguEgoP1qIrxQF7pCiPv8eE5Fa6jyPAil6Pfy+19uH Rc+Mw/AjNhGFgnlpcmca6DfJSFaE0aILOL/DvYril84gF881VP4SnztTc7ov8jgTT7uTc9 NpDONh/ER8mBremQK6gKg8DvlNCMSLTxyxdihflyk7iti1KTShGToGfvlKafjUD+qOcjAH j1g21UgfXgWP7Lz06Rf0XEhRPg9WyW/HZ4to33kDqaWayiCRJmCKB8UdYKrLnfpVnXKumY hCCC0VVB4qIDCU2mzZ85zMF3vCqnkDuNaN2SKzYoWhIKDfd/NV5makrQzQlC5Q== 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=1718385126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dj+h5tXCw17ytnq3r02UomjLAdvCYSrihiaw3GI30/k=; b=f8cX3hS3dh6y869W2s5IpnC9kj0s6tGgyXDonz8GWYXtkyQltgNSEZU72uVaec7/ns+D49 ljkLoDoSkktc9O/NpbRyiiug+SU8nKaOl5BFPuFaqrv7C7g7xA5LhHm3ASGgyw01d0fwBv bF6PAdurimTkkrWAnnT56uTzrjepXZzxCyxwg9jHbjxzdYEXfWLyhoddr6rQXHk1+vGD7l fIOBkzgnPDxkE5S5wj8fVK2Gs7pzajUJVfEIY1W8XBqdm788uTeKh7M2vQIuebyZAvLC09 iLUQZ9z3dAkUiWZFIC0cHFD1mlEPZklaNG+J/raALLZ5pUw6t20C0Odyq0MaEg== 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 4W15Rp0dYFzT6P; Fri, 14 Jun 2024 17:12: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 45EHC6dc063291; Fri, 14 Jun 2024 17:12:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45EHC6JN063288; Fri, 14 Jun 2024 17:12:06 GMT (envelope-from git) Date: Fri, 14 Jun 2024 17:12:06 GMT Message-Id: <202406141712.45EHC6JN063288@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: cadc9c7db780 - main - boot/efi: Fix warning for non-standard formats when debugging 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: cadc9c7db780877396da23f3683a8c69c9b1c01e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cadc9c7db780877396da23f3683a8c69c9b1c01e commit cadc9c7db780877396da23f3683a8c69c9b1c01e Author: John F. Carr AuthorDate: 2024-06-14 17:06:03 +0000 Commit: Warner Losh CommitDate: 2024-06-14 17:11:05 +0000 boot/efi: Fix warning for non-standard formats when debugging Add -Wno-format for zfs_module and regroup. This fixes warnings when EFI_DEBUG is defined. PR: 279071 Reviewed-by: imp --- stand/efi/boot1/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile index fb1c7d74eec1..607c30f10cf7 100644 --- a/stand/efi/boot1/Makefile +++ b/stand/efi/boot1/Makefile @@ -12,11 +12,12 @@ CFLAGS+= -DEFI_BOOT1 # seems to matter on arm64 where wchar_t defaults to an int instead # of a short. There's no good cast to use here so just ignore the # warnings for now. -CWARNFLAGS.proto.c+= -Wno-format -CWARNFLAGS.boot1.c+= -Wno-format +CWARNFLAGS.proto.c += -Wno-format +CWARNFLAGS.boot1.c += -Wno-format +CWARNFLAGS.ufs_module.c += -Wno-format +CWARNFLAGS.zfs_module.c += -Wno-format # Disable bogus alignment issues -CWARNFLAGS.ufs_module.c += -Wno-format CWARNFLAGS.ufs_module.c += -Wno-cast-align # Disable warnings that are currently incompatible with the zfs boot code From nobody Fri Jun 14 18:02: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 4W16Ys1dHZz5PGFw; Fri, 14 Jun 2024 18:02: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 4W16Ys192yz478k; Fri, 14 Jun 2024 18:02:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718388145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FPI7C0/sQ+DtsyVKlGETor0Rr+onY+kNa2EhNt77GGM=; b=Dffhl1FsD8jaLkP+RUYG8UYqJgR8rV+mRJaz4TIrLec5f7Iwl20657A9DibAYLFmnipOz8 XEUC2pDpTlCfN4/Z24Cs/p19AxGxS9p0cyIEN3h+1oSS6WC0lhdbQSHdEQny6B2IYdGiCe xXbC/HIghYRZYa0odLplkCkMzYGSKrOvIm9aHmzWGDkTLgWOb0LK5HBHaL6HVmXSm/Irh9 1NveUuaHCjfH9j3zw/xjcSpai9ANm7BWsdTEYK8ii9yCSxD4VkdI/eZwGpiLxxuVQPlGCe 2Hj3NFn48jYJJmYKa7Tbjql+quXUlJHifEp8SEURH4xEDBkugxqoVgb3kSyRVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718388145; a=rsa-sha256; cv=none; b=mZGVSpIvOMkxXEXuuGIr3XMPtRwZPhWKTzb54kvAFjxfBm/Mc7cSmVNoo18FrxJGdHyZmJ nzPRmvPxaE1XVcoVFYOIwXKXoCelSWACvxavzRBsysWirakveensbGr+dQ+YU81NAzibbP QRSIH+zn8l9yWZWJN5I+m3bqYh/sbX+15GTWkV3rEqSH78oQYw/0PoSZLrUxfbiYB8RsJt Z5GVMGvQyScRkdGbWJItIxSvIga/IczzVbzD2+E2B802PHCaiFB56njYSSZUxu9RqIUiwx byiuNXF7FVFZaaholJxP2ocjvNpST2nimoNjOlsk2GIkH2GGaHtyWaiIFdLXBw== 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=1718388145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FPI7C0/sQ+DtsyVKlGETor0Rr+onY+kNa2EhNt77GGM=; b=xOR0eRdrRCQsN1a7zhOMir2UEuO2GYFG2fR6t+Isu9sCAzbWSykyRQTj/DHoRwSgnNxdbM 4F22cxAXfzi2jUJjmEmsWkJ4r9bicTWxAtLizLk/3yjej1UdqfYMVQlQV1XO7Qc6NLVwID LKrRIVvWNloml+zpaCe9JSvxpsBgyeVZK+hlktbbWtbB3kEg6hMPK64RRToBSM+1MzdVYt yVNoWLVNrfukED/0q/nPc/1dMygxWmLQ0c508S9RPTLw+3/kyyxPfu0vfpqQqCR3CViNq7 G+uNIb+GE9EvbfQWFZiRHG4JEMKqOtaY5zkuywU+p2+xzwFYORWnS42X1ozyqw== 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 4W16Ys0m2BzX2t; Fri, 14 Jun 2024 18:02: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 45EI2PVC052943; Fri, 14 Jun 2024 18:02:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45EI2PuH052940; Fri, 14 Jun 2024 18:02:25 GMT (envelope-from git) Date: Fri, 14 Jun 2024 18:02:25 GMT Message-Id: <202406141802.45EI2PuH052940@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 0e4e77072f65 - main - riscv: adjust physmem reservation 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e4e77072f65df71644140e41229b868a73f3371 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=0e4e77072f65df71644140e41229b868a73f3371 commit 0e4e77072f65df71644140e41229b868a73f3371 Author: Mitchell Horne AuthorDate: 2024-06-14 17:57:28 +0000 Commit: Mitchell Horne CommitDate: 2024-06-14 18:02:05 +0000 riscv: adjust physmem reservation Make sure we do this BEFORE pmap_bootstrap(). Reviewed by: markj, jhb MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45325 --- sys/riscv/riscv/machdep.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/riscv/riscv/machdep.c b/sys/riscv/riscv/machdep.c index f44056f56212..1e2b96acd3a1 100644 --- a/sys/riscv/riscv/machdep.c +++ b/sys/riscv/riscv/machdep.c @@ -549,10 +549,6 @@ initriscv(struct riscv_bootparams *rvbp) cache_setup(); - /* Bootstrap enough of pmap to enter the kernel proper */ - kernlen = (lastaddr - KERNBASE); - pmap_bootstrap(rvbp->kern_l1pt, rvbp->kern_phys, kernlen); - #ifdef FDT /* * XXX: Unconditionally exclude the lowest 2MB of physical memory, as @@ -565,6 +561,11 @@ initriscv(struct riscv_bootparams *rvbp) physmem_exclude_region(mem_regions[0].mr_start, L2_SIZE, EXFLAG_NODUMP | EXFLAG_NOALLOC); #endif + + /* Bootstrap enough of pmap to enter the kernel proper */ + kernlen = (lastaddr - KERNBASE); + pmap_bootstrap(rvbp->kern_l1pt, rvbp->kern_phys, kernlen); + physmem_init_kernel_globals(); /* Establish static device mappings */ From nobody Fri Jun 14 18:02: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 4W16Yt3C1Vz5PGFx; Fri, 14 Jun 2024 18:02: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 4W16Yt2QXmz46tq; Fri, 14 Jun 2024 18:02:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718388146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uRW+ASm8bB6vDT1vqIsIVkWL77yE+5PLcUYE6UdwScc=; b=FsXzNEWa7D8322Ud34Pdkgf1iwg5ZHkQKpVCiMXV8mdxKJsH+LDdBXbI92YiTsJkebaamG FXJABcQgXn7lzJyE6gKBKW6/JgEUpV63/A8OXXW7oMTBQWejTutBkrFAjOQdYnPMMmELno 3wVJmOEUChslWtYEHEtlosTLsQu5cscWoFimiRxpus6ZyW78zV2rW16WTrFkHK1I9DWMMe 7CP9udtkZpl3gQ94yIa4SfvLujAevpA6gEd3PIknIALQiWCU/+55l0Y/2ddb5LFFPftNmA n6c2V0Xd/9lfKFCpBr6ZpiisJDzp3MALxSyNkmOhMQLP/siuIZQkC/74aYc+UA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718388146; a=rsa-sha256; cv=none; b=Tq/PtOz0zC2qG6jArkQPeqGiHumMovUCKWbdPKs0Pd9oAFMVdfL7iE8ZN3w920zZqVF93r BKXU7TZBJssC264ZnfyDSKgsN7BrWAh5GbwBSgcxEoKAjm0IcyKpkB2tWXDARtgQNOq8AS TXBAtu+gfS3PuUg0FPc6MtObN0p+Wddsg2bmN9nnVNfo8vYMwLPLkAVXlvBKSP7GXAYV+3 ruowe0FNboYJazoWNiAIqaPFnHE6hKBo7X+8/7LyiTPwJDo8bnRmy4RvgeE8H0clp1mnUT 0wA9H4eEw07zG7crrd/iwA5WZoEWSxWZMN7x1e8w3oy1AxjAqpP9TfG1+W9TDQ== 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=1718388146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uRW+ASm8bB6vDT1vqIsIVkWL77yE+5PLcUYE6UdwScc=; b=ms2Q9FQfcl42ULNihrPHFxgFNGEmyUq6qE+a739dVePhU0jR/k00n7SNBL/wyhDvlcr+hm 8yM+hFTDAAlTBhp4qWVQ840ekHGBw5oDi362G6RJvDLEkR+EhNnpQuI30zZbdIMvm/MeOs 1kFvkPbyiPtDcpneF1WAf8sNJ5+E/Ndrpfw6Uqeo67o/Uj9GvhbuBL7SbkqnAxmXO+ocF6 61jkDF4t/utGMJBJDHgo7mCKSJjzeJDqC8C3B/L2+2z145NpOsppvbV32dR2tRRwI/4PL/ nYbbWXplj1zoizrqVr22eDpxbLrMTxxRYgiUAo/7POtuYFRmuCEecXr+2xEnFA== 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 4W16Yt2222zWDP; Fri, 14 Jun 2024 18:02: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 45EI2Qif052996; Fri, 14 Jun 2024 18:02:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45EI2Qqu052993; Fri, 14 Jun 2024 18:02:26 GMT (envelope-from git) Date: Fri, 14 Jun 2024 18:02:26 GMT Message-Id: <202406141802.45EI2Qqu052993@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 3ff981587ff8 - main - riscv: Don't handle missing kernel L3 pages 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ff981587ff8f05c06092d05edcc50f1ede1bbd6 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=3ff981587ff8f05c06092d05edcc50f1ede1bbd6 commit 3ff981587ff8f05c06092d05edcc50f1ede1bbd6 Author: Mitchell Horne AuthorDate: 2023-11-24 17:21:51 +0000 Commit: Mitchell Horne CommitDate: 2024-06-14 18:02:05 +0000 riscv: Don't handle missing kernel L3 pages This code path should never be hit, if it does it means we did not bootstrap correctly. Turn it into a panic like we do on amd64 and arm64. Reviewed by: markj, jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45326 --- sys/riscv/riscv/pmap.c | 43 +++++-------------------------------------- 1 file changed, 5 insertions(+), 38 deletions(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 8176975b049c..1902f1f4009b 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -2911,14 +2911,13 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, u_int flags, int8_t psind) { struct rwlock *lock; - pd_entry_t *l1, *l2, l2e; + pd_entry_t *l2, l2e; pt_entry_t new_l3, orig_l3; pt_entry_t *l3; pv_entry_t pv; - vm_paddr_t opa, pa, l2_pa, l3_pa; - vm_page_t mpte, om, l2_m, l3_m; - pt_entry_t entry; - pn_t l2_pn, l3_pn, pn; + vm_paddr_t opa, pa; + vm_page_t mpte, om; + pn_t pn; int rv; bool nosleep; @@ -2990,39 +2989,7 @@ pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, } l3 = pmap_l3(pmap, va); } else { - l3 = pmap_l3(pmap, va); - /* TODO: This is not optimal, but should mostly work */ - if (l3 == NULL) { - if (l2 == NULL) { - l2_m = vm_page_alloc_noobj(VM_ALLOC_WIRED | - VM_ALLOC_ZERO); - if (l2_m == NULL) - panic("pmap_enter: l2 pte_m == NULL"); - - l2_pa = VM_PAGE_TO_PHYS(l2_m); - l2_pn = (l2_pa / PAGE_SIZE); - - l1 = pmap_l1(pmap, va); - entry = (PTE_V); - entry |= (l2_pn << PTE_PPN0_S); - pmap_store(l1, entry); - pmap_distribute_l1(pmap, pmap_l1_index(va), entry); - l2 = pmap_l1_to_l2(l1, va); - } - - l3_m = vm_page_alloc_noobj(VM_ALLOC_WIRED | - VM_ALLOC_ZERO); - if (l3_m == NULL) - panic("pmap_enter: l3 pte_m == NULL"); - - l3_pa = VM_PAGE_TO_PHYS(l3_m); - l3_pn = (l3_pa / PAGE_SIZE); - entry = (PTE_V); - entry |= (l3_pn << PTE_PPN0_S); - pmap_store(l2, entry); - l3 = pmap_l2_to_l3(l2, va); - } - pmap_invalidate_page(pmap, va); + panic("pmap_enter: missing L3 table for kernel va %#lx", va); } orig_l3 = pmap_load(l3); From nobody Fri Jun 14 18: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 4W16Yv5cyCz5PGSm; Fri, 14 Jun 2024 18:02: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 4W16Yv3C1gz46yn; Fri, 14 Jun 2024 18:02:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718388147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rw7tVkfk0/GTWH3CkLygPEU8DLJVQxEMB2gL7j3zApo=; b=MICO96gLLz3eEE73Ymaggp1J2agqPPWbgZuD0sqHX2Uez+wShoY1O1CeoVBsMycTi1fPms xFsD7Fo2vRDrZE5tjC6ov2oBP3BIWDjFJ0Dz5+nmU2otBYPdEslG8axuKNSZoGKhQelqlY nffu+SFFhNlfg0NDY+IizoSJ7Pb0WUB3CXEg1xcuqCHYGQi2fH1w3mMBJhTnG8gdmzKwR9 n2F7lh6YeidkP4dVyyOwOY4wzfrSdW9AKMpN6x+G/fGY/E9zue+PF7rPbIiHgRCjigM9lm Vcf4nC7cLk7oSpKv3UNhWUO4Jd/QXryOvKWCR9djpVi7V43ZrDbI35YsDO8vUA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718388147; a=rsa-sha256; cv=none; b=ahFZoAADF8ahsFK1PIq2BRZjXd90loaaWMK2gHMUGecMe5qcIbw1M7CWuTp6y94laMhT6k GsH7TYm45YkjCm9mtNdz4jbyb4OgLRrNggaqdbdKPDDNrnJVxWJ9S3PhHKRqeeBzBqj29h sFxXcWElA8QRe3j7SL9PYuw/w5XD6Dic+EEK6SAA7RxJCmGtIhw2H/0vnT0Ev5a1ddkrb+ Rrh+uHbcE65crWnk6EDxhpi+hJ5lTgCXJy9EuZa5gD2RZ5uqkiIMrOH4EkACuY1Lf3BxCk QTD1KdL7EowV2jeZ+84spuICYuwMxwk5FHhxxl0tmG0yRrPmtb3zm88bZjQY4g== 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=1718388147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rw7tVkfk0/GTWH3CkLygPEU8DLJVQxEMB2gL7j3zApo=; b=eLln1n9rqc6JfKIfooeHsNO+S9KG+tI4qEZlhaHScjfq6MuZKQBUJpiIvRN9oe8MYt/B0i YsvkStovwT53lmfbLjzsLHHGDtg+9RXXDMdG+LJ9+QdC2ehRaGZ4f35AtNP5UdLeHwQY30 PV427knAt7JJoURr38eCFz6NZ9+IP/xLPCWmIsckS5HDZuvAArDuPC22QJF8iBL2MQ/q87 /fonNqM0l7vOWg7rHpfIQ9ujk6X5BKIw/lk6ljxi5kmswoI0XjVt+/2WgS9ZOjYX7pKXHQ GcfSXO/7tycaZdv33EFgFSdAXhrlNz+gbR9W6S2I2WhQ1gqtIeX8TlvhrTf23g== 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 4W16Yv2phlzW74; Fri, 14 Jun 2024 18:02: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 45EI2Rix053047; Fri, 14 Jun 2024 18: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 45EI2RSO053044; Fri, 14 Jun 2024 18:02:27 GMT (envelope-from git) Date: Fri, 14 Jun 2024 18:02:27 GMT Message-Id: <202406141802.45EI2RSO053044@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 134f7b5fa91f - main - riscv: improve commentary around initial stvec 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 134f7b5fa91fa41e3c3c7caeaf1dff72018684e5 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=134f7b5fa91fa41e3c3c7caeaf1dff72018684e5 commit 134f7b5fa91fa41e3c3c7caeaf1dff72018684e5 Author: Mitchell Horne AuthorDate: 2024-06-03 17:24:12 +0000 Commit: Mitchell Horne CommitDate: 2024-06-14 18:02:05 +0000 riscv: improve commentary around initial stvec Make it explicit why we must set the trap vector before enabling virtual memory. Reviewed by: br, jhb, markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45474 --- sys/riscv/riscv/locore.S | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/riscv/riscv/locore.S b/sys/riscv/riscv/locore.S index 5a7e15ba443b..7e885ab8ca89 100644 --- a/sys/riscv/riscv/locore.S +++ b/sys/riscv/riscv/locore.S @@ -197,7 +197,11 @@ pagetables: /* Page tables END */ - /* Setup supervisor trap vector */ + /* + * Set the supervisor trap vector temporarily. Enabling virtual memory + * may generate a page fault. We simply wish to continue onwards, so + * have the trap deliver us to 'va'. + */ 2: lla t0, va sub t0, t0, s9 @@ -221,7 +225,7 @@ va: lla gp, __global_pointer$ .option pop - /* Setup supervisor trap vector */ + /* Set the trap vector to the real handler. */ la t0, cpu_exception_handler csrw stvec, t0 @@ -342,7 +346,11 @@ ENTRY(mpentry) /* Get the kernel's load address */ jal get_physmem - /* Setup supervisor trap vector */ + /* + * Set the supervisor trap vector temporarily. Enabling virtual memory + * may generate a page fault. We simply wish to continue onwards, so + * have the trap deliver us to 'mpva'. + */ lla t0, mpva sub t0, t0, s9 li t1, KERNBASE @@ -365,7 +373,7 @@ mpva: lla gp, __global_pointer$ .option pop - /* Setup supervisor trap vector */ + /* Set the trap vector to the real handler. */ la t0, cpu_exception_handler csrw stvec, t0 From nobody Fri Jun 14 18:09: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 4W16jk5ymrz5PGpG; Fri, 14 Jun 2024 18:09: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 4W16jk5Qk4z48jB; Fri, 14 Jun 2024 18:09:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718388554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XURd3LxFV80GE9oMFQBbJUjUnR0IEeD5M26UTUvfBqg=; b=edgcatkhJTQKka5+4WtCZQ0JcotfQJfN0xRZJcr2HMHA9ltEe6126W2D9JMsI8MW66q2uf nVrZetS43oxJFHxQHdPWIUaKGcuCL0dHzCG/jOycgSv0U0fa5/uwOq/ciba/CXMDCzKzQ6 enYsjCz55PjtDg5t5A6cC3ywcHn7qh1HTcP4KrHS9FSNgpPy0dGsgTDlJzuz0svlOr1g6E Fu+PfMr7aiALUbrf7P9ilapjgvokabJQDDDWwSnXig2LGZqelCZQeWmqDt2G8fWCLrriWx 6/RU856NY6C1fkHRJZ/GvEibOAOCZFVZQL24PQBfJsaXG50EIawIhl7BF4gxWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718388554; a=rsa-sha256; cv=none; b=ij9z/FSAuWIiN28s/NenY1ZX7N34UJE1XbohoqqkrGTgwWpbDjytwDy26n9y8pAqmaFEHY 3AD8IGXJcSiYK2uRosvs+DB/QSxIUSrfr7YBCCcN+AdoMVStXUXFhoq+Yoi8jH4vU9d8zh UVnebInhKtUpiTuTZDGaAROaQElULYTxtXIrFOzUNEhREU/Z0xOU8/GAY5HF3fJr4/jDdi wOU5YzhP0yVwaT7pi6NnfSTSa0FQPB3zAG+f4SAxjuUHD44lb78kfr3zqhirnDh46s8Tcs lgqiDTsdOyaPYBO2ZMnMM7r08nVZJp4Xmf6uWPhBI8O7bT7gSxJskRm88Cr4rA== 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=1718388554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XURd3LxFV80GE9oMFQBbJUjUnR0IEeD5M26UTUvfBqg=; b=uV+lE/IL6shw6c+3G7vXbJSYG4QPK0qZPCPOebvwwoVDCV5TLrIEBa/cM8IKMTvzibMxDr HzxBWU/SPt4PnR9lPL7qTYROsFuW43xERfCUJlhOREjUJIMcNgZhnPkz86pCnjibuMh3WT k8yxtR0Y5Cr2OLTvi9zrnLnCs4DWtORgXAyfp69Vt7ZrETFnqIUhEx5iAM1KjITcHCGl7K 1p/qNLIuQhVBtwE5mbCat7sc8u1aFiu9pYulzGGbRZL2tuXORsfaXskBbfx00eUW240CXF DP9L6U5yQCiHGGOG4TEsgOliUPRAcM6J7Pby84FKYiVKROEygUpNZ2TAolYAbw== 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 4W16jk4vztzWRy; Fri, 14 Jun 2024 18:09: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 45EI9EHM054094; Fri, 14 Jun 2024 18:09:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45EI9E80054091; Fri, 14 Jun 2024 18:09:14 GMT (envelope-from git) Date: Fri, 14 Jun 2024 18:09:14 GMT Message-Id: <202406141809.45EI9E80054091@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 2909ddd17cb4 - main - ctld: plug memory leaks 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2909ddd17cb4d750852dc04128e584f93f8c5058 Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=2909ddd17cb4d750852dc04128e584f93f8c5058 commit 2909ddd17cb4d750852dc04128e584f93f8c5058 Author: Alan Somers AuthorDate: 2024-06-12 21:34:05 +0000 Commit: Alan Somers CommitDate: 2024-06-14 18:08:38 +0000 ctld: plug memory leaks MFC after: 2 weeks Reviewed by: mav Sponsored by: Axcient Reported by: valgrind Pull Request: https://github.com/freebsd/freebsd-src/pull/1288 --- usr.sbin/ctld/ctld.c | 1 + usr.sbin/ctld/kernel.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) diff --git a/usr.sbin/ctld/ctld.c b/usr.sbin/ctld/ctld.c index c31ac328c84e..bf2791040125 100644 --- a/usr.sbin/ctld/ctld.c +++ b/usr.sbin/ctld/ctld.c @@ -2873,6 +2873,7 @@ main(int argc, char **argv) error = conf_apply(oldconf, newconf); if (error != 0) log_warnx("failed to apply configuration"); + conf_delete(newconf); conf_delete(oldconf); oldconf = NULL; diff --git a/usr.sbin/ctld/kernel.c b/usr.sbin/ctld/kernel.c index dd1c89d0e9b8..ae455e7815f7 100644 --- a/usr.sbin/ctld/kernel.c +++ b/usr.sbin/ctld/kernel.c @@ -614,6 +614,22 @@ retry_port: } cp->p_ctl_port = port->port_id; } + while ((port = STAILQ_FIRST(&devlist.port_list))) { + struct cctl_lun_nv *nv; + + STAILQ_REMOVE_HEAD(&devlist.port_list, links); + free(port->port_frontend); + free(port->port_name); + free(port->cfiscsi_target); + free(port->ctld_portal_group_name); + while ((nv = STAILQ_FIRST(&port->attr_list))) { + STAILQ_REMOVE_HEAD(&port->attr_list, links); + free(nv->value); + free(nv->name); + free(nv); + } + free(port); + } free(name); STAILQ_FOREACH(lun, &devlist.lun_list, links) { @@ -664,6 +680,18 @@ retry_port: cl->l_name); } } + while ((lun = STAILQ_FIRST(&devlist.lun_list))) { + struct cctl_lun_nv *nv; + + STAILQ_REMOVE_HEAD(&devlist.lun_list, links); + while ((nv = STAILQ_FIRST(&lun->attr_list))) { + STAILQ_REMOVE_HEAD(&lun->attr_list, links); + free(nv->value); + free(nv->name); + free(nv); + } + free(lun); + } return (conf); } @@ -741,12 +769,14 @@ kernel_lun_add(struct lun *lun) req.args = nvlist_pack(req.args_nvl, &req.args_len); if (req.args == NULL) { + nvlist_destroy(req.args_nvl); log_warn("error packing nvlist"); return (1); } } error = ioctl(ctl_fd, CTL_LUN_REQ, &req); + free(req.args); nvlist_destroy(req.args_nvl); if (error != 0) { @@ -824,12 +854,14 @@ kernel_lun_modify(struct lun *lun) req.args = nvlist_pack(req.args_nvl, &req.args_len); if (req.args == NULL) { + nvlist_destroy(req.args_nvl); log_warn("error packing nvlist"); return (1); } } error = ioctl(ctl_fd, CTL_LUN_REQ, &req); + free(req.args); nvlist_destroy(req.args_nvl); if (error != 0) { @@ -1052,6 +1084,7 @@ kernel_port_add(struct port *port) req.args = nvlist_pack(req.args_nvl, &req.args_len); if (req.args == NULL) { + nvlist_destroy(req.args_nvl); log_warn("error packing nvlist"); return (1); } @@ -1059,6 +1092,7 @@ kernel_port_add(struct port *port) req.result = result_buf; req.result_len = sizeof(result_buf); error = ioctl(ctl_fd, CTL_PORT_REQ, &req); + free(req.args); nvlist_destroy(req.args_nvl); if (error != 0) { @@ -1202,11 +1236,13 @@ kernel_port_remove(struct port *port) req.args = nvlist_pack(req.args_nvl, &req.args_len); if (req.args == NULL) { + nvlist_destroy(req.args_nvl); log_warn("error packing nvlist"); return (1); } error = ioctl(ctl_fd, CTL_PORT_REQ, &req); + free(req.args); nvlist_destroy(req.args_nvl); if (error != 0) { From nobody Fri Jun 14 18:15: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 4W16sL2LsRz5PHGm; Fri, 14 Jun 2024 18:15: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 4W16sL1nYvz4CYY; Fri, 14 Jun 2024 18:15:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718388950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X8wRIYMY4RvyhHAeBkzs7jqUnQBxPbb5Fd5h5zZY6lo=; b=b4BwI13pRsbC6tARR8r/GwLllTHkwyEb+WCCswyAgfBbqE6/k/XAIjOrP3Oua9UMgMNOIK slU3n3FvrTpHaiA+mz3U8MfhAgFnav14OtmVYlBv/FIzv6la7iWfpxQR3DsN6zorVW4SMs ebWg0rhtQ3i0fEmjI8GFbiFeJR3VZ9EaNt7rkkO+gLT224oMkE+lbXov9/wMcuhxqwb+yu 2d9gFvo8Kz6UPCXpTw/OeYM0GBiVXaykQMGPXooB7KI6v7hMhJQ8s/fKn8QRF3Q6ULCZVH 9eNNzj6H5qvgRTRPBC7yanLlHZl7Ya2XYRLfM7HM8ka92ZNEK3MQRAIgdejCsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718388950; a=rsa-sha256; cv=none; b=rwVtZWS23ObzG/jNeDx+WpIbOII7zzpsystn+uijkurImoZKENh4pAMY6gNQ3uVtc70eBQ PVWNxCli8qINByZJUyQBRHDJOJYGkryrj+uyIKy8oPNRM0yU/CgpAfQRJAnGSDEacMIho9 pPcY/dG549LpUJp47TWEcRbKNs7JEhAiNOvm48r+ceooTZGRDzvQP5tCMR+PhXVdBDFaoW trF0ofIfA9bSiJoDvjrfuJPGAO1dtYC8oapMX7WATlg0XyiZDHAop9oyaEtGIkUDuZrSOK xCnO+oDL9NwrSopVVDVmG2bgzkol0uj4pcY4/3toAbowibZ8Mkmv2oJXimcAiA== 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=1718388950; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X8wRIYMY4RvyhHAeBkzs7jqUnQBxPbb5Fd5h5zZY6lo=; b=AS8da1LC51ERZWwev0mUvM1g5L9LbbfWlJgym1H7Biqiq2aDkLFgS0vtUU7ZirKK6ZxieQ KVM0Iv4x7O1ZV73mFcVJ+i6YNZoXfC9BQuQZMREkowtJArqdN37yjEOWUDJEsEI/6zWJ/G 5t2XzNARqA6p66m+4AFsDujDY+87WR/7RINceXAwvMNWPmS9MzLx78XFwM2tMlmur8rBM2 /D3Vx3JuB5GsXA6tDOTFrMn/N/wECZ7HJ9Rkt9Wj6DZqKway29A3qSYcSN4zXNI3iGyD9I +TLofSWLJZlOQxezwXzY1ElbalIFTACakpBESmSkkCgxigU6UAVR9OPxIgtJFQ== 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 4W16sL15SFzX15; Fri, 14 Jun 2024 18:15: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 45EIFoO1070407; Fri, 14 Jun 2024 18:15:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45EIFon3070404; Fri, 14 Jun 2024 18:15:50 GMT (envelope-from git) Date: Fri, 14 Jun 2024 18:15:50 GMT Message-Id: <202406141815.45EIFon3070404@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Leidinger Subject: git: a70ecfb11757 - main - rc.subr: add new sysv option for service jails 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: netchild X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a70ecfb11757812cd97b6499dc4b73984c310681 Auto-Submitted: auto-generated The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/src/commit/?id=a70ecfb11757812cd97b6499dc4b73984c310681 commit a70ecfb11757812cd97b6499dc4b73984c310681 Author: Alexander Leidinger AuthorDate: 2024-06-14 18:05:52 +0000 Commit: Alexander Leidinger CommitDate: 2024-06-14 18:15:45 +0000 rc.subr: add new sysv option for service jails Clarify that the "sysvipc" svcj option inherits from the host / parent. Add "sysvipcnew" which creates a new SysV namespace for the service jail. Sanity check that only one of them is used. --- libexec/rc/rc.subr | 11 +++++++++++ share/man/man5/rc.conf.5 | 8 ++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 2380d1aeabc3..f9d8bf9a3cc3 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1219,6 +1219,7 @@ run_rc_command() if [ -n "$_svcj_options" ]; then # translate service jail options _svcj_cmd_options="" + _svcj_sysvipc_x=0 for _svcj_option in $_svcj_options; do case "$_svcj_option" in mlock) @@ -1243,8 +1244,13 @@ run_rc_command() _svcj_cmd_options="allow.nfsd enforce_statfs=1 ${_svcj_cmd_options}" ;; sysvipc) + _svcj_sysvipc_x=$((${_svcj_sysvipc_x} + 1)) _svcj_cmd_options="sysvmsg=inherit sysvsem=inherit sysvshm=inherit ${_svcj_cmd_options}" ;; + sysvipcnew) + _svcj_sysvipc_x=$((${_svcj_sysvipc_x} + 1)) + _svcj_cmd_options="sysvmsg=new sysvsem=new sysvshm=new ${_svcj_cmd_options}" + ;; vmm) _svcj_cmd_options="allow.vmm ${_svcj_cmd_options}" ;; @@ -1253,6 +1259,11 @@ run_rc_command() ;; esac done + if [ ${_svcj_sysvipc_x} -gt 1 ]; then + echo -n "ERROR: more than one sysvipc option is " + echo "specified in ${name}_svcj_options: $_svcj_options" + return 1 + fi fi [ -z "$autoboot" ] && eval $_pidcmd # determine the pid if necessary diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 9f32cfa5ab82..3fa20fe3cf0c 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -4977,8 +4977,11 @@ to them. .It nfsd Allows to run nfsd and affiliated daemons. .It sysvipc -Allows access to SysV semaphores, SysV shared memory and -SysV messages. +Inherits the SysV semaphores, SysV shared memory and +SysV messages from the host or the parent jail. +.It sysvipcnew +Creates a new namespace for SysV semaphores, SysV shared memory +and SysV messages for this particular service jail. .It vmm Allows access to .Xr vmm 4 . @@ -4988,6 +4991,7 @@ is enabled in the kernel. .El All non-network options can be combined with all other options. +From the SysV options only one option can be specified. If the .Ao Ar name Ac Ns Va _svcj From nobody Fri Jun 14 18:15: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 4W16sM3bFLz5PHGn; Fri, 14 Jun 2024 18:15: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 4W16sM2VLHz4CjS; Fri, 14 Jun 2024 18:15:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718388951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XTcO1o798WqwqdUYvcq7Pf59LbE42yRF0yYSaQrtKD8=; b=aNN5T9U2HiB7gQ66va4rrOX/uOFW7vx8jJcQoPdP6uqD+hI6QVTvJ5sYXsGPAvgM7OOUbk eTAscuh8TAcOpIo6HU6gAzQPbdNe4+a8w7Dz5aoTO+/SIYd18Pe/9MpQClaS1TO17M6dEP oZgq6arkZd0MTAIj4ofBEQeZZczlvH6vGzexLVmd4a7iy6x17hg6ZFjRx+5xOauBzXAEwS dvBE37yXdQOTwXwFQukCOJBuH15ZtH+pFt6RGoVIUYtXXE/jKGTex1jZYXQBJ+K7drGSar cnkDsSkwz18DBFr3zi+ZtcIyitgwvDsFBYCfVh0QfnYPFj2B6/aPZbtrltoqAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718388951; a=rsa-sha256; cv=none; b=rwNBBAyXsvgyO/69ZCWojYVXinmMVihDd+9974//uI+o+KNZ0PjCFN4pAznr82U1jm4g9/ YW3JxTWkXk1ZQ+1ojq6AP9QDnvllsuUvLqlI71qUU+JwrNuHfnvP2vKA2FETFf/U2ltW/s DSb8R9xfGWs6JLMAQCDUwF21Kz3WHiyEv96c/SBE/p/BDZLFKqPa7/86xwbB5gZJDscbo2 IJTousgrH/tQxHs6EAZ+uvJeJTXoJrCQ+RPAPq1xrYX0zgK0ykm2zE9QJqOidqfx+a06+y 2Gd2k1MCzltLjffyw/p+d4rsyA9PwXEVK3ofH8esdJHgwvFrPrgCdDh9cIbksg== 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=1718388951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XTcO1o798WqwqdUYvcq7Pf59LbE42yRF0yYSaQrtKD8=; b=HeBExu7rimAbplqYfivVnlf4lbEcPPDFbVEJ88QaP1qpoGZj19hUFB9hLJUCYZ7B8MI4IJ 2W/EhlDudM26ejb8UMzAUg/ez5OBaGlwAXVGP6BH+74w2udy2197i4h3erZub8y0udGKAM rIw85p9rHpbcTTXGS6+hq/zsSVt0dsPnH0xlI6+qGrPABAg7OGcyw2mcHHXSuThySXO8n+ /GKGqq/BAYItHUScKu4V4J9UDPkIDkgmr6LpMGZUfP2AY04rCrikju4a42p767lnoqQ8PB 1wdCSUeC1lrcGNMwO5cQ/M2NimM12DRQCSI80vRovaB9qVr7hsH+ySOBBzR88g== 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 4W16sM2607zX16; Fri, 14 Jun 2024 18:15: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 45EIFpQP070458; Fri, 14 Jun 2024 18:15:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45EIFpT0070455; Fri, 14 Jun 2024 18:15:51 GMT (envelope-from git) Date: Fri, 14 Jun 2024 18:15:51 GMT Message-Id: <202406141815.45EIFpT0070455@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Leidinger Subject: git: 2d08f6b577e9 - main - rc.subr: add some sanity checks for service jails 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: netchild X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d08f6b577e9d58848cd7734dc979e60fe6f0165 Auto-Submitted: auto-generated The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/src/commit/?id=2d08f6b577e9d58848cd7734dc979e60fe6f0165 commit 2d08f6b577e9d58848cd7734dc979e60fe6f0165 Author: Alexander Leidinger AuthorDate: 2024-06-14 18:10:07 +0000 Commit: Alexander Leidinger CommitDate: 2024-06-14 18:15:46 +0000 rc.subr: add some sanity checks for service jails Add some sanity checks when service jails are used in jails: - children.max > 0 - children.max - children.cur > 0 The nesting is too deep at those places to have a sane formatting, so no line wrapping at the usual column. If someone has a better idea how to format this: feel free to go ahead. --- libexec/rc/rc.subr | 39 ++++++++++++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index f9d8bf9a3cc3..e540d8f7d207 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1332,11 +1332,28 @@ run_rc_command() start) if [ "${_rc_svcj}" != jailing ]; then _return=1 - $JAIL_CMD -c $_svcj_generic_params $_svcj_cmd_options \ - exec.start="${SERVICE} -E _rc_svcj=jailing ${name} ${_rc_prefix}start $rc_extra_args" \ - exec.stop="${SERVICE} -E _rc_svcj=jailing ${name} ${_rc_prefix}stop $rc_extra_args" \ - exec.consolelog="/var/log/svcj_${name}_console.log" \ - name=svcj-${name} && _return=0 + _do_jailing=1 + + if check_jail jailed; then + if [ $(${SYSCTL_N} security.jail.children.max) -eq 0 ]; then + echo ERROR: jail parameter children.max is set to 0, can not create a new service jail. + _do_jailing=0 + else + _free_jails=$(($(${SYSCTL_N} security.jail.children.max) - $(${SYSCTL_N} security.jail.children.cur))) + if [ ${_free_jails} -eq 0 ]; then + echo ERROR: max number of jail children reached, can not create a new service jail. + _do_jailing=0 + + fi + fi + fi + if [ ${_do_jailing} -eq 1 ]; then + $JAIL_CMD -c $_svcj_generic_params $_svcj_cmd_options \ + exec.start="${SERVICE} -E _rc_svcj=jailing ${name} ${_rc_prefix}start $rc_extra_args" \ + exec.stop="${SERVICE} -E _rc_svcj=jailing ${name} ${_rc_prefix}stop $rc_extra_args" \ + exec.consolelog="/var/log/svcj_${name}_console.log" \ + name=svcj-${name} && _return=0 + fi else _run_rc_doit "$_cpusetcmd $_cmd $rc_extra_args" || _return=1 fi @@ -1432,6 +1449,18 @@ run_rc_command() if checkyesno ${name}_svcj; then if [ "${_rc_svcj}" != jailing ]; then + if check_jail jailed; then + if [ $(${SYSCTL_N} security.jail.children.max) -eq 0 ]; then + echo ERROR: jail parameter children.max is set to 0, can not create a new service jail. + return 1 + else + _free_jails=$(($(${SYSCTL_N} security.jail.children.max) - $(${SYSCTL_N} security.jail.children.cur))) + if [ ${_free_jails} -eq 0 ]; then + echo ERROR: max number of jail children reached, can not create a new service jail. + return 1 + fi + fi + fi $JAIL_CMD -c $_svcj_generic_params $_svcj_cmd_options\ exec.start="${SERVICE} -E _rc_svcj=jailing ${name} ${_rc_prefix}start $rc_extra_args" \ exec.stop="${SERVICE} -E _rc_svcj=jailing ${name} ${_rc_prefix}stop $rc_extra_args" \ From nobody Fri Jun 14 19:33: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 4W18b86FsMz5PNcc; Fri, 14 Jun 2024 19:33: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 4W18b85gwVz4NZl; Fri, 14 Jun 2024 19:33:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718393620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lPNkom6noheerE0y2EDzp+AiKMH0ZtLcZLfCBnLyLs8=; b=hV7RU2y04uks6BwmJR3X0D6klNowscFjLwFWH0ySXrpeLgz7wV9e9ZmQDYKUMwd4cAHfwa e97vwe/+LTWtfIrWAYhLiL5do8a+L4sM1xBwfiyHUOIHfUFuOerkSZzrcXSQDlCL8mb0XW fMOO1s74aLk3oGiOMAWpJRuwmzKRkYZc+2ghSQp8T/gTmJLzH1gD+DAQ+wDTmFHJqOwKiJ L1WSj/3LXzHmZpT4XIHH2qoAzOhKt3tZvw1mCNaApmNGxCJE8hpNI3QpccJiSzsT3XTJhN yt3EN0k2zb6B6p7XdXp9hDC1AeuJ55Usbuq1JldskmLrNPClgl8RVunEr5wJTw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718393620; a=rsa-sha256; cv=none; b=ZrTgWLIG200/AzXteu3aHBbqM5t2kZsZmLzv8LHbnXVQ62BrZY1ydNzyYVfVNQihwA1XLy 1yCHScaKfKNYCAYaBy4o1c5Y0JmZTuYIKL/0fyVMfyA0+RZHXRK1E5o2Xf50jXf/da2PTK AVRA0arSPQnc49CHFldzt8tE53ZvX8X5dkHn9DvbFly5Ye91RmVKo7xWQXNAZM6JJcNZ6V xBuOT71PvQ/mNlie3YxH8EgV0OH6h9XqjwmHeiomG9JB/9/XYas2eIeL6qIbjGgXbjIBUV BEJRgwZSpvY2KXXOrVCXOs0+2ENwbJquZXw7VMPRVtMpLM3vDSOcWptOY8lHSQ== 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=1718393620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lPNkom6noheerE0y2EDzp+AiKMH0ZtLcZLfCBnLyLs8=; b=TMY1aJ71H0wFi72nVovSn63zpEl2mlhutMPaM/k6b1VOU6PSrxgSejtaMe0nlzTtqk2Xsj Dblj+FohFEA5nUHrq9AEhW7y2KR3b8vC6r3O2dyVjctDqMQW3ctpw+A3Y6Cot+bpQv8Eo+ zf+cqZqFWsAF9+4UMlWDTmxzWsAusvQJms18+C3ujlNJ7vf90W0aHi264EcZpta/si7lbb DXchc58wPPFQUFzdjpvFZRCso+CpKgq6iJtRgnpcPJcpvHXf09jlaBvPXvQ/uTljUvnlux O/mqr3AzFnacgqTs+/LjLExYmALzb2VzgwKL6qpRih/z9f1jWmPFDmyNG0X40Q== 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 4W18b85HlHzZ1k; Fri, 14 Jun 2024 19:33: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 45EJXeaB005088; Fri, 14 Jun 2024 19:33:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45EJXeOl005085; Fri, 14 Jun 2024 19:33:40 GMT (envelope-from git) Date: Fri, 14 Jun 2024 19:33:40 GMT Message-Id: <202406141933.45EJXeOl005085@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: 80b42329248a - main - nvme: Fix panic on detach after ce75bfcac9cfe 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 80b42329248a7473f79eebf7850ee8e4116c17dd Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=80b42329248a7473f79eebf7850ee8e4116c17dd commit 80b42329248a7473f79eebf7850ee8e4116c17dd Author: Alexander Motin AuthorDate: 2024-06-14 19:32:10 +0000 Commit: Alexander Motin CommitDate: 2024-06-14 19:32:10 +0000 nvme: Fix panic on detach after ce75bfcac9cfe MFC after: 2 weeks --- sys/dev/nvme/nvme_ns.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index b19fc8664407..4c65e2c49e64 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -620,8 +620,9 @@ void nvme_ns_destruct(struct nvme_namespace *ns) { - if (ns->cdev->si_drv2 != NULL) - destroy_dev(ns->cdev->si_drv2); - if (ns->cdev != NULL) + if (ns->cdev != NULL) { + if (ns->cdev->si_drv2 != NULL) + destroy_dev(ns->cdev->si_drv2); destroy_dev(ns->cdev); + } } From nobody Fri Jun 14 19:55: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 4W194J6k5Fz5PQ4f; Fri, 14 Jun 2024 19:55: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 4W194J65rbz4PbM; Fri, 14 Jun 2024 19:55:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718394928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OrJzS7h+QLVGza6XVyS4PQkhbMNjXclfm3Z2JujTmfs=; b=qz3pM0BcMTqmuvouaN2vd75jH8WPXsGQVIQlFdqA7ww6tz9qGUb5E0xCjLPU6+ln/jdLDp jWywp0GyfndZi0cIKhdCLJNZhajtAJifhmVxZy+qNVCWH1d421Eoke4Oz0Lxy1nqmkeASg EFA0mcDRw/mxv0BC/eEJe8NfRsKIRZGwOUOAm5xol05/EiBhiWm1VIz8CatvH0EkMVH7Is EhYbNJ77Pg2s8oC+qV7hjxpvTFe08cv+/Ts2xEGK9vf0AELPU9/fHO/RSWx0vVr4zWnp4q FZXcqsUrCgFm+N22n0Xr/a7qDV8KbSQAtjEXA1SOUnpFoPfzhsMHM0vg3tw5mQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718394928; a=rsa-sha256; cv=none; b=nC4LEfuuBYEScjB1y89yeVVU0VCF+0UtHIieRPdfPlI4k//uujGBDS8XXhFyEo5qfy6TnZ rDzC6BR3kTNhEko1qo/7gIvtsa60bqiPZh8dPCvOiPoy/OYfchIVJhaHdVW/Luj+78qg20 SuPJJWAQNhvq5+c1lf62MYKMrj5ZDei0iZlhHr4g7VMkwPAXVqzDMFj15vjnRjSv9T1f6q i/xzp5NeSMXk9MV6uS2TTv7EscwOOFIzsutmEuYn5aokoOebB6Tp9VLnrbl9A3KU8FZVBA r0FD4shZAz/hbCbYWA6ok2JZq7ikzYhsP/xAJ/MeztFzDgEibJR3UrCV/REqXQ== 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=1718394928; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OrJzS7h+QLVGza6XVyS4PQkhbMNjXclfm3Z2JujTmfs=; b=bHqfzMZf4hi8RyW4B9UHYF8w3x+8sgN1NlskdTP2g+ndcwGUTUVf6hL12xB13S6lleKOn7 abLX+sPmrdacdVBFE7tVGrmvsFVqYYXNoKxKgjwQ63YvtL3u+qHpYOsER7fn98BHxmjplz sjPYoI3yIM96FGQVV5mt5gxFRYAwtPEEPZCVAGkgVAnvUuqVs/zGi5cXj2425WRHwSzbYE hx63ieOX1BM2SPhI5xDbAHkyQAXQw6k84Elt8gNKCrzDooVnanrA+bSbgUHnjiHhDJb0aO 5Ms31DdL3ohAbIcJciGrQi+wX8vgSidPmAHG4eDaN15RSF0GwjQEIuec2v8/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 4W194J5Z8NzZTg; Fri, 14 Jun 2024 19:55: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 45EJtSH0039040; Fri, 14 Jun 2024 19:55:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45EJtS7N039037; Fri, 14 Jun 2024 19:55:28 GMT (envelope-from git) Date: Fri, 14 Jun 2024 19:55:28 GMT Message-Id: <202406141955.45EJtS7N039037@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: 517c5854588e - main - vm_phys: Make sure that vm_phys_enq_chunk() stays in bounds 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 517c5854588eaa7c2248d97cd750b8b8bad9d69f Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=517c5854588eaa7c2248d97cd750b8b8bad9d69f commit 517c5854588eaa7c2248d97cd750b8b8bad9d69f Author: Mark Johnston AuthorDate: 2024-06-14 14:45:02 +0000 Commit: Mark Johnston CommitDate: 2024-06-14 19:55:02 +0000 vm_phys: Make sure that vm_phys_enq_chunk() stays in bounds vm_phys_enq_chunk() inserts a run of pages into the buddy queues. When lazy initialization is enabled, only the first page of each run is initialized; vm_phys_enq_chunk() thus initializes the page following the just-inserted run. This fails to account for the possibility that the page following the run doesn't belong to the segment. Handle that in vm_phys_enq_chunk(). Reported by: KASAN Reported by: syzbot+1097ef4cee8dfb240e31@syzkaller.appspotmail.com Fixes: b16b4c22d2d1 ("vm_page: Implement lazy page initialization") --- sys/vm/vm_phys.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index 53e58283eb9f..59ab7d13c55d 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -711,12 +711,16 @@ vm_phys_enq_chunk(struct vm_freelist *fl, vm_page_t m, int order, int tail) #ifdef VM_FREEPOOL_LAZYINIT if (__predict_false(m->pool == VM_FREEPOOL_LAZYINIT)) { vm_page_t m_next; + vm_paddr_t pa; int npages; npages = 1 << order; m_next = m + npages; - vm_page_init_page(m_next, m->phys_addr + ptoa(npages), m->segind, - VM_FREEPOOL_LAZYINIT); + pa = m->phys_addr + ptoa(npages); + if (pa < vm_phys_segs[m->segind].end) { + vm_page_init_page(m_next, pa, m->segind, + VM_FREEPOOL_LAZYINIT); + } } #endif } From nobody Fri Jun 14 19:56: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 4W195d15J9z5PQP3 for ; Fri, 14 Jun 2024 19:56:37 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic310-21.consmr.mail.gq1.yahoo.com (sonic310-21.consmr.mail.gq1.yahoo.com [98.137.69.147]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4W195b5F9Mz4Q58 for ; Fri, 14 Jun 2024 19:56:35 +0000 (UTC) (envelope-from marklmi@yahoo.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=yahoo.com header.s=s2048 header.b=RQBtjg0d; dmarc=pass (policy=reject) header.from=yahoo.com; spf=pass (mx1.freebsd.org: domain of marklmi@yahoo.com designates 98.137.69.147 as permitted sender) smtp.mailfrom=marklmi@yahoo.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1718394993; bh=yuVs3yPmnwjykJB23I3m1BtKJR5dzf6k5RTzjZV3gZ8=; h=From:Subject:Date:To:References:From:Subject:Reply-To; b=RQBtjg0d43Pezg5DEApmM9iUHmw+KN8FIdvrf3zFrahdcClOu3jxy7xvhuXH87mTNFCzFEujt62ABxFN3u9GTdJ6ji09fC/QE3TjLoUpzMCZgqYtnKOPphR5pzEe1os7ycZqRAiN9aPCp2DI3x4Wl9ZAPUVdxkXyKsW7fDrSaRQaIyupCrCHt76kk6gIsVgOf1TaGXA4catmbtVpRk44G9aWfhxxK9y2RhtSfSvdF32HumlgcJvzYgH+Y31yEHME/rukAYycKCeSYgsqAuuA7N0IaXGL7FH3QRUUaU29a2tzpIiLKryvA9Q5ZHJGg16D8WQu1Devpjl5j9STfWuLNQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1718394993; bh=S76CeGjdmomtzQCAqc8BzzYPgbKdJsMdbwTP2sDE8Mw=; h=X-Sonic-MF:From:Subject:Date:To:From:Subject; b=hh2fArFhjXKyC9l0svhchvC74uc0ygxVHdTzQ4C/DKO+Jr0L27+32nEY20eSidaVRjLvENvURrrRWFS3yOzCANwq68FKqVVo/BQq43XMvYGvah/ttQKPYVyURfjAWr98odwYEKuoFbOIkCeJXDTWvytamnTqQCUXz7jY7TDDu/a6WjcM1YA8PxZBwgoo7FtecPoLKp977pS9GHj+d2Q+ThIvD3ZU/UJ9yrXq+dUC4vIeDiNUmBWiofTWjbnp0DLFqdviLdyWbHkAbn9xqDXJ8d2/B+3gKu9k+M/e88l+UIWZR8KpAXUVxSqCaMuTES7DPxYwCWn1y3EV3uIu6Uj47g== X-YMail-OSG: GGzizq0VM1nynB4T8BoB1Od6dqqJvw0WcA.vWrNc6go6zVHzbJ4MsaaehomCzjW aC4eGqsHT5famoGRQqFJNwf4Vw4UhwAEYy8JL3e0ij.WtI2Vs0u6KaDwoIEbVuR24VXRbcPAVnsk sytYKnbMAQIj_ISjGdgQ2WWzU6ABmWpw8fEy0_Gb1IMIJ9cC_g2K2yK55fzd_Vt4DZii_Ql.dKTd cFwtG9h31bBV6Gw_DcywU_3X_fyhQTFhNePGPcmPXya4ENBrkO7d.PPTVGZkiAd6KBs1M1QnuvPs dIWULMnqUZ7VBZO6yQ7VrJJdGh2kD3iRvvBXGP6f3Jf_35IxkOX4BtsvcjUoy9cgG7qjs2V2F.eT MLuHFy_lobuaeSM8K7gR_DizbMCETbLU1_VswxXYj2L0wJnN35SnQvG71aZpvRacpoWFY42LfXrz wbDNoZLPIZEK2wja3dqBlryBB4UKqBKnykdMqacXdFpTkKlAYfJf4fJ_wkW233tdAU5WvfseUCAZ WJuyV3IfEnmykSJ4ccciAgJw7j0peEp2WGrbDn3UdSQwQyyi1o_IT9sDzdiraJJk09k3BYZSiq83 lj70yb8L74jWKK56zVuQ2l4rDsCSP6LLpKa6NAZ1sICZ1oOmtOoCR.iW9BireP6E3Xveb2NPhXpL nDbFj3jmDHroFStfihKIyYaJf_nBye8mV8sAZh5bQN0OokNHCBydbYRllV7.8hoOx.ewXoO9dgx. qyPfi1NEWr.9LJ.Erza2qdPNRxPj562dJcprnGm4xRHkYORhJHQLGBHhMmacvFzh836ng4M5RUN3 vZYCBELBYwccWN3mPjB8OeW_IV9xDuEyEoMhQcG353q4OifWuYX0BrWt3zzKFV210dQfLXPAcMQr jSlGJGkCYt699uY_ziZtSQliwUEBX6SsfBrCJ28SGqfiU1lFAAMzRu7MzgAPS3AScyQAOZdBhvto FhD19aqWAd38hrkAPBTVgAK5LrKZJWKMxATalx9DSTHJZyPbG4nniRSBiUPkJliwOkHjMiwm_dn5 4LWvPNIRovSSdz_uh6PDBJB6hSrOIBqNZ2bmtPy6NKdDcFic9O_yX0hrAVbQGAMu4SOs_aa.w275 IV2mvVUy_qLC0W0KPXgBXwE6xIeLyrrjl2jZKf096LTc_eIpgF7JAvyHaLosj62_2E4gfz2tB8.4 5V_i.kE94fST91vQRwP_PPV_Ofnw3Yt37Al8QiEIgStGbTCZZFSoQnCqeXRr1e8ulD2hBNUdxwfh 7Ql.4CF9czpjkh7ihFyX8Axm6XqYM2Vww9HfTlRtekne9NAxRghVFhoGYb1LLnA4zwwSGroQBhQg .X40F_fjhTMMygC.CD.3lHIE9IE2LpKBVSP7JwmwjP8uBB65zsOU7wf__nBbiBw2zBx5s3BDksIC Pr4Fzsyvrx2878E44guJfo.j2uDDc0_xFeJSPnsiOg6TNN73jlkuiXxU9MRv3pO46QZ.lRShBQ5F d5d2kAUvv1BxM3tlkc4hyaj2Dvu_F1uirM3Jol7aW.XTvCVGCpkVgNFVAiraAMndITbrSWR38cVG i8eAGvbQyts5qz6l8LoJdSNO8xjOAkJV4IRjeQ.6DKH6J9ETmbYBh9QOFKamnIo.HR3cy9Utjdu2 U96MP5ONdtxaG3TK5YPUkk_igboY8mjzWEjgwLhh2Cl_wrOXwENxSBgJ8aXCmGImxTRgIZXFeXFo Jpo96EmuTUo4Ro74MlZKbL7ie596jvC7a_9fH8X1tRxGem5kq81v1nYAdhQSsilp.oL2HnSZxQ3. _UzyZIaby1Feu50jQVY2Z6uVzskZwnUkTx_vLqWcwhvaq8HLlIgR0ht3q3fnh5.7tPRqE2RcUQOw WPJTE35Tb3IFTGXe4Ppzn5nnpwShEmLbL.b.2aWRZjvVuLPliYf2XZwxe218.0pU1yMgt6RrOA2T KNvcR5d_j7kd7UYt_Q4M4f69VOSg4r0t8ROb9g7OnkLUdYqv81w7s6K2uCLDBM8xrbnJMhtfeAP3 gohaim08OSqbs7Ez2MdvHRHQfR9BFXqiunb1OVSZdsYuUTXIG0EcNMtdtNLKFEgTFcB2xXoNe0dy zq0nnhnPKNG.1Oj7AYh4m_W8S9leb_5d8fK.siPgZk9lS2ToIeuxPkLxPXDiqy.98Jzla.tbFpOH T3yH1g9oWmTRRBZjnC0HIj4JQ.a2GjYRPvrDfrME3SQJSItwGJC9lxgedZ6QaeWujJBBzu2iEY4s pz259R9hcGhh1u5qOYR9zr_W8oTedurBPV2o59Be9xc_.5tQ7NeoNyNuOscUAhidB_X.kZo4eK2T Mu9dMz2U6.mvsbCik568- X-Sonic-MF: X-Sonic-ID: e9814eb2-26e9-43c6-b583-32cf3b418805 Received: from sonic.gate.mail.ne1.yahoo.com by sonic310.consmr.mail.gq1.yahoo.com with HTTP; Fri, 14 Jun 2024 19:56:33 +0000 Received: by hermes--production-gq1-5b4c49485c-75jqb (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 6d2fac0de933042639caee6dd6ccb97e; Fri, 14 Jun 2024 19:56:31 +0000 (UTC) From: Mark Millard Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.600.62\)) Subject: RE: git: aa6fb1d277be - main - tzsetup: ask local/UTC question only on x86 Message-Id: <16D52B39-D711-4A4A-B6D6-084A164553B8@yahoo.com> Date: Fri, 14 Jun 2024 12:56:20 -0700 To: Ed Maste , dev-commits-src-main@freebsd.org X-Mailer: Apple Mail (2.3774.600.62) References: <16D52B39-D711-4A4A-B6D6-084A164553B8.ref@yahoo.com> X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; MIME_GOOD(-0.10)[text/plain]; NEURAL_SPAM_SHORT(0.03)[0.035]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; FREEMAIL_FROM(0.00)[yahoo.com]; FROM_HAS_DN(0.00)[]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; DKIM_TRACE(0.00)[yahoo.com:+]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; APPLE_MAILER_COMMON(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.69.147:from]; RCVD_IN_DNSWL_NONE(0.00)[98.137.69.147:from] X-Rspamd-Queue-Id: 4W195b5F9Mz4Q58 Ed Maste wrote on Date: Fri, 14 Jun 2024 16:16:06 UTC : > The branch main has been updated by emaste: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Daa6fb1d277be47c51abc309ac9305def= 0fce7f9d >=20 > commit aa6fb1d277be47c51abc309ac9305def0fce7f9d > Author: Ed Maste > AuthorDate: 2024-06-12 23:48:24 +0000 > Commit: Ed Maste > CommitDate: 2024-06-14 16:15:48 +0000 >=20 > tzsetup: ask local/UTC question only on x86 >=20 > Storing local time in the RTC is a legacy of 1990s PCs; it's not > relevant on other platforms of interest to FreeBSD. . . . So, you are saying that the modern aarch64 Windows 11 on a system that has an RTC would be based on storing UTC in the RTC, even for booting Windows 11? [I dual boot a Windows DevKit 2023 with Windows 11 (presupplied internal media) and with FreeBSD (external USB3 media). Imagine that it had a RTC to make the question relevant.] =3D=3D=3D Mark Millard marklmi at yahoo.com From nobody Fri Jun 14 22:40: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 4W1DkK1bBYz5PdlJ; Fri, 14 Jun 2024 22:40: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 4W1DkK0pYmz4hNZ; Fri, 14 Jun 2024 22:40:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718404809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TGuonx+cfEnukKpvBIDttjErOh2TfLm+4ckQdW+fNkU=; b=jSCME/P8Aei96U7zBT+UfWOtFRdGp/9VEleQk1llEQbPOTYDPO++hGwRji79ok6W4j66hZ LFkFhjXhsfDgckSnI9Lztlz99FZSog1CTnrJGMMKtoEdrxlKwpvp7jjn1K8BCxJG7+Ci9w alMk+x6J76HZE7NGwaWcg9pdyMQWxQmF71yD6Mdp/EVow4IqVhNJG2Zg7K8HOJif8svbmD GVMpqQUyNEezZlneOlfQq+BIPpmJF6oc+VMv9u7F7QF9I2JDCCt3HJ4btj2BV0fZbzUQCH O8JeqOJwhff1ZEYoMArVkSkKlVsIcBH1MdJhiNi5e4qU0pZO+hcfp0s0J+gQPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718404809; a=rsa-sha256; cv=none; b=KB6ebginIs0nXhh0y1Jp4SB7jCukqoJVY3Jiv00L6YeOLTbhDRyoRKrdOR4K8mY2VGexBT bNVlEXs2lJFqAzuxVPPFVduP7Urxsj0BvtsoxrR4Zu2ZxQI1uRVSTGZtb5VY5jJyHMd3jL mjiKB7FIjfh0Ja+MBouOvIV/IgL2kM3RgOw+7B4dLXkYiDqjbTPY8MpIZ9FySeVUqMVGnf 4vUSo3Gg73edvo52Qw/6x4Fl0gXnoh/IaDdpsFDXjDzT/K/4JKr1oNdeJMTFhP+T/urSVj qRKcpVL8+Ed/eIEteXY7QWMOVqIgXSWSOg1suaGklDKTjFsNyUooVp2+zxItyQ== 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=1718404809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TGuonx+cfEnukKpvBIDttjErOh2TfLm+4ckQdW+fNkU=; b=wI+W4tO3zVbsxw/8jSeVoV1r696FZQ00rROsGdqNtuY/umjMNK+aC7myYD9VV/ixRwPCVU e0TARMWRziqGXicKll5RkKgoTmIcMicRoe6/e2mE7sXztZMd790uxeMhwT96WzlRpdWwyz IgvQ2Iepv8gTt6JFwIxng3KbsNpP+uyMJt1gYq7JL21X04OYH3ZXjMbXRNvkbZuCWpA3Nk rLCriDPVyotsku5SH/MZyxtQnW2vhCryMQ2kaWBoFs0NFVrhdusjFUOlsLM8V7BHju9+LN QhHlh7dmiFH56VeasLhBUp0e/MDwO4j6E9d5ogaGg0Drx9Ee0XdUZziFOg0rVA== 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 4W1DkK0GmJzfJr; Fri, 14 Jun 2024 22:40:09 +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 45EMe8EO013128; Fri, 14 Jun 2024 22:40:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45EMe8UL013118; Fri, 14 Jun 2024 22:40:08 GMT (envelope-from git) Date: Fri, 14 Jun 2024 22:40:08 GMT Message-Id: <202406142240.45EMe8UL013118@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: 5198178f3eb6 - main - cdefs.h: Add POSIX.1-2024 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 5198178f3eb6f9d1eae68adf00ac4aef62b2bb1d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5198178f3eb6f9d1eae68adf00ac4aef62b2bb1d commit 5198178f3eb6f9d1eae68adf00ac4aef62b2bb1d Author: Warner Losh AuthorDate: 2024-06-14 21:06:53 +0000 Commit: Warner Losh CommitDate: 2024-06-14 22:38:55 +0000 cdefs.h: Add POSIX.1-2024 values Sponsored by: Netflix --- sys/sys/cdefs.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index c3268791787f..476c89d1dddb 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -639,10 +639,13 @@ * and the omnibus ISO/IEC 9945-1: 1996 * (1003.1 Issue 5, Single Unix Spec v2, Unix 95) * _POSIX_C_SOURCE == 200112 1003.1-2001 (1003.1 Issue 6, Unix 03) + * with _XOPEN_SOURCE=600 * _POSIX_C_SOURCE == 200809 1003.1-2008 (1003.1 Issue 7) * IEEE Std 1003.1-2017 (Rev of 1003.1-2008) is - * 1003.1-2008 with two TCs applied with - * _POSIX_C_SOURCE=200809 and _XOPEN_SOURCE=700 + * 1003.1-2008 with two TCs applied and + * _XOPEN_SOURCE=700 + * _POSIX_C_SOURCE == 202405 1003.1-2004 (1003.1 Issue 8), IEEE Std 1003.1-2024 + * with _XOPEN_SOURCE=800 * * In addition, the X/Open Portability Guide, which is now the Single UNIX * Specification, defines a feature-test macro which indicates the version of From nobody Fri Jun 14 22:40: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 4W1DkL1sxlz5MB7G; Fri, 14 Jun 2024 22:40:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W1DkL0zxPz4h8q; Fri, 14 Jun 2024 22:40:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718404810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NivKcoWR9P4/gu/Ab5qIH+uWGBSjAHcK/dC87r70BBw=; b=tl+rlY4QHa4+jjZx01hL4bFmRkJrDL7aa5Q60w9RbYyrI/HKk+lySKjTVtCApMMbsiZsC4 MtF9KvRnUDwU5N3MfVxDFZZ4CL4BW3YVvYpjY/R/6tUNtSj5pSeThE8qoieu9/o/CwmIQq rcqy3GTUa1sw2xvbffS43GDP9suk92N+DpQtZKW3oZTttk0wFpuTaqztPXdJxr7xYuGf+A BjgJDhQdoyMT14RTSr4XSelrkGFeGcBVq3bg0SwOqsvpaSZs0GJDKhN7N7+xpDuxuthemu Q22fx72BWZwq8s112XbRuLUPPfmxWB3zrkjTv0bUlTduE27MpvYngBqquDYuiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718404810; a=rsa-sha256; cv=none; b=m64cy7XZ1WMDgAVRL8PaGVg47Qts+YCHnC71FUF0oj+rdtahVDocDHxby52rVjT8YeoAPR Sp7jaTYDtG1kJ841jDVbqqjmIWOk03RxgaX+DQ8GsxPFIJaTW2yioESD8Ea/3e8N3Y+1g3 XDNxpzy/yewyml0aoSaW5PThPv6IrIm+uz7gmOqRccr3j1uPB+Ex3XyvKe14IFe7s7j24y G4wW3NLOgyygrCDXcy6uW6yO9XcVk6LBsxGF/x8aBdn6ZG/AHRiATnXYObTJbLiUOl++Zj 0dzORkjSZhgUvCZzB5ONc15YyDH6Ql63YPrttAo4Gqyp99ed8EW+G6h5O9Va8w== 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=1718404810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NivKcoWR9P4/gu/Ab5qIH+uWGBSjAHcK/dC87r70BBw=; b=saSFAVtzJIb1854iLQ1UQ5TZJ9NDN/CtjeVQ+dbj+MraK43MmUpq2HOYNyHcaRg0Z33V7S 6pjDZD5XcF9mmKP7Ix1EqMqdghqRyFST3mgr992AgwVz2y0RGdMhsawaVzalNnOuTnASse 8YKQ8LS5LD+TP87k7+6Jy7diiLYcJAr3P4Z7uoWhp0z+6/VFbXIhvxmA14OHnGSF0fmWv5 as41sFC/DRC7jjAvrbIyQHMFpaOfRzYV9WithZ+CIW8ZrkGgixe0n8hajjCWKnJJ7BEzVL jBnwxww4gihjuuGz8fSkdltNP21YukBr7Jh7jP6NIQDW+SWvj4ETF/AAlO92SQ== 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 4W1DkL0c0jzfJs; Fri, 14 Jun 2024 22:40: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 45EMe9J0013735; Fri, 14 Jun 2024 22:40:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45EMe9gU013729; Fri, 14 Jun 2024 22:40:09 GMT (envelope-from git) Date: Fri, 14 Jun 2024 22:40:09 GMT Message-Id: <202406142240.45EMe9gU013729@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: 1bce7cd885e7 - main - nvme: Add Linux copatible ioctls 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 1bce7cd885e7e5b376a60367629a0f76ff7f0167 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1bce7cd885e7e5b376a60367629a0f76ff7f0167 commit 1bce7cd885e7e5b376a60367629a0f76ff7f0167 Author: Warner Losh AuthorDate: 2024-06-14 22:40:08 +0000 Commit: Warner Losh CommitDate: 2024-06-14 22:40:08 +0000 nvme: Add Linux copatible ioctls Add the NVME_IOCTL_ID, NVME_IOCTL_ADMIN_CMD, and NVME_IOCTL_IO_CMD Linux compatible ioctls. These may be run on either an I/O (ns) dev or a nvme (admin) dev. Linux allows both on either device, and programs use this and aren't careful about having the right device open. Emulate this feature, and implement these ioctls. The data is passed in into the kernel in host byte order (not converted to le). Results are returned in host order. The timeout field is ignore, and the metadata and metadata_len fields must be zero. The addr field can be null, even when the data_len is non zero (FreeBSD's ioctl interface prohibits this, Linux's just ignores the inconsistency). Only the cdw10 is returned from the command: the status is not returned in 'result' field. XXX need to verify that this is what Linux does on an error signaled from the drive. No external include file is yet available for this: most programs that call this interface either use a linux-specific path or have their own private copy of the data. It's unclear the best thing to do. Also, create a /dev/nvmeXnY as an alias for /dev/nvmeXnsY. These changes allow a native build of nvme-cli to work for everything that doesn't depend on sysfs entries in /sys, calls that use metadata, send / receive drive data and sed functionality not in our nvme driver. Sponsored by: Netflix Co-Authored-by: Chuck Tuffli Reviewed by: chuck Differential Revision: https://reviews.freebsd.org/D45415 --- sys/dev/nvme/nvme.h | 6 +++ sys/dev/nvme/nvme_ctrlr.c | 114 +++++++++++++++++++++++++++++++++++++++++++++- sys/dev/nvme/nvme_linux.h | 58 +++++++++++++++++++++++ sys/dev/nvme/nvme_ns.c | 14 +++++- 4 files changed, 190 insertions(+), 2 deletions(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index a389fc443743..1db50d24c259 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -1902,6 +1902,7 @@ struct thread; struct nvme_namespace; struct nvme_controller; struct nvme_consumer; +struct nvme_passthru_cmd; typedef void (*nvme_cb_fn_t)(void *, const struct nvme_completion *); @@ -1921,6 +1922,11 @@ int nvme_ctrlr_passthrough_cmd(struct nvme_controller *ctrlr, uint32_t nsid, int is_user_buffer, int is_admin_cmd); +int nvme_ctrlr_linux_passthru_cmd(struct nvme_controller *ctrlr, + struct nvme_passthru_cmd *npc, + uint32_t nsid, bool is_user, + bool is_admin); + /* Admin functions */ void nvme_ctrlr_cmd_set_feature(struct nvme_controller *ctrlr, uint8_t feature, uint32_t cdw11, diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c index 155aedf2f31a..f058a4e33b9f 100644 --- a/sys/dev/nvme/nvme_ctrlr.c +++ b/sys/dev/nvme/nvme_ctrlr.c @@ -43,6 +43,7 @@ #include #include "nvme_private.h" +#include "nvme_linux.h" #define B4_CHK_RDY_DELAY_MS 2300 /* work around controller bug */ @@ -1269,7 +1270,7 @@ nvme_ctrlr_passthrough_cmd(struct nvme_controller *ctrlr, ret = EFAULT; goto err; } - req = nvme_allocate_request_vaddr(buf->b_data, pt->len, + req = nvme_allocate_request_vaddr(buf->b_data, pt->len, nvme_pt_done, pt); } else req = nvme_allocate_request_vaddr(pt->buf, pt->len, @@ -1314,6 +1315,103 @@ err: return (ret); } +static void +nvme_npc_done(void *arg, const struct nvme_completion *cpl) +{ + struct nvme_passthru_cmd *npc = arg; + struct mtx *mtx = (void *)(uintptr_t)npc->metadata; + + npc->result = cpl->cdw0; /* cpl in host order by now */ + mtx_lock(mtx); + npc->metadata = 0; + wakeup(npc); + mtx_unlock(mtx); +} + +/* XXX refactor? */ + +int +nvme_ctrlr_linux_passthru_cmd(struct nvme_controller *ctrlr, + struct nvme_passthru_cmd *npc, uint32_t nsid, bool is_user, bool is_admin) +{ + struct nvme_request *req; + struct mtx *mtx; + struct buf *buf = NULL; + int ret = 0; + + /* + * We don't support metadata. + */ + if (npc->metadata != 0 || npc->metadata_len != 0) + return (EIO); + + if (npc->data_len > 0 && npc->addr != 0) { + if (npc->data_len > ctrlr->max_xfer_size) { + nvme_printf(ctrlr, + "npc->data_len (%d) exceeds max_xfer_size (%d)\n", + npc->data_len, ctrlr->max_xfer_size); + return (EIO); + } + /* We only support data out or data in commands, but not both at once. */ + if ((npc->opcode & 0x3) == 0 || (npc->opcode & 0x3) == 3) + return (EINVAL); + if (is_user) { + /* + * Ensure the user buffer is wired for the duration of + * this pass-through command. + */ + PHOLD(curproc); + buf = uma_zalloc(pbuf_zone, M_WAITOK); + buf->b_iocmd = npc->opcode & 1 ? BIO_WRITE : BIO_READ; + if (vmapbuf(buf, (void *)npc->addr, npc->data_len, 1) < 0) { + ret = EFAULT; + goto err; + } + req = nvme_allocate_request_vaddr(buf->b_data, npc->data_len, + nvme_npc_done, npc); + } else + req = nvme_allocate_request_vaddr((void *)npc->addr, npc->data_len, + nvme_npc_done, npc); + } else + req = nvme_allocate_request_null(nvme_npc_done, npc); + + req->cmd.opc = npc->opcode; + req->cmd.fuse = npc->flags; + req->cmd.rsvd2 = htole16(npc->cdw2); + req->cmd.rsvd3 = htole16(npc->cdw3); + req->cmd.cdw10 = htole32(npc->cdw10); + req->cmd.cdw11 = htole32(npc->cdw11); + req->cmd.cdw12 = htole32(npc->cdw12); + req->cmd.cdw13 = htole32(npc->cdw13); + req->cmd.cdw14 = htole32(npc->cdw14); + req->cmd.cdw15 = htole32(npc->cdw15); + + req->cmd.nsid = htole32(nsid); + + mtx = mtx_pool_find(mtxpool_sleep, npc); + npc->metadata = (uintptr_t) mtx; + + /* XXX no timeout passed down */ + if (is_admin) + nvme_ctrlr_submit_admin_request(ctrlr, req); + else + nvme_ctrlr_submit_io_request(ctrlr, req); + + mtx_lock(mtx); + while (npc->metadata != 0) + mtx_sleep(npc, mtx, PRIBIO, "nvme_npc", 0); + mtx_unlock(mtx); + + if (buf != NULL) { + vunmapbuf(buf); +err: + uma_zfree(pbuf_zone, buf); + PRELE(curproc); + } + + return (ret); +} + static int nvme_ctrlr_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, struct thread *td) @@ -1324,6 +1422,7 @@ nvme_ctrlr_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, ctrlr = cdev->si_drv1; switch (cmd) { + case NVME_IOCTL_RESET: /* Linux compat */ case NVME_RESET_CONTROLLER: nvme_ctrlr_reset(ctrlr); break; @@ -1342,6 +1441,19 @@ nvme_ctrlr_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, case NVME_GET_MAX_XFER_SIZE: *(uint64_t *)arg = ctrlr->max_xfer_size; break; + /* Linux Compatible (see nvme_linux.h) */ + case NVME_IOCTL_ID: + td->td_retval[0] = 0xfffffffful; + return (0); + + case NVME_IOCTL_ADMIN_CMD: + case NVME_IOCTL_IO_CMD: { + struct nvme_passthru_cmd *npc = (struct nvme_passthru_cmd *)arg; + + return (nvme_ctrlr_linux_passthru_cmd(ctrlr, npc, npc->nsid, true, + cmd == NVME_IOCTL_ADMIN_CMD)); + } + default: return (ENOTTY); } diff --git a/sys/dev/nvme/nvme_linux.h b/sys/dev/nvme/nvme_linux.h new file mode 100644 index 000000000000..aaa68e1d34f8 --- /dev/null +++ b/sys/dev/nvme/nvme_linux.h @@ -0,0 +1,58 @@ +/*- + * Copyright (c) 2024, Netflix Inc. + * Written by Warner Losh + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +/* + * Linux compatible NVME ioctls. So far we just support ID, ADMIN_CMD and + * IO_CMD. The rest are not supported. + */ + + +#include +#include + +struct nvme_passthru_cmd { + __uint8_t opcode; + __uint8_t flags; + __uint16_t rsvd1; + __uint32_t nsid; + __uint32_t cdw2; + __uint32_t cdw3; + __uint64_t metadata; + __uint64_t addr; + __uint32_t metadata_len; + __uint32_t data_len; + __uint32_t cdw10; + __uint32_t cdw11; + __uint32_t cdw12; + __uint32_t cdw13; + __uint32_t cdw14; + __uint32_t cdw15; + __uint32_t timeout_ms; + __uint32_t result; +}; + +#define nvme_admin_cmd nvme_passthru_cmd + +/* + * Linux nvme ioctls, commented out ones are not supported + */ +#define NVME_IOCTL_ID _IO('N', 0x40) +#define NVME_IOCTL_ADMIN_CMD _IOWR('N', 0x41, struct nvme_admin_cmd) +/* #define NVME_IOCTL_SUBMIT_IO _IOW('N', 0x42, struct nvme_user_io) */ +#define NVME_IOCTL_IO_CMD _IOWR('N', 0x43, struct nvme_passthru_cmd) +#define NVME_IOCTL_RESET _IO('N', 0x44) +/* #define NVME_IOCTL_SUBSYS_RESET _IO('N', 0x45) */ +/* #define NVME_IOCTL_RESCAN _IO('N', 0x46) */ +/* #define NVME_IOCTL_ADMIN64_CMD _IOWR('N', 0x47, struct nvme_passthru_cmd64) */ +/* #define NVME_IOCTL_IO64_CMD _IOWR('N', 0x48, struct nvme_passthru_cmd64) */ +/* #define NVME_IOCTL_IO64_CMD_VEC _IOWR('N', 0x49, struct nvme_passthru_cmd64) */ + +/* io_uring async commands: */ +/* #define NVME_URING_CMD_IO _IOWR('N', 0x80, struct nvme_uring_cmd) */ +/* #define NVME_URING_CMD_IO_VEC _IOWR('N', 0x81, struct nvme_uring_cmd) */ +/* #define NVME_URING_CMD_ADMIN _IOWR('N', 0x82, struct nvme_uring_cmd) */ +/* #define NVME_URING_CMD_ADMIN_VEC _IOWR('N', 0x83, struct nvme_uring_cmd) */ diff --git a/sys/dev/nvme/nvme_ns.c b/sys/dev/nvme/nvme_ns.c index 4c65e2c49e64..3f29382fe42f 100644 --- a/sys/dev/nvme/nvme_ns.c +++ b/sys/dev/nvme/nvme_ns.c @@ -43,6 +43,7 @@ #include #include "nvme_private.h" +#include "nvme_linux.h" static void nvme_bio_child_inbed(struct bio *parent, int bio_error); static void nvme_bio_child_done(void *arg, @@ -93,6 +94,18 @@ nvme_ns_ioctl(struct cdev *cdev, u_long cmd, caddr_t arg, int flag, case DIOCGSECTORSIZE: *(u_int *)arg = nvme_ns_get_sector_size(ns); break; + /* Linux Compatible (see nvme_linux.h) */ + case NVME_IOCTL_ID: + td->td_retval[0] = ns->id; + return (0); + + case NVME_IOCTL_ADMIN_CMD: + case NVME_IOCTL_IO_CMD: { + struct nvme_passthru_cmd *npc = (struct nvme_passthru_cmd *)arg; + + return (nvme_ctrlr_linux_passthru_cmd(ctrlr, npc, ns->id, true, + cmd == NVME_IOCTL_ADMIN_CMD)); + } default: return (ENOTTY); } @@ -610,7 +623,6 @@ nvme_ns_construct(struct nvme_namespace *ns, uint32_t id, return (ENXIO); ns->cdev->si_drv2 = make_dev_alias(ns->cdev, "%sns%d", device_get_nameunit(ctrlr->dev), ns->id); - ns->cdev->si_flags |= SI_UNMAPPED; return (0); From nobody Fri Jun 14 22:40: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 4W1DkM3yVhz5PdyZ; Fri, 14 Jun 2024 22:40: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 4W1DkM1fwKz4hCJ; Fri, 14 Jun 2024 22:40:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718404811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lhLsBcpaAKyxCg5lTMx/u0i0N9Sj9AKntjW2ymMD5vU=; b=IRnfuSyYjZWaIXV7oT1I7efuMUZdWWdw4BtDZdx2WXERSPBw1X9PO6wFxw73oAtvWz+PFG pXanT3v6BHJ0UOdOLWFVZQlTRBtW6ILV3cIdFQVIf34P3K1r+Js80BA8Q1DBsX6zjk2vkV wokYW4uPFCaNwAyWYfiZq7x2OaeP3gTjSzL8xPo7OXNUMeER/Uj6yLxaQGkLEl/eZJ5CYi RTU1PKCKx+V/6fspFRs9IhjS55dOHST/fvxfQnXY2WRNzz/bGQoDhNrC7JrU/KnazVtENF OUDkz3LvOdqsvNCpckJuwhJ0uEF/IZRNL2Up+qVlCpzifgkMCah7R30/Uh1Mag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718404811; a=rsa-sha256; cv=none; b=b+bsAJx1FrZ+7xYoS5SpkhzvFwaGc/tgXZs3RMxsFsXxEJq/xyExduzOUHibHvBzx9Vq3M jkTucuYpYNbrL/J4WI/VrWVLvMchPVX75hJfscTPB36deKi7as2D29kb5G3ZNpoR3Tw5Nd E1evYkmPx4w8lpqUwv3HRos2BUIiX3ibZY/1BMscma7g4W9NPqanIpQBJS0q57u+cPGNN2 8M/r8R5mMSUduRc9BRSUQIAYE4GeIpp+NfqaElA6V56DSL+yQfSrO6LGsND6vnSaMUrSNu PWBGi+dkedyriKB8bniALVVRBWy0IpyneSJ73aei5R+Ct4pU9Kykxos40I7h/w== 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=1718404811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lhLsBcpaAKyxCg5lTMx/u0i0N9Sj9AKntjW2ymMD5vU=; b=u3st3lnFmhcxoYoO1KVXswaWENBAazND6+8USD927FqTIquSdYHCcXmLcrvAT213cvCng0 V0svilj4H2D4P6sy2bSGFkQbsnl0FbDnDIJRJwR9UhfDPgzv0P917IOlfI2MmIhDOJVzoR 0BSOHFbeRsRjtbbkSDVDIb0KQG7Dy4myZPan5Fv3Q+EYFL9tPCkoaITY+cft0wQzZ0Y8hP afOJ1me9UqXjqUE1cFlLuheL1lwK2hmQJngKLwiWaU92ZqAE1FFeDs/WoPdfZpduvl4/Pb lzI+icAZOosbVJaTymOYL3IqpUnFZSf4gq7od6R5uc0XycxdN6dnqFDvg+NT6g== 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 4W1DkM1FNhzfT7; Fri, 14 Jun 2024 22:40: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 45EMeBcT014412; Fri, 14 Jun 2024 22:40:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45EMeBKe014403; Fri, 14 Jun 2024 22:40:11 GMT (envelope-from git) Date: Fri, 14 Jun 2024 22:40:11 GMT Message-Id: <202406142240.45EMeBKe014403@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: ad9cc86bf60c - main - linux: Translate Linux NVME ioctls to the lower layers. 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: ad9cc86bf60cee2b35e804b348840a096f66561d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ad9cc86bf60cee2b35e804b348840a096f66561d commit ad9cc86bf60cee2b35e804b348840a096f66561d Author: Chuck Tuffli AuthorDate: 2024-06-14 22:40:20 +0000 Commit: Warner Losh CommitDate: 2024-06-14 22:40:20 +0000 linux: Translate Linux NVME ioctls to the lower layers. The lower layers implement a ABI compatible Linux ioctl for a few of the Linux IOCTLs. Translate them and pass them down. Since they are ABI compatible, just use the nvme ioctl name. Co-Authored-by: Warner Losh Reviewed by: chuck Differential Revision: https://reviews.freebsd.org/D45416 --- sys/compat/linux/linux_ioctl.c | 35 +++++++++++++++++++++++++++++++++++ sys/compat/linux/linux_ioctl.h | 14 ++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 41c43f1ef8e6..aa2c9ce7f273 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -83,6 +83,8 @@ #include +#include + #define DEFINE_LINUX_IOCTL_SET(shortname, SHORTNAME) \ static linux_ioctl_function_t linux_ioctl_ ## shortname; \ static struct linux_ioctl_handler shortname ## _handler = { \ @@ -108,6 +110,9 @@ DEFINE_LINUX_IOCTL_SET(v4l2, VIDEO2); DEFINE_LINUX_IOCTL_SET(fbsd_usb, FBSD_LUSB); DEFINE_LINUX_IOCTL_SET(evdev, EVDEV); DEFINE_LINUX_IOCTL_SET(kcov, KCOV); +#ifndef COMPAT_LINUX32 +DEFINE_LINUX_IOCTL_SET(nvme, NVME); +#endif #undef DEFINE_LINUX_IOCTL_SET @@ -3531,6 +3536,36 @@ linux_ioctl_kcov(struct thread *td, struct linux_ioctl_args *args) return (error); } +#ifndef COMPAT_LINUX32 +static int +linux_ioctl_nvme(struct thread *td, struct linux_ioctl_args *args) +{ + + /* + * The NVMe drivers for namespace and controller implement these + * commands using their native format. All the others are not + * implemented yet. + */ + switch (args->cmd & 0xffff) { + case LINUX_NVME_IOCTL_ID: + args->cmd = NVME_IOCTL_ID; + break; + case LINUX_NVME_IOCTL_RESET: + args->cmd = NVME_IOCTL_RESET; + break; + case LINUX_NVME_IOCTL_ADMIN_CMD: + args->cmd = NVME_IOCTL_ADMIN_CMD; + break; + case LINUX_NVME_IOCTL_IO_CMD: + args->cmd = NVME_IOCTL_IO_CMD; + break; + default: + return (ENODEV); + } + return (sys_ioctl(td, (struct ioctl_args *)args)); +} +#endif + /* * main ioctl syscall function */ diff --git a/sys/compat/linux/linux_ioctl.h b/sys/compat/linux/linux_ioctl.h index 8a56e35d10c6..4ef6d4f40830 100644 --- a/sys/compat/linux/linux_ioctl.h +++ b/sys/compat/linux/linux_ioctl.h @@ -781,6 +781,20 @@ #define LINUX_KCOV_DISABLE 0x6365 #define LINUX_KCOV_REMOTE_ENABLE 0x6366 +/* + * NVMe IOCTLs defined by Linux + */ +#define LINUX_NVME_IOCTL_ID 0x4e40 +#define LINUX_NVME_IOCTL_ADMIN_CMD 0x4e41 +#define LINUX_NVME_IOCTL_SUBMIT_IO 0x4e42 +#define LINUX_NVME_IOCTL_IO_CMD 0x4e43 +#define LINUX_NVME_IOCTL_RESET 0x4e44 +#define LINUX_NVME_IOCTL_SUBSYS_RESET 0x4e45 +#define LINUX_NVME_IOCTL_RESCAN 0x4e46 + +#define LINUX_IOCTL_NVME_MIN LINUX_NVME_IOCTL_ID +#define LINUX_IOCTL_NVME_MAX LINUX_NVME_IOCTL_RESCAN + /* * Pluggable ioctl handlers */ From nobody Sat Jun 15 06:36: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 4W1RHr0L7zz5NRfJ; Sat, 15 Jun 2024 06:36: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 4W1RHq6kX6z4V4C; Sat, 15 Jun 2024 06:36:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718433383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G0JnlERiXUSrAIQp9qJACAePPwniRUyOt2RTbzj4TOA=; b=WYma5Ag9na8C2DJEJOEeOftvfvhiyJ4phxRdQ23G3xrEfW7cSyjfB5PvMlUU9qhiE+HHVs v+N6Jg0j8ZtEgiQLPmwjZGQvyhml5CjoJhEyPDVDpKwm2xmhGE/2OtHmx9OW6RFzpr+qKQ 8qHCXxIbEA4XjDgZPlVN5CU5SAamDL4bBy0NpFI4txVdTz2QgC40w2tcbHdeX5FK2zVrE2 VQKX6IoIyN3PhpPALM34DM8jvC5qdRX1BsVxmp7uwB7SIKSI+6HRgn+O1X30eUgyF26Ris jV7hlEdCzvXvjcXB5lzkcYVuU79CaKoZz5df1JY7d3mw5sHYjLDBfygFcNSe9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718433383; a=rsa-sha256; cv=none; b=ktt/kz/vbg96cW6RwKjlFeziH4CpAXcdvv5uMfib6vI5cAAywbRfOAApnKL0VZ4tOZDbEL G5oVZPO0O8rE9ier5VB9kwg29uirkXqmnMK5EY92UCnuVowMQvloDjoO4LZzQbxbCl/rUF t7qmfCsSS99zISZX9hoXc1ZS5UbyzV+sH9TXF92pZEdNRE36Y00keUSDFuzISAnMost5cO s9IE2HHZjA9tpBX1P/LAXBrDgLjChJkvZ/8KVMkQAlFKHuEat+j87ywWWlRUBmgv5m5gV8 R5eGLuzs10r+DV14GUDWqYMDRw+ACmE1Qk/24/Loawg+aIgSpyI44mQ6ptTsKA== 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=1718433383; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G0JnlERiXUSrAIQp9qJACAePPwniRUyOt2RTbzj4TOA=; b=N36z+bXiBPHOmeG/d9bYFJpx5CznIJa9gfmAZ3nqRhCPr98MqicHivU3HkNk9+plv6Igee 0yymSZg1GD0BruuPRIxExcHbJaRroBqCqouKo2xtTs85WE/Erz1RwQkk5GEORHoTWR6THY 5pbCgZdiDWOa4ja98UedGLtOtNmHZvNRvvSNsSEgjw+2RYKsQuKW8YJZ9rlIIOM5mbDjn6 O3hbS9yaZ3WtnuHct+aY9LLXPQ6sqrdvrT5PTqdqKej2pjjk/+ERN5BJP0p0R4L0fgPPzL cXMP/XSOKdF7ErjNjIB7jHVEgMu+marb/2+kCco4Nq6AHPscvw0gCdzOUS/t8A== 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 4W1RHq66sqztXd; Sat, 15 Jun 2024 06:36: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 45F6aNv5021281; Sat, 15 Jun 2024 06:36:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45F6aNhp021278; Sat, 15 Jun 2024 06:36:23 GMT (envelope-from git) Date: Sat, 15 Jun 2024 06:36:23 GMT Message-Id: <202406150636.45F6aNhp021278@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: d26c565597b8 - main - stress2: Revert change accidentally added in ff4a72c159e0 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: d26c565597b88eb5c6000dbba9e348debe7095e3 Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=d26c565597b88eb5c6000dbba9e348debe7095e3 commit d26c565597b88eb5c6000dbba9e348debe7095e3 Author: Peter Holm AuthorDate: 2024-06-15 06:33:14 +0000 Commit: Peter Holm CommitDate: 2024-06-15 06:33:14 +0000 stress2: Revert change accidentally added in ff4a72c159e0 --- tools/test/stress2/misc/umountf2.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/test/stress2/misc/umountf2.sh b/tools/test/stress2/misc/umountf2.sh index cd5b53616f97..5018a804c403 100755 --- a/tools/test/stress2/misc/umountf2.sh +++ b/tools/test/stress2/misc/umountf2.sh @@ -886,12 +886,11 @@ test(void) { unsigned long offset; unsigned long size = maxoplen; - unsigned long rv; + unsigned long rv = random(); unsigned long op = rv % (3 + !lite + mapped_writes); /* turn off the map read if necessary */ - arc4random_buf(&rv, sizeof(rv)); if (op == 2 && !mapped_reads) op = 0; From nobody Sat Jun 15 12:40: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 4W1bN60Bxpz5NksD; Sat, 15 Jun 2024 12:40:38 +0000 (UTC) (envelope-from peterj@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 4W1bN56qglz46wr; Sat, 15 Jun 2024 12:40:37 +0000 (UTC) (envelope-from peterj@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718455238; 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: in-reply-to:in-reply-to:references:references; bh=odVyxW0oqlb0tJZ7YROIqf6OngVIKLM9hE68bhaRWjw=; b=GmFoN4pbg9LT3zNbMw0zQVlGnGG2P6CtkB0+vwHVTvt220aUMKFVKkMZb1SY0x3j8dutoc +OL83zyLQ4VdnDQ5v5o7Uh07vWlXzXaFvS4V1YSFFPATucAvA7Rz/W/4alHaC9X19saByB S/6A7DJmygqjfk7okWy4Mj+haZygAvZXuQRXGKqFaRdnxAqLk8A6YpldKUnk5OXY9GUHxQ GyBjAmNjz+dwYFW39TJPCIQjALNKDSMNUgm+rco/NJr3VaFr2v38yBunFoL/l0/otrJyGZ QnkM3jMuqiykbdczI4pVa0riksovNVKGSl43ce2Ul1GTt+hYgsD1jPWFT0qYZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718455238; a=rsa-sha256; cv=none; b=FhHScvn03Qf77Gw0kXogWCJwxEN4nuWzmfxYv8epXifUXPJTmQZg0V8MpQAgjGY0D9L3xG s2/pDPBooouR/Y8ticR/KO2+QhY5uUPdKLmrKmtsCdGUbp7FNwnZaaV1NBoCY87vh9DNUY OfWGp9FT0S53w7M+w5KupaOgBtHUtjtTs0BUSOHmDl+CaqkRzbZvwUwt9TLWHR5xx7JNPT t8UQzVpwtfGBEH15gWUNczM2wukS8IAk3VKn1UxvKBNk0LdnapQtwsW0w9l5iBWXaNpW+a ++j0tG1tLgVolRp7YUyzYyDtBy8zsc+N5NQV84qiFXLq/gDxfsj9Ev0FVjjh/A== 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=1718455238; 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: in-reply-to:in-reply-to:references:references; bh=odVyxW0oqlb0tJZ7YROIqf6OngVIKLM9hE68bhaRWjw=; b=NZ993xF0njNmqHjNpRqLogawYzRjme1DGyMNhm5uRjmMgqKAigGwQZ94gPiU7fwMhwxbLv 9epaHZvhPOIxkMGWAra6xv1R+TpVxR0+IDPGaMZUP5PvTOrG8eaMbzLe+dqvZ8EgvYMNMO AGszVIpb2BXpCtjedL8Hzo8iP0buKC5zsPDOVqU+jcI06N5mtebFcGFIQhfFe89JMpr1oy y0ECIyVyA9S75sSpEorMfV7hHmtGe2f3nZ7OMCSwmniK1QEwWhyG4qKy+FJronu2mspsJu jZ4SRdS3kD3jgVCOvDPOUGoCTHt+P7XruRP737v1p+tGfD+L3ssxbJRmazAwWg== Received: from server.rulingia.com (ppp239-208.static.internode.on.net [59.167.239.208]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA512) (Client did not present a certificate) (Authenticated sender: peterj) by smtp.freebsd.org (Postfix) with ESMTPSA id 4W1bN43PbXzPNY; Sat, 15 Jun 2024 12:40:36 +0000 (UTC) (envelope-from peterj@freebsd.org) Date: Sat, 15 Jun 2024 22:40:31 +1000 From: Peter Jeremy To: Mark Johnston Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: bf454ca88bdf - main - wg: Add netmap support Message-ID: References: <202404201605.43KG564E080220@gitrepo.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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="VKAYPSKkzu5Qsqrn" Content-Disposition: inline In-Reply-To: <202404201605.43KG564E080220@gitrepo.freebsd.org> X-PGP-Key: http://www.rulingia.com/keys/peter.pgp --VKAYPSKkzu5Qsqrn Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On 2024-Apr-20 16:05:06 +0000, Mark Johnston wrote: >URL: https://cgit.FreeBSD.org/src/commit/?id=3Dbf454ca88bdf4acfa873386e876= ff5e772e6a830 > > wg: Add netmap support =2E.. >--- a/sys/dev/wg/if_wg.c >+++ b/sys/dev/wg/if_wg.c =2E.. >@@ -2206,6 +2341,11 @@ wg_output(if_t ifp, struct mbuf *m, const struct so= ckaddr *dst, struct route *ro > return (EAFNOSUPPORT); > } >=20 >+#ifdef DEV_NETMAP >+ if ((if_getcapenable(ifp) & IFCAP_NETMAP) !=3D 0) >+ return (wg_xmit_netmap(ifp, m, af)); >+#endif >+ > defragged =3D m_defrag(m, M_NOWAIT); > if (defragged) > m =3D defragged; >@@ -2781,7 +2921,10 @@ wg_clone_create(struct if_clone *ifc, char *name, s= ize_t len, > if_setinitfn(ifp, wg_init); > if_setreassignfn(ifp, wg_reassign); > if_setqflushfn(ifp, wg_qflush); >+#ifdef DEV_NETMAP > if_settransmitfn(ifp, wg_transmit); >+ if_setinputfn(ifp, wg_if_input); >+#endif > if_setoutputfn(ifp, wg_output); > if_setioctlfn(ifp, wg_ioctl); > if_attach(ifp); sys/net/if.c:if_attach_internal() (called from if_attach()) requires that both transmit and qflush must either be NULL or set but if DEV_NETMAP is undefined, this code only sets qflush, guaranteeing a panic() as soon as a wg is attached. Unfortunately, I don't understand the code well enough to offer a fix. --=20 Peter Jeremy --VKAYPSKkzu5Qsqrn Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEE7rKYbDBnHnTmXCJ+FqWXoOSiCzQFAmZti7FfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEVF QjI5ODZDMzA2NzFFNzRFNjVDMjI3RTE2QTU5N0EwRTRBMjBCMzQACgkQFqWXoOSi CzSEiA//TFPoTUzp7D01ospWUU3p+6hGfx+PPdQK93abCk483I2yfc8EGONTpDs2 P7KLi0Vd7tlL/EHKKEUThaVwTSXlLPKpgwek1EMyzTILWm+ho6iJhCvJ2gIdP+Ax sFwCz8NivbHSmL74I9CI1Cm8Q6BThDMkdG8FFb1XsSx5oPnRvq7uJEdi/3PfI0SS s0DKbHWg6Fsn62m24qYD6J+wuvMXZ5J4PtVSqo2yE7NhPbGcbc826E9YqgBPb/bL il6LiLx0gVIttQk1J7ct3slH+1kIHazTiXHA0Le00Dtn/3xWAfyHOqYWdPXnpmL3 NmYWIPLqpUJizBAWLDqWMevGGruAdGIIUVDH0SuASY6VXV+i2O77TM0hipvmRYv8 AEZxmORYnZdsi1smzsmqfweZkWh0OK0G5qElkj606nHAIsFLlIA0arNFlfAxz0wm 4MuivBfMcVECzzUjDHK/eqdMP/2hM2EtOFt8ezL0r7VkeAYaGRpn55e+n4nPoQ2G EndWPLi2yha0SUH5fsGChULY2ljHS3t+eZ2V5ILtWC/R1aDOSNBaT4IN7blTdbDS cCyLlEpkElmJKNa/jqSowE/s8NR4lX5wQ7VLj+/m2sHzLwaTU8Qcj1uTokHa8oXj +Dw9upt9j7jP6ztQjHGoACn3gZJrqmHShSoApMNHYa8akvDakbA= =q27h -----END PGP SIGNATURE----- --VKAYPSKkzu5Qsqrn-- From nobody Sat Jun 15 14:24: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 4W1dhQ0B7Kz5NtMF; Sat, 15 Jun 2024 14:24: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 4W1dhP6kvqz4K2y; Sat, 15 Jun 2024 14:24:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718461493; h=from:from:reply-to:subject:subject: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/8TxbtssQf5tZkQ2KSUzxaYQO0A3Ykr5xmPKshGBgM=; b=wOtk1MeMAfF8pr8II0h67OsLPuv08tS6S/48XxtIvtng+VIdY1Zq7gAj8ffiXDNs3USaW2 Ij68WClZUn9QBRXX9ozr+lcfe/q4f6I6gp/rhBbbgDrDuB2SI3RkN5XlVJjzZHNcFaT9CJ 2DkhvXE2ci6EMCijv5ptlRYX6TqQGoQArCBLCK/NdJk5m+eLKHdfibHSmrTgCWqY5MxVad quNzf74R7tob192tL/VrPK25UlsK4wz+p+iPAwiPmgn1lCftsS1eyciTnEHCLDtY48PUFD Yzr9Yr+NdslF/R52Waq8ZUxc0aYfWO9dNUOjYjcBPNdPXtg6PthKflcfAWkBkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718461493; a=rsa-sha256; cv=none; b=LWHhIFsSiEBDcy0TZfo3CnBVdLnHzAy60tDFBV2KVmis5RviRehlQ9QByV/SzN26s1KKI1 hO8vwV0IZvHKVnTvxOMLjzYWDIoqzTnMQsamLFZR6dsWVKnlx5rmujkJIXfJoKCCSqoaud cE7PPFTuEDcBI00SS78wJUMzfO1ZROI+HAZIF3d75SDVPDmZGUYOtdfISS3KHebGwkquE0 b2EzrMZDHvYaWqz8zQcpR9ZDn1ziUNgGOwfLd4DWSWmUN65OW/ixbp8k1zohDg1nL/vvTQ 6wdw0PGkDKeu9uYf0LRdnD9PijLkjX7+0rNNvjCxj5nE1YhA+HFJcU3WaTOXBQ== 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=1718461493; h=from:from:reply-to:subject:subject: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/8TxbtssQf5tZkQ2KSUzxaYQO0A3Ykr5xmPKshGBgM=; b=RfMDIK1ZqHxhcruED/XwRoV+DK35K8mZ7SzkfZoPL120r48YYaKoHWTK4cmjlNdDef+FpZ ljBt3SF7juP5w66C+ms8SENSBh9PEMQ9yhmZD8QFQ5T/CFy+rlmZfLqpUY4BBAXseig/XW hKk5CsdG/4J1Z7/e1qTQx9O26s3UP6kNocIwQ1C76zpkwxLZU8olohrBNMGJArAAF6Pb3Y p2k0MAmFrBI5kpCpOGJmToMbJ+X6r8PRLFG+ttmJ13RgPUP/TUdRkeJiKql48x85vxXWr1 YLjrUHPpCx12QRVJoR+ONbCGTaGBrtmF5OzdZWqRNFOA5eYz9ytKSG/fvRVZSQ== 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 4W1dhP6FKLz17Pp; Sat, 15 Jun 2024 14:24: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 45FEOrLM018294; Sat, 15 Jun 2024 14:24:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45FEOrCw018291; Sat, 15 Jun 2024 14:24:53 GMT (envelope-from git) Date: Sat, 15 Jun 2024 14:24:53 GMT Message-Id: <202406151424.45FEOrCw018291@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wei Hu Subject: git: d0cb4674df97 - main - Hyper-V: move memory alloc call for tlb hypercall out of smp_rendezvous 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: whu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0cb4674df97aa638d5d17861c364b1625f79401 Auto-Submitted: auto-generated The branch main has been updated by whu: URL: https://cgit.FreeBSD.org/src/commit/?id=d0cb4674df97aa638d5d17861c364b1625f79401 commit d0cb4674df97aa638d5d17861c364b1625f79401 Author: Wei Hu AuthorDate: 2024-06-15 14:07:58 +0000 Commit: Wei Hu CommitDate: 2024-06-15 14:07:58 +0000 Hyper-V: move memory alloc call for tlb hypercall out of smp_rendezvous The allocation call could result in sleep lock violation if it is in smp_rendezvous. Move it out. Also move the pcpu memory pointer to vmbus_pcpu_data since it is only used on Hyper-V. PR: 279738 Reported by: gbe Fixes: 2b887687edc25bb4553f0d8a1183f454a85d413d MFC after: 2 weeks Sponsored by: Microsoft --- sys/dev/hyperv/vmbus/hyperv_mmu.c | 6 +-- sys/dev/hyperv/vmbus/vmbus.c | 88 +++++++++++++++++++++++++++++---------- sys/dev/hyperv/vmbus/vmbus_var.h | 5 ++- 3 files changed, 71 insertions(+), 28 deletions(-) diff --git a/sys/dev/hyperv/vmbus/hyperv_mmu.c b/sys/dev/hyperv/vmbus/hyperv_mmu.c index 13b1f52fa1f6..7c29fe294093 100644 --- a/sys/dev/hyperv/vmbus/hyperv_mmu.c +++ b/sys/dev/hyperv/vmbus/hyperv_mmu.c @@ -144,7 +144,7 @@ hv_vm_tlb_flush(pmap_t pmap, vm_offset_t addr1, vm_offset_t addr2, return smp_targeted_tlb_shootdown_native(pmap, addr1, addr2, curcpu_cb, op); - flush = *DPCPU_PTR(hv_pcpu_mem); + flush = *VMBUS_PCPU_PTR(sc, cpu_mem, curcpu); if (flush == NULL) return smp_targeted_tlb_shootdown_native(pmap, addr1, addr2, curcpu_cb, op); @@ -253,9 +253,9 @@ hv_flush_tlb_others_ex(pmap_t pmap, vm_offset_t addr1, vm_offset_t addr2, { int nr_bank = 0, max_gvas, gva_n; struct hv_tlb_flush_ex *flush; - if(*DPCPU_PTR(hv_pcpu_mem) == NULL) + if(*VMBUS_PCPU_PTR(sc, cpu_mem, curcpu) == NULL) return EINVAL; - flush = *DPCPU_PTR(hv_pcpu_mem); + flush = *VMBUS_PCPU_PTR(sc, cpu_mem, curcpu); uint64_t status = 0; uint64_t cr3; diff --git a/sys/dev/hyperv/vmbus/vmbus.c b/sys/dev/hyperv/vmbus/vmbus.c index f55f0329b017..dee738f6e373 100644 --- a/sys/dev/hyperv/vmbus/vmbus.c +++ b/sys/dev/hyperv/vmbus/vmbus.c @@ -139,7 +139,10 @@ static void vmbus_event_proc_dummy(struct vmbus_softc *, int); static bus_dma_tag_t vmbus_get_dma_tag(device_t parent, device_t child); static struct vmbus_softc *vmbus_sc; -static void free_pcpu_ptr(void); +#if defined(__x86_64__) +static int vmbus_alloc_cpu_mem(struct vmbus_softc *sc); +static void vmbus_free_cpu_mem(struct vmbus_softc *sc); +#endif SYSCTL_NODE(_hw, OID_AUTO, vmbus, CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, "Hyper-V vmbus"); @@ -217,7 +220,6 @@ static driver_t vmbus_driver = { }; uint32_t hv_max_vp_index; -DPCPU_DEFINE(void *, hv_pcpu_mem); DRIVER_MODULE(vmbus, pcib, vmbus_driver, NULL, NULL); DRIVER_MODULE(vmbus, acpi_syscontainer, vmbus_driver, NULL, NULL); @@ -750,7 +752,6 @@ vmbus_synic_setup(void *xsc) int cpu = curcpu; uint64_t val, orig; uint32_t sint; - void **hv_cpu_mem; if (hyperv_features & CPUID_HV_MSR_VP_INDEX) { /* Save virtual processor id. */ @@ -762,19 +763,6 @@ vmbus_synic_setup(void *xsc) if (VMBUS_PCPU_GET(sc, vcpuid, cpu) > hv_max_vp_index) hv_max_vp_index = VMBUS_PCPU_GET(sc, vcpuid, cpu); - hv_cpu_mem = DPCPU_ID_PTR(cpu, hv_pcpu_mem); - *hv_cpu_mem = contigmalloc(PAGE_SIZE, M_DEVBUF, M_NOWAIT | M_ZERO, - 0ul, ~0ul, PAGE_SIZE, 0); - -#if defined(__x86_64__) - if (*hv_cpu_mem == NULL && hv_tlb_hcall) { - hv_tlb_hcall = 0; - if (bootverbose && sc) - device_printf(sc->vmbus_dev, - "cannot alloc contig memory for hv_pcpu_mem, " - "use system provided tlb flush call.\n"); - } -#endif /* * Setup the SynIC message. @@ -858,7 +846,6 @@ vmbus_synic_teardown(void *arg) */ orig = RDMSR(MSR_HV_SIEFP); WRMSR(MSR_HV_SIEFP, (orig & MSR_HV_SIEFP_RSVD_MASK)); - free_pcpu_ptr(); } static int @@ -1412,15 +1399,41 @@ vmbus_probe(device_t dev) return (BUS_PROBE_DEFAULT); } +#if defined(__x86_64__) +static int +vmbus_alloc_cpu_mem(struct vmbus_softc *sc) +{ + int cpu; -static void free_pcpu_ptr(void) + CPU_FOREACH(cpu) { + void **hv_cpu_mem; + + hv_cpu_mem = VMBUS_PCPU_PTR(sc, cpu_mem, cpu); + *hv_cpu_mem = contigmalloc(PAGE_SIZE, M_DEVBUF, + M_NOWAIT | M_ZERO, 0ul, ~0ul, PAGE_SIZE, 0); + + if (*hv_cpu_mem == NULL) + return ENOMEM; + } + + return 0; +} + +static void +vmbus_free_cpu_mem(struct vmbus_softc *sc) { - int cpu = curcpu; - void **hv_cpu_mem; - hv_cpu_mem = DPCPU_ID_PTR(cpu, hv_pcpu_mem); - if(*hv_cpu_mem) - contigfree(*hv_cpu_mem, PAGE_SIZE, M_DEVBUF); + int cpu; + + CPU_FOREACH(cpu) { + void **hv_cpu_mem; + hv_cpu_mem = VMBUS_PCPU_PTR(sc, cpu_mem, cpu); + if(*hv_cpu_mem != NULL) { + contigfree(*hv_cpu_mem, PAGE_SIZE, M_DEVBUF); + *hv_cpu_mem = NULL; + } + } } +#endif /** * @brief Main vmbus driver initialization routine. @@ -1511,6 +1524,25 @@ vmbus_doattach(struct vmbus_softc *sc) if (ret != 0) goto cleanup; +#if defined(__x86_64__) + /* + * Alloc per cpu memory for tlb flush hypercall + */ + if (hv_tlb_hcall) { + ret = vmbus_alloc_cpu_mem(sc); + if (ret != 0) { + hv_tlb_hcall = 0; + if (bootverbose) + device_printf(sc->vmbus_dev, + "cannot alloc contig memory for " + "cpu_mem, use system provided " + "tlb flush call.\n"); + + vmbus_free_cpu_mem(sc); + } + } +#endif + /* * Setup SynIC. */ @@ -1627,6 +1659,16 @@ vmbus_detach(device_t dev) smp_rendezvous(NULL, vmbus_synic_teardown, NULL, NULL); } +#if defined(__x86_64__) + /* + * Restore the tlb flush to native call + */ + if (hv_tlb_hcall) { + smp_targeted_tlb_shootdown = &smp_targeted_tlb_shootdown_native; + vmbus_free_cpu_mem(sc); + } +#endif + vmbus_intr_teardown(sc); vmbus_dma_free(sc); diff --git a/sys/dev/hyperv/vmbus/vmbus_var.h b/sys/dev/hyperv/vmbus/vmbus_var.h index 4f0668476716..4e0a769402d5 100644 --- a/sys/dev/hyperv/vmbus/vmbus_var.h +++ b/sys/dev/hyperv/vmbus/vmbus_var.h @@ -74,6 +74,9 @@ struct vmbus_pcpu_data { uint32_t vcpuid; /* virtual cpuid */ int event_flags_cnt;/* # of event flags */ struct vmbus_evtflags *event_flags; /* event flags from host */ +#if defined(__x86_64__) + void *cpu_mem; /* For Hyper-V tlb hypercall */ +#endif /* Rarely used fields */ struct taskqueue *event_tq; /* event taskq */ @@ -216,8 +219,6 @@ void vmbus_synic_teardown1(void); int vmbus_setup_intr1(struct vmbus_softc *sc); void vmbus_intr_teardown1(struct vmbus_softc *sc); -DPCPU_DECLARE(void *, hv_pcpu_mem); - extern uint32_t hv_max_vp_index; From nobody Sat Jun 15 20:32: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 4W1ns052PZz5PPC9; Sat, 15 Jun 2024 20:32: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 4W1ns04Bxrz4qcR; Sat, 15 Jun 2024 20:32:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718483572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fxqInYue9zkyBZIH0veKupr+CU9HM6l1nIGW1VllFmc=; b=xB/o0Hpx/9+TkwvYqAGHq54Oji/M8hu6B88et7+e+9XoI9Chl7+P7Y1Bpsx31b8cBxyeQt KKdInQTEqfzFB8r7kjhXRWAnwl1KrPcH4yi0tzEj+eC9wlIleR/xy19BkY85urWdFvHmms rTFwsnARBN8zYshF+rwHWkIZncdknVF/BYHN4YZgBvOkhGgfiTrvrR9bscmOgkkqKFzhzl 2yf4LG2e1LlJqFCnuWqdUjeJEVGK/oZO9Rl6Ckf/CPuIXymxXjGpdCgJs87Vqx+kQ0j7k/ 17q+73Jp3rDUPsXjjI7BuH7TUYMED0Os5Ai5CNRjsfs2x9l6LSRPOD2mwB3o5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718483572; a=rsa-sha256; cv=none; b=KrOwdjoEo3Aoqb+jACX84Q+UXI3cQaRuXSydmx9OuGxzVsRiMpguyzvMVVe6piBky7tHML aFXjHhOSJLpFDIUE2zIpwdEE3KX8a8q4qEONEX+FN2xKrU5JrQjUxgZSJ9AiXqAzh28eAZ dsAYhq9Beat36RMwfFC4YyhcIdMk//exMfBvjZjZH4jqCu1KUNzyf7mBXzXbwyRpJ/uvfv viRAWE7z4i9JwUPAKNN6Aowl6jyWmbejDz12jobvJhYhgf904EADSznB1I0MTvxSZkG0bs SOZw3aPFt3Lch4+hbziHOeB9uONJmjsnFeR167bVDpMzSrNdoWHO48QDEFEIGA== 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=1718483572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fxqInYue9zkyBZIH0veKupr+CU9HM6l1nIGW1VllFmc=; b=AKjhQsrbViBEqKre8sVmdzlWEnVpTQI3tIBYdeSk39eDSUjfPtA2k6wN46vJPeTLdycOnY k2dfYfCsvZlXODwfaHO/fJcBYM0cglAdrSJxdnpHe4Fb7AUs+vcWvpHZ6/1QmA9RKEBc23 gCSbIwBMfBxn5MkkZRavxq+/9+WtuDISzBRfMmGHpi6ftH6NHCKeh0CMi0aWVCRNgIZ4aB xwvcIDhbWDHwNMPIAjahRlhjRRg1Yd3EqPcMXsGsQ4F+PdRC2RrN06pPdKz/QTCqZnLl63 M562iJ6s3jLFnyD2VFuK/T4cvzu0OJ7JOx+Vrb4qxqcmndoEYGdk36JdWr5PfA== 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 4W1ns03m82zK06; Sat, 15 Jun 2024 20:32: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 45FKWqcn047169; Sat, 15 Jun 2024 20:32:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45FKWqGu047166; Sat, 15 Jun 2024 20:32:52 GMT (envelope-from git) Date: Sat, 15 Jun 2024 20:32:52 GMT Message-Id: <202406152032.45FKWqGu047166@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Pedro F. Giffuni" Subject: git: 1a968da448b0 - main - fparseln: Update NetBSD version strings 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pfg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a968da448b0795184884ffe428fb24d7e695628 Auto-Submitted: auto-generated The branch main has been updated by pfg: URL: https://cgit.FreeBSD.org/src/commit/?id=1a968da448b0795184884ffe428fb24d7e695628 commit 1a968da448b0795184884ffe428fb24d7e695628 Author: Pedro F. Giffuni AuthorDate: 2024-06-15 20:32:06 +0000 Commit: Pedro F. Giffuni CommitDate: 2024-06-15 20:32:06 +0000 fparseln: Update NetBSD version strings The correponding changes (mostly ANSIfication) were done long ago locally. No functional change. Obtained from: NetBSD (libutil CVS Attic) --- lib/libutil/fparseln.3 | 2 +- lib/libutil/fparseln.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libutil/fparseln.3 b/lib/libutil/fparseln.3 index 7ddfaefcc943..49b504ffc9b4 100644 --- a/lib/libutil/fparseln.3 +++ b/lib/libutil/fparseln.3 @@ -1,4 +1,4 @@ -.\" $NetBSD: fparseln.3,v 1.7 1999/07/02 15:49:12 simonb Exp $ +.\" $NetBSD: fparseln.3,v 1.8 2001/08/20 12:00:49 wiz Exp $ .\" .\" Copyright (c) 1997 Christos Zoulas. All rights reserved. .\" diff --git a/lib/libutil/fparseln.c b/lib/libutil/fparseln.c index c9290230c126..f817860f2e57 100644 --- a/lib/libutil/fparseln.c +++ b/lib/libutil/fparseln.c @@ -1,4 +1,4 @@ -/* $NetBSD: fparseln.c,v 1.7 2007/03/08 19:57:53 drochner Exp $ */ +/* $NetBSD: fparseln.c,v 1.10 2000/07/05 11:46:40 ad Exp $ */ /*- * SPDX-License-Identifier: BSD-4-Clause From nobody Sat Jun 15 22: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 4W1rwT191Fz5PZhn; Sat, 15 Jun 2024 22:51: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 4W1rwS6HbHz51G3; Sat, 15 Jun 2024 22:51:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718491864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FFoqwTen/OT2A3SLwoYz7d2+z/+b8AWA07noPz66X58=; b=Z/5L/mBEF9rYqd8/0t23TEA45gTXuKFlYZPYXhJC735TZ66sbySP+DQ7UBc/VZh3zP/Ki4 u1QoarHGgYZhcY1bnY15HtrgyZ44J0PPz/GfV0ki7aa9Ps0c+ooaReUV+KIh/tHsNQIRHH fut8O50fTP2Zi1BGN91wwGXFOpVwCFWJzjGdexbnTFkYNUojJak6A5+TRR98fVIcC6egKH gD3S24IzygO7R3OyiY0Bskfb7FZVGH7bBffjHkIyt61JA7s3VxhX7oCX9K3GD3QM34TC/K EJtQOH9NfVwvMIUkJswwFNMWsOwTPhqDFTqj5W0TE2sOvFuwi+OD5q+i+reAVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718491864; a=rsa-sha256; cv=none; b=A1Sixr8+0EiOT2Ka+Zq5tuXrKegdM5N3sP145SwCIBjCiUXK58Bpd0j0iw71mmJOgeRLQX tX0stV+ulLgEe0SpMabROL7GaWs5+RFm+8ei4t8FwvjezL472axFam+0pKgh6WAysbL4d8 oJpCSIC9pntnnB373Ijl5K55o5OimzIf9K3YZvAP5VNb4XK/u8kUrqTbVa0PpIYw3poNjq 5bTPgh01alBa4HXKmTSGk629xL7/I2+2kgvcLmdFTOw3Z16+NaXO38AOC985Rwkpm7VNOK AbCVORiFZXAX7bOYXcLkDx3U+uExMQojGITA6/cQM9dbhQ/BE//PD4/Uje+7ww== 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=1718491864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FFoqwTen/OT2A3SLwoYz7d2+z/+b8AWA07noPz66X58=; b=KJO47zoDXRMxRRi5cXFcqAoVtiswmbYr3mYMBTl5YCPcdgzsEF4fj7z6O66YTx7ZeY+4G4 i7oRmIAm/VbPbmLrEm0yM7mXb2lxN4HfenfSUJfTsaFuJ0558D1zLoM/u7iYjuwYleyW7A 1DVfEJLin4iSXHGx7ZzrfL7Hegt9Yjjb0zUXx8oQENxbNZU+8iJ94OHg88BsZxykc3PZYp ZZygqyG7bFSsiqxPC+gxoRei78i7+ZegIVZ9sKJX1qp1026UihjICOOoSHmbNN7XK0u46R f9enEUvyKjDQAA0P/XeEI11cQ8ZWg8qsMoTl1MwQogu0UL9v0YPCgyISJG4H5w== 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 4W1rwS5vvXzNST; Sat, 15 Jun 2024 22:51: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 45FMp4XD080419; Sat, 15 Jun 2024 22:51:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45FMp4lR080416; Sat, 15 Jun 2024 22:51:04 GMT (envelope-from git) Date: Sat, 15 Jun 2024 22:51:04 GMT Message-Id: <202406152251.45FMp4lR080416@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Pedro F. Giffuni" Subject: git: 9a39435c0b66 - main - Revert "fparseln: Update NetBSD version strings" 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pfg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9a39435c0b661e05a55bf817e724c1c80e431c8c Auto-Submitted: auto-generated The branch main has been updated by pfg: URL: https://cgit.FreeBSD.org/src/commit/?id=9a39435c0b661e05a55bf817e724c1c80e431c8c commit 9a39435c0b661e05a55bf817e724c1c80e431c8c Author: Pedro F. Giffuni AuthorDate: 2024-06-15 22:46:56 +0000 Commit: Pedro F. Giffuni CommitDate: 2024-06-15 22:46:56 +0000 Revert "fparseln: Update NetBSD version strings" This reverts commit 1a968da448b0795184884ffe428fb24d7e695628. I was mistakenly looking at the version strings in the CVS attic but the function was moved to libc/stdio where it matches the current string. --- lib/libutil/fparseln.3 | 2 +- lib/libutil/fparseln.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libutil/fparseln.3 b/lib/libutil/fparseln.3 index 49b504ffc9b4..7ddfaefcc943 100644 --- a/lib/libutil/fparseln.3 +++ b/lib/libutil/fparseln.3 @@ -1,4 +1,4 @@ -.\" $NetBSD: fparseln.3,v 1.8 2001/08/20 12:00:49 wiz Exp $ +.\" $NetBSD: fparseln.3,v 1.7 1999/07/02 15:49:12 simonb Exp $ .\" .\" Copyright (c) 1997 Christos Zoulas. All rights reserved. .\" diff --git a/lib/libutil/fparseln.c b/lib/libutil/fparseln.c index f817860f2e57..c9290230c126 100644 --- a/lib/libutil/fparseln.c +++ b/lib/libutil/fparseln.c @@ -1,4 +1,4 @@ -/* $NetBSD: fparseln.c,v 1.10 2000/07/05 11:46:40 ad Exp $ */ +/* $NetBSD: fparseln.c,v 1.7 2007/03/08 19:57:53 drochner Exp $ */ /*- * SPDX-License-Identifier: BSD-4-Clause From nobody Sat Jun 15 23:36: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 4W1swX3htHz5Pdqs; Sat, 15 Jun 2024 23:36: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 4W1swX3BSvz544j; Sat, 15 Jun 2024 23:36:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718494572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ncbm6PgDZ0nMptvn/I2uGhxEtq9KL4dDDYbqtOfmZ9c=; b=XiIN37CqNP0g9p9gI86zgUpTMDKoeJQvnX9HEv/xuYKVqkhNOBJ60loZ3CqMW6TAI4QOcG g7BjFGF+zvRLkvbu7mLpVSlairjKoeQBMZRH2eRDbHX/BjAd79qd4KCrHt/YXBIKCfDYM+ 9DSsLjDj8Yu6U+vaFlWdBJb32mRu+00CLd69G7eatL1Oegm1l1EUepttIbtNSBxhTiC6C3 GgELGTmoXmN1qZmROEi92BRWStFaBvKoWKGnrOmHBecYXRaPv3TAUNJVx9dt3vC6eOGt5O pT1gwiO6EUeSsOZrUObd8ERScbdPf/agNAOtarYCuyyyC59fZ6PxZ2+Hib4Xng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718494572; a=rsa-sha256; cv=none; b=w/THQw8R3CdERvNyhlFozyuMQtL9VRceCoTHzPjhMsaNkdr6E6+166hDGR1lLqQ1aRWfdj +HlQwFAfQ6D5W18WbQvk6ZyvDaj4Bsjx9CCVKpA54NmZdsTMAtSCWHDqPz3w+rI6MCoZK8 knVCzRhxcTL8X/hzCun3Yspu4t7k3iu9bQV97NLw26gMMEOqFeT6mMJEM8fT6wkuYLXVmA lyI/eOJhhAb9ZVYOmU5AUHOUdEMKQ/612+jTbJl9I0caYs0RXfvue2uqH23ekakuWQpK1o yjB0pG7mUh0XA/Ozv7H9OvYzAlV3GLX+SBqRTyuG6Cc8j7UPZoY5Ebt+GKz52Q== 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=1718494572; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ncbm6PgDZ0nMptvn/I2uGhxEtq9KL4dDDYbqtOfmZ9c=; b=Pa2U15sKaiJTfR4C73YMrAjtt0P1JFrRbvQPgb/T8xQ9seFXoIjQ4OwsZLJlPQvLNDziyy 6WzH1PGAyVE1jigLieJJOTY0X48WEu3dKkFdNlBGnBgAI1Kih0W2r4dqHtar/ROSnKSgpx /d8kXNaCsxMQAkrxOjG2uLEkEvBgAVNzoT1uh5wQjQxpaG493oV9PVkz6e99Cc6e+uvkdf InaIdPCgB3GXKdqpteGWMvBHnRSfa7lv9CayE5yK0IaqHA2wjzb0cDapxXmH1k29hLBMN3 gJMZrBoSd1XWcVcNPe/RifFlyhJuFEojc1098chChaozLqH28xFU+5Iq3jqwJQ== 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 4W1swX2kZNzPXw; Sat, 15 Jun 2024 23:36: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 45FNaCcx049807; Sat, 15 Jun 2024 23:36:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45FNaCvU049804; Sat, 15 Jun 2024 23:36:12 GMT (envelope-from git) Date: Sat, 15 Jun 2024 23:36:12 GMT Message-Id: <202406152336.45FNaCvU049804@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Pedro F. Giffuni" Subject: git: fc3907ce001e - main - fparseln: Update license 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pfg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc3907ce001ec95ff4f32861bfa84f81c268d179 Auto-Submitted: auto-generated The branch main has been updated by pfg: URL: https://cgit.FreeBSD.org/src/commit/?id=fc3907ce001ec95ff4f32861bfa84f81c268d179 commit fc3907ce001ec95ff4f32861bfa84f81c268d179 Author: Pedro F. Giffuni AuthorDate: 2024-06-15 23:30:27 +0000 Commit: Pedro F. Giffuni CommitDate: 2024-06-15 23:30:27 +0000 fparseln: Update license Remove 3rd and 4th clauses in christos' license. OK christos. Obtained from: NetBSD --- lib/libutil/fparseln.3 | 10 ++-------- lib/libutil/fparseln.c | 9 ++------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/lib/libutil/fparseln.3 b/lib/libutil/fparseln.3 index 7ddfaefcc943..2f7ebcbf4d68 100644 --- a/lib/libutil/fparseln.3 +++ b/lib/libutil/fparseln.3 @@ -1,4 +1,4 @@ -.\" $NetBSD: fparseln.3,v 1.7 1999/07/02 15:49:12 simonb Exp $ +.\" $NetBSD: fparseln.3,v 1.4 2009/10/21 01:07:45 snj Exp $ .\" .\" Copyright (c) 1997 Christos Zoulas. All rights reserved. .\" @@ -10,11 +10,6 @@ .\" 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. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by Christos Zoulas. -.\" 4. The name of the author may not be used to endorse or promote products -.\" derived from this software without specific prior written permission. .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -52,8 +47,7 @@ returns a pointer to the next logical line from the stream referenced by This string is .Dv NUL terminated and it is dynamically allocated on each invocation. -It is the -responsibility of the caller to free the pointer. +It is the responsibility of the caller to free the pointer. .Pp By default, if a character is escaped, both it and the preceding escape character will be present in the returned string. diff --git a/lib/libutil/fparseln.c b/lib/libutil/fparseln.c index c9290230c126..256ee5b04cea 100644 --- a/lib/libutil/fparseln.c +++ b/lib/libutil/fparseln.c @@ -1,7 +1,7 @@ -/* $NetBSD: fparseln.c,v 1.7 2007/03/08 19:57:53 drochner Exp $ */ +/* $NetBSD: fparseln.c,v 1.10 2009/10/21 01:07:45 snj Exp $ */ /*- - * SPDX-License-Identifier: BSD-4-Clause + * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 1997 Christos Zoulas. All rights reserved. * @@ -13,11 +13,6 @@ * 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by Christos Zoulas. - * 4. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES From nobody Sun Jun 16 12:13: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 4W2Bky35T9z5NhH1; Sun, 16 Jun 2024 12:14:02 +0000 (UTC) (envelope-from peter@holm.cc) Received: from kaskal.pair.com (kaskal.pair.com [209.68.5.173]) (using TLSv1.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 4W2Bkx0y1Nz3xRr; Sun, 16 Jun 2024 12:14:00 +0000 (UTC) (envelope-from peter@holm.cc) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of peter@holm.cc designates 209.68.5.173 as permitted sender) smtp.mailfrom=peter@holm.cc Received: from kaskal.pair.com (localhost [127.0.0.1]) by kaskal.pair.com (Postfix) with ESMTP id B5ACCD656D1; Sun, 16 Jun 2024 08:13:59 -0400 (EDT) Received: from Peters-Air (c-x5996a268.customers.hiper-net.dk [89.150.162.104]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by kaskal.pair.com (Postfix) with ESMTPSA id EAD09D8DA5B; Sun, 16 Jun 2024 08:13:58 -0400 (EDT) Date: Sun, 16 Jun 2024 14:13:56 +0200 From: Peter Holm To: Doug Moore Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: dd0e5c02ab13 - main - swap_pager: small improvement to find_least Message-ID: References: <202406111638.45BGcnhX099470@gitrepo.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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202406111638.45BGcnhX099470@gitrepo.freebsd.org> X-Scanned-By: mailmunge 3.11 on 209.68.5.173 X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.86 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.96)[-0.962]; MID_RHS_NOT_FQDN(0.50)[]; R_SPF_ALLOW(-0.20)[+a:kaskal.pair.com]; RCVD_IN_DNSWL_LOW(-0.10)[209.68.5.173:from]; MIME_GOOD(-0.10)[text/plain]; FREEFALL_USER(0.00)[peter]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; ASN(0.00)[asn:7859, ipnet:209.68.0.0/18, country:US]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; R_DKIM_NA(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; MISSING_XM_UA(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DMARC_NA(0.00)[holm.cc]; RCVD_TLS_LAST(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: 4W2Bkx0y1Nz3xRr On Tue, Jun 11, 2024 at 04:38:49PM +0000, Doug Moore wrote: > The branch main has been updated by dougm: > > URL: https://cgit.FreeBSD.org/src/commit/?id=dd0e5c02ab13b9eb240d42a71a8f41a8b036bd33 > > commit dd0e5c02ab13b9eb240d42a71a8f41a8b036bd33 > Author: Doug Moore > AuthorDate: 2024-06-11 16:36:23 +0000 > Commit: Doug Moore > CommitDate: 2024-06-11 16:36:23 +0000 > > swap_pager: small improvement to find_least > > Drop an unneeded test, a branch and a needless computation to save a > few instructions. > > Reviewed by: kib > Differential Revision: https://reviews.freebsd.org/D45558 > --- > sys/vm/swap_pager.c | 19 +++++++------------ > 1 file changed, 7 insertions(+), 12 deletions(-) > > diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c > index a07a38481490..15f227457bba 100644 > --- a/sys/vm/swap_pager.c Doug, Here's an easy way to reproduce the issue: 12:43 ~ $ sort /dev/zero & [1] 3650 12:43 ~ $ sort /dev/zero & [2] 3651 12:43 ~ $ sort /dev/zero & [3] 3652 12:43 ~ $ panic: Negative index: -16 cpuid = 8 time = 1718534645 KDB: stack backtrace: db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe010855fa50 vpanic() at vpanic+0x13f/frame 0xfffffe010855fb80 panic() at panic+0x43/frame 0xfffffe010855fbe0 swap_pager_find_least() at swap_pager_find_least+0x105/frame 0xfffffe010855fc20 vm_object_collapse() at vm_object_collapse+0x68b/frame 0xfffffe010855fca0 vmspace_fork() at vmspace_fork+0xb68/frame 0xfffffe010855fd30 fork1() at fork1+0x4f8/frame 0xfffffe010855fda0 sys_fork() at sys_fork+0x54/frame 0xfffffe010855fe00 amd64_syscall() at amd64_syscall+0x158/frame 0xfffffe010855ff30 fast_syscall_common() at fast_syscall_common+0xf8/frame 0xfffffe010855ff30 --- syscall (2, FreeBSD ELF64, fork), rip = 0xaba1c31565a, rsp = 0xaba1b0cecb8, rbp = 0xaba1b0cf220 --- KDB: enter: panic [ thread pid 3653 tid 100349 ] Stopped at $0,0x104d5c2(%rip) db> x/s version version: FreeBSD 15.0-CURRENT #2 main-n270778-d26c565597b8-dirty: Sun Jun 16 12:32:39 CEST 2024\012 pho@mercat1.netperf.freebsd.org:/usr/src/sys/amd64/compile/PHO\012 db> --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -2303,6 +2303,7 @@ swap_pager_find_least(vm_object_t object, vm_pindex_t pindex) if (sb == NULL) return (object->size); for (i = pindex - sb->p; i < SWAP_META_PAGES; i++) { + KASSERT((i >= 0), ("Negative index: %d", i)); if (sb->d[i] != SWAPBLK_NONE) return (sb->p + i); } - Peter From nobody Sun Jun 16 14:55: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 4W2GKr4cmsz5NwZ7; Sun, 16 Jun 2024 14:56:00 +0000 (UTC) (envelope-from ctuffli@gmail.com) Received: from mail-oo1-xc2f.google.com (mail-oo1-xc2f.google.com [IPv6:2607:f8b0:4864:20::c2f]) (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 "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W2GKp6Bfbz4Fpq; Sun, 16 Jun 2024 14:55:58 +0000 (UTC) (envelope-from ctuffli@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b="Ka/285Ec"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of ctuffli@gmail.com designates 2607:f8b0:4864:20::c2f as permitted sender) smtp.mailfrom=ctuffli@gmail.com Received: by mail-oo1-xc2f.google.com with SMTP id 006d021491bc7-5bfa5f18ab0so265915eaf.3; Sun, 16 Jun 2024 07:55:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718549757; x=1719154557; darn=freebsd.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=WWpATYBdIWIZHU/ysgQzrQNGSuhbL/Y2u3Gc5XsJP3E=; b=Ka/285Ecmal6uhwuJQ7l1PcUiM3ChiL3UX23Ri2tes/BlHeEcegj/yzD/tFMAzijeD Q/FUKjHQvXHeGvhEZFxpp/TopTYjyjrsrN219A4Hr8mWBtxi4Cok8MRvEg9YUKO3B/Hk tHiekWw/EjdVYEH39Zbhc9d5gvZLKKbFdQfidrNEbi7gUEO9RbIqPQ2X4DhvE0U4Z22l 555EBwf5sdgtYaudaRvaqXFHjx9anpWEoY2fviPg65A2RkGDN1H9O40bp4SdNXYqMrA8 BOSEnovPRNZQq7nYvKAkMGQaqWV62y2z79ui8hyvJs3AOp9ZDqMQfNRaVoGtGgWEEESb Fafg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718549757; x=1719154557; h=content-transfer-encoding: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=WWpATYBdIWIZHU/ysgQzrQNGSuhbL/Y2u3Gc5XsJP3E=; b=k/eewsHoodzGfPjqGt8Caaql+ruBkQJULv4NUD0zUDIOgqzf9mWJElfggSKObz3i5K nISgu3Ez/GrBHF8RSji+M99tCNnPmZ0N9Yk/q3/ebORc6iQig+3pkDzbwVWj9icYKoMy j7ObFboMFzjCc/stu/m5mYTiChQFHleDpSuTQBzZO5BrQmSB0hA/o3Sb6BUrNAM9ZWqm ITqwIZR7c68pmh8rODkcMzS8P5U9gDXbc3St8NFWraO974vj19f7dAlj3u1jGYAG5VlF aO1tTqM+L10E8LiyHqZhc61ipfjqZAZt9zz4y563XhaKR1/RUcq6FtsG0CRZGdKFEvi3 fWWg== X-Forwarded-Encrypted: i=1; AJvYcCUa+dndtdxB96LVF6bObXn56VXk9A+paC6JnPhESCR7ja5dqt93XKC6tj93hjtUnV5gj7SYyXd2IL3eSY9AgLwMDL3Ce75VK4Aj9RxkJvQ6goc1kYvD7V3Ksviu29N1ueFVwwJj7QvAsybpant+QoYFyw== X-Gm-Message-State: AOJu0YxEZMwB/tyskSnhFkhXjbGwZQ1tnxpWzDroWBKjoazKcRa6iCEd lSjXQ9gjebXugPfNdHDs+DANe7UDYokTQ6X5jm2zwS2v+BcExuYIY0YpGttdz6a/NmbaajvVldd SeoFJCP+PZ3L/Xon7aE50SiHHbBrnkg== X-Google-Smtp-Source: AGHT+IE3Qu40quhBPkJmXskqgR9fbaq8CvlfUc4P1/uMtE9FG2unW0v/bIwqWh9C/+AMV5yNPaPsg7UuMWFVstcgNO8= X-Received: by 2002:a05:6359:3502:b0:1a0:bb4c:7079 with SMTP id e5c5f4694b2df-1a0bb4c7159mr455302755d.0.1718549757314; Sun, 16 Jun 2024 07:55:57 -0700 (PDT) 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 References: <202406141933.45EJXeOl005085@gitrepo.freebsd.org> In-Reply-To: <202406141933.45EJXeOl005085@gitrepo.freebsd.org> From: Chuck Tuffli Date: Sun, 16 Jun 2024 07:55:46 -0700 Message-ID: Subject: Re: git: 80b42329248a - main - nvme: Fix panic on detach after ce75bfcac9cfe To: Alexander Motin Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.36 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-0.36)[-0.357]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; MIME_GOOD(-0.10)[text/plain]; MISSING_XM_UA(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_ONE(0.00)[1]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[gmail.com]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::c2f:from]; RCPT_COUNT_THREE(0.00)[4]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROMTLD(0.00)[]; RCVD_TLS_LAST(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; DKIM_TRACE(0.00)[gmail.com:+] X-Rspamd-Queue-Id: 4W2GKp6Bfbz4Fpq On Fri, Jun 14, 2024 at 12:33=E2=80=AFPM Alexander Motin = wrote: > > The branch main has been updated by mav: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D80b42329248a7473f79eebf785= 0ee8e4116c17dd > > commit 80b42329248a7473f79eebf7850ee8e4116c17dd > Author: Alexander Motin > AuthorDate: 2024-06-14 19:32:10 +0000 > Commit: Alexander Motin > CommitDate: 2024-06-14 19:32:10 +0000 > > nvme: Fix panic on detach after ce75bfcac9cfe Sorry about that. I had a review up for it and was going to commit today. Pointy hat, me. --chuck From nobody Sun Jun 16 15:37: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 4W2HFz59Fnz5P0yx; Sun, 16 Jun 2024 15:37: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 4W2HFz4gf7z4Jt6; Sun, 16 Jun 2024 15:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718552263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jUn77Q4g0uV6gxadftMew6+wcXqy5q0wfg1lUBrPwSQ=; b=P83XoiJkqQHEvXkLCvzV/+pjbuEkaw/vBAbJGjruoomaFPyYmPJJglznunc02QDBxA5nCV J5M2NfyYcTnSb/jSUUZDGvW9aA1CrA+2+/9Ulrw/PzH8/BlE/RaZoz0ya7l9rtPzEapGCY 82ZS/eimEqK2hNTEdCtGJWFmj5Iz9bssFoecSkuHqIA8ZYG2YcZMQjNzl88y4v1lK3tqGf SdNsR7zFhKeax44+d1CI/Uuq+oZQKOd59pPLEMn0g32V0YHK+J658ksSb1fYujBf8Tl+aL 8QujTAoNQYJwGBFG1e8oO9CCRe7I6Je4e/WIif3UpVC/Gc6l3XBlpdKsclGi/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718552263; a=rsa-sha256; cv=none; b=rd80SVABOCwg9wVDsxFYbXLjupLBVlEAxMDk/K3cfcrOj9Jaf8jS/vFhvAmMIVvxxcWiry cJu+AfOksziKuZ0a0zDrbruGKEwnssKBqFFe4V/AnZUcQ2+N5oiWx0kjzwdpMElxp1e1bt f8ZGUR1jOD7C48QYxndwOhmwzrd5XgQ1aX7VXsbrHiZ5vTUhWe6Dsjzxq9w7h9ZjoB2dQ7 Y5ILxWJzKA5AM7oSzKi8yuvTc453u3UrAQViMNU3Dncc01DwljS3HCTB2ujlagmSg6bLMT nzokj/I1DyoH5Ggwds9zGGkacXgAamH5SF4d2GD9P6kNij8HtnvFS7L/4YeRiA== 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=1718552263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jUn77Q4g0uV6gxadftMew6+wcXqy5q0wfg1lUBrPwSQ=; b=friufQqE3ClJp5H/kCdofvvJMXy92H2885mo4Vn7h3nI405rvS0xuw0JJ2Fm8JRzqTkS2S GqbDDBUbgz07V2ckgdT1pzGT49s0SycqFY3uVDvRaTEXcH5sh43crTHFYwg8rAseC4o7R7 nrULQ8v12eWBCRzz4qKJW4oU7qwjp34Q1azU0erMxJ4zjKOXKy00lXlqPW+ZwOgJqTUgmS 2U14BRbAXumQ8xdlNinjvZCSK7VgNoD3JQUBXtNWT41Rj7Vogq9mjtBuTaCB+8P3gYQU/0 ohFISDlUMOie8mO52XNLFlPQRQ8dFIOBHHXIYs0YFYn0D51ZRG4VEu3yZBcDBg== 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 4W2HFz4HC3zsVQ; Sun, 16 Jun 2024 15:37: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 45GFbhxt070203; Sun, 16 Jun 2024 15:37:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GFbhc1070200; Sun, 16 Jun 2024 15:37:43 GMT (envelope-from git) Date: Sun, 16 Jun 2024 15:37:43 GMT Message-Id: <202406161537.45GFbhc1070200@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 28af3eb62b73 - main - Revert "swap_pager: small improvement to find_least" 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 28af3eb62b733ce4d7e01e9ba30b7a18c8cf5369 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=28af3eb62b733ce4d7e01e9ba30b7a18c8cf5369 commit 28af3eb62b733ce4d7e01e9ba30b7a18c8cf5369 Author: Doug Moore AuthorDate: 2024-06-16 15:37:16 +0000 Commit: Doug Moore CommitDate: 2024-06-16 15:37:16 +0000 Revert "swap_pager: small improvement to find_least" This reverts commit dd0e5c02ab13b9eb240d42a71a8f41a8b036bd33. --- sys/vm/swap_pager.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 455c39ab6fd7..8d9236a2eb1a 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -2298,17 +2298,22 @@ swap_pager_find_least(vm_object_t object, vm_pindex_t pindex) VM_OBJECT_ASSERT_LOCKED(object); MPASS((object->flags & OBJ_SWAP) != 0); + if (pctrie_is_empty(&object->un_pager.swp.swp_blks)) + return (object->size); sb = SWAP_PCTRIE_LOOKUP_GE(&object->un_pager.swp.swp_blks, rounddown(pindex, SWAP_META_PAGES)); if (sb == NULL) return (object->size); - for (i = pindex - sb->p; i < SWAP_META_PAGES; i++) { - if (sb->d[i] != SWAPBLK_NONE) - return (sb->p + i); + if (sb->p < pindex) { + for (i = pindex % SWAP_META_PAGES; i < SWAP_META_PAGES; i++) { + if (sb->d[i] != SWAPBLK_NONE) + return (sb->p + i); + } + sb = SWAP_PCTRIE_LOOKUP_GE(&object->un_pager.swp.swp_blks, + roundup(pindex, SWAP_META_PAGES)); + if (sb == NULL) + return (object->size); } - sb = SWAP_PCTRIE_LOOKUP_GE(&object->un_pager.swp.swp_blks, pindex); - if (sb == NULL) - return (object->size); for (i = 0; i < SWAP_META_PAGES; i++) { if (sb->d[i] != SWAPBLK_NONE) return (sb->p + i); @@ -2318,7 +2323,7 @@ swap_pager_find_least(vm_object_t object, vm_pindex_t pindex) * We get here if a swblk is present in the trie but it * doesn't map any blocks. */ - __unreachable(); + MPASS(0); return (object->size); } From nobody Sun Jun 16 16:02: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 4W2HpK6Xcbz5P2yV; Sun, 16 Jun 2024 16:02: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 4W2HpK65JHz4MY3; Sun, 16 Jun 2024 16:02:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718553737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iPb13Ck3rCVKVcLSnYAhsi6iOmQSufoy7tq9Kmk5PAU=; b=rbf+MLsCIVjyHue16tLh1fI+kJCt7eDGhjLoGLxeg2lhE2IHI0dFldu691ub2T6weTOX/4 +ZWy0bqzuGuKnjJyi0pwkoBsoyropMgiZpkuDKYqt0IHBIjXDoq7XV+oW0yM501qDzEnAF 5wL7QeNedpxvePjq2HUH1W8BRoRi+jKVIGEGmnRed2k0uMETrjYec82jmyvIzyhW5VgeUQ TisucyoRdT61b4NSg60AP3lLvIAKD6CmwqLNnuIJx4ut/tzoTbCLRfIhAWEr7NXH7gOj0J ve2ohozawuxB4KbQ9vhqm6InKzNQagAqA7oLVTvAiEfj1T4sEBRvZCfyFjooSw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718553737; a=rsa-sha256; cv=none; b=Mr4R3xUcHr+0zNaCYYMpAl4uXKwwBZBl/pTGs5IFnEKkY9bbvWn8svOdvf0Ykmhgp5J7hA 1eSE+riHe77eTLAlKIKcm8TVwcm8IsBYDwmG7pd68YlZ6MUuJ8Vm5/Bcx8xiXdGeffBEtY cIhCb0BPSo2rOrcZqhak2OjmbK3IapyV9Cqhfem7+wCPp6cftQGJ+/fR0r8CBXNxOvPW1x G10SfsmopCI1/T6r2zQpMUbjm/54g6Q/9Cwa1U6BhAIYsqs7U8znnxKSZl2cKHUiH4nCr1 ciX4787NL8FoISheNQ24EuSz8o/ArWflpgoEkwiL7og8KNV80pEAm8DGiBNaxw== 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=1718553737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iPb13Ck3rCVKVcLSnYAhsi6iOmQSufoy7tq9Kmk5PAU=; b=qzCbYiqs4BXKLqnh89QE6tuMMBA/6fb5IQMkCrf1me0/9w9v8quOpdNxv4o/Clf0jVxQdI vjsU7Zsaijep4MzdybD/sd9rCgNnplu4HZwVOXGoFnPqv0xXcGSvNPIqqSGE752SDTAAyh RrAE2hTrKaDNFa5mCeP5tBaJ8BILcd+AgkBsN9VBBP4N064tPEs45Q82s9+S7mlTVx7NbD A119plVNkYBmfAf6b52h/I78G7VLqsCWh1N/Yp1TJmdpxaGEmKYp6tF7CHHkEBGrKXd+Va zQmN1OZW/IHxgbghtfoVMoV+OQ5tEK8+RsHPQ6E89lt7/3WNNUUTluS4UK3S4w== 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 4W2HpK5jHvzv5t; Sun, 16 Jun 2024 16:02: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 45GG2HsJ020770; Sun, 16 Jun 2024 16:02:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GG2HNs020767; Sun, 16 Jun 2024 16:02:17 GMT (envelope-from git) Date: Sun, 16 Jun 2024 16:02:17 GMT Message-Id: <202406161602.45GG2HNs020767@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: d1e652bf04bd - main - camcontrol.8: Fix a typo in the manual page 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: d1e652bf04bd94ed3469a5a2fcb6938b3f4dcbc0 Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=d1e652bf04bd94ed3469a5a2fcb6938b3f4dcbc0 commit d1e652bf04bd94ed3469a5a2fcb6938b3f4dcbc0 Author: Gordon Bergling AuthorDate: 2024-06-16 16:01:12 +0000 Commit: Gordon Bergling CommitDate: 2024-06-16 16:01:12 +0000 camcontrol.8: Fix a typo in the manual page - s/emtpy/empty/ MFC after: 3 days --- sbin/camcontrol/camcontrol.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/camcontrol/camcontrol.8 b/sbin/camcontrol/camcontrol.8 index bb206bf6ad85..bdda1828abf5 100644 --- a/sbin/camcontrol/camcontrol.8 +++ b/sbin/camcontrol/camcontrol.8 @@ -2330,7 +2330,7 @@ For the Report Zones command, specify a subset of zones to report. .It all Report all zones. This is the default. -.It emtpy +.It empty Report only empty zones. .It imp_open Report zones that are implicitly open. From nobody Sun Jun 16 16:03: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 4W2Hqy6x9Hz5P2qF; Sun, 16 Jun 2024 16:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W2Hqy68qNz4MjW; Sun, 16 Jun 2024 16:03:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718553822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bKxa6IJ2ej0ysVHcGNaT/ycolEc7MjpPmhCaxDdSLM8=; b=khR/oS2ZRvdlrcpAqCXOT9ndP2UQOQxNGNMW59ER1W82gVLo3qK+clxCeqchQX9gLtFag5 JimGWI2XkCgdDCC5y2EUNHU5FlbF8ukDDgW+JV4GG6Xa3BPuFAqFFqWz96PXCn2GV4rryQ 60gItQHoRGKfArtuo2vz80DGgiF7n53L1Kyaa2psmGsJlFGYyawhWLHedoGFcdg/CRiQaC ezXw9m9D3rsDxfTLyyELQo3+nGkv9N59yj1wsFyXbeGM17yR0wDmqmOuQNEGTYJ99MzGEH XrNGD8yPH+9h+ROKlPHNCJ3iJReegGFZVr796O4eOMkE3Yssj6375Nr6OdKUiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718553822; a=rsa-sha256; cv=none; b=yHun74tOAPaP5C5yZ96fR5C55F+IqMVE07Ay3Nqqo9wU3Qx4EXaeRgUOusjs/zoEPxgGpV dyyPRIYvu1o9UR5Xsiy3pWu8wd1IYQLgGuLeoG0zKJ8gYQoOr4fQb5R6VJRKa+BrHrmEhQ rp6l+Frl5/TB30LFBb2ifn+J717ktwyWd+3tjcVfHo/tLy2HUWr52WNkf6raFvst03EyC7 qJa1y7Cssee4bcHbdEMBri6nGNp/1HpEWrACAmmqBy7th35dghxb1qPtzIjuxR0/SSJvuS BcnMRwX6PBSFaA+NGLbFYtRtN9Ttybf0U/XQydtPcDv0FbVADsR+EdTBq5/rbQ== 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=1718553822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bKxa6IJ2ej0ysVHcGNaT/ycolEc7MjpPmhCaxDdSLM8=; b=e0CSzcnyEIfZrJ8igPFFPZ6/Xu4uTbmqzxhJm+eqUKJvWiWiDayTZAvtw8DKlbmX8FJimN wub9sKVGN8haYVrVKyF6gCZQvAP4z6+7mYdoVuej5iLZM/ZtRucL8rj9L3M1GtWHDjHed/ Ft11cN5NpXYR/3/GgJSmYd9qvW/zl8QJLidBFnqdECb/GzaQRJ9Z4tO08nv67B/mMqwrt2 1F+eU6ZE2A3JeuJz6RJtwTTOncN3qMxNkqnNDL9xoRq3+lxAaF9XCu6E7dYXASBqxuoaCB Fr+TCP/5Hk46r3aSoAhbyKp9KgU+s1irnofReGC1jxIBbvqW7MFlDq1DJCddIQ== 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 4W2Hqy5hP7ztxN; Sun, 16 Jun 2024 16:03: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 45GG3gVP021114; Sun, 16 Jun 2024 16:03:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GG3gU1021111; Sun, 16 Jun 2024 16:03:42 GMT (envelope-from git) Date: Sun, 16 Jun 2024 16:03:42 GMT Message-Id: <202406161603.45GG3gU1021111@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: 018a361f8902 - main - virtio(4): Fix two typos in KASSERT 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 018a361f8902d629fca64be372ef9b266fee53ba Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=018a361f8902d629fca64be372ef9b266fee53ba commit 018a361f8902d629fca64be372ef9b266fee53ba Author: Gordon Bergling AuthorDate: 2024-06-16 16:02:46 +0000 Commit: Gordon Bergling CommitDate: 2024-06-16 16:02:46 +0000 virtio(4): Fix two typos in KASSERT messages - s/emtpy/empty/ MFC after: 5 days --- sys/dev/virtio/console/virtio_console.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/virtio/console/virtio_console.c b/sys/dev/virtio/console/virtio_console.c index 4a3fb1e97e57..66433565ce25 100644 --- a/sys/dev/virtio/console/virtio_console.c +++ b/sys/dev/virtio/console/virtio_console.c @@ -978,7 +978,7 @@ vtcon_ctrl_poll(struct vtcon_softc *sc, */ VTCON_CTRL_TX_LOCK(sc); KASSERT(virtqueue_empty(vq), - ("%s: virtqueue is not emtpy", __func__)); + ("%s: virtqueue is not empty", __func__)); error = virtqueue_enqueue(vq, control, &sg, sg.sg_nseg, 0); if (error == 0) { virtqueue_notify(vq); @@ -1366,7 +1366,7 @@ vtcon_port_out(struct vtcon_port *port, void *buf, int bufsize) vq = port->vtcport_outvq; KASSERT(virtqueue_empty(vq), - ("%s: port %p out virtqueue not emtpy", __func__, port)); + ("%s: port %p out virtqueue not empty", __func__, port)); sglist_init(&sg, 2, segs); error = sglist_append(&sg, buf, bufsize); From nobody Sun Jun 16 16:20: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 4W2JBr6vcGz5P43V; Sun, 16 Jun 2024 16:20: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 4W2JBr6976z4P7M; Sun, 16 Jun 2024 16:20:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718554804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4kdDWYp5S77udd3eb0rCb1SI2L5Zbkj7sBaY8TxAXRU=; b=xnHjp37ULe/NzcjO9zvhRgba0qcA/yyvEvjnio4H2moAYwZzsCbbIG0U4D1T1y9l7c0zND DTHqsy2HCJ8rmCiRIK8Cf5O2MJ3d4WPKltoI38oEWgDpBx+7+kH2TtJouIhqfE9tAMvgva hrpfHbb6yzSvFNAAPfQW9jGt124bikynpjenI4YUlB38EzApnEakVd1WJBmoRCNYA0fwn9 atbl7mBdXMU0NEpXStSydl6TaqP1+VzD8Z9S0aG3yA18sGVv1jsjTXkS9mdFCD2OqcVoH6 D1D8abCa3kL7HFcT1Np67c+yfowWFg91atpwk+iEbEvQMl2zNHXgplc6OdayaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718554804; a=rsa-sha256; cv=none; b=ypdakv+hLFMzI91IgZWn2mXCW6rXi0CySwAf6qKecD2uVv890090GyGao8VJJFwfiG7AAb etO5EKBKFJdgzNSF17e9K9r6u4GOYXZg8R4+mdIAIgJ8L6PRoGsbU88XwXcrCl4SIPbWU2 y2jcEtJXYAoS+mYgODeHoEW3Di+ucgteccJpfzZNcAxpX1hN8TGC33OYuf99FadknZN2Kp mIjjHyXi9o7xymfwzU/JK720KCP2IxwWWlEMrN406OzFFnnNmG4kQqW4S2S8mC7IMB+BT3 MdsLM5OJxu4ejsPOq9mXdQVFujm9x2974M4bUCMsdcs4zhPVt3L/EDXjF624Mw== 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=1718554804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4kdDWYp5S77udd3eb0rCb1SI2L5Zbkj7sBaY8TxAXRU=; b=I5q5WHYUq8OGQyfgW6LxRnczfvRqhJVkXs9g4N7Y6csFaDMOdGJV0/FX+fCrcQQCn7miBr BraDNz8kisFLnlkBESgX3SZrLvl0pFGNJuZ97K4bXAJoogxnaqwiDQj9Zn+LIef2vZFUNp EdIcI7soqsgAUkED1MRgQtABLwHLAolkTXDH7MsJzH+8br5I+SAo15W0qy90rxHobUfyZA AumCYqSRNlbxgvGKbqjPYNWN8WU/H/1AHZP6l/jzlK9Tc5lKHBSmfIHOzHi2Ro/lvbdrvh ooXqMMKwrIWvqSRGGDpvwAh/Yy6IzhaP7aVSSwFvqsLpShwNwgQXKoqFB4gouw== 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 4W2JBr5m42zvHj; Sun, 16 Jun 2024 16:20: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 45GGK41b041113; Sun, 16 Jun 2024 16:20:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GGK4Dq041106; Sun, 16 Jun 2024 16:20:04 GMT (envelope-from git) Date: Sun, 16 Jun 2024 16:20:04 GMT Message-Id: <202406161620.45GGK4Dq041106@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: b53b21e8f81a - main - amd64 pmap: Release PTP reference on leaf ptpage allocation failure 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: b53b21e8f81a8d2d233b99cee6426c2f64765a3c Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=b53b21e8f81a8d2d233b99cee6426c2f64765a3c commit b53b21e8f81a8d2d233b99cee6426c2f64765a3c Author: Bojan Novković AuthorDate: 2024-06-13 15:58:49 +0000 Commit: Bojan Novković CommitDate: 2024-06-16 16:19:26 +0000 amd64 pmap: Release PTP reference on leaf ptpage allocation failure aa3bcaa fixed an edge case invloving mlock() and superpage creation by creating and inserting a leaf pagetable page for mlock'd superpages. However, the code does not properly release the reference to the pagetable page in the error handling path. This commit fixes the issue by adding calls to 'pmap_abort_ptp' in the error handling path. Reported by: alc Approved by: markj (mentor) Fixes: aa3bcaa Differential Revision: https://reviews.freebsd.org/D45577 --- sys/amd64/amd64/pmap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 4d4ecc8ea4e2..dee208fc9145 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -7595,10 +7595,13 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t va, pd_entry_t newpde, u_int flags, if ((newpde & PG_W) != 0 && pmap != kernel_pmap) { uwptpg = pmap_alloc_pt_page(pmap, pmap_pde_pindex(va), VM_ALLOC_WIRED); - if (uwptpg == NULL) + if (uwptpg == NULL) { + pmap_abort_ptp(pmap, va, pdpg); return (KERN_RESOURCE_SHORTAGE); + } if (pmap_insert_pt_page(pmap, uwptpg, true, false)) { pmap_free_pt_page(pmap, uwptpg, false); + pmap_abort_ptp(pmap, va, pdpg); return (KERN_RESOURCE_SHORTAGE); } From nobody Sun Jun 16 16:20: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 4W2JBt0GXBz5P3mS; Sun, 16 Jun 2024 16:20: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 4W2JBs6rN2z4P1c; Sun, 16 Jun 2024 16:20:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718554806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r+yjclsVDdZ1STV0vGNJvLCeLz2GGxTx1xHEYS+k760=; b=RW1lqpGnEvsmq5ghSsbyVr/pM1YnCqzrXOcQ/lZ4FOIgVawbt2RYz7S30Bpa+3oPPesT/F 5YisGoKfGK3QXnqRwrB6XC5xWQ3dClyomQgQDqFx/Rr4SN/eVdQggbdf/+xPCOj9p4iSxd nvWyVw+GcmOF7ZwXFd60cMO31WvFiiZuAQo+hcvywCOrh5hQjzOsLrbhJbY8MkJvaFjSyL 3+NRYAaEhWgatTuMbtVKIN+A8T4l1+mUpK7GrrZUxhQ/h5tuHb/Hn9n8kJAhCBbSPBVGON ddOer4l+uHCrJkuWDXG/Tfq489Nk3u99AScdvQNRhvf/J3bxtrdVJmNu3irl4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718554806; a=rsa-sha256; cv=none; b=bKfYm24K7BUcuUj4UYwxduBoE9dQ+Gznong9nRdqXN87hHnecwRPa4tvQaXTP7CQGe/+zw 2XcriU01ZC0MQwLL20NT1G+6y8L87DpWcP9JrontAdxN/AhthYjXGa3nC1V2bJ7T0sboSP Eq1LLWACFZtR8xGhInrIdW+zQjwNGW28i80ealohF8/JOG0mBtPYAtmihfxrwZOAu+2x1F 1LU/3kUK5eOZ1NAYH4hEuY4A8lH8ybyjft+KeXWZOYg7jYSfXkBoooX3Q7GTHnrAIWPE// 22uzg96zaGItUzWk6axo8s2b7vcPCl1lHMerIIYz1ujrnpuMcAUppTJQ+0S/fQ== 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=1718554806; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r+yjclsVDdZ1STV0vGNJvLCeLz2GGxTx1xHEYS+k760=; b=Gy9oqplGP4VoAzjuODTLyugQxXsGHCRdSy7a7FbvOgRGJX8RU6hZieR+WxbRHTw38JUxUg g03EgV/e3dgJdsVjoP6kFozu4YLu4dQgsW+TJFA6Chk2CVeLTRJvNEH7SQBQSpO8XK2R7R /wB/gppOeFqgoJKJXF+Z77yTafExe2Wm0pcTwKNkRovUgW5rNHKaJwkRBQsgLOX8j07CdF efNxRJFWT4wW0IBW/UPZpQHCfSX3+8kudgIM+kJukl4geN5nLtsEA/2vqEJgszVB5Z20ri Kzg9vTHDcLZ3V7NEzOkns1d64DAQ2fMDMnCscXhdH590JCee3AIl8TZRLCTq5Q== 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 4W2JBs6Prszv6d; Sun, 16 Jun 2024 16:20: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 45GGK523041410; Sun, 16 Jun 2024 16:20:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GGK5JU041404; Sun, 16 Jun 2024 16:20:05 GMT (envelope-from git) Date: Sun, 16 Jun 2024 16:20:05 GMT Message-Id: <202406161620.45GGK5JU041404@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: 5d4545a2270e - main - arm64 pmap: Release PTP reference on leaf ptpage allocation failure 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 5d4545a2270e9d6c37c0a580c010c579ccdfa129 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=5d4545a2270e9d6c37c0a580c010c579ccdfa129 commit 5d4545a2270e9d6c37c0a580c010c579ccdfa129 Author: Bojan Novković AuthorDate: 2024-06-13 15:59:29 +0000 Commit: Bojan Novković CommitDate: 2024-06-16 16:19:26 +0000 arm64 pmap: Release PTP reference on leaf ptpage allocation failure 808f5ac fixed an edge case invloving mlock() and superpage creation by creating and inserting a leaf pagetable page for mlock'd superpages. However, the code does not properly release the reference to the pagetable page in the error handling path. This commit fixes the issue by adding calls to 'pmap_abort_ptp' in the error handling path. Reported by: alc Approved by: markj (mentor) Fixes: 808f5ac Differential Revision: https://reviews.freebsd.org/D45578 --- sys/arm64/arm64/pmap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 7b30b2a6ae37..e8991ae706f9 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -5545,12 +5545,14 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, if ((new_l2 & ATTR_SW_WIRED) != 0 && pmap != kernel_pmap) { uwptpg = vm_page_alloc_noobj(VM_ALLOC_WIRED); if (uwptpg == NULL) { + pmap_abort_ptp(pmap, va, l2pg); return (KERN_RESOURCE_SHORTAGE); } uwptpg->pindex = pmap_l2_pindex(va); if (pmap_insert_pt_page(pmap, uwptpg, true, false)) { vm_page_unwire_noq(uwptpg); vm_page_free(uwptpg); + pmap_abort_ptp(pmap, va, l2pg); return (KERN_RESOURCE_SHORTAGE); } pmap_resident_count_inc(pmap, 1); From nobody Sun Jun 16 16:20: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 4W2JBv16k4z5P43Z; Sun, 16 Jun 2024 16:20: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 4W2JBv0P8yz4P7R; Sun, 16 Jun 2024 16:20:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718554807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gt/HBUY3N6vgFsXlAPMaVBlXYsXfbO5IeyQLRalf6Yo=; b=pBJc1zxDTldmHsVgVuI4lsSp2OW+iZxjU2Oxw9Uhr0vu87XRDvXpMGV10hqI9q/TrHraY5 RIsndaSmV26ZjyKSzccbehuh3BVU546nqPEqYrtN4R+7p8SbHMKNKntTTsTRrzvN+/EKw2 1bLHAnZQVaS5uJqAQqQ9KiN5PLQ79U8iqSyS8X33gfvu483Q7jLDuC+CAUJq0ZZlxz5goY fgOSmIRvI+VWWqegGKotxgOhOBr8ZsqeYZZiIa40ah7+PQcVc1QlvzhHkUMSYuHadMl2Qf gy1hT280Ywpid1/9y2Du+kf1amoPUYoLxgP0O5eN3079mBt5c1MvdSB5p7VhbA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718554807; a=rsa-sha256; cv=none; b=QCfjy8hLtxfufAgHIfJa0JGLQfH2iwsTrQbX7X0bJL5QycMi+SlOpnHLafoy5/6zQk6Iv2 6eyu3q6PH9No2KEU2OsxKdfHed6U8d2akVG7+rYVj23GFguES8d0Orm7swh/a6/MRx+sSs VgRRzTIkH7+HxzUM6csnFrR4WPuCPg3DQvTSkwV1rjKtpR6oIp+xjrgHq8iL4jprs/ekpV ZYibO4lFBICyc1YQp5KMoH+wCFafKRmzbYaNRdcIynsnQ39XkrP+YDz030j35hO/zf1QHS TSRP7xOrms+lqs/WpYc94bVRaL9YWJ/m2crP5En45Q63ZVkiItlYS16D8pZMYQ== 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=1718554807; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gt/HBUY3N6vgFsXlAPMaVBlXYsXfbO5IeyQLRalf6Yo=; b=EzjhxBBzL0n0/khcMtfCI/jdJzZYAIcD1ai9HH5VKHMgpq5uM4r1ESSwX+qKJ4Fg8ZR20r w1U+L9lIn8/oZDeOCtpsPP5YaYicQN6uUhDg099DPuXXvy4gmIDdbg1n57eHOQNCjU1tNV tt1MZM/MZJpg/NVH2fwx5OkUO4HznHTJDgPaGmo5J4wiAVN17KM8DD2ssYgY0/nw8YiEoa 5FBV3HnnjY4kuyjWH+RG042QPUkWnASFn3v3cmuoRfWz+ObJ+z0b2B5x6XMhmqH2G1EYWf pJ1DS+ClbcKB0ilSgfz+WZwW+rtbPvP2kEOxR7HUTEu3ErAWOJo8Rhfp93OfZg== 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 4W2JBt72Ptzvcn; Sun, 16 Jun 2024 16:20: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 45GGK6TI041682; Sun, 16 Jun 2024 16:20:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GGK6no041677; Sun, 16 Jun 2024 16:20:06 GMT (envelope-from git) Date: Sun, 16 Jun 2024 16:20:06 GMT Message-Id: <202406161620.45GGK6no041677@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: 200de4dc0716 - main - powerpc_mmu_radix: Introduce 'pmap_abort_ptp' 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 200de4dc0716ae2cc2b0995ccb6eee555d14c751 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=200de4dc0716ae2cc2b0995ccb6eee555d14c751 commit 200de4dc0716ae2cc2b0995ccb6eee555d14c751 Author: Bojan Novković AuthorDate: 2024-06-13 16:03:31 +0000 Commit: Bojan Novković CommitDate: 2024-06-16 16:19:26 +0000 powerpc_mmu_radix: Introduce 'pmap_abort_ptp' This commit moves code for releasing pagetable page references into a separate function. No functional change intended. Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D45581 --- sys/powerpc/aim/mmu_radix.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/sys/powerpc/aim/mmu_radix.c b/sys/powerpc/aim/mmu_radix.c index 0a534e3f9d3f..746b1ef49a99 100644 --- a/sys/powerpc/aim/mmu_radix.c +++ b/sys/powerpc/aim/mmu_radix.c @@ -3137,6 +3137,28 @@ out: return (rv); } +/* + * Release a page table page reference after a failed attempt to create a + * mapping. + */ +static void +pmap_abort_ptp(pmap_t pmap, vm_offset_t va, vm_page_t pdpg) +{ + struct spglist free; + + SLIST_INIT(&free); + if (pmap_unwire_ptp(pmap, va, pdpg, &free)) { + /* + * Although "va" is not mapped, paging- + * structure caches could nonetheless have + * entries that refer to the freed page table + * pages. Invalidate those entries. + */ + pmap_invalidate_page(pmap, va); + vm_page_free_pages_toq(&free, true); + } +} + /* * Tries to create a read- and/or execute-only 2MB page mapping. Returns true * if successful. Returns false if (1) a page table page cannot be allocated @@ -3264,17 +3286,7 @@ pmap_enter_l3e(pmap_t pmap, vm_offset_t va, pml3_entry_t newpde, u_int flags, * Abort this mapping if its PV entry could not be created. */ if (!pmap_pv_insert_l3e(pmap, va, newpde, flags, lockp)) { - SLIST_INIT(&free); - if (pmap_unwire_ptp(pmap, va, pdpg, &free)) { - /* - * Although "va" is not mapped, paging- - * structure caches could nonetheless have - * entries that refer to the freed page table - * pages. Invalidate those entries. - */ - pmap_invalidate_page(pmap, va); - vm_page_free_pages_toq(&free, true); - } + pmap_abort_ptp(pmap, va, pdpg); if (uwptpg != NULL) { mt = pmap_remove_pt_page(pmap, va); KASSERT(mt == uwptpg, From nobody Sun Jun 16 16:20: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 4W2JBw45z3z5P41r; Sun, 16 Jun 2024 16:20:08 +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 4W2JBw0wM8z4P5J; Sun, 16 Jun 2024 16:20:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718554808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I228+A+kSbOkphE1mEqEw9vNx6gPl8Eg4pk/sygj24A=; b=Z+JnDubiEBIkk4jg1j1rAo1Nr86xx9PQHd9Nn03hZQoKKClaUQGfy6O2YhBfxDEPNBSlrs qx0lU3G02aD6PQ+6n/MLZBqZVb4aWJhB2UD+HPyHYcEnwEta9jCIxXUcleNcR4YwSzsXQB V/3qH13LCh8bpRRcaWqBLzJctv9cNiJQNgwDgpoz0mkZvUB3UCoGwudt6bGzHJUJ+Q2Z4l 3ZWCHVgQRrmlDlYIfABGqdUUEzVMJYp1ekO1O37AqUaToDTymelMZUFSp+wmlnlGgmQbfg TLEnQdQOPLWQ4fUPo5Kp+L7Ix6qhcGiuAcucbz7mryGlRE5i+dl1qdWMsMmLsg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718554808; a=rsa-sha256; cv=none; b=Z2n5Da7r4CO1IOZdjLuxDkspcBHqlWNkWxYhfqHzcCfDSZbRPurtPhI8lUVQxmbQKTlZcx K+xTn3xKWBVVa3pd6Oi6zDOoXwL/dlX3iNw4uvgVOgCTS8KMf+KfbV14xLDeHs+PxQsZiP p6Q7VvdeQ4CkLL/YW4Xl+LMQJ72KdWXj629vY2Xun9g8fGpMo6hjAbRWIB4116fzWCo4tJ vzLQ6AvSMYmD7VAOtXeEH/OfjYBaBpmBGbBGsJB63skkeJaXvSgWnEirSZYBc3HWdK/AfK ELZH8XKeTg7/RdvcV3cS7PJMlEi021vVg6PJNFoZGy+502KCJxJ4sXUpGUH2Ww== 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=1718554808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I228+A+kSbOkphE1mEqEw9vNx6gPl8Eg4pk/sygj24A=; b=k4QBcGb68kFzpRZCAqPGIXkL2d0q5p0mOmP/9WO48idZnwB/pyWdLXfHqUMYYX97+Y18p+ 9la9YMfrzU3VxZnlDyv+KF1eUBQmj75ssPQ/Tk+8XuaY5GUEPFaUBYjAyPbRcDdN/9NlLY FovkoAns78F+vovp8jdw0KpAxbVbS3B9FWNiQaaIctg+aJ+DL/aKXEHf9M+DfbaG5tyVSi 0WsZyUIqZ0lZvhTLN9jVkbkzZjgb8rYwhpWwIT3BflNzWbcBqGBm55qaukLtaMy9cy4pTd lGkaBFxqhJ2yVrbdAmWS9878njZkGen+wjZ42g54SJUD4xLQ1qM8Zo9rJ/KZ+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 4W2JBw0WMWzvcp; Sun, 16 Jun 2024 16:20: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 45GGK7oq041976; Sun, 16 Jun 2024 16:20:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GGK7MB041972; Sun, 16 Jun 2024 16:20:07 GMT (envelope-from git) Date: Sun, 16 Jun 2024 16:20:07 GMT Message-Id: <202406161620.45GGK7MB041972@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: 858ead4bcefb - main - powerpc_mmu_radix: Release PTP reference on leaf ptpage allocation failure 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 858ead4bcefb4657629cba29b0e4507db509ee36 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=858ead4bcefb4657629cba29b0e4507db509ee36 commit 858ead4bcefb4657629cba29b0e4507db509ee36 Author: Bojan Novković AuthorDate: 2024-06-13 16:11:12 +0000 Commit: Bojan Novković CommitDate: 2024-06-16 16:19:27 +0000 powerpc_mmu_radix: Release PTP reference on leaf ptpage allocation failure 0013741 fixed an edge case invloving mlock() and superpage creation by creating and inserting a leaf pagetable page for mlock'd superpages. However, the code does not properly release the reference to the pagetable page in the error handling path. This commit fixes the issue by adding calls to 'pmap_abort_ptp' in the error handling path. Reported by: alc Approved by: markj (mentor) Fixes: 0013741 Differential Revision: https://reviews.freebsd.org/D45582 --- sys/powerpc/aim/mmu_radix.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/powerpc/aim/mmu_radix.c b/sys/powerpc/aim/mmu_radix.c index 746b1ef49a99..ae6e4d116e87 100644 --- a/sys/powerpc/aim/mmu_radix.c +++ b/sys/powerpc/aim/mmu_radix.c @@ -3268,12 +3268,15 @@ pmap_enter_l3e(pmap_t pmap, vm_offset_t va, pml3_entry_t newpde, u_int flags, uwptpg = NULL; if ((newpde & PG_W) != 0 && pmap != kernel_pmap) { uwptpg = vm_page_alloc_noobj(VM_ALLOC_WIRED); - if (uwptpg == NULL) + if (uwptpg == NULL) { + pmap_abort_ptp(pmap, va, pdpg); return (KERN_RESOURCE_SHORTAGE); + } uwptpg->pindex = pmap_l3e_pindex(va); if (pmap_insert_pt_page(pmap, uwptpg)) { vm_page_unwire_noq(uwptpg); vm_page_free(uwptpg); + pmap_abort_ptp(pmap, va, pdpg); return (KERN_RESOURCE_SHORTAGE); } pmap_resident_count_inc(pmap, 1); From nobody Sun Jun 16 16:20: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 4W2JBx5LRxz5P3mX; Sun, 16 Jun 2024 16:20: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 4W2JBx1lhfz4PH1; Sun, 16 Jun 2024 16:20:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718554809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W8IW7SCRqmQ5FcAC4ozfMlg4eXsLOFhxcnSqs7iFSmU=; b=R0g63UITdI6y8Jijn2MFwqATc+m6sGDuTg0mwxOpOEWwA2LlBLqynzd5YgKuXLUqUub+Sl zHzInP2r7MEiv1FU2sG9ZKmoWW1O0CHeZq2DwU7hPqvjvN275pQpB3Qu3WT4QWVC+vygIw f+CWpgY8fJxSb9fPTVSN75ICEbj2yBu8TzGELi/6Ebp81xOQzpywCi0WcJ2WKaKdwaO5r3 ciXOhYvUTIlByHMEcvk9TFSLb1bscn5G3/yXsOoocEvkG7HU2TInJ+NH4oZUTa98WHE01T P9mjgYn3wYZabdsghjUvPgG/ehGzJU0a+bYOdgqYMegKbMIQDXq8xCXRN7bkcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718554809; a=rsa-sha256; cv=none; b=C1w3tGcYAAyVmpxj8qEpkvAIwq1Qecwjqs2Dt/JLKNTEjpBKQ++QSAimXdYiQUtDYQsBn+ yXzPLdnIjS8qpDdOuwNC46zz13yspMQ3xUOIMqnN7XB65ZTOnvvh4fAs6x8Kis/eUA+807 mnLNk6l1XrYm8qy0F6dfXUk41/bIKye4IsghQjQhOe27gRmcg5cPKVm7BsPXHgN9/m4E7l tmepC2aQ923fKYSgjyGppMuKdFTm3iBgcJU1tpPEoKN+kmJm8v0X0xLZCm+j+UuEFvqXNa flNQ0Ot9+0Qo91fxaUh5JgWnJak03t2a1S+pD+iUwRt69uIdgKDH0YueR06fgg== 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=1718554809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W8IW7SCRqmQ5FcAC4ozfMlg4eXsLOFhxcnSqs7iFSmU=; b=ToxIHr0aNoVtOuxS1dkTq5wg1BSDJtGp1Li9tzvrtL3w7QpHIsXeMpwHEuJefSRu/FzrIk ArlP/a+caux+C7LMaIOo8WqvyfqoQUii0t/UaY86A+SbAVPDlP9xEVZudoeypespjm39Yz LgIPtDO6z2tqBXNnQ4X85oNzass5xZpP6gwLwEvNKK6R9nGKokkPBdWUtqQwN+DAI3zkR0 bosfu9wbEtcsJkzqraNYo88saquxDRU3M5Md85xQOg+3DqLjoMMt7j31HhA7WSCWz/HLRD tWlXLrGaOV5RS1Vzm81nzNe0o6vZnEC4Rn8vXHn6Yzwy5+dHzwbzUvdqjrYLOw== 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 4W2JBx12Y8zvcq; Sun, 16 Jun 2024 16:20:09 +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 45GGK9aN042249; Sun, 16 Jun 2024 16:20:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GGK9bu042244; Sun, 16 Jun 2024 16:20:09 GMT (envelope-from git) Date: Sun, 16 Jun 2024 16:20:09 GMT Message-Id: <202406161620.45GGK9bu042244@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: e8816b4b66ad - main - riscv pmap: Introduce 'pmap_abort_ptp' 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: e8816b4b66adf2e6052803cd0eb609ee63fbb3ed Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=e8816b4b66adf2e6052803cd0eb609ee63fbb3ed commit e8816b4b66adf2e6052803cd0eb609ee63fbb3ed Author: Bojan Novković AuthorDate: 2024-06-13 16:13:53 +0000 Commit: Bojan Novković CommitDate: 2024-06-16 16:19:27 +0000 riscv pmap: Introduce 'pmap_abort_ptp' This commit moves code for releasing pagetable page references into a separate function. No functional change intended. Approved by: markj (mentor) Differential Revision: https://reviews.freebsd.org/D45579 --- sys/riscv/riscv/pmap.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 1902f1f4009b..4f6305ed651d 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -3137,6 +3137,28 @@ out: return (rv); } +/* + * Release a page table page reference after a failed attempt to create a + * mapping. + */ +static void +pmap_abort_ptp(pmap_t pmap, vm_offset_t va, vm_page_t l2pg) +{ + struct spglist free; + + SLIST_INIT(&free); + if (pmap_unwire_ptp(pmap, va, l2pg, &free)) { + /* + * Although "va" is not mapped, paging-structure + * caches could nonetheless have entries that + * refer to the freed page table pages. + * Invalidate those entries. + */ + pmap_invalidate_page(pmap, va); + vm_page_free_pages_toq(&free, true); + } +} + /* * Tries to create a read- and/or execute-only 2MB page mapping. Returns * KERN_SUCCESS if the mapping was created. Otherwise, returns an error @@ -3285,17 +3307,7 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, * Abort this mapping if its PV entry could not be created. */ if (!pmap_pv_insert_l2(pmap, va, new_l2, flags, lockp)) { - SLIST_INIT(&free); - if (pmap_unwire_ptp(pmap, va, l2pg, &free)) { - /* - * Although "va" is not mapped, paging-structure - * caches could nonetheless have entries that - * refer to the freed page table pages. - * Invalidate those entries. - */ - pmap_invalidate_page(pmap, va); - vm_page_free_pages_toq(&free, true); - } + pmap_abort_ptp(pmap, va, l2pg); if (uwptpg != NULL) { mt = pmap_remove_pt_page(pmap, va); KASSERT(mt == uwptpg, From nobody Sun Jun 16 16:20: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 4W2JBy3lLxz5P43c; Sun, 16 Jun 2024 16:20:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W2JBy22zxz4PBh; Sun, 16 Jun 2024 16:20:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718554810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=alHLw9Xl7r5Zulusvkd7BBIV3EkJlY2kzU5TB+5WKyQ=; b=WJzv4Gevdnwr6UEUgGM7uRiPScVpMnfcJqFehOj+lsOdmUj+qJfx8zNTbFlX/LMHVb2h+A dWmvT8TZ0TUOBx3JLR6TXzQQpEboxppTjlwZcu4ZZaE4d++upg3Zk101Y8z70z/lItGFYf yVIVlvc7dXek8A0tCtirCjK815bKJMgmqDXWk08r11qU0WupX4XM4FG3O+rSeLh7kxqnRQ 0mqSegT9MGnIqj5BCMENpUgytj6P/gWWvsxJhMwY1qS+WIbqCzx5uzZim0zSMJwcbxpX5F tidRx6v/iJbJa++hrUL6Zv7yoQ8oVTrCydSRnmQUc27GeluD8J3WOO0AH0whOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718554810; a=rsa-sha256; cv=none; b=VB3NF+OhiY7SW4zcLL55Ju7kLXxi5MyzU5nFDfw01NGOlwgO8oGQlpQEOPIIdPsDgLRzf8 IpmUZhdm0fq5VJQ3cgZZD8blOSdW7KM33jNoWFrN8HSsblmXFSSw8y7xnl8G64F5SGyIxz WY+9HfilxxBEaiB/fzl9xo1Ydj3QJyR0++NXS+7cDDz/lVZ99X8JDeRKXcbdUvoQqNJDGU xdxRmNphvmLVn+1ZeFJlNi0te225Ce3OOs8gmqTd1gGbld944683oBpMRX5C+WaDTLWpwY xVHr6PdvsVsZODpD+QSC0UBYZOTVs8GLFE0Ag2Q7EgGri28kxpvWqbAOca3gBg== 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=1718554810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=alHLw9Xl7r5Zulusvkd7BBIV3EkJlY2kzU5TB+5WKyQ=; b=yeDwQszowgCEngWr9QRmB458YIiEMqt6LtquS/T1c7P04isoGfu+fwhhUkJGqC7r73+Lai eFPALSGf8M5qlW0t9l+JyjF7odUwhdDXJvrTOPFdkQ71GXZUU17ZoSc23y3N6+uF0cw704 MJvL8G/h8bJjERsK8oMwnpm5HbDpf5yzqXqzBYjavRkCiJEobQSIuOnSXziLlz6wkp0drq h9jyW+aWhLaW81QyZCr4vkoaJASw86bP32CHqfOaNhkFjafsqwryIsuK/QrnKD2/LNfSze JUF5n01NR+iAKKYRJ0CSKCi2bZ4w7wle0im+DC+wIUCBMeyt2cJ/M7sbhdiXDA== 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 4W2JBy1gTRzvcr; Sun, 16 Jun 2024 16:20: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 45GGKA1k042807; Sun, 16 Jun 2024 16:20:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GGKAnr042801; Sun, 16 Jun 2024 16:20:10 GMT (envelope-from git) Date: Sun, 16 Jun 2024 16:20:10 GMT Message-Id: <202406161620.45GGKAnr042801@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: 774549fe06ac - main - riscv pmap: Release PTP reference on leaf ptpage allocation failure 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 774549fe06ac0f45a5a5a661a7fb4107a8695d4c Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=774549fe06ac0f45a5a5a661a7fb4107a8695d4c commit 774549fe06ac0f45a5a5a661a7fb4107a8695d4c Author: Bojan Novković AuthorDate: 2024-06-13 16:14:21 +0000 Commit: Bojan Novković CommitDate: 2024-06-16 16:19:27 +0000 riscv pmap: Release PTP reference on leaf ptpage allocation failure d0941ed fixed an edge case invloving mlock() and superpage creation by creating and inserting a leaf pagetable page for mlock'd superpages. However, the code does not properly release the reference to the pagetable page in the error handling path. This commit fixes the issue by adding calls to 'pmap_abort_ptp' in the error handling path. Reported by: alc Approved by: markj (mentor) Fixes: d0941ed Differential Revision: https://reviews.freebsd.org/D45580 --- sys/riscv/riscv/pmap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 4f6305ed651d..1e4061935ca0 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -3291,12 +3291,14 @@ pmap_enter_l2(pmap_t pmap, vm_offset_t va, pd_entry_t new_l2, u_int flags, if ((new_l2 & PTE_SW_WIRED) != 0 && pmap != kernel_pmap) { uwptpg = vm_page_alloc_noobj(VM_ALLOC_WIRED); if (uwptpg == NULL) { + pmap_abort_ptp(pmap, va, l2pg); return (KERN_RESOURCE_SHORTAGE); } uwptpg->pindex = pmap_l2_pindex(va); if (pmap_insert_pt_page(pmap, uwptpg, true, false)) { vm_page_unwire_noq(uwptpg); vm_page_free(uwptpg); + pmap_abort_ptp(pmap, va, l2pg); return (KERN_RESOURCE_SHORTAGE); } pmap_resident_count_inc(pmap, 1); From nobody Sun Jun 16 16:55: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 4W2K084BRJz5P71G; Sun, 16 Jun 2024 16:55:52 +0000 (UTC) (envelope-from unkadoug@gmail.com) Received: from mail-ot1-x32c.google.com (mail-ot1-x32c.google.com [IPv6:2607:f8b0:4864:20::32c]) (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 "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W2K081gPGz4Vnb; Sun, 16 Jun 2024 16:55:52 +0000 (UTC) (envelope-from unkadoug@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ot1-x32c.google.com with SMTP id 46e09a7af769-6f9923df5dbso2163154a34.2; Sun, 16 Jun 2024 09:55:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718556950; x=1719161750; darn=freebsd.org; h=content-transfer-encoding:in-reply-to:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:from:to:cc:subject:date:message-id:reply-to; bh=Z+CtyinDJ2ytkxC6eXJ8EBxYx3gd46UfYjmeEIirlXU=; b=ck1ZsHMJ90tRoGxj9hheV+fG8wGcUlyO4U2UZ73uGqrsZXBO6Lpw/0jT0Zqaf0c4Bi StMwqsrwrAOe2wByarTX0/rDHSCns/1k5KT8mZhj2EyOnhSEZDIrm6wGcvzaoXq58s9x 0P03VXNnyYvSAqUGjkG+Z6rhKXvYdzKAEljdVVLEQbF5a+m11lebNdsp/3Z1Jjpddrmy Yoiuz8+pV9O4bADsraKJAKhhwgY3p4efgswZ3uKZEFhBKN9z+TVtJb1gnD16ktjInC2i kIEwc8ahHciHgsc8EzCg2BcxAQLHBk5s8R0cFNksbU7CGSBg/9033x9iKrKAEqiyZ0Ew zPbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718556950; x=1719161750; h=content-transfer-encoding:in-reply-to:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Z+CtyinDJ2ytkxC6eXJ8EBxYx3gd46UfYjmeEIirlXU=; b=mONij5TpgYardOxl7yAMECgW06HY/czBr+eUemYT5X+9Q1nT626GSM6thiSeTqiJCk HtfrVqOgrf6pr0JVFMx7mA6VP/1HTE4FEmXibO3SM1npSv+A1i1Qr9wkv4MYELRS6KHk 6PD6GPMnV/0BQIK1ogTeHRAKmK+o2M8KSKBPYZlA7ClfmyddU4+rULw+NnaT6YlkNE/2 HZsnOLJ+D/f5chfnGgWHEEAiM2Gg8jeJ0SqHLXx0YSr2e/EQuGXAChmg/nhdjMMqw5gS j/ZKlYVPHv74P3pdrT2Objcp475JRA/TuCn2eKiQ8WFPQ489e2el9PLks8gul9EsVB0A g4Sw== X-Forwarded-Encrypted: i=1; AJvYcCU9sGc27XS1pJDC2OrY3B9S3BxkOUwFNPEddAXUpH3xiSJ72hM7sZ31/hLMv0YHiHV26S1UQpyZwr7SNUEJNekrDGtz+thYP05TNkCY6hjNFlP0aaz6gFshHQpdLQgMjOKlVGgJi1FMtZ3jgHMKMriXLA== X-Gm-Message-State: AOJu0Yw++0ITkEAv+pfqHNg2N5NAjmrS1FyrdUkcEMM+wDOgdhDrIvP0 21dkelKZ3qVTEVTVMtcROLmu1nJej8TiTzy8bhFGcWulGInao4sRE3BfEdIT X-Google-Smtp-Source: AGHT+IGLeSTzv+8DOETvcP/5AT+WMYk71/tTgefL9Q/Mo+LMk3Va/o2p5eto3PISS/pYmxEyrIuhjg== X-Received: by 2002:a05:6830:1682:b0:6f9:7fb1:b6f6 with SMTP id 46e09a7af769-6fb93b1b142mr8918491a34.32.1718556950490; Sun, 16 Jun 2024 09:55:50 -0700 (PDT) Received: from [108.254.203.202] (108-254-203-202.lightspeed.hstntx.sbcglobal.net. [108.254.203.202]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-6fb5b1f57a1sm1292995a34.46.2024.06.16.09.55.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 16 Jun 2024 09:55:49 -0700 (PDT) From: Doug Moore X-Google-Original-From: Doug Moore Message-ID: <29240b1e-6a8a-0bd5-f16f-322623d4b778@freebsd.org> Date: Sun, 16 Jun 2024 11:55:48 -0500 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: git: dd0e5c02ab13 - main - swap_pager: small improvement to find_least Content-Language: en-US To: Peter Holm Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202406111638.45BGcnhX099470@gitrepo.freebsd.org> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 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:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4W2K081gPGz4Vnb Thank you, Peter.  That was a stupid mistake and I have now undone it. Doug On 6/16/24 07:13, Peter Holm wrote: > On Tue, Jun 11, 2024 at 04:38:49PM +0000, Doug Moore wrote: >> The branch main has been updated by dougm: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=dd0e5c02ab13b9eb240d42a71a8f41a8b036bd33 >> >> commit dd0e5c02ab13b9eb240d42a71a8f41a8b036bd33 >> Author: Doug Moore >> AuthorDate: 2024-06-11 16:36:23 +0000 >> Commit: Doug Moore >> CommitDate: 2024-06-11 16:36:23 +0000 >> >> swap_pager: small improvement to find_least >> >> Drop an unneeded test, a branch and a needless computation to save a >> few instructions. >> >> Reviewed by: kib >> Differential Revision: https://reviews.freebsd.org/D45558 >> --- >> sys/vm/swap_pager.c | 19 +++++++------------ >> 1 file changed, 7 insertions(+), 12 deletions(-) >> >> diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c >> index a07a38481490..15f227457bba 100644 >> --- a/sys/vm/swap_pager.c > Doug, > > Here's an easy way to reproduce the issue: > > 12:43 ~ $ sort /dev/zero & > [1] 3650 > 12:43 ~ $ sort /dev/zero & > [2] 3651 > 12:43 ~ $ sort /dev/zero & > [3] 3652 > 12:43 ~ $ panic: Negative index: -16 > cpuid = 8 > time = 1718534645 > KDB: stack backtrace: > db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe010855fa50 > vpanic() at vpanic+0x13f/frame 0xfffffe010855fb80 > panic() at panic+0x43/frame 0xfffffe010855fbe0 > swap_pager_find_least() at swap_pager_find_least+0x105/frame 0xfffffe010855fc20 > vm_object_collapse() at vm_object_collapse+0x68b/frame 0xfffffe010855fca0 > vmspace_fork() at vmspace_fork+0xb68/frame 0xfffffe010855fd30 > fork1() at fork1+0x4f8/frame 0xfffffe010855fda0 > sys_fork() at sys_fork+0x54/frame 0xfffffe010855fe00 > amd64_syscall() at amd64_syscall+0x158/frame 0xfffffe010855ff30 > fast_syscall_common() at fast_syscall_common+0xf8/frame 0xfffffe010855ff30 > --- syscall (2, FreeBSD ELF64, fork), rip = 0xaba1c31565a, rsp = 0xaba1b0cecb8, rbp = 0xaba1b0cf220 --- > KDB: enter: panic > [ thread pid 3653 tid 100349 ] > Stopped at $0,0x104d5c2(%rip) > db> x/s version > version: FreeBSD 15.0-CURRENT #2 main-n270778-d26c565597b8-dirty: Sun Jun 16 12:32:39 CEST 2024\012 pho@mercat1.netperf.freebsd.org:/usr/src/sys/amd64/compile/PHO\012 > db> > > --- a/sys/vm/swap_pager.c > +++ b/sys/vm/swap_pager.c > @@ -2303,6 +2303,7 @@ swap_pager_find_least(vm_object_t object, vm_pindex_t pindex) > if (sb == NULL) > return (object->size); > for (i = pindex - sb->p; i < SWAP_META_PAGES; i++) { > + KASSERT((i >= 0), ("Negative index: %d", i)); > if (sb->d[i] != SWAPBLK_NONE) > return (sb->p + i); > } > > - Peter From nobody Sun Jun 16 17:11: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 4W2KLS6jTFz5P87g; Sun, 16 Jun 2024 17:11:44 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp052.goneo.de (smtp5.goneo.de [IPv6:2001:1640:5::8:30]) (using TLSv1.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 4W2KLR50g5z4Ycw; Sun, 16 Jun 2024 17:11:43 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=walstatt-de.de header.s=DKIM001 header.b=jQ2lVpTN; dmarc=none; spf=pass (mx1.freebsd.org: domain of freebsd@walstatt-de.de designates 2001:1640:5::8:30 as permitted sender) smtp.mailfrom=freebsd@walstatt-de.de 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 smtp5.goneo.de (Postfix) with ESMTPS id 779CA240454; Sun, 16 Jun 2024 19:11:40 +0200 (CEST) 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 9A38E240308; Sun, 16 Jun 2024 19:11:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1718557898; 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=0n0+RjHXOQT6iCXHLVRRPam81H2YLYG1M5ZIyI+EeD4=; b=jQ2lVpTNMM1FIgAbmqcGxKg6xAPo5cQJBvQVIK4XpwM3qqjcDjD+PNq/OM7npOJlsUG9hW nWoheFtx+dIAcK6hLrdZEhPl/8SCWQHVtqoALU2rQTeZ5osaOA/1swKvcT9WonIXlvrAZ1 fhrh0kxces7U8H9XnHgSjldbEreEawAEsIJ2Udq+26tzAKS4PiPd6fP8EFJu9xvECdKDkz 3LXnwcWGJjbbO8wr4BWjaTLrTlshrfYmk/fbh5jAsLaRlqKEY/ICuQHBjG7T1PpHLPY9af py1gq06KDldE28KsVsAe9bYhNg6GtAXxU7FFDWctsEZArTC6GsI4eeY/E3hZWg== Received: from thor.intern.walstatt.dynvpn.de (dynamic-077-191-020-207.77.191.pool.telefonica.de [77.191.20.207]) (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 494D024021E; Sun, 16 Jun 2024 19:11:38 +0200 (CEST) Date: Sun, 16 Jun 2024 19:11:10 +0200 From: FreeBSD User To: Sumit Saxena Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org, FreeBSD CURRENT Subject: Re: git: 8d3c3b52423f - main - mpi3mr: Track IO per target counter during queue poll with local variable Message-ID: <20240616191137.7f7d6a30@thor.intern.walstatt.dynvpn.de> In-Reply-To: <202406061039.456AdXZ4090138@gitrepo.freebsd.org> References: <202406061039.456AdXZ4090138@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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-UID: 9d34ec X-Rspamd-UID: f4f0bd X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.60 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_ALLOW(-0.20)[+ip6:2001:1640:5::8:0/112]; R_DKIM_ALLOW(-0.20)[walstatt-de.de:s=DKIM001]; RCVD_IN_DNSWL_LOW(-0.10)[2001:1640:5::8:30:from]; MIME_GOOD(-0.10)[text/plain]; ASN(0.00)[asn:25394, ipnet:2001:1640::/32, country:DE]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; HAS_ORG_HEADER(0.00)[]; MISSING_XM_UA(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCVD_TLS_ALL(0.00)[]; DMARC_NA(0.00)[walstatt-de.de]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_FIVE(0.00)[5]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org,freebsd-current@freebsd.org]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[walstatt-de.de:+] X-Rspamd-Queue-Id: 4W2KLR50g5z4Ycw Am Thu, 6 Jun 2024 10:39:33 GMT Sumit Saxena schrieb: > The branch main has been updated by ssaxena: > > URL: https://cgit.FreeBSD.org/src/commit/?id=8d3c3b52423f9740da424aa6dd73a20e694a9e08 > > commit 8d3c3b52423f9740da424aa6dd73a20e694a9e08 > Author: Chandrakanth patil > AuthorDate: 2024-06-06 10:28:38 +0000 > Commit: Sumit Saxena > CommitDate: 2024-06-06 10:39:16 +0000 > > mpi3mr: Track IO per target counter during queue poll with local variable > > Reviewed by: imp > Approved by: imp > Differential revision: https://reviews.freebsd.org/D44494 > --- > sys/dev/mpi3mr/mpi3mr_cam.c | 22 ++++++++++++---------- > 1 file changed, 12 insertions(+), 10 deletions(-) > > diff --git a/sys/dev/mpi3mr/mpi3mr_cam.c b/sys/dev/mpi3mr/mpi3mr_cam.c > index e3958ed8daf2..e00d61073d96 100644 > --- a/sys/dev/mpi3mr/mpi3mr_cam.c > +++ b/sys/dev/mpi3mr/mpi3mr_cam.c > @@ -1839,6 +1839,7 @@ int mpi3mr_remove_device_from_os(struct mpi3mr_softc *sc, U16 handle) > { > int retval = 0; > struct mpi3mr_target *target; > + unsigned int target_outstanding; > > mpi3mr_dprint(sc, MPI3MR_EVENT, > "Removing Device (dev_handle: %d)\n", handle); > @@ -1856,16 +1857,17 @@ int mpi3mr_remove_device_from_os(struct mpi3mr_softc *sc, U16 handle) > > target->flags |= MPI3MRSAS_TARGET_INREMOVAL; > > - if (mpi3mr_atomic_read(&target->outstanding)) { > - mpi3mr_dprint(sc, MPI3MR_ERROR, "there are [%2d] outstanding IOs on target: > %d" > - "Poll reply queue once\n", > mpi3mr_atomic_read(&target->outstanding), > - target->per_id); > - mpi3mr_poll_pend_io_completions(sc); > - if (mpi3mr_atomic_read(&target->outstanding)) > - mpi3mr_dprint(sc, MPI3MR_ERROR, "[%2d] outstanding IOs present on > target: %d" > - "despite poll\n", > mpi3mr_atomic_read(&target->outstanding), > - target->per_id); > - } > + target_outstanding = mpi3mr_atomic_read(&target->outstanding); > + if (target_outstanding) { > + mpi3mr_dprint(sc, MPI3MR_ERROR, "there are [%2d] outstanding IOs on target: > %d " > + "Poll reply queue once\n", target_outstanding, > target->per_id); > + mpi3mr_poll_pend_io_completions(sc); > + target_outstanding = mpi3mr_atomic_read(&target->outstanding); > + if (target_outstanding) > + target_outstanding = mpi3mr_atomic_read(&target->outstanding); > + mpi3mr_dprint(sc, MPI3MR_ERROR, "[%2d] outstanding IOs present on > target: %d " > + "despite poll\n", target_outstanding, target->per_id); > + } > > if (target->exposed_to_os && !sc->reset_in_progress) { > mpi3mr_rescan_target(sc, target); > On recent CURRENT (FreeBSD 15.0-CURRENT #6 main-n270784-d1e652bf04b: Sun Jun 16 18:19:49 CEST 2024 amd64) "make installkernel" fails with: [...] --- realinstall_subdir_mpi3mr --- install -T release -o root -g wheel -m 444 mpi3mr.ko /boot/kernel/ install -T dbg -o root -g wheel -m 444 mpi3mr.ko.debug /usr/lib/debug/boot/kernel/ install: /usr/lib/debug/boot/kernel/INS@QhWCmf: No such file or directory *** [_kmodinstall] Error code 71 make[4]: stopped in /usr/src/sys/modules/mpi3mr make[4]: 1 error [...] The problem occurs when diabling makeoptions DEBUG=... in kernel configuration and including: # Debugging support. Always need this: #options KDB # Enable kernel debugger support. #options KDB_TRACE # Print a stack trace for a panic. # For full debugger support use (turn off in stable branch): include "std.nodebug" On another host with the same CURRENT and mostly same configs, the problem does not occur! The differenc between both is: tha failing host hasn't been updated for tha last 20 days, the other one has been updated almost every day. On the failing host, "make cleanworld" has been issued before building world/kernel. /etc/src.conf is also the same on both checked hosts. GENERIC compiles flawless. -- O. Hartmann From nobody Sun Jun 16 17:13: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 4W2KNK0RzHz5P8Rl; Sun, 16 Jun 2024 17:13:21 +0000 (UTC) (envelope-from unkadoug@gmail.com) Received: from mail-oi1-x22c.google.com (mail-oi1-x22c.google.com [IPv6:2607:f8b0:4864:20::22c]) (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 "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W2KNJ5ZBqz4bCk; Sun, 16 Jun 2024 17:13:20 +0000 (UTC) (envelope-from unkadoug@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oi1-x22c.google.com with SMTP id 5614622812f47-3c9c36db8eeso2079909b6e.0; Sun, 16 Jun 2024 10:13:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718557999; x=1719162799; darn=freebsd.org; h=content-transfer-encoding:in-reply-to:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:from:to:cc:subject:date:message-id:reply-to; bh=MtjM9GSl4/eJw41CI/xjSisQ4Z8l5MncP90gE4DhqxA=; b=dvbsjY3XxiIUMFL9h0KetrhcQg0hJLt/kWhZ3NoZKU5UCdEJipUZT6CIxHcnBPX9V4 +WNQ5/zXZ2JM+oF8HI7f1VRZt9oyE5v/AayPvPDZXp2vtRDTUJu7BMTsfeLANK0dwPB4 IyKfSrONAoQ+QMo3PukIbggG6HLvuiKO9cCTyYLCUTc0j0YbtWcXzrVeKdOeagQgSUDW OzxZDRZYqrNtiugvkXP9FoZY8kHqbiBpn79lGGvvkiFPw1YMcO7woQLt5iE0T2ftmqUz EM0adcVHMhpQzW8dGScoeDURhaeIS9NrCfp2hT0mnAXGH7xtQQU01rougG4gfiN/oz4Y nJwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718557999; x=1719162799; h=content-transfer-encoding:in-reply-to:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=MtjM9GSl4/eJw41CI/xjSisQ4Z8l5MncP90gE4DhqxA=; b=MAGG8CvW0E0nnRTxAu7jC24VLTJyC9n7X4Z5qc7kHQ3uWfRpZTKA+LquInl1pBkago NkLrYXmG19/nLMOAU3HgqZSUkk6ETc3Hy6pIB6UoN39I94y/M5WeUak0aELAHcwoTYEm k2GY58LH/CH63qOQzwShV6X7XbfYQ+HhIRiL8N0Vyu61WuBgAGldwCE+zOlz0g5LcMDf YRAQUGnYvujPA7ujUnL7hP1hkmNoaEP6BTtz19PDpeLMpAAkUsltudP65DSuGY6i3Eh4 bIoWy8BYVsV0pz+Vbr9iCehfdsYKzlTqFK0Ss1b1Wa4Tr7cdehCnIBoyCMex676ZDzjy sl4g== X-Forwarded-Encrypted: i=1; AJvYcCXWR8uaGlG3m/wpEzD9gzXgPxE0z3q/nFYzIoQIgIEs+z1Sm3QfSWSYP47OPEbH+rzzwHRkbJ+moeKS4x3A/3sqsND7bBv6oKyGEswsyz1GAULaWkd6dODkKQJAzFuLc7wwHsAm7V1MyWRYC+qIph6EcQ== X-Gm-Message-State: AOJu0Yxd9btPmPixIcN4nl8O23fJDgpOqqVbPsnPSkU28ZYQIOUPa9J9 MsC1wlVgRbpEB/3dBPaJVS+/EKz1dhPwSV6mMlhjhN0feYIzey/9JplxDi7e X-Google-Smtp-Source: AGHT+IHBQoVjnW2dtRIOf+XciHLgJ+EtolhlN88GvUG3o5+6juUDPAv17O2eoBxeIoLu4nLQEdBl3A== X-Received: by 2002:a05:6808:148e:b0:3d2:3811:bc78 with SMTP id 5614622812f47-3d24e8f8a44mr8970329b6e.28.1718557999442; Sun, 16 Jun 2024 10:13:19 -0700 (PDT) Received: from [108.254.203.202] (108-254-203-202.lightspeed.hstntx.sbcglobal.net. [108.254.203.202]) by smtp.gmail.com with ESMTPSA id 5614622812f47-3d2475e49absm1249751b6e.12.2024.06.16.10.13.18 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 16 Jun 2024 10:13:18 -0700 (PDT) From: Doug Moore X-Google-Original-From: Doug Moore Message-ID: <0fbfd389-21e8-d1df-b640-46c283124888@freebsd.org> Date: Sun, 16 Jun 2024 12:13:18 -0500 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: git: dd0e5c02ab13 - main - swap_pager: small improvement to find_least Content-Language: en-US To: Peter Holm Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202406111638.45BGcnhX099470@gitrepo.freebsd.org> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit 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:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4W2KNJ5ZBqz4bCk Thank you, Peter.  That was a stupid mistake and I have now undone it. On 6/16/24 07:13, Peter Holm wrote: > On Tue, Jun 11, 2024 at 04:38:49PM +0000, Doug Moore wrote: >> The branch main has been updated by dougm: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=dd0e5c02ab13b9eb240d42a71a8f41a8b036bd33 >> >> commit dd0e5c02ab13b9eb240d42a71a8f41a8b036bd33 >> Author: Doug Moore >> AuthorDate: 2024-06-11 16:36:23 +0000 >> Commit: Doug Moore >> CommitDate: 2024-06-11 16:36:23 +0000 >> >> swap_pager: small improvement to find_least >> >> Drop an unneeded test, a branch and a needless computation to save a >> few instructions. >> >> Reviewed by: kib >> Differential Revision: https://reviews.freebsd.org/D45558 >> --- >> sys/vm/swap_pager.c | 19 +++++++------------ >> 1 file changed, 7 insertions(+), 12 deletions(-) >> >> diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c >> index a07a38481490..15f227457bba 100644 >> --- a/sys/vm/swap_pager.c > Doug, > > Here's an easy way to reproduce the issue: > > 12:43 ~ $ sort /dev/zero & > [1] 3650 > 12:43 ~ $ sort /dev/zero & > [2] 3651 > 12:43 ~ $ sort /dev/zero & > [3] 3652 > 12:43 ~ $ panic: Negative index: -16 > cpuid = 8 > time = 1718534645 > KDB: stack backtrace: > db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe010855fa50 > vpanic() at vpanic+0x13f/frame 0xfffffe010855fb80 > panic() at panic+0x43/frame 0xfffffe010855fbe0 > swap_pager_find_least() at swap_pager_find_least+0x105/frame 0xfffffe010855fc20 > vm_object_collapse() at vm_object_collapse+0x68b/frame 0xfffffe010855fca0 > vmspace_fork() at vmspace_fork+0xb68/frame 0xfffffe010855fd30 > fork1() at fork1+0x4f8/frame 0xfffffe010855fda0 > sys_fork() at sys_fork+0x54/frame 0xfffffe010855fe00 > amd64_syscall() at amd64_syscall+0x158/frame 0xfffffe010855ff30 > fast_syscall_common() at fast_syscall_common+0xf8/frame 0xfffffe010855ff30 > --- syscall (2, FreeBSD ELF64, fork), rip = 0xaba1c31565a, rsp = 0xaba1b0cecb8, rbp = 0xaba1b0cf220 --- > KDB: enter: panic > [ thread pid 3653 tid 100349 ] > Stopped at $0,0x104d5c2(%rip) > db> x/s version > version: FreeBSD 15.0-CURRENT #2 main-n270778-d26c565597b8-dirty: Sun Jun 16 12:32:39 CEST 2024\012 pho@mercat1.netperf.freebsd.org:/usr/src/sys/amd64/compile/PHO\012 > db> > > --- a/sys/vm/swap_pager.c > +++ b/sys/vm/swap_pager.c > @@ -2303,6 +2303,7 @@ swap_pager_find_least(vm_object_t object, vm_pindex_t pindex) > if (sb == NULL) > return (object->size); > for (i = pindex - sb->p; i < SWAP_META_PAGES; i++) { > + KASSERT((i >= 0), ("Negative index: %d", i)); > if (sb->d[i] != SWAPBLK_NONE) > return (sb->p + i); > } > > - Peter From nobody Sun Jun 16 17:14: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 4W2KPP2l2Hz5P8dD; Sun, 16 Jun 2024 17:14:17 +0000 (UTC) (envelope-from peter@holm.cc) Received: from kaskal.pair.com (kaskal.pair.com [209.68.5.173]) (using TLSv1.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 4W2KPN60Mxz4bhR; Sun, 16 Jun 2024 17:14:16 +0000 (UTC) (envelope-from peter@holm.cc) Authentication-Results: mx1.freebsd.org; none Received: from kaskal.pair.com (localhost [127.0.0.1]) by kaskal.pair.com (Postfix) with ESMTP id 7A370D656AF; Sun, 16 Jun 2024 13:14:15 -0400 (EDT) Received: from Peters-Air (c-x5996a268.customers.hiper-net.dk [89.150.162.104]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by kaskal.pair.com (Postfix) with ESMTPSA id AFDEED8D1AA; Sun, 16 Jun 2024 13:14:14 -0400 (EDT) Date: Sun, 16 Jun 2024 19:14:10 +0200 From: Peter Holm To: Doug Moore Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: dd0e5c02ab13 - main - swap_pager: small improvement to find_least Message-ID: References: <202406111638.45BGcnhX099470@gitrepo.freebsd.org> <29240b1e-6a8a-0bd5-f16f-322623d4b778@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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <29240b1e-6a8a-0bd5-f16f-322623d4b778@freebsd.org> X-Scanned-By: mailmunge 3.11 on 209.68.5.173 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:7859, ipnet:209.68.0.0/18, country:US] X-Rspamd-Queue-Id: 4W2KPN60Mxz4bhR On Sun, Jun 16, 2024 at 11:55:48AM -0500, Doug Moore wrote: > Thank you, Peter.  That was a stupid mistake and I have now undone it. > > Doug > Happy to help. It was a KASAN build that found the issue. - Peter > On 6/16/24 07:13, Peter Holm wrote: > > On Tue, Jun 11, 2024 at 04:38:49PM +0000, Doug Moore wrote: > > > The branch main has been updated by dougm: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=dd0e5c02ab13b9eb240d42a71a8f41a8b036bd33 > > > > > > commit dd0e5c02ab13b9eb240d42a71a8f41a8b036bd33 > > > Author: Doug Moore > > > AuthorDate: 2024-06-11 16:36:23 +0000 > > > Commit: Doug Moore > > > CommitDate: 2024-06-11 16:36:23 +0000 > > > > > > swap_pager: small improvement to find_least > > > Drop an unneeded test, a branch and a needless computation to save a > > > few instructions. > > > Reviewed by: kib > > > Differential Revision: https://reviews.freebsd.org/D45558 > > > --- > > > sys/vm/swap_pager.c | 19 +++++++------------ > > > 1 file changed, 7 insertions(+), 12 deletions(-) > > > > > > diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c > > > index a07a38481490..15f227457bba 100644 > > > --- a/sys/vm/swap_pager.c > > Doug, > > > > Here's an easy way to reproduce the issue: > > > > 12:43 ~ $ sort /dev/zero & > > [1] 3650 > > 12:43 ~ $ sort /dev/zero & > > [2] 3651 > > 12:43 ~ $ sort /dev/zero & > > [3] 3652 > > 12:43 ~ $ panic: Negative index: -16 > > cpuid = 8 > > time = 1718534645 > > KDB: stack backtrace: > > db_trace_self_wrapper() at db_trace_self_wrapper+0x2b/frame 0xfffffe010855fa50 > > vpanic() at vpanic+0x13f/frame 0xfffffe010855fb80 > > panic() at panic+0x43/frame 0xfffffe010855fbe0 > > swap_pager_find_least() at swap_pager_find_least+0x105/frame 0xfffffe010855fc20 > > vm_object_collapse() at vm_object_collapse+0x68b/frame 0xfffffe010855fca0 > > vmspace_fork() at vmspace_fork+0xb68/frame 0xfffffe010855fd30 > > fork1() at fork1+0x4f8/frame 0xfffffe010855fda0 > > sys_fork() at sys_fork+0x54/frame 0xfffffe010855fe00 > > amd64_syscall() at amd64_syscall+0x158/frame 0xfffffe010855ff30 > > fast_syscall_common() at fast_syscall_common+0xf8/frame 0xfffffe010855ff30 > > --- syscall (2, FreeBSD ELF64, fork), rip = 0xaba1c31565a, rsp = 0xaba1b0cecb8, rbp = 0xaba1b0cf220 --- > > KDB: enter: panic > > [ thread pid 3653 tid 100349 ] > > Stopped at $0,0x104d5c2(%rip) > > db> x/s version > > version: FreeBSD 15.0-CURRENT #2 main-n270778-d26c565597b8-dirty: Sun Jun 16 12:32:39 CEST 2024\012 pho@mercat1.netperf.freebsd.org:/usr/src/sys/amd64/compile/PHO\012 > > db> > > > > --- a/sys/vm/swap_pager.c > > +++ b/sys/vm/swap_pager.c > > @@ -2303,6 +2303,7 @@ swap_pager_find_least(vm_object_t object, vm_pindex_t pindex) > > if (sb == NULL) > > return (object->size); > > for (i = pindex - sb->p; i < SWAP_META_PAGES; i++) { > > + KASSERT((i >= 0), ("Negative index: %d", i)); > > if (sb->d[i] != SWAPBLK_NONE) > > return (sb->p + i); > > } > > > > - Peter From nobody Sun Jun 16 18:11:16 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 4W2Lg91z7rz5PDg5; Sun, 16 Jun 2024 18:11: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 4W2Lg828F1z4gj1; Sun, 16 Jun 2024 18:11:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718561476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jp4TtnkQe/2tk7glYCdPMCvCjTS0FVOrWb35VteFwKE=; b=GUimD7Rw5bBq0x27Ru0pPJd5EGAzzooL+aVmo8dQHgu8OnntVyOBlbKFxAM8bI8zdcP530 64UExDXZKKGnGItstVfJbqtYF2OgEAy0o6eokpC/ueq+jmoEyfZYKX2eBfdt52kBIMPxz1 zYKzhqQc2KY4pbVDacLGlEmm31nO1AT13FlzBH7PDh7GmCZimI1ZVGWi+mAvdfNS9roSZU 1/lL+A7FQPsyi7GSTefXcSgQHvOLIwyov0jMCo+YyYPrOPXYyxLbTnF/zCza2TnbxCAemW MkI71TK8/rWne4ZbNLIj/TBEXVetm+UNJtEOXTO4Y+z/YDNNgq7QJa6dmJKpsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718561476; a=rsa-sha256; cv=none; b=eP1s6rlLhndjksoDzX6Z3an/0HUQhfPZuLgiPqFm8ZkQwU1BKeFOMVbv/+1FSBvuro2skk Q5DEA0bSV/4Opg/OmTL59Tp+SU4kKygdW+2db5lPAPo32bXvkg8DHNCjs9Nth3M/McWizd XVfgLJ+u+AByrZ1zOOFg571laWg5nlQC2bKYA0PlvUzgLO1BIoJKSYAFrw/oFUZZhsANcW uQ5hynU6DrEVqyzCAZwE/qrTWBHkLZfoFmJ9EKQehjWHz1noaIPMDWBylrr7T+YszIVr3c D4Iyw0+EwTT6jZfqjFxCgv8f9Zb8THDNtvaCzQhLe6Jv7sS6gLf/trnu9Hcatw== 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=1718561476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jp4TtnkQe/2tk7glYCdPMCvCjTS0FVOrWb35VteFwKE=; b=OS9rDRiz04bWvUH+M7Ibwt8Vh8QTsfASnAWWap/nJuBFuqbW2sA95NTDyzNq4x8/Gg8kyu j82jNfbCnLr7OD92tITWO4f9j2q/xf/qDwJ06t87eUgyOgRtUJbwRV50GxZLZ0h15JPLp1 D6n116y01S0XhgQZJqvjb+s43YrBRxcbRMXUqrES3Ugbx7iWf1oh+wcpHHzn3W++ZQmIAj S6h83KyhWCXiazYf/Gnb/8nFw+n23MIPx9EnI+O6i2aWwEVqqppqqMaiy8ez+6lINP7ajm 3EEnTAokwLuMFhokESHL3rEVK15aobpau6vdQdXZ7Li9D8h64SMazb2I6KqN7w== 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 4W2Lg81lh0zxvq; Sun, 16 Jun 2024 18:11: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 45GIBGUd039450; Sun, 16 Jun 2024 18:11:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GIBGnV039447; Sun, 16 Jun 2024 18:11:16 GMT (envelope-from git) Date: Sun, 16 Jun 2024 18:11:16 GMT Message-Id: <202406161811.45GIBGnV039447@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: 4441dd4094e1 - main - vm_phys: Fix a typo 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 4441dd4094e1e1863d9973e4a064d620f7cd2976 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4441dd4094e1e1863d9973e4a064d620f7cd2976 commit 4441dd4094e1e1863d9973e4a064d620f7cd2976 Author: Mark Johnston AuthorDate: 2024-06-15 14:54:23 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 17:33:00 +0000 vm_phys: Fix a typo Fixes: b16b4c22d2d1 ("vm_page: Implement lazy page initialization") Reported by: Steffen Nurpmeso --- sys/amd64/include/vmparam.h | 2 +- sys/arm64/include/vmparam.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/include/vmparam.h b/sys/amd64/include/vmparam.h index 2ffa51d9021c..ad6bf28f1c3b 100644 --- a/sys/amd64/include/vmparam.h +++ b/sys/amd64/include/vmparam.h @@ -97,7 +97,7 @@ * Create three free page pools: VM_FREEPOOL_DEFAULT is the default pool from * which physical pages are allocated and VM_FREEPOOL_DIRECT is the pool from * which physical pages for page tables and small UMA objects are allocated. - * VM_FREEPOOL_LAZINIT is a special-purpose pool that is populated only during + * VM_FREEPOOL_LAZYINIT is a special-purpose pool that is populated only during * boot and is used to implement deferred initialization of page structures. */ #define VM_NFREEPOOL 3 diff --git a/sys/arm64/include/vmparam.h b/sys/arm64/include/vmparam.h index 08a3b18da64e..28b8380fc7c1 100644 --- a/sys/arm64/include/vmparam.h +++ b/sys/arm64/include/vmparam.h @@ -76,7 +76,7 @@ * Create three free page pools: VM_FREEPOOL_DEFAULT is the default pool from * which physical pages are allocated and VM_FREEPOOL_DIRECT is the pool from * which physical pages for page tables and small UMA objects are allocated. - * VM_FREEPOOL_LAZINIT is a special-purpose pool that is populated only during + * VM_FREEPOOL_LAZYINIT is a special-purpose pool that is populated only during * boot and is used to implement deferred initialization of page structures. */ #define VM_NFREEPOOL 3 From nobody Sun Jun 16 18:12: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 4W2LhB6xF3z5PDTw; Sun, 16 Jun 2024 18:12:10 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qk1-x72d.google.com (mail-qk1-x72d.google.com [IPv6:2607:f8b0:4864:20::72d]) (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 "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W2Lh95Z93z4hqT; Sun, 16 Jun 2024 18:12:09 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20230601 header.b=cgWXHBVd; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=freebsd.org (policy=none); spf=pass (mx1.freebsd.org: domain of markjdb@gmail.com designates 2607:f8b0:4864:20::72d as permitted sender) smtp.mailfrom=markjdb@gmail.com Received: by mail-qk1-x72d.google.com with SMTP id af79cd13be357-797a7f9b52eso289548485a.2; Sun, 16 Jun 2024 11:12:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1718561528; x=1719166328; darn=freebsd.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=7yEeCBQlRh6WcxkmiXqb7bmQbhTuh9tXzaXp7CwqRXc=; b=cgWXHBVdsESostcLrIDyreK/fDhbrplha5Aj6fdwj1CHn/OYULl2riZiaXqtX4EWdG RihVQgewdmEPLFItIhLUmH/bofz0IUz+Xv11SHy1QvrSXIY2rEIJlIZoithaHThtg+O+ kx0nigubVZxQtPfpaMeWLZhnL5sNl6M5P2TNj1rdBfc4xd5NQl5uh1Y7jueBaVTBR0xT iEi4+DuJzSYEfYJddZvxybir9qpd4Ffi4tUOQrgMItSM1sIwpbp8tbvfO648aaYq158k hO+1Oj3h6Z9jyriFBwcobGrDfgVQbMdSNRDTH3ZfKC2ky+UNzTPELhw4UXcdIFARY+Vq 5Ofg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718561528; x=1719166328; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7yEeCBQlRh6WcxkmiXqb7bmQbhTuh9tXzaXp7CwqRXc=; b=PCu6s7+//GizWUci5w9itcqLR9HML/P66keOpZ+igN2w5yaAbZ9rfr+vGS+4hESORY waHh3upEKwUJ5lWFRH40+4+mTs2AE2/cffxIK7W6ZcrvhKiUx0kNn93UiU0Epd/DLwTL 9LXSGarzQfuqYrWgwjete4S81+JVnNakwVF8Lhw4zQ0GAWc27bsirMe084KMMKBpCsFa 5Bn+gJDKnNo9lh5XcQUY9KQjlAoAEsEdO+wikREa6ayDXxH/8Alqv9nsTG+ANedeuKxl c6u7N00XH+e1dhPmgn5QVnvmIJgG71SfwGz45ssXC+1ygNdPzP8qDSuAuQG9sZ+7RUks Odrg== X-Forwarded-Encrypted: i=1; AJvYcCUlJUIv7j1jdsfDQloX5HT1Bvd06MC8mWxBL7gssXSGOPF6wZSimHrw03lBWwYMKmFMp8vIalWMQ5Qzt+lUlUMDErNd1k5x5j5UX2RG95za1QhxrKW72oM3RXzffnkZzSyFaEmALDtRgEdDm6t8QNRFwQ== X-Gm-Message-State: AOJu0YwtOQ6YTY9xG58y7nTEcEYhsxz2I2uIBvsSuSdGg9yoc6vn6hUz 8rP3CS2kX/nHWXZjMTiVSCqPF0jW89WlFXRnu2l/W4LX3LqXZDdYZi7lbqLY X-Google-Smtp-Source: AGHT+IGKK2D79l8Tvp4ah9lPgpX4l9naN2Qt5pPG5R7SNFRlxETmAOwiwPNEw8usGDfXO33b+FzsbQ== X-Received: by 2002:ac8:7fd6:0:b0:441:1536:2faf with SMTP id d75a77b69052e-442168aac8dmr95760831cf.19.1718561527572; Sun, 16 Jun 2024 11:12:07 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4448f5719c7sm4174661cf.34.2024.06.16.11.12.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Jun 2024 11:12:06 -0700 (PDT) Date: Sun, 16 Jun 2024 14:12:04 -0400 From: Mark Johnston To: Peter Jeremy Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: bf454ca88bdf - main - wg: Add netmap support Message-ID: References: <202404201605.43KG564E080220@gitrepo.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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Spamd-Bar: -- X-Spamd-Result: default: False [-2.60 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MID_RHS_NOT_FQDN(0.50)[]; FORGED_SENDER(0.30)[markj@freebsd.org,markjdb@gmail.com]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20230601]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : SPF not aligned (relaxed), DKIM not aligned (relaxed),none]; MIME_GOOD(-0.10)[text/plain]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; ARC_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[gmail.com:+]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; RCVD_COUNT_TWO(0.00)[2]; FROM_NEQ_ENVFROM(0.00)[markj@freebsd.org,markjdb@gmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MISSING_XM_UA(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::72d:from]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim] X-Rspamd-Queue-Id: 4W2Lh95Z93z4hqT On Sat, Jun 15, 2024 at 10:40:31PM +1000, Peter Jeremy wrote: > On 2024-Apr-20 16:05:06 +0000, Mark Johnston wrote: > >URL: https://cgit.FreeBSD.org/src/commit/?id=bf454ca88bdf4acfa873386e876ff5e772e6a830 > > > > wg: Add netmap support > ... > >--- a/sys/dev/wg/if_wg.c > >+++ b/sys/dev/wg/if_wg.c > ... > >@@ -2206,6 +2341,11 @@ wg_output(if_t ifp, struct mbuf *m, const struct sockaddr *dst, struct route *ro > > return (EAFNOSUPPORT); > > } > > > >+#ifdef DEV_NETMAP > >+ if ((if_getcapenable(ifp) & IFCAP_NETMAP) != 0) > >+ return (wg_xmit_netmap(ifp, m, af)); > >+#endif > >+ > > defragged = m_defrag(m, M_NOWAIT); > > if (defragged) > > m = defragged; > >@@ -2781,7 +2921,10 @@ wg_clone_create(struct if_clone *ifc, char *name, size_t len, > > if_setinitfn(ifp, wg_init); > > if_setreassignfn(ifp, wg_reassign); > > if_setqflushfn(ifp, wg_qflush); > >+#ifdef DEV_NETMAP > > if_settransmitfn(ifp, wg_transmit); > >+ if_setinputfn(ifp, wg_if_input); > >+#endif > > if_setoutputfn(ifp, wg_output); > > if_setioctlfn(ifp, wg_ioctl); > > if_attach(ifp); > > sys/net/if.c:if_attach_internal() (called from if_attach()) requires that > both transmit and qflush must either be NULL or set but if DEV_NETMAP is > undefined, this code only sets qflush, guaranteeing a panic() as soon as a > wg is attached. Unfortunately, I don't understand the code well enough to > offer a fix. I've pushed a commit which fixes this problem. Thanks for the report. From nobody Sun Jun 16 20:37: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 4W2Pw95MCSz5PRTW; Sun, 16 Jun 2024 20:37: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 4W2Pw94tQrz3wrC; Sun, 16 Jun 2024 20:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718570265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=otc8G82DHxfmrBQyF7oZsTE3R7UnCn5f+sJP0/2Ql/I=; b=n2MNFmrUB/v0h1hJStvgYhe75s/BkuwmtysBMKc0oXZdWpwK09aFejMl3YvA26FZECh39U kmx1DrW10Tk+DlXIdCEPbX9gyCjkdg0okpLwR6+lc8bwTdiWTIOmtxRYGtepS6FAR5p9Dp okp9lAQgBxmobqHGD7j/gvQt111Dt3r8FgvXwXIr3PITmgPjDAOqgT8mTLrMst2gPRFqMh P8LpbDXrYkBm5OCwvBSkg9EuzD1sAzwi6C5lul417q88VmeGB1KsZMegY8zVfG1sjzid40 iSDx0giyrnNbY51JMij5cqnDf04TJ6gqcA4jjb/+u0xVGJY/YnHQFKN7I2erWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570265; a=rsa-sha256; cv=none; b=E0/OPallFpeRJznCuuUbvsWgIP+WuF38sYrWjTiqNNaUht5xz00W05bIcXrTK7i8uDc9Wq 8bPWT0RLSuqzQ2fy/DvdM1MJg3XoUbt+QsbM0T7X3QmmHenfI14yn76xqL+QBSD3u1phHd jwtRGY9X5HMcFvXWXRwLH1/1F9PZptdRNLcDQqo31/h5tN5/TBKxphlPSpNw1az+wBsdWz niYUrXqxb0zgWdz0eiefW7cJ127ZyBPgIzO/MY0jrbuWlk5+pmr8fSbt5YB/niNyTpcOlQ Ik1VzNhk++bpsI5Sh8hzMvTuBxeAPEa4qM9nlLUxsLviAwYCl7tizmyRW/qlYQ== 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=1718570265; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=otc8G82DHxfmrBQyF7oZsTE3R7UnCn5f+sJP0/2Ql/I=; b=e8BuhEd8ysPM534BprMDnfBl6RaMGc3gKB4lEV5j4kwdmStfPbbwEd/733TfzqqKt0/Bc2 VY95njJMXd48gzLM/WPz2ggvveaEt44FodFI2zBTvIfdBEXxGsFsvT78cl5h1JB4rs+XRy gv5RyDTcaUxSaPoEXBrEiWl/E7F+BZnlivo29m6b32ADg6vkfd3vu5uXuSHBD9lm4YXnTc T6P2s/q3yqvHiqucgY54BfksBZEHVYHIbSNM7oqMc5iNe3sqh2orZ1rPimbV9YiULMw0jv x+rA/DCGh2cAmpJSEB/HnuIrWCcGXGn/W6WX5oCO1yzxH7WWVs6Uctln2tlSvQ== 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 4W2Pw94Mlyz12Gj; Sun, 16 Jun 2024 20:37: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 45GKbjlX079091; Sun, 16 Jun 2024 20:37:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GKbjYB079088; Sun, 16 Jun 2024 20:37:45 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:37:45 GMT Message-Id: <202406162037.45GKbjYB079088@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: 4f0ff49fee00 - main - arcmsr: Use device_set_descf() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 4f0ff49fee00dee624e13b2d305cf9dfee395b7d Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=4f0ff49fee00dee624e13b2d305cf9dfee395b7d commit 4f0ff49fee00dee624e13b2d305cf9dfee395b7d Author: Mark Johnston AuthorDate: 2024-06-05 14:13:26 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:25 +0000 arcmsr: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/arcmsr/arcmsr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/dev/arcmsr/arcmsr.c b/sys/dev/arcmsr/arcmsr.c index ea37da30db93..6de4372a67ea 100644 --- a/sys/dev/arcmsr/arcmsr.c +++ b/sys/dev/arcmsr/arcmsr.c @@ -5238,7 +5238,6 @@ static int arcmsr_probe(device_t dev) { u_int32_t id; u_int16_t sub_device_id; - static char buf[256]; char x_type[]={"unknown"}; char *type; int raid6 = 1; @@ -5313,9 +5312,8 @@ static int arcmsr_probe(device_t dev) } if(type == x_type) return(ENXIO); - sprintf(buf, "Areca %s Host Adapter RAID Controller %s\n%s\n", - type, raid6 ? "(RAID6 capable)" : "", ARCMSR_DRIVER_VERSION); - device_set_desc_copy(dev, buf); + device_set_descf(dev, "Areca %s Host Adapter RAID Controller %s\n%s\n", + type, raid6 ? "(RAID6 capable)" : "", ARCMSR_DRIVER_VERSION); return (BUS_PROBE_DEFAULT); } /* From nobody Sun Jun 16 20:37: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 4W2PwB6gC0z5PRRD; Sun, 16 Jun 2024 20:37: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 4W2PwB4f62z3wqH; Sun, 16 Jun 2024 20:37:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718570266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I0f81DuPM1RNcyeWVJHF8NATopLU5VYKUhvhigVzyY4=; b=u0a5z3SIAeM1ssLBKn2+K7VarT6F3xXvivWMgw+lNbeoRy+3HVqc9jO0UNhO8W0h5qTIZO 7tuWulK6tWkaHUcdfXjNFcDHu5Y/0EvVib0Gllf3lFJhHHi8xYkXkRTGH/3sTYs5NwGMoJ +5k8y9EofGWI6u4P/UkBv95fEMgjIDtgVL4EE5/aX4iI/9a999zYYVyZ+BexdyUUXVHj4A nVs86EyXI/fTcdut+JBl9ndWXbQAFeE5LR8XtwfBrPp+4haqZGpt07LH9QBbvHtjsI74E+ OKMez2XgCyWowMHUdLcLO6QcIKZVLxMgDbt2wdZMAKg73CYQRkrT6Cmvb1v2Pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570266; a=rsa-sha256; cv=none; b=Y088lZSMVkIvJYkwuWyDcBqzlWHrNxbKIH67/2dzRoHCkZPJMAP+1ikLr/d+4PqfnKW1QM x0Y35Hx3dDHmwdomWivNtS5snVJc09tnIKTxRHZFafX/e3uWlGf+KN9UrwKdwoQqQ0KJf4 /o1ZogG/ysi8/k/yEFKb55zNxStpTRdYxeq7Ct2yZ0Nu2shhfFW/UFAw5s/5xupUNZnkkq pxc5VJiiun+YPtMxwWCRK7VUCH0qCy0ne1eB0YGG4EBwtG/oDB1STMAKkDIfFYppBcE1Wi nJ/6uQ4G7HgYRvjNlNS8ViiVZL5IEwrAlkb+byfH+rdaDyZiVJzdv9jJEfQdvQ== 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=1718570266; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I0f81DuPM1RNcyeWVJHF8NATopLU5VYKUhvhigVzyY4=; b=mOO/ZNPfd4ybBQAEsCkch7aU1J5RI8sH9dtrROLIJY/SM5ayOV7Tb5Xuzya58W0sVMtV45 vO1alqnQ/dhijhncf5STIch/3j6eNYUrY60OdOdJS/8w33f8G51EKqMdwyS/0W+mAqkVSq 9NOCbA21FdicA46BFpwGovwFtUkEQSI7PjqSjP88NccBydLEd371WziV/FfBhHGnfA2Yjd IQ1XFyTn7fy0hb3mWZF2+zVRJPCGfHz9Oibgh5OrlOKExsmVmDONTFJzOqRE1p6ySLPw4i t/3+wlAAwAXmEdZrqRO9mj9VujgPURmWShd2YACRNYiEMQ+GgMnbaDwn6qwaiw== 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 4W2PwB4FThz12Gk; Sun, 16 Jun 2024 20:37: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 45GKbkeY079127; Sun, 16 Jun 2024 20:37:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GKbk9k079124; Sun, 16 Jun 2024 20:37:46 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:37:46 GMT Message-Id: <202406162037.45GKbk9k079124@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: 5823a09f7949 - main - cavium/thunder: Use device_set_desc() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 5823a09f79499d426f9f57131be756ddc9be3ff9 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5823a09f79499d426f9f57131be756ddc9be3ff9 commit 5823a09f79499d426f9f57131be756ddc9be3ff9 Author: Mark Johnston AuthorDate: 2024-06-05 14:14:00 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:25 +0000 cavium/thunder: Use device_set_desc() No functional change intended. MFC after: 1 week --- sys/arm64/cavium/thunder_pcie_pem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/cavium/thunder_pcie_pem.c b/sys/arm64/cavium/thunder_pcie_pem.c index dd6ef14f1a6e..a27ed810c618 100644 --- a/sys/arm64/cavium/thunder_pcie_pem.c +++ b/sys/arm64/cavium/thunder_pcie_pem.c @@ -766,7 +766,7 @@ thunder_pem_probe(device_t dev) if ((pci_vendor_id == THUNDER_PEM_VENDOR_ID) && (pci_device_id == THUNDER_PEM_DEVICE_ID)) { - device_set_desc_copy(dev, THUNDER_PEM_DESC); + device_set_desc(dev, THUNDER_PEM_DESC); return (0); } From nobody Sun Jun 16 20:37: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 4W2PwD2VHlz5PRNq; Sun, 16 Jun 2024 20:37: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 4W2PwC6YFtz3wqM; Sun, 16 Jun 2024 20:37:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718570267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fcFcVRy9C4QwXIURG71WM4sODD3vscJO0+/yyitMYiM=; b=ysf/ALD7XneEjrQvUEUXSp3BoMUulmivAGu+0+sYP3w8ewloxoWenApOnOn53cRd7MZZKE 0ff3l14Fg5SIwzpkmCa6AvSCC1dIViNvBLN3YzD4wCtZS3GyeGIQVUbU4MKD3U9OqI0d3O +xW9gygR7XNWVQxWTgc8pjB3VO//5+SWCqmohEDRHwsnTSJIY8VYbgBVZlgxOscWA2JMWz 8hSgYQoS8aSk6lFBjwVMHegifGGHoam4GMJdYJImri6sP8Q3B5AnS3jv5qs46HQxKNGutk eP8MAoqxDi3J8YVnwMcmCi9q0SWknKrkIc1emjriZmXhKQjC2UOh/nEq65pjqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570267; a=rsa-sha256; cv=none; b=O4HgHTgEVl++VCZ9HTTDRXpP1fcqqyI7carWfB5elIMqv0XERn10d+eHWEvz4Lvb+WvRyU ojx9751KjoaIdFbTqyiyn9jLW+BwWfcE5sKMV9B8rcS3V4DDWArOq9mNu7tl2KMRh8PQTH RfJj8sVl7Jc5tMWOZC34wrtI97LJ+lJii2Uy2YmxtHYssRDhct5qGQTvLedssvPz51zS8H bo1xLNbJjnLIGa1ihakSsFe2eIqw8ErZ4ycx5OMk3EFnOLR5E1E7nsUk90IysaqlR1amlR m8R+AyJu3ve51xw8bV2zwBs85OrQJ+PM4O3NT71s5JHzIf5xgaYmIVdnYJKc/w== 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=1718570267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fcFcVRy9C4QwXIURG71WM4sODD3vscJO0+/yyitMYiM=; b=Q1OCY/Ph6+PavGN1dW4B6MFHrP5B21z7oASLpvuC5SS4HwnN3DGEdGfTMN2zbTKsSOV/2t G0zqFyIwWwdXmyOLdlc2WQqGlnwQniHtblxxcWS7+B72sbkdgsXOJlfok71DAq+nK19wkc n6Gj1+biudMylgh59KjkDSypv03exheYCLjD8Y2dqa+RzYpkyaTvpzzgM1laPqThbxtZWn K4UyvBAfd51pWRV2aP5PgYussbK++XrXeVJpvTqd4NnGeueYHmemqdNm9p6tncVluJ0EVO LJ+zME/3SAkLGZywc3tMiQoFGtrj9FuhyLqnzMgQvFX9LVQRDUWx1C6zEUExqw== 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 4W2PwC5Q0xz12KS; Sun, 16 Jun 2024 20:37: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 45GKblOP079171; Sun, 16 Jun 2024 20:37:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GKbl1J079169; Sun, 16 Jun 2024 20:37:47 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:37:47 GMT Message-Id: <202406162037.45GKbl1J079169@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: 1878529d2fc8 - main - amdsbwd: Use device_set_descf() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 1878529d2fc861ba2f14ec3c15bf373221883e41 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1878529d2fc861ba2f14ec3c15bf373221883e41 commit 1878529d2fc861ba2f14ec3c15bf373221883e41 Author: Mark Johnston AuthorDate: 2024-06-05 14:15:36 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:26 +0000 amdsbwd: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/amdsbwd/amdsbwd.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/amdsbwd/amdsbwd.c b/sys/dev/amdsbwd/amdsbwd.c index b04aa8564ccd..1dfe6c1b11bf 100644 --- a/sys/dev/amdsbwd/amdsbwd.c +++ b/sys/dev/amdsbwd/amdsbwd.c @@ -376,7 +376,6 @@ static void amdsbwd_probe_fch41(device_t dev, struct resource *pmres, uint32_t *addr) { uint8_t val; - char buf[36]; /* * Enable decoding of watchdog MMIO address. @@ -414,9 +413,8 @@ amdsbwd_probe_fch41(device_t dev, struct resource *pmres, uint32_t *addr) amdsbwd_verbose_printf(dev, "AMDFCH41_PM_DECODE_EN3 value = %#04x\n", val); #endif - snprintf(buf, sizeof(buf), "%s FCH Rev 41h+ Watchdog Timer", + device_set_descf(dev, "%s FCH Rev 41h+ Watchdog Timer", cpu_vendor_id == CPU_VENDOR_HYGON ? "Hygon" : "AMD"); - device_set_desc_copy(dev, buf); } static int From nobody Sun Jun 16 20:37: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 4W2PwF1L2Zz5PRJk; Sun, 16 Jun 2024 20:37: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 4W2PwD6s1pz3whb; Sun, 16 Jun 2024 20:37:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718570269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GsuzNpPsGUO8asibOlA8ZEyqmY2ZXRUhN4eqLhzL67A=; b=t1GggTeXcwcP3vJ+Mraqc1ca/Q5Tg9WSUnNdg4YMRHJKHnPNapxivWOt4U8/TItP1s1+f4 245f3r/tzXE1HSAMod5/Hqjyq6IZt/vPSkHR6q4Iq7vTpOCyAY/uc428yQQitw3u1wCZ9O wEmWj+zDmvUfweZ13UO0KIl81xSvDJ8pt3ntM9wlT1l8Rtg2TFzZjAdF7ngdPkmoXmHdFX yTdXBREx+jDYzWpu9RKYslQqn2xxY6qFhwOTbtq+xRYQwh5oHLCeu2x1Ki7Y4oVkhdBPVM AHW4mZxMEDjmNFfC+ZUkGd76oytN5MNbxUEV2d+tfkS98JZmJlLBfx9LWSDjyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570269; a=rsa-sha256; cv=none; b=qILBwl15DX2B+1v7XsqrMUHa89pGqiW8vYJjEQXcw6yu74cKm6GSLYDukwDZt8TUcvwPUv VlaV1YCujRhev5Q4kSUbou1Igbf8s41d6nOW2G2eM6/X9aKkMcYcSlbBSz3beTI/KLOxA7 L8nx5PQdpHHapJJ70fHPZqJKt/VsBbWFM00eVfSsGYHemPekVcYhDWChpgm78LkCFXQ8r/ avimlsGKUJ4EMGRuE6DLEv1RMNfXLoAFAUP0OnRObT/avruzq3s+h9cscktHx0QoF4VHpr pq3hXsKMwGBE6GHf7XYoawYOzXeVFhXIZhfUXfBpO6pds6K11lWEknonFxRfuA== 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=1718570269; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GsuzNpPsGUO8asibOlA8ZEyqmY2ZXRUhN4eqLhzL67A=; b=mRqhxLPHItZxoSQC6drqWs8tOkQbxGBFPPpyY44mVsKK4eku04lZzD/CIbouq+52H/o5rD NNRWVTpVKYVWXJg600/JvduLLf6f0RQUfwOuiBdzlyi+ynXKhzaa3HOeRHvAyBAiWvMZ4o MrDLSMlgf5LKI9otMizjG6hfLNzuleJ0ajRB0ZUwHCPBUtguFpiU8s3mdDCjM5JJ3ihL/M z9xK8J0AZs/00z+lqyDzyK2aopUj0ubuGuBdTj2O26Iqutwf6jNW3bRDkzK9HaUe0V5xR3 V8S2sNJBCzASN+H0OMEkP8gziRE6/Hk9/TMBr6+4OuQDaZWkJFPaiQ4vUdqDWg== 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 4W2PwD6QL2z131x; Sun, 16 Jun 2024 20:37:48 +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 45GKbmOd079213; Sun, 16 Jun 2024 20:37:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GKbm4h079210; Sun, 16 Jun 2024 20:37:48 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:37:48 GMT Message-Id: <202406162037.45GKbm4h079210@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: 48ef9cff9c29 - main - amdsmn: Use device_set_descf() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 48ef9cff9c2934d8a13eb8624c02050cd8f00595 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=48ef9cff9c2934d8a13eb8624c02050cd8f00595 commit 48ef9cff9c2934d8a13eb8624c02050cd8f00595 Author: Mark Johnston AuthorDate: 2024-06-05 14:16:22 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:26 +0000 amdsmn: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/amdsmn/amdsmn.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/amdsmn/amdsmn.c b/sys/dev/amdsmn/amdsmn.c index ddb5be4c2c3c..d657ab84924a 100644 --- a/sys/dev/amdsmn/amdsmn.c +++ b/sys/dev/amdsmn/amdsmn.c @@ -185,7 +185,6 @@ static int amdsmn_probe(device_t dev) { uint32_t family; - char buf[64]; if (resource_disabled("amdsmn", 0)) return (ENXIO); @@ -202,9 +201,8 @@ amdsmn_probe(device_t dev) default: return (ENXIO); } - snprintf(buf, sizeof(buf), "AMD Family %xh System Management Network", + device_set_descf(dev, "AMD Family %xh System Management Network", family); - device_set_desc_copy(dev, buf); return (BUS_PROBE_GENERIC); } From nobody Sun Jun 16 20:37: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 4W2PwH3LYfz5PRRL; Sun, 16 Jun 2024 20:37: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 4W2PwH1fHkz3wvK; Sun, 16 Jun 2024 20:37:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718570271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fpFxjERr/rhmxi9qbOfXTDZaFjwqQ9AZzF03nBakCJc=; b=Z3HgVrIAwNbUbAwi0SXfglE8xYS1BwOUtFI1sGDfDI0ZIyWRtoXhcIinzCT+ERZ7GcgwuF k4YuOEArIf0rPmMQS6uu40ao/QaneLrFAo+4q0T7KNvM0pO7GfR+pJgTAaC27Zn/ahNKmf KGGrmCw9M0HvRWZl4mgSVzo2yFNVjkx1iqCAwA3QZ8mOrizOleGidS0gfhZ4YcXpPTWzSJ k65UWzzjG7jNRYuFb/7qxtwlzPHakeysREm9b9vowYkgaTwVDO9FopBIXJjgE2rLBRx77S MaiOOEh8HbV/aayR5s4Z7+sgQOL5Dzgs74sGtFwpgihr5XfMs8WMaqvRLKLDbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570271; a=rsa-sha256; cv=none; b=ufwstUmalFxPUbl1XiKRlxl/ND2PruqCn0Mi5ET0x7ZSRf0FpGd6a4TrrkgoVGHG+dk2cU AxMIII+qOZ3Plc7V7v6zJgMn1VAVRoMReHe0aO4zJEdtcHXu4149XrXNpTIGeMoUB7Tb/h lutUcdgreyHWbUrcsAzfjj7jop54iWLqseVl4CFr3a3ho9PD5joZPSYp29SpM0STGN3FoZ 25VMr9oE3I5Tm4laUnGiDdvz4Ma06vpuHt5hqvlMljcMZeal0KAPg/2GgZ1/Q5MzrCRFQJ UEQKoGG1LkAROz3rPCyTNmtWDq01RIqaoYA2c4N2jYxcKpnjwBtY+05+aoH6sg== 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=1718570271; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fpFxjERr/rhmxi9qbOfXTDZaFjwqQ9AZzF03nBakCJc=; b=nRr9Brkh07j1pUH9DBGiy9ql547q8k6wn1Z58Fx8vwM5HhazIzrJZRWrFeRATJlU+By1if 8OMDhFXyoAEGCbmu4Xgk0piMUlh77gmAHNGcBpAkqfQumbcvyWAT6iyqw5CIZjxRLyZaBR bBrujoDdXdZcmFp17XxZ5AvdsRJUo7zRuDhUOi2kVb2lbU0mjexyA5lrYAH5jCZNWEFpNR BrhKfaJNOh9UKwnRwwsgJCM3JmviqV4vJUgbzXRr0xAQGEduD5DK9VPJH0lyvv6dMnEHnx 2W9xEYcpWMccIuSurh5STETygwloA11mdFDJylhNrEpYaRL0PQmP/FqidBiVZA== 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 4W2PwH18Ksz12yY; Sun, 16 Jun 2024 20:37: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 45GKbphv079290; Sun, 16 Jun 2024 20:37:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GKbpKC079287; Sun, 16 Jun 2024 20:37:51 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:37:51 GMT Message-Id: <202406162037.45GKbpKC079287@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: b67f24852378 - main - nvmf: Use device_set_descf() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: b67f2485237815b6bdb130e7e9beff7043491dd3 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b67f2485237815b6bdb130e7e9beff7043491dd3 commit b67f2485237815b6bdb130e7e9beff7043491dd3 Author: Mark Johnston AuthorDate: 2024-06-05 14:17:50 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:26 +0000 nvmf: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/nvmf/host/nvmf.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/nvmf/host/nvmf.c b/sys/dev/nvmf/host/nvmf.c index 47cdbe7e47fd..623c76954720 100644 --- a/sys/dev/nvmf/host/nvmf.c +++ b/sys/dev/nvmf/host/nvmf.c @@ -251,13 +251,11 @@ static int nvmf_probe(device_t dev) { struct nvmf_ivars *ivars = device_get_ivars(dev); - char desc[260]; if (ivars == NULL) return (ENXIO); - snprintf(desc, sizeof(desc), "Fabrics: %.256s", ivars->cdata->subnqn); - device_set_desc_copy(dev, desc); + device_set_descf(dev, "Fabrics: %.256s", ivars->cdata->subnqn); return (BUS_PROBE_DEFAULT); } From nobody Sun Jun 16 20:37: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 4W2PwG1vHZz5PRRK; Sun, 16 Jun 2024 20:37: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 4W2PwG0ycdz3wxY; Sun, 16 Jun 2024 20:37:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718570270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p2h+/G85YFP7BxA87gYj6/+IZKXmLOHTnsRTk6Xc2DM=; b=M7nP1m5pU8cjTuCYPBWBrVzKuitXHaxA13lchUAtjLLjTKP7sJUE1tikjYJxAK7Ep1d+o6 IZ+c+Un+XxkRw56uFgFok8FddpQuDnHrBnQuXNjbJaGWJT74MaabKTnyZlg9tRqdnkob3D ftUg1PGJ6atCdrZXGATaA3VgDfFnTFr2nOJLqRO56/hacrgmVoSub14b6ZK5rDcGO2ZPeN bDAV19IXejEwkMNkDA1tY+XfWGL9+gj6AFVB733cd+vca1yuNPudjpjaiCRI3/7XIKf9/X TqHbCfuvR57mLGNEMuRzUkKyjqOOwqfR/0MPMxkXHnrWbSL+UN6jsniJq5WynQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570270; a=rsa-sha256; cv=none; b=p3cwe/bNeJz1qrppdlmw1Vwdbdex9rcuxYUEGI8RdDOOYokz2nPzd37uKHfHvr4yOGYnTQ 3scskvfzt20xfYsh4ze8WNAoxK4exWVDy27quPxVWMwKVemJ7SvFofDiLygyhzAHZeiGxo AuA4sP0TFTy4zltBBss9/4QVz2AbQg8EFlFlZLkHMuV7EkK4wIRL716SehRuSVE9evsTEl 2cM9Y9dd74TNHeLZA198AjzW9IdJT9kObFEVcbGu1dKYEdguhIy0gQGI4nOgKLsJviSsEW s4N04hQeiIOYks5Gvl0CcYL6fMZkZtQtsQliJJagQiTqBc2NwV3A2/CWQB0JtA== 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=1718570270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p2h+/G85YFP7BxA87gYj6/+IZKXmLOHTnsRTk6Xc2DM=; b=TQXAZCAfjm1sgHXlQdv8RLA04gNncS46Gm+dWxysfQ3i3NOeTKhyE6Z71xPx98stO5dmRV HNBJJIFWDHgivqXrdPi3X/41G3bVeZObP7CyKLGZPkA2An6k0w337qDQAK3xGJCOz31RNz KyGTVjD41KhXwrbkGWGVbbzQr73qq8mBH36sXt/fwcNpCXfC1YSfNYJdjlUPA1rZU6AFZg rip80d7REf9xuXv5+X5WOUst6fiTTRyI5xDZFiAXc4oJ5E76lqzuiqjFnUpTkUAYe/jXKN GuM2V4YR0fZ5WFvv17XIoLl6Gw9Bo8QLKYKaFFmN3MkvX20FwAzvdnNoLjYZVg== 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 4W2PwG0GHPz12h8; Sun, 16 Jun 2024 20:37: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 45GKbnC6079250; Sun, 16 Jun 2024 20:37:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GKbnr2079247; Sun, 16 Jun 2024 20:37:49 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:37:49 GMT Message-Id: <202406162037.45GKbnr2079247@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: 44d36c9731c1 - main - netmap: Use device_set_descf() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 44d36c9731c172977ad8a95a09c0d6fbddcc9b2f Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=44d36c9731c172977ad8a95a09c0d6fbddcc9b2f commit 44d36c9731c172977ad8a95a09c0d6fbddcc9b2f Author: Mark Johnston AuthorDate: 2024-06-05 14:17:14 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:26 +0000 netmap: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/netmap/netmap_freebsd.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/dev/netmap/netmap_freebsd.c b/sys/dev/netmap/netmap_freebsd.c index a4a0124471c0..cf3578ddc7fe 100644 --- a/sys/dev/netmap/netmap_freebsd.c +++ b/sys/dev/netmap/netmap_freebsd.c @@ -864,16 +864,12 @@ nm_os_pt_memdev_iounmap(struct ptnetmap_memdev *ptn_dev) static int ptn_memdev_probe(device_t dev) { - char desc[256]; - if (pci_get_vendor(dev) != PTNETMAP_PCI_VENDOR_ID) return (ENXIO); if (pci_get_device(dev) != PTNETMAP_PCI_DEVICE_ID) return (ENXIO); - snprintf(desc, sizeof(desc), "%s PCI adapter", - PTNETMAP_MEMDEV_NAME); - device_set_desc_copy(dev, desc); + device_set_descf(dev, "%s PCI adapter", PTNETMAP_MEMDEV_NAME); return (BUS_PROBE_DEFAULT); } From nobody Sun Jun 16 20:37: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 4W2PwJ4Z2Gz5PRTZ; Sun, 16 Jun 2024 20:37: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 4W2PwJ2fq3z3x1L; Sun, 16 Jun 2024 20:37:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718570272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z7BLuOMFEmV5ihoDl5AqKoBtp2tGXOprYQRe4QsfqcA=; b=nVNXCRGq4Jeeys9fK/ZvXcFnayWMMlEfWEMtnguTEUYyVQlFDgiGWZpqmBGaLh9MOpdwl7 60W0xS6DhPxq7Avje2WYnJln3QGsrCAwyNO0hSsoTZsivLWuSbOer6zzLg0mjwf8q+g9Dt 36zcpxXl9rcKtEbK98HgYnwbkk/mqYJrxr/00S4WUKPy7Iq4d+Uwfd9uEFPtwwRKcHqy82 0IaJGZAxkGRqSFFYQXShsxL3/OgEkrjoTRbZcL75rp1Uzy5MGgtaltErEUXokb7JzJbE1z Zk1IDy/v9k0RjlLLKTq62PoAPQnFjkFIwYTtZuLrcXEiivkwU0RWqlKffhwVdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570272; a=rsa-sha256; cv=none; b=wd9h+O/uc9XKTECKQbGm86s1IJNgEohFRo972utvE1oGZDBY9JZkyEyPPBvq196sLSUsOi Qk56SjYox4bXhSJpXdHW5yGmiygvZRZjEGcLQXND7J89HIVAMMgjKyXBNdoRfv6xVa3n2E d0ePWFxpSib2ZpDdltegtHKzw9wKGOsGUaV0Jr+AA3m8U3qyU3gMLe/V/KsODZtRsaol4q 5xA3sYZhkrLjLQZr0snscfw1XrOtyvTfaEU3ne56oNBmYlCzonJP+5Dx9zHQ5tOFw2et/0 lk7Qo1MK5bNvCxBeC9lNITc5IuL7dWchJGSEGLW/GXWZoOlqDhfcMiiLz3wpfg== 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=1718570272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z7BLuOMFEmV5ihoDl5AqKoBtp2tGXOprYQRe4QsfqcA=; b=Aw+b3A1mBTBjwz5eso90ygj34XZAtdfQhjMOQl75xQ4jrm/qxfgy9gKIy/QG5xX1nFF6ID ehCVQXZLRjlAtVm8L1ZA+iOEnZI3KxEkHtAdbGFkaKdOlNqWm86vg56MZ9l2Po24xNkulD JtoyETv9QrgvVhbavM2bylsQ8DVBtG6gMLaVKFC7oEVEXUJVOsYQ3GZBS+fsL/ba/0ff0g XOHr2MDuLSFxXBhsGsa8VBowEU0dhEb4uKrwt9JjCwAVQ/YlRE3vdRN4IMCdj0EpWPsdeI GTO3fhOP3WeZpyX7KTdQiJmDT8klqnTbqzwu3rLlUzYyGq/NOZ9pNSbXgH2jCQ== 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 4W2PwJ2FZ0z12km; Sun, 16 Jun 2024 20:37: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 45GKbqAE079335; Sun, 16 Jun 2024 20:37:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GKbqVl079332; Sun, 16 Jun 2024 20:37:52 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:37:52 GMT Message-Id: <202406162037.45GKbqVl079332@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: 48f5a429c955 - main - iicbus: Use device_set_descf() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 48f5a429c95513465327f722a8df52cb48eeb473 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=48f5a429c95513465327f722a8df52cb48eeb473 commit 48f5a429c95513465327f722a8df52cb48eeb473 Author: Mark Johnston AuthorDate: 2024-06-05 14:19:06 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:26 +0000 iicbus: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/iicbus/iichid.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/dev/iicbus/iichid.c b/sys/dev/iicbus/iichid.c index ff443afbf30a..222f20842a04 100644 --- a/sys/dev/iicbus/iichid.c +++ b/sys/dev/iicbus/iichid.c @@ -1037,7 +1037,6 @@ iichid_probe(device_t dev) { struct iichid_softc *sc; ACPI_HANDLE handle; - char buf[80]; uint16_t config_reg; int error, reg; @@ -1097,10 +1096,8 @@ iichid_probe(device_t dev) sc->probe_result = BUS_PROBE_DEFAULT; done: - if (sc->probe_result <= BUS_PROBE_SPECIFIC) { - snprintf(buf, sizeof(buf), "%s I2C HID device", sc->hw.name); - device_set_desc_copy(dev, buf); - } + if (sc->probe_result <= BUS_PROBE_SPECIFIC) + device_set_descf(dev, "%s I2C HID device", sc->hw.name); return (sc->probe_result); } From nobody Sun Jun 16 20:37: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 4W2PwK53d4z5PR3x; Sun, 16 Jun 2024 20:37: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 4W2PwK3WGJz3wyP; Sun, 16 Jun 2024 20:37:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718570273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dREyFybktpPeDu2Wim7KIC1kybhLdGqxn0hvnF526v8=; b=aNQC5XSTGyRu6A10+cCUeFlSQTl8LyxQooE8TD1QLz564b5bFUOKsh6j15x/Vcq4ubgld0 TNwYuRdOb7IkvDYt4SC+4F2Sz8tVq1SjJJaDFLS2cx17wbBPaqG9Lp7vbSpp3omV3qJjea HHVkelX+QydZEWeBruXxBqq2seO/3mM1LeOw2DI/Wj7l88/b2owyBU7RKiMg+bBa5zC0hH liHD5x0cnRVLab39AWeFIRz4OV/fVQqzdwdsVoTLDcUvuZwakmcZtevzblL9CJdC21sOpn pwdyqimtycQZ3NA4554Zc5Tzz38a8KtCLh5TntrdOo7kiH5Qf/x1Aex0SKopEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570273; a=rsa-sha256; cv=none; b=K8cwU48ZVvL0qwSoZL/8G+Fu/J7eJpLaS9MZj3tnmfnWKyF/Xa9IoavMrH32FSpHVfOKf1 IS8pA98EROw8jpa/15DDvraNZZITbe1z2pQqPiXpuGoeDw4XtYyV6XgpYb8C+zrlRcnnQU s7CKUZnFXjFmoG5m74GqcZAKKud2yq/43GAY46A70V3c7clEPXWyNwQGjmTff4WQb8TyaS POh8zTZJ145WmScGwRX+PmTUiqUp90eRX0nN3Hbux/8hCOEAsUWuON59gtyNYTRF31bvtX nXV5rRiMUiB2iXFqc/yqrOaZW7/GrEp3KHehOYrQ9iu/56W9nW6x8PTHt4uLMw== 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=1718570273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dREyFybktpPeDu2Wim7KIC1kybhLdGqxn0hvnF526v8=; b=AuLUBtFgRNpLduGRJ2c1Wk/7uofE3hZBEsWPmoBul/4/QibW+6WfZPrTJ/EAgD8C5qLyll 7iTs0rww/tseeVUgdNUuR39ol8ynwqKYmXqmJNrx6CUoG4G1WvUVLdqYYALaxlVI/fTrV7 4LQBLbyuirR30R2b7j50kTUtTsUTUBcikkQTTLjYl49cspRFCZHXug30hxMz65WOSw9/G5 Kl8dJltFuGc4JxqGX4C8mQNhvHiGKiAkM9CUkWmnFjFmxKjklubpWgrbKL+rxKnqm55tU2 PxtJO7aPax26thmBh5fsXcym819uVFdBzJFw2ebc05ChUWacJfSlPqRpUT+tFg== 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 4W2PwK35FLz131y; Sun, 16 Jun 2024 20:37: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 45GKbrET079371; Sun, 16 Jun 2024 20:37:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GKbrGn079368; Sun, 16 Jun 2024 20:37:53 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:37:53 GMT Message-Id: <202406162037.45GKbrGn079368@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: eb634b9f4f48 - main - wbwd: Use device_set_descf() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: eb634b9f4f48c29753e177f3340d03f73a75dbe5 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=eb634b9f4f48c29753e177f3340d03f73a75dbe5 commit eb634b9f4f48c29753e177f3340d03f73a75dbe5 Author: Mark Johnston AuthorDate: 2024-06-05 14:19:51 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:26 +0000 wbwd: Use device_set_descf() No functional change intended. --- sys/dev/wbwd/wbwd.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/wbwd/wbwd.c b/sys/dev/wbwd/wbwd.c index 56b3f8adcd90..e19a60de14a2 100644 --- a/sys/dev/wbwd/wbwd.c +++ b/sys/dev/wbwd/wbwd.c @@ -461,7 +461,6 @@ wb_watchdog_fn(void *private, u_int cmd, int *error) static int wb_probe(device_t dev) { - char buf[128]; struct wb_softc *sc; int j; uint8_t devid; @@ -478,10 +477,9 @@ wb_probe(device_t dev) for (j = 0; j < nitems(wb_devs); j++) { if (wb_devs[j].device_id == devid) { sc->chip = wb_devs[j].chip; - snprintf(buf, sizeof(buf), + device_set_descf(dev, "%s (0x%02x/0x%02x) Watchdog Timer", wb_devs[j].descr, devid, revid); - device_set_desc_copy(dev, buf); return (BUS_PROBE_SPECIFIC); } } From nobody Sun Jun 16 20:37: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 4W2PwM0Lv5z5PRRT; Sun, 16 Jun 2024 20:37: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 4W2PwL44v9z3wsx; Sun, 16 Jun 2024 20:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718570274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Ie/ZbTmMJHbk2kLkQVKamUvh3q5LparEStv1pVgWqY=; b=VC473DxriweB7Pod+GOQp8F71GgU53BdDidv0wFfNOpFwMoGl8ZMBvWQbYV+QkZcu4pqr5 /itELawRhhkzTDVcCSmDIS+hovwhteeVN3Gca0PW/LUzFNFhSEPDhwfcdknalbjy0OIV6r pXfXixN/eN0vjoQrnbOGexZIyrmXi2siVMWkR/jiY16lAueM820FHlpJZpIPXaOFhBGvXv oWuENHv3AXe++zEmxiIpwYTBKsGLUNu8qi730TrcgIeFwH/+DikOTm84Jrxr1iDjoESYex XC1Y4HpcbhqIGJynL9XznnhOm1u/6W3LEGopH/cOaZsMwu8m7S0egvWJOVYp7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570274; a=rsa-sha256; cv=none; b=O/YgdPasteZpTtWdNF8mKTDAERblKK22cnRdtGSXqP+4tGReWV9x31yJJN57g6iF51COjS 8/xmkJCwTpYbaUJZvN2ArzvTbENrlDHoHppFZcc5Req0gWspqV9D1u3MyODD+Or6HIuctU gr49/DCXQZ9QDhh9fVO/NL/a0jKJrRDN+9/rlMaRBkJabCJDpoQMvMeR8k3RKoBtlIjMus sjXCCkpJZtXLeUrQRDGG9I/wzT8/ehI+339xcgpYPfBi3Q119vr2Aw8eN2siYwM9hG9STy /bvkCwB4Pf2e4P03IJpfcOVbS7XGub4Pag9HbsLhsutrtyWkq1IQwEIcCLErYg== 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=1718570274; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Ie/ZbTmMJHbk2kLkQVKamUvh3q5LparEStv1pVgWqY=; b=upRMy/2kA5tzmbICk6VWU7drLYH5WpZ2F7ucXHwmIV0ZXMBaow81nkvvEomI4M4M3aoUWg RZlJrPEq9ESpDRfbBWVezCno5tXMCn3hpLL6RJ1uZSJUCr6zvHBVVAH6ykciGdftPgjwZh 6dtGse7sjiYRo7Hy3NRRMEOaRX6MP2SFvzk8kNzZYkU4AsOGFw9gMiPzq7reDG3Zpu1+nT /LRRdeR+nhOnDxMEkWr53/KuEk+98Qjs5k5U+a3YYznUO1BwY+xARg3bQ3KioejIDG5E0n 9fH7MM18YrYX2+DBYPU1ImpkpBT7t26zm301ubqfU+sTg6VHCf3xej76skszCA== 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 4W2PwL3hK0z12Xc; Sun, 16 Jun 2024 20:37: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 45GKbsuu079412; Sun, 16 Jun 2024 20:37:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GKbs6m079409; Sun, 16 Jun 2024 20:37:54 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:37:54 GMT Message-Id: <202406162037.45GKbs6m079409@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: aaa878e95676 - main - mpc85xx: Use device_set_desc() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: aaa878e956761167f8115a32698c8b424fd341c6 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=aaa878e956761167f8115a32698c8b424fd341c6 commit aaa878e956761167f8115a32698c8b424fd341c6 Author: Mark Johnston AuthorDate: 2024-06-05 14:20:12 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:26 +0000 mpc85xx: Use device_set_desc() No functional change intended. MFC after: 1 week --- sys/powerpc/mpc85xx/fsl_sata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/powerpc/mpc85xx/fsl_sata.c b/sys/powerpc/mpc85xx/fsl_sata.c index 74fc40053fdc..18fd8e438cd4 100644 --- a/sys/powerpc/mpc85xx/fsl_sata.c +++ b/sys/powerpc/mpc85xx/fsl_sata.c @@ -316,7 +316,7 @@ fsl_sata_probe(device_t dev) !ofw_bus_is_compatible(dev, "fsl,pq-sata")) return (ENXIO); - device_set_desc_copy(dev, "Freescale Integrated SATA Controller"); + device_set_desc(dev, "Freescale Integrated SATA Controller"); return (BUS_PROBE_DEFAULT); } From nobody Sun Jun 16 20:37: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 4W2PwM6KyHz5PRRW; Sun, 16 Jun 2024 20:37: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 4W2PwM541gz3x23; Sun, 16 Jun 2024 20:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718570275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HwTnbv07N4BqWDoQDje4brh10xwqROR7Mca/qs/UjWo=; b=IKQjEXLQ2Rln/H43ItRUZuloHbN7uAUqYMDbK4cotSl/s2wzxohWZnlat2giuJVPsbQRQc iJ4497D8tVtm1LcMOmvXqk/j6i5hGuHzVWHKVUi2v1e7AIY9c/Hl/ZOL8c/3eOo0KXuERu a6H4nwIhziTOx0j8uWWBo+bqOD8NhILLk4GK9lPIFm+YY3Cgde71kPiiJlrKHC3hdf/F8i 0KldgRKtaVh68Wp8yVaZdZIEIolYgRjCzEfcbzzDtBWg3j5mKHqgU0rIOU5HOGisAKyImN phA3JtJr3UIHYSJ9B8wIOaF3bVsajxSdJgk4VSnQr97tt6WibGjpN3mBRYas9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570275; a=rsa-sha256; cv=none; b=OVfHMr9rBRRqTCAW1zsQ7QJfhwJxsLHkIE37f8AAca4rgmcaTUKQ8O4aMC2z18/a4I9Nmz W8/4ZsOFg5blCwUzSUh88C762aeBBfIq6T3Sz52gEwOf6REzrXfEjxa6GGBPzZ9cqVBp79 BmUp46qwrC97nLX4/Ths5YSi7rNhjvlcGYiJxORtSqtUenEtqH6GFZHa48whZDyLx+cje8 NYVBmlkNWxSojI7FZnBRHSZe8E+k/zyudXx8g8HKaFOFzaMCTEaiuZi6lnjI/F1WEgoNkX ndKYuL9Zuhg7vIB8VpInjq+uhBMntqnsCcJu2/izfNBbVUkcObjeTWgrQUQxiQ== 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=1718570275; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HwTnbv07N4BqWDoQDje4brh10xwqROR7Mca/qs/UjWo=; b=ui7tB9d9zk9nXcAjCW49rJzgK1+mpawo1PF/Ce0HF7WXo8xbZJujntURLjbh9WZl2JdFhq RHznv3tgC2ECo6sLIH1Qdu0v9DTtsGKGx/Gc4/ybsMUr95UFLkRRmHPnyJ3DxGtd5L0ieT zHcBQtLIB/LEMnkfg/wJNydDN6sVYzVGD1F0FwCw2Q86eUzabLm5BUkeBk6TzKne4QdB2p ccB6VSuy8hI+yodLurzOEwz7Da587uXbD7F3W21BoFW7h17L5vLYE+oO1zDM/tUPd1224r V/hLkIn/10trxfV5bOCdxu6Xb9Z4B4pCWBj77KgWyTyDshItg/c96VMqOGjABg== 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 4W2PwM4hJLz1320; Sun, 16 Jun 2024 20:37: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 45GKbt6L079459; Sun, 16 Jun 2024 20:37:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GKbt4V079456; Sun, 16 Jun 2024 20:37:55 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:37:55 GMT Message-Id: <202406162037.45GKbt4V079456@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: 443f33481e46 - main - msk: Use device_set_descf() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 443f33481e461ae1f36e0110537131b972ec6a37 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=443f33481e461ae1f36e0110537131b972ec6a37 commit 443f33481e461ae1f36e0110537131b972ec6a37 Author: Mark Johnston AuthorDate: 2024-06-05 14:20:58 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:26 +0000 msk: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/msk/if_msk.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/msk/if_msk.c b/sys/dev/msk/if_msk.c index bb00ffc7ae34..2165cb73f7cd 100644 --- a/sys/dev/msk/if_msk.c +++ b/sys/dev/msk/if_msk.c @@ -1564,7 +1564,6 @@ static int msk_probe(device_t dev) { struct msk_softc *sc; - char desc[100]; sc = device_get_softc(device_get_parent(dev)); /* @@ -1573,11 +1572,10 @@ msk_probe(device_t dev) * mskc_attach() will create a second device instance * for us. */ - snprintf(desc, sizeof(desc), + device_set_descf(dev, "Marvell Technology Group Ltd. %s Id 0x%02x Rev 0x%02x", model_name[sc->msk_hw_id - CHIP_ID_YUKON_XL], sc->msk_hw_id, sc->msk_hw_rev); - device_set_desc_copy(dev, desc); return (BUS_PROBE_DEFAULT); } From nobody Sun Jun 16 20:37: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 4W2PwP37V0z5PRP5; Sun, 16 Jun 2024 20:37: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 4W2PwN63nSz3xCQ; Sun, 16 Jun 2024 20:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718570276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yLuzjR2v+chykjQw1NeMcot5B+iL8zgSNNvo3Qox4nY=; b=FcFwolC9wnPrn5xixnXirP7GwiX7IFYjuqej8kOqzUnjU4JnNNTt1Pekd30YpGh0uDh6V4 ztuF6+3l0JEU3oBovKiqZVfhLIPox86IkCX0+p79HdWTG+/JejWqC9hThTbGDbxdsdjXLF cPUPci1YJKCwfTaVY6LXYMZoHQ1xLFmSpiTkqCAE39impvJeavoPyDbFWQIJh7krAO+UV9 Y7Klzh8PSQJPpm8MDvU83xFGc+9NOzr9GEOTFVDlbKhxEEGFUb7l6golsVFMJZ80kj9x5n SgitmrFfYaRR9rsXRBp5xzx7EWpgzYCEk7IskY8YZnGABSHfMBLtLCLTqrfxiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570276; a=rsa-sha256; cv=none; b=Qp1qbvuJ3Nnw0usFtUrdMUuC93Uk0y1a2w0L1OcSAxATtEt1nIX2W6i0SCVaZdrkuIjEq+ YQ86E3basiqEebjKOgmlC+cCs924uZxfthjOihw39UX3vXaGryYLXYrHbRcTBSoybCcNUz 1HvvxhicRwxdj70Zde93zUtKbcC7+AOc6akb/rwCGA2qCssuaCtCa/7Kv6vMmnJNJqzoYQ bFA1s4r01HkJGgpNz93T6DXWzQEt9xlIGEZ0S0vlDGAG7VhfOBlTqLyL89PkHBLhTpSiSO V6gF3b1suS7QcuNetWdNdgrB/AaNNR2YM9I/21fM+Rv/GxGbf/P/YI4EXAcprg== 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=1718570276; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yLuzjR2v+chykjQw1NeMcot5B+iL8zgSNNvo3Qox4nY=; b=Aj3bVa9sMjxwJPT3LkJiMpq8+PMHiWSAR/rZ30pLIu4c8rGGVGwPNVPmQ5IawHJCHKfkep 82t1a16M5LvxtSy+M970bUgFDD2Zk/lgdRN0ZUy/FOMZP+SwGgX8nISF+U5CsVbQPd4iF3 Cb7fywW4KEqJf51jYnDn1uOyZH4ouCanuNbY8su/S/Chdvte54TbP9ivoYIyTFGISh+4jk Mq4pRam9+E994Vmx0Zc9i90IVohNBiPwaMbGjzrEu5i9VpVtAmpcFnCAi2oc61zwLqG2h/ o476IbbMbjAJxmOmB4u9UHggFJZRZDohO79TFvDqkDTiOZwXCpWpmj+zwD2cqQ== 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 4W2PwN5dxsz12Gl; Sun, 16 Jun 2024 20:37:56 +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 45GKbu2t079495; Sun, 16 Jun 2024 20:37:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GKburl079492; Sun, 16 Jun 2024 20:37:56 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:37:56 GMT Message-Id: <202406162037.45GKburl079492@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: 1794a0a87e0c - main - liquidio: Use device_set_descf() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 1794a0a87e0cecee1ef63fcf4f0a8a6cf6945dc8 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1794a0a87e0cecee1ef63fcf4f0a8a6cf6945dc8 commit 1794a0a87e0cecee1ef63fcf4f0a8a6cf6945dc8 Author: Mark Johnston AuthorDate: 2024-06-05 14:26:22 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:26 +0000 liquidio: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/liquidio/lio_main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/dev/liquidio/lio_main.c b/sys/dev/liquidio/lio_main.c index bec510af0c65..aa52612dda04 100644 --- a/sys/dev/liquidio/lio_main.c +++ b/sys/dev/liquidio/lio_main.c @@ -200,7 +200,6 @@ lio_probe(device_t dev) uint16_t device_id; uint16_t subdevice_id; uint8_t revision_id; - char device_ver[256]; vendor_id = pci_get_vendor(dev); if (vendor_id != PCI_VENDOR_ID_CAVIUM) @@ -216,9 +215,8 @@ lio_probe(device_t dev) (device_id == tbl->device_id) && (subdevice_id == tbl->subdevice_id) && (revision_id == tbl->revision_id)) { - sprintf(device_ver, "%s, Version - %s", - lio_strings[tbl->index], LIO_VERSION); - device_set_desc_copy(dev, device_ver); + device_set_descf(dev, "%s, Version - %s", + lio_strings[tbl->index], LIO_VERSION); return (BUS_PROBE_DEFAULT); } From nobody Sun Jun 16 20:37: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 4W2PwQ1CBLz5PRRb; Sun, 16 Jun 2024 20:37: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 4W2PwP6yjvz3x4g; Sun, 16 Jun 2024 20:37:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718570278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MnYFSjT4BxfsQK8ZI6FPJb1pjwy8yCC0QKyjW/yZGwY=; b=WC76b2pMRU59K0q5WAWmgrYehYdvrOFjRT3DfYXJ3AX79pSBiS7s/4+lkYc1NddZVKWaqx /kIw3dxaiHfDB89AOxJbepVLqHciueLMrfG9m2NUjNxXKUlyrAkENFZkbLv34Ox+N4vCu5 1O6HHwQtvlxXLPjre/kPuyK1hev1kiDeQ+UJubbf4SwDRe8c3FwmxGEkT6zG88TIq41Rtz 0ZpmdiNzIvon7IPo717z9WW7Dna+rR2oH6DJumXjbzPPoew9urowNSk0cXpatVNDEOshUC I8zaxrTApqOsj9Ey/5SSA5B8o8qzuRGgv3dOVQkRZtVq8XnB/1WYKrqMtHb9pg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570278; a=rsa-sha256; cv=none; b=AWUlJ6LMOQJ+5RCZ1NQcy1cmgGMMxuxor5HNfLOEtaxbthxSsAJpNTGtBRprF0nKD4rbBg WRfI2XZAgUsFrIr3A8VYrwFW95LARBfPQigc7mJt4lfXxeyEj8pUQ28lffDsVcOzuBQ9JT 69ODZgOl8xbIuuE+U5sWdRyZwP/o9gh4xoFELnXFjTwm1aZj7rKD5Ztu+qGI+Z5BGG4JHY 0dpQWr2JNEUEIJBQkXrrZdFPh8reP92pJC2rwCIw2GPQXseBprvhlz6Y2fJw7CcE7u8vVE Vd51I+2JIU676DxsK1knAoDurxqFehrCUFCRIJwwU8x4jBfl8IDvkXQtmg78iw== 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=1718570278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MnYFSjT4BxfsQK8ZI6FPJb1pjwy8yCC0QKyjW/yZGwY=; b=Os3OAtFe+Hk8Z4BnAvaa6xHf3tmgXtdxeFcHsITAkYndX+QtcxHcm7rs15aO6kq6R4b4dT W8CKjvKfZWyOMk1osPXK1ujL0U/MaM57tHwSwN8LkfMqkx9ZnYjSrr5Q4C1vZurpkRQIC8 ewJdXH22NGG6eNf4NqJwx+xhkDT6Xbw8Kav0pu9AisU9c01BAn10KDtDEx7Tkzima+KxpG qVuYV0kmDeCzCB8uCE9sTvSbAkc+coGE34BtieLix5w+KD5he4roEKSlaewrEGnhMJiLYs RU2KXja9Dk7wZt61oMvIRKNMS4UXzEcb2fzaq+Eg7qEV8tglDN9UVIuGxEGXdw== 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 4W2PwP6bClz12kn; Sun, 16 Jun 2024 20:37: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 45GKbvMU079531; Sun, 16 Jun 2024 20:37:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GKbvqR079528; Sun, 16 Jun 2024 20:37:57 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:37:57 GMT Message-Id: <202406162037.45GKbvqR079528@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: c0bd6ec3bb24 - main - bce: Use device_set_descf() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: c0bd6ec3bb2414d23f3013766b79eed51b31f696 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c0bd6ec3bb2414d23f3013766b79eed51b31f696 commit c0bd6ec3bb2414d23f3013766b79eed51b31f696 Author: Mark Johnston AuthorDate: 2024-06-05 19:22:32 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:26 +0000 bce: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/bce/if_bce.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/sys/dev/bce/if_bce.c b/sys/dev/bce/if_bce.c index 33158b75486c..2564d0c1dac6 100644 --- a/sys/dev/bce/if_bce.c +++ b/sys/dev/bce/if_bce.c @@ -671,7 +671,6 @@ bce_probe(device_t dev) { const struct bce_type *t; struct bce_softc *sc; - char *descbuf; u16 vid = 0, did = 0, svid = 0, sdid = 0; t = bce_devs; @@ -695,19 +694,10 @@ bce_probe(device_t dev) if ((vid == t->bce_vid) && (did == t->bce_did) && ((svid == t->bce_svid) || (t->bce_svid == PCI_ANY_ID)) && ((sdid == t->bce_sdid) || (t->bce_sdid == PCI_ANY_ID))) { - descbuf = malloc(BCE_DEVDESC_MAX, M_TEMP, M_NOWAIT); - - if (descbuf == NULL) - return(ENOMEM); - - /* Print out the device identity. */ - snprintf(descbuf, BCE_DEVDESC_MAX, "%s (%c%d)", + device_set_descf(dev, "%s (%c%d)", t->bce_name, (((pci_read_config(dev, PCIR_REVID, 4) & 0xf0) >> 4) + 'A'), (pci_read_config(dev, PCIR_REVID, 4) & 0xf)); - - device_set_desc_copy(dev, descbuf); - free(descbuf, M_TEMP); return(BUS_PROBE_DEFAULT); } t++; From nobody Sun Jun 16 20:37: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 4W2PwR3ZgFz5PRRf; Sun, 16 Jun 2024 20:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W2PwR0vJCz3xD3; Sun, 16 Jun 2024 20:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718570279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1tGW4vIf0YeQWGKSJqw+SoFlmgL/uoIq8qKwGrTsKg8=; b=CIWETs1wyy8z7B4ZhyP01NhxdUVRQXzG6Uv4Fqrs8fz/d/TYVOh4egy6ftSPhei/6j80B3 tghXn0YWciscK0RNgR/UxBC62Kbj/B+FuXc4uCDQ/G4SXQAR1e/OVfVTP2Kmdh/jL8ovLn CyFOQYDH2RQEdwBsbZzVz/q7q0aL2fuAr0s5v8fPNKG3pOeWt3VCgWnZLQvDYF4BeVoHuW xmKs8P6ZBujcCfo+Bq3ozMiqcpROiOIgZr2S0KQvD1NEvp/djYEk24pzO6ebUAuf7qs1i9 Ej32ojShFcRp6dx0lasCrZo+oZT54aluK2TZ07OVY5R0MAynTtbycK2Hh5pTyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570279; a=rsa-sha256; cv=none; b=c5qmJU09pd5EC6ZHxAYLkgSnDRL12iTvtBpfciVxFhDaPIUwOpzpZHaiMAWyvVsLdWSIld SSrlUWevv8RhqHOlRyjtjFBJ/dKTG9z8gs/D9RZJ6jK3/ABLt1fMHZmODzDJi+T23YfY5B ZysjjsNUUvBCflZaWtQFx91wdmTfF6VShn2Hf1dfuNAxoA0FbIkTcIUO2IVlzQQFF8aap/ jXx3wk9nL9sPJBOBknAkgcxzlGMqNgebBZqEmxegNHyYCqjaxGm1Q1KcSUiXc5YS2xnPjr XL3VFw7oh+v6BCIpgrLOFwEZWiScCyI4MO0pVjd8sYSi0RMejBZ1BCD2JJVEOA== 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=1718570279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1tGW4vIf0YeQWGKSJqw+SoFlmgL/uoIq8qKwGrTsKg8=; b=E1qKHvOCMzWeaL3HIBi2eRfYc/u+PsLLAFo6jIrYk1p58sSWOBdNz3wWjytd0mbJA0S8RK 3/RRdk3rWzZeDw1gTIYwyDI1NRnks569ER5/lCHBCu9f4GTfceurL9/RZwKcMIVb37+DGe ktCsTnxtgk35i1RqX4S7lX1a4RoNT5eOJhD+rVaK+R2i0jbg4UkbQRNR2XoYa0Wj0C63yF o5tqnHXU1bM30JcTjh/AfYDlNpCeoIywjciHFVssel1bKgvBRob+Ltwzc4zvC0CszHzVrw ICzf+Kf02UvbdymIOQ9SmwRSKqVgW2cUGVMMStebXSVFjARVc9I3odbFireBRA== 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 4W2PwR0RGFz12yZ; Sun, 16 Jun 2024 20:37: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 45GKbwnP079567; Sun, 16 Jun 2024 20:37:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GKbw7g079564; Sun, 16 Jun 2024 20:37:58 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:37:58 GMT Message-Id: <202406162037.45GKbw7g079564@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: 50505c853c6c - main - bge: Use device_set_descf() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 50505c853c6cf1a4e8fac54d20c43f0f91ff0c67 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=50505c853c6cf1a4e8fac54d20c43f0f91ff0c67 commit 50505c853c6cf1a4e8fac54d20c43f0f91ff0c67 Author: Mark Johnston AuthorDate: 2024-06-05 19:23:26 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:26 +0000 bge: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/bge/if_bge.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/bge/if_bge.c b/sys/dev/bge/if_bge.c index 15cd3b0df8e9..2662568c850a 100644 --- a/sys/dev/bge/if_bge.c +++ b/sys/dev/bge/if_bge.c @@ -2699,7 +2699,6 @@ bge_chipid(device_t dev) static int bge_probe(device_t dev) { - char buf[96]; char model[64]; const struct bge_revision *br; const char *pname; @@ -2727,9 +2726,8 @@ bge_probe(device_t dev) br != NULL ? br->br_name : "NetXtreme/NetLink Ethernet Controller"); } - snprintf(buf, sizeof(buf), "%s, %sASIC rev. %#08x", + device_set_descf(dev, "%s, %sASIC rev. %#08x", model, br != NULL ? "" : "unknown ", id); - device_set_desc_copy(dev, buf); return (BUS_PROBE_DEFAULT); } t++; From nobody Sun Jun 16 20: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 4W2PwS2lMpz5PR29; Sun, 16 Jun 2024 20: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 4W2PwS1c4Kz3x3C; Sun, 16 Jun 2024 20: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=1718570280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i5vuKDpxm6/k11K8ouECy2kIMsjAB39+ra/P7Nf64us=; b=tvaxARySzYSRaC9GIbPNLP21SKgF4wXBRmTQlHTAlo5961jKx+IcVAsfLiWkTIm+f5DKdQ ANnieCNnnQpH11gC8/SOSmyhQ8rjR4yiOtp78de6PhFkFBxi293uyDoThPFJiVpVr0EqVf vNsIN6seEC9qXqywdZSoTdbmltqE+sSgc3j14AsaFWS9Uy9VWJC73LmlS/dL2qqYjRcBbc 3WW2JN1zInROl1q1hF4faQPSB2VZLSTEPizf23G3e5i9H19kdcEYm7PzF5mH9O8kA3NCHz NIaysrt9lckuDADTOBL0vqM1iPLX2lQVwTD0WAUt0APxTR6N+h4R9YyAJWmGpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570280; a=rsa-sha256; cv=none; b=RlPipNPTj8J6+Nx0C6MpfLOlQm1ij6JTGbDKvABZCOSfOK9zS4x4dUINNWn1deiQ7AthJc pJ+Do/R3ne5a3QRNZgHX1Gbgh8zIDY2lV1ius3RLCgkWpL+9hsSYrnhX3eJ5u+rXvSm9+3 ZNFledZxo7He6wP61iMCO2gcbskyA04w+Bqr6OM7f1NzCsdNmHB6wQ0kRcIaFrXVw9y3tX Io/wyICgo0vsM6MVIMor8AYqKv+yfXVTN5vLRPWzmPZAhEVk9xOL8iRzuglTRbZ+JM9KsD THuWSSNJnWcBAhn+T8lXwjHpBfBg+X9sGq9oPi5cr7WW3PkeP1+Ab8qiXLO0pg== 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=1718570280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=i5vuKDpxm6/k11K8ouECy2kIMsjAB39+ra/P7Nf64us=; b=bGLsvJUKk6/lRTUAk1MXf+rfz0gkJIu3vxwfxliMSOEfLFXHfVmMyDSyf0GtJc8+sKzGpr Ig9YAjQVOrRRgsT+NPozgtDTFsqa4MdnK+Lz0n1Lc0wvmhabuZWYdTdhtGhG6Y9R+xY+9h zhHkq1pDdTEN4R4S8r4z30iIKI4uwmZj3Dt4WopxOdWEY2uCO0vOe/PADCe8G9HbWwZifh ZqajBMIVGKBMxnkS8FrbkxabjinjBNtCVgnJgF8nOPPSAWiF4WPe51QQK7PoyalS/UirRB VpmqRrr/Nvv2qzb1HdXyiSqfqr9SHwR3iGpYyiF9PnG7hLLo942sg16Zxgz7kQ== 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 4W2PwS1BBLz12KT; Sun, 16 Jun 2024 20: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 45GKc0P2079618; Sun, 16 Jun 2024 20: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 45GKc0Te079615; Sun, 16 Jun 2024 20:38:00 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:38:00 GMT Message-Id: <202406162038.45GKc0Te079615@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: 9da1b6dc161b - main - bxe: Use device_set_descf() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 9da1b6dc161bfd7b494ba472cde33af49ef8196f Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9da1b6dc161bfd7b494ba472cde33af49ef8196f commit 9da1b6dc161bfd7b494ba472cde33af49ef8196f Author: Mark Johnston AuthorDate: 2024-06-05 19:24:16 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:26 +0000 bxe: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/bxe/bxe.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/sys/dev/bxe/bxe.c b/sys/dev/bxe/bxe.c index 8350d02cb2a3..38a45de95083 100644 --- a/sys/dev/bxe/bxe.c +++ b/sys/dev/bxe/bxe.c @@ -2489,7 +2489,6 @@ static int bxe_probe(device_t dev) { struct bxe_device_type *t; - char *descbuf; uint16_t did, sdid, svid, vid; /* Find our device structure */ @@ -2506,20 +2505,12 @@ bxe_probe(device_t dev) if ((vid == t->bxe_vid) && (did == t->bxe_did) && ((svid == t->bxe_svid) || (t->bxe_svid == PCI_ANY_ID)) && ((sdid == t->bxe_sdid) || (t->bxe_sdid == PCI_ANY_ID))) { - descbuf = malloc(BXE_DEVDESC_MAX, M_TEMP, M_NOWAIT); - if (descbuf == NULL) - return (ENOMEM); - - /* Print out the device identity. */ - snprintf(descbuf, BXE_DEVDESC_MAX, + device_set_descf(dev, "%s (%c%d) BXE v:%s", t->bxe_name, (((pci_read_config(dev, PCIR_REVID, 4) & 0xf0) >> 4) + 'A'), (pci_read_config(dev, PCIR_REVID, 4) & 0xf), BXE_DRIVER_VERSION); - - device_set_desc_copy(dev, descbuf); - free(descbuf, M_TEMP); return (BUS_PROBE_DEFAULT); } t++; From nobody Sun Jun 16 20:38: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 4W2PwT50Q5z5PRRk; Sun, 16 Jun 2024 20:38: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 4W2PwT2SwDz3xJj; Sun, 16 Jun 2024 20:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718570281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1vg61I47w1Nhr37vmH8PsEIKOJsdyVWNGEyXs2d5YiQ=; b=ZLiz+Iucuo33DpwfTfUn5rM/rYVU+jgytopqpY4XKjmmlh38tU1EyoQ5iF/SXivf8vYxS3 xUmvMjrMsqYl5NJOquaqkwpQ4CXfFNrsF7CS6/ZZMs+fpVZm4pkoTPn6br5VzbTGxNhHu+ 7WeovYAGH8MzJPnDFHsVrXgIwvlx0ZeO9Abg3FXVIO52yZ92kVWjuZfIuGfWgRXWc11PCy 7QLp00e2SZm/STRPxidDmdzyjhUNVFfzmuQy13hBGL7AXjh0OwI9eqOVLf1NOP4TPuzz/5 6+F3YsJA0QL6NHuck02xBsmveT1fiGWpb0HGkCL3kJ4UfLrOv0XFxP4HJNRABQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570281; a=rsa-sha256; cv=none; b=yBh8rIZX2/zwdR5azm/ZmhL9gvQGcLQQdKrA0KG55KXCJ8FHIuL89G+U/jQ/QKVEZqxbUf uTLjjOc6nPYebHiD8l/HMkbbHRxFiB55KMXDPkAgSxmmbA6oLII2fZFZyrgqfcE98WoRUy poBXbtP5XgE+KzQre43PfYrmGp1oehB8szNeav/zYEV2hffXLdzl97r4elUhBH0xKmULJW dVD+mhQscZm3jplCN+FGOPExsbyNHWylaDkPnsamdiqeuI4///gZPEf2ZpAK/v+4cOPmzk +hLSGNoAm6XseXsaNB5knu1pkehL6igdjnYFczuXkgpDPbyEjTplygQoWeM41Q== 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=1718570281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1vg61I47w1Nhr37vmH8PsEIKOJsdyVWNGEyXs2d5YiQ=; b=DCVMC+sFuqdn6PYa+/0UNmKm4+Gcf029Nkf8eqG+WfoEAR9X8dq06zkLJ8aYUBZ6DT919q xTkyOARvu7Z0k0CwehhluJc7yuWZhN8oLGdmMlbXLDyGvf8pZyuxi94ogIKx4soOOZ1JzG A7eYeTHezf/dMZQLNWF/cznatEEs0z1dwX0VcPqcYXrN933rdhuKZEfAzKN2IY6zJBr1mQ wtKOtcO7k8CAYulsO9LB1MMxPQniVERwzd/nM/zbmgC5FKQj8WNdnzbwzq+JN0Pc7i27qM oLsnImcuHTb+NNk+YTilqjCkgxsCY/5JPwBdG2VicbYr1qoZQG/UB3gOKKTKBQ== 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 4W2PwT25Mfz12kp; Sun, 16 Jun 2024 20:38: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 45GKc111079656; Sun, 16 Jun 2024 20:38:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GKc1jw079653; Sun, 16 Jun 2024 20:38:01 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:38:01 GMT Message-Id: <202406162038.45GKc1jw079653@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: 3f795763e453 - main - hidbus: Use device_set_descf() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 3f795763e45326489ab707c369b8daea495f6562 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3f795763e45326489ab707c369b8daea495f6562 commit 3f795763e45326489ab707c369b8daea495f6562 Author: Mark Johnston AuthorDate: 2024-06-05 19:25:05 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:26 +0000 hidbus: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/hid/hidbus.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/dev/hid/hidbus.c b/sys/dev/hid/hidbus.c index f50abd4b0a4d..003017c0f3ea 100644 --- a/sys/dev/hid/hidbus.c +++ b/sys/dev/hid/hidbus.c @@ -525,14 +525,12 @@ hidbus_set_desc(device_t child, const char *suffix) struct hidbus_softc *sc = device_get_softc(bus); struct hid_device_info *devinfo = device_get_ivars(bus); struct hidbus_ivars *tlc = device_get_ivars(child); - char buf[80]; /* Do not add NULL suffix or if device name already contains it. */ if (suffix != NULL && strcasestr(devinfo->name, suffix) == NULL && - (sc->nauto > 1 || (tlc->flags & HIDBUS_FLAG_AUTOCHILD) == 0)) { - snprintf(buf, sizeof(buf), "%s %s", devinfo->name, suffix); - device_set_desc_copy(child, buf); - } else + (sc->nauto > 1 || (tlc->flags & HIDBUS_FLAG_AUTOCHILD) == 0)) + device_set_descf(child, "%s %s", devinfo->name, suffix); + else device_set_desc(child, devinfo->name); } From nobody Sun Jun 16 20:38: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 4W2PwV593kz5PR6y; Sun, 16 Jun 2024 20:38: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 4W2PwV3g9kz3xG9; Sun, 16 Jun 2024 20:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718570282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TZBpNWs/bK9Or1RmkxGy9B3c3Ri6vUFAB2dd9ZZRA7o=; b=lypg6obZxs7SmG/SUFng6RyktnNfBT541kqbyraY/OqJZSt39KmxmYzcBBhCLysRjtumWp kvzOl6KdwuMspth8GHxt47gNPMkW6hwM3Lw5SN7m/EWHc34+ayLLdBnSPi/vXVpldWyLsZ TuCEO61L6dOSPAaLsdsR3Dj1dLMmlD8P5MjVP75L4FYfjM6bUyF46HSvRDGIzW2xlSjcMy QxN3qbrNQNzxEXDeI6kI4Z0BIa9jwNqQmijcaSCNVH6V8q3ZnXHJ44gqS8Qjfh8tGn2rSO o5jg69M6kzlh/f97zfGxo05gKj4hUaVN+mentvOkTFM3jkxFHv+J3ffJQ5JCCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570282; a=rsa-sha256; cv=none; b=lI/GIsE8gxTvfdnjpw/xZZXI+LSp52M0LaS4meXFIJrRoFwsekIboLg3bJCJPwRoNorfj5 1ZnRze6v/3HJyvi4DDDHc2S1hb3SV11u9QXTjSBTS4XgQVkx7lncV4rRexWr7h/66czU5I X1fp/emvOIExTOkrq1xYnj/06BxBiTU3PE2IN9qXfWCywvHeKYSeb5/VswWMa0GswOwo8l u+Tcx34lXQvcOLXJOkqiWiqDGX6ZIrX596JiVQSvfDpvTo0qPyqgkZtSHi9BYzVJaHrGqg kNyo5HIa4L3k9zYB5onjmtIUpLe3aOyExrcgdFkXD4lXyZWcjiuFFW73cvz+CQ== 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=1718570282; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TZBpNWs/bK9Or1RmkxGy9B3c3Ri6vUFAB2dd9ZZRA7o=; b=WTuiXZiXbffB2UfyIzTkOPL7stjMeqKsXCZLDJbRpRK4J8x/S28D2Do03VqXW2ZxcDE1Su Peei6OokAiU266atyBQtqNeIZqQkwWgYJYZ6/nmiPBw0w4hXgsP0u9TJGg1XxApu6HshQh DwGrdITt3JIwxKHg8Ko6W7bbrf6nXSY0iMMom+xhEY7pqaMoSHydEJJ1nGm0kD6Qza59ed MAIvIaKl22+HhzDj2bRm7RDitbNeDx7Vx95L7xu39vDjVALvWYyA7xRqwgD/+o1YN/AVfB CYdsHomzBDzOTx7YIwNMO2UeaxEMKxcVUCyYXB9ZC2xskEvEwhd1ZXcr4gkZEg== 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 4W2PwV3Hfkz1321; Sun, 16 Jun 2024 20:38: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 45GKc2lC079692; Sun, 16 Jun 2024 20:38:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GKc2sn079689; Sun, 16 Jun 2024 20:38:02 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:38:02 GMT Message-Id: <202406162038.45GKc2sn079689@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: 76a79178187f - main - superio: Use device_set_descf() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 76a79178187f5a3ac05733e068c0860b14fd8632 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=76a79178187f5a3ac05733e068c0860b14fd8632 commit 76a79178187f5a3ac05733e068c0860b14fd8632 Author: Mark Johnston AuthorDate: 2024-06-05 19:25:58 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:26 +0000 superio: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/superio/superio.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/dev/superio/superio.c b/sys/dev/superio/superio.c index 35b15ac4d62e..ddb06af93bec 100644 --- a/sys/dev/superio/superio.c +++ b/sys/dev/superio/superio.c @@ -615,12 +615,9 @@ superio_detect(device_t dev, bool claim, struct siosc *sc) if (superio_table[i].descr != NULL) { device_set_desc(dev, superio_table[i].descr); } else if (sc->vendor == SUPERIO_VENDOR_ITE) { - char descr[64]; - - snprintf(descr, sizeof(descr), + device_set_descf(dev, "ITE IT%4x SuperIO (revision 0x%02x)", sc->devid, sc->revid); - device_set_desc_copy(dev, descr); } return (0); } From nobody Sun Jun 16 20:38: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 4W2PwY0xjDz5PR71; Sun, 16 Jun 2024 20:38: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 4W2PwX66ptz3xMX; Sun, 16 Jun 2024 20:38:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718570284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j6orLuqOfeuxEL+Xx4JzHJhLY/xrERZQ/vjHYwwmpoM=; b=tnsza/LR4C+lG5dh27Qonbuz0IBuhC/+6cCTeRAcso1HN2U0MN12zjV0nM9Hn4a71PkrZD ZyuFNXKYfCAvOn8EyQONJbmwBM4sMv3MNkDKjya87dIghrw+QfItYqtCg3sPe83Mir4/ta sMwBaQu4tI8McM+vdLh8u0U4qNwZqZr87yW0PRf03To27vgHsMruFaDtpuF4pTKGB9eWAk 9HI6SKvyPEa3ZY05f35BBKTtb9qKVrxThDFc1GeAkMrK04lms26d1hZ4jLEvojSeGDaI/f WLMFPCm/JYLPeVeKVD0X+waKRJRaBM4wUpnzTVRVLQwq611+8YgBlei9vlOICQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570284; a=rsa-sha256; cv=none; b=YnOWtmtM/tW7BLNVoyJwP4NuTm4XV3wRPlnrOoi8JLBZuFUKK6p83JRXqN5mgH5fLEsLak crcEjDS7QXH7pGfA3596uqg5gUoMjd64k2u2w6veghMQQaVvnvvPVgZT+etQWP6UgbW1lT 5oab1NkW7A+Q944KuY2t8RTsfjVjKrpafcrrJhNJXtSNi1xBaGbvAte/AZVC40aFLHaMHX oje/kDkaZsU1km+LkneWJVH+bWF8ihzHegfHb/COrjwv7QP5f5i7qg4hhbCUd3CxmVFU9M iGijbiTxhaUUOs0SjuCG3HDPiOi9TwsfFTXnIIdGnDIoL83SZAWCtQfaJtNvZw== 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=1718570284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=j6orLuqOfeuxEL+Xx4JzHJhLY/xrERZQ/vjHYwwmpoM=; b=IG5arHWtYzMuSnVKzfNBv4q1dDerxaU8jeI8EuVBi9/bthIfLI/BJ8VQapfFobzs69oas8 0wAEH+uBXOnWmvioMCEmPPSgbFk5Hni9GzvmUkodhdRiKYIatKRNDk1qg0S1qgiDrqfrIl +espx8+G0jafDBmWB+Vb9AYsd56zBer53cXFCi6Dx365WSNExSxZJBAlUnl72Lhlrf8VV8 Wf44e9v1jtq5zKmUTtEzMgHumgb0LOaUwlutfhQzazjoGMuPkU7KenPF2OM8fwteVUcdBC 5iXHb4wygu2gz5lu+bA0HXcEPo7tti0ovGaF1A5VCc7b1LAhZjxEnTbFYqn8Tw== 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 4W2PwX5jsKz12yb; Sun, 16 Jun 2024 20:38: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 45GKc4uW079764; Sun, 16 Jun 2024 20:38:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GKc4Fx079761; Sun, 16 Jun 2024 20:38:04 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:38:04 GMT Message-Id: <202406162038.45GKc4Fx079761@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: c704b87ba679 - main - oce: Use device_set_descf() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: c704b87ba679563cb8b344da69aa3cb7118a10b0 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=c704b87ba679563cb8b344da69aa3cb7118a10b0 commit c704b87ba679563cb8b344da69aa3cb7118a10b0 Author: Mark Johnston AuthorDate: 2024-06-05 19:28:13 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:26 +0000 oce: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/dev/oce/oce_if.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/dev/oce/oce_if.c b/sys/dev/oce/oce_if.c index d7ec58ec1f5e..2084b9c84fff 100644 --- a/sys/dev/oce/oce_if.c +++ b/sys/dev/oce/oce_if.c @@ -252,7 +252,6 @@ oce_probe(device_t dev) uint16_t vendor = 0; uint16_t device = 0; int i = 0; - char str[256] = {0}; POCE_SOFTC sc; sc = device_get_softc(dev); @@ -265,9 +264,9 @@ oce_probe(device_t dev) for (i = 0; i < (sizeof(supportedDevices) / sizeof(uint32_t)); i++) { if (vendor == ((supportedDevices[i] >> 16) & 0xffff)) { if (device == (supportedDevices[i] & 0xffff)) { - sprintf(str, "%s:%s", "Emulex CNA NIC function", - component_revision); - device_set_desc_copy(dev, str); + device_set_descf(dev, + "%s:%s", "Emulex CNA NIC function", + component_revision); switch (device) { case PCI_PRODUCT_BE2: From nobody Sun Jun 16 20:38: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 4W2PwZ0s9Nz5PRKB; Sun, 16 Jun 2024 20:38: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 4W2PwY6tj9z3xKg; Sun, 16 Jun 2024 20:38:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718570286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DDLepf5sA64N+dukNEKsi/ndpO1zGaccZNc0ZOmEbf4=; b=J17AnrjjNtFYvyR+UxbcULspnNMqnyeHFfr2tVaSUNi0qytzDzDB7cqb0kf5AlddylMJcY 9c0FjbxmlJSE26HFyBjPhnMJHPl1HnOfJnvTvjbeW8fuFyJ7GrqPKY9r1CQBXe81QemeDy IlZYpLuJxp8yjIilKLOrr19Li8g9kUOspLrNg/68+ibMUL3J8VOKXKN5xcBZi9oIXP/Kcj 4An37N3i45Cy/8rIuYOXDDipPjCuZmAlCYSN4Uhz3AsU56spE2B/ucpFuuxjc9zicBQuFz A+iUjEKhxA8QQeaOMxzRoKat03n8qqyN8KJoDo8E/gNylaX5Yq/6J1jcMmcKyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570286; a=rsa-sha256; cv=none; b=XmcCQnsZQrcV1MJW0mGCyN6gKiaVu8daaFlo82dH8GmvKPhff6hRqJec5YSdXWswEya01q arhx1PTHVdMIrqWrljBnj3lFcGvRE2pgdmt8kU1WOc+3+IKkChzB4jeO0BFISERI/D/UiR IENaJq8yRnr1ySXyZxxRM67mEjPv7WJpeMLYhpk+F06ud4fAKGUV5/WRw00qzH4CQw+M0z fjYwwrjjEaTydUGi1pwg+dvQ+DWJ75TYnuJedvhioRh7YVaytSYrK8/ApKUCdSfPszeIyF 3ekB2hmBzML5RikB0hkH7IvA4yscFrf4VnuxYc8PJne8gpHF1rSAUGrnPwavtg== 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=1718570286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DDLepf5sA64N+dukNEKsi/ndpO1zGaccZNc0ZOmEbf4=; b=qhKCLz/HotvH16fuO/ZxuRERZe7mPdZIxv5Ev1FAiCrqsaVgiFJX0y74D4uaX8DAvxZXNt ViJdB0h6TqLV+YTXzVBb+/PKezjdzKlG9VPzsCQ8TA3/8xyiPhji7kyDZP8xB/YEU5Ocxu u8SOJ/LNdghc0P5tKRGO9qpKGc/cMvochK5Rg7iuNy3VKWQRVbr7mP+SzExXM/VezPJs8p sYWLBd7isYB1ICPnjYFWXIbUSvFPdq+vdzEfDIlxQtcDcuhLLFTs+vTKS0iWB2dIocOHPo uGU755O9XAyavdrQno4SZMtwOoEavTdnIJd/g2KqpzrQRfa5GwbwhiUCJ0+X9A== 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 4W2PwY6SgJz12Xd; Sun, 16 Jun 2024 20:38: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 45GKc5s1079806; Sun, 16 Jun 2024 20:38:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GKc59W079803; Sun, 16 Jun 2024 20:38:05 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:38:05 GMT Message-Id: <202406162038.45GKc59W079803@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: a96a9577127c - main - pir: Use device_set_descf() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: a96a9577127c9bf804e7e47e38e7b4123a43efa1 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a96a9577127c9bf804e7e47e38e7b4123a43efa1 commit a96a9577127c9bf804e7e47e38e7b4123a43efa1 Author: Mark Johnston AuthorDate: 2024-06-05 19:29:30 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:26 +0000 pir: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/i386/pci/pci_pir.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c index 6750e85deb40..ec56fcb2c54e 100644 --- a/sys/i386/pci/pci_pir.c +++ b/sys/i386/pci/pci_pir.c @@ -653,11 +653,8 @@ pci_pir_probe(int bus, int require_parse) static int pir_probe(device_t dev) { - char buf[64]; - - snprintf(buf, sizeof(buf), "PCI Interrupt Routing Table: %d Entries", + device_set_descf(dev, "PCI Interrupt Routing Table: %d Entries", pci_route_count); - device_set_desc_copy(dev, buf); return (0); } From nobody Sun Jun 16 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 4W2Pwb6MmDz5PR4N; Sun, 16 Jun 2024 20:38: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 4W2Pwb0pH7z3xH8; Sun, 16 Jun 2024 20:38:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718570287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bE2rNCHah2InDAH4OrYEYOarNgQxgl+KQI8wUrwSdb4=; b=GpmMxRz0tFotwGwa0Key1vqruG4ZkFLuFUE4qSnh0rIazp7F08jmJRLhC9BgldwpjmhFfe FG38qTPi+kBRzZxFEEXHSuvnlF9e+z3/Lns6TXbHfCbgERtMWwOvUk/y6ItAMCn4ejC/7m 04V1OpQ/XIxcLFagxURTTkLvFMxyf9V5J4XK5BPEQDGWvlzFUk/ipAl9MpaH4jNfzlGL4L QhH3GLBkSughiCCEzMXkl3Ku15RIEUCPse0djdZxjzPmfs+ubp98mQn4TJdRnSIi5ch29g 1PonWERCjctDo0wFRkaE01vipgnjyv1+S6sSh/nZYZHV/Yb/qIHU3Xi87qrNag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570287; a=rsa-sha256; cv=none; b=LsRf4G2dAVJHkS3GF26CNSVSmxu9bKi5tFIvK5odpIRkYvc5lvT4EIiMFgXuIk7bFPpOEQ lXdy0JKhVAaGhvAG2Pg9GgrSXb6e6xqA0UHgCCNoQuKlYv67jnYp1f5Rk99QVpAX4/3CfI MR2raIZl80Pv30ndAqu205be+HwKOsljYAwE4l6NXD8d61HkEDT+woPa2U+VSIQX/FnB8Z loWB5RuPuccmURRu5ezPHTjSB0dvwZf+D5r05vF329yVzovr4PTB/Q/0tR2RW5dTLL3V2I aIekwRWbKwQdOBy9sHD6cK92HQLOSivrnHPRGYSGqcySRySn+7/+ghZuunn6mw== 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=1718570287; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bE2rNCHah2InDAH4OrYEYOarNgQxgl+KQI8wUrwSdb4=; b=tgOxDHWXKWG4T1UZ9Y2ZnW5QgaQlQ8j15TVxNFDbaQ34fC5TgK6dUTsdK7fbjjkMw4D8+Z Cp1y+cnZxYZXHyxwgpQYMGhf90I5LRgRyFXha9b4lWH13n1NZSArj5+xIcYmt3PQLIAp8W Gae6SCJ/EhNpoR48UvmcKLU85RHi8fmna0olzNFZak7UzCSxg+bO+z8iv/cdqXDFoGyBIO TAuGQSD5uy70CJ+unWdDEl4u32ONmrHuAIrEJ0UPMcxLxNSn7CVSqEIYAQPdHVQI1REliU iDWT8zP9Wu21lan0C02edOEbPUA3iJaosxIUn/T9JB2QJRtiCqoxf+H2XFbsRQ== 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 4W2Pwb0Q2jz12kq; Sun, 16 Jun 2024 20:38: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 45GKc6Y4079842; Sun, 16 Jun 2024 20:38:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GKc6Ig079839; Sun, 16 Jun 2024 20:38:06 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:38:06 GMT Message-Id: <202406162038.45GKc6Ig079839@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: 89848b3445ad - main - mana: Use device_set_desc() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 89848b3445ad52c304e6f9c5036aa9108bedb4c8 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=89848b3445ad52c304e6f9c5036aa9108bedb4c8 commit 89848b3445ad52c304e6f9c5036aa9108bedb4c8 Author: Mark Johnston AuthorDate: 2024-06-05 19:30:15 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:26 +0000 mana: Use device_set_desc() No functional change intended. MFC after: 1 week --- sys/dev/mana/gdma_main.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sys/dev/mana/gdma_main.c b/sys/dev/mana/gdma_main.c index 13f8a30762b1..6be3e148d0da 100644 --- a/sys/dev/mana/gdma_main.c +++ b/sys/dev/mana/gdma_main.c @@ -1750,7 +1750,6 @@ static int mana_gd_probe(device_t dev) { mana_vendor_id_t *ent; - char adapter_name[60]; uint16_t pci_vendor_id = 0; uint16_t pci_device_id = 0; @@ -1764,8 +1763,7 @@ mana_gd_probe(device_t dev) mana_dbg(NULL, "vendor=%x device=%x\n", pci_vendor_id, pci_device_id); - sprintf(adapter_name, DEVICE_DESC); - device_set_desc_copy(dev, adapter_name); + device_set_desc(dev, DEVICE_DESC); return (BUS_PROBE_DEFAULT); } From nobody Sun Jun 16 20:38: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 4W2Pwc42pPz5PRKH; Sun, 16 Jun 2024 20:38:08 +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 4W2Pwc1Ywbz3xQt; Sun, 16 Jun 2024 20:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718570288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/DrlB5HN7hk3ipG2998FIlOjjY2OElBIzAcAijDbAnY=; b=mAh+jPeKQp5VpFazZRuEsagrzdLOGxLHBvWKQa1B6MHuf2E12f7CW3p0Tt4zTQ0mk+P1Rf fJzcl+VwhFanxOsL03MNz7hH0wp3ixfLG8NdSEMlocJTG9tvXJWthVGD3DoV+/XIOeZZha ovTRFThkh78X5H9l1/s2uDtHAk3Gho2fxfL9rMQ3djW//U4wnq4yxScpE4KLbWTaE54e9Z eG7qSU3WWsvWrtP1ujt23Lhqfry2qtFM9axvICJk0KuyZlcWl0KMbS+DczTjOlCnFLmXNn sqhU7VgqC1IadTU+ZYSd0pOifVEnebB136uNf9WGYN2nNSvVxProke7NshQdoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570288; a=rsa-sha256; cv=none; b=Yv9OLh4/Wq2KejP3xRT4dWh7sFz1B4LG7T/K70mbSR0VPVzYNzxauZijqxOYvFvJ5IzDBC 6iGfGQZpPwTCH2cYKrSdMFBVohEKOxulBJtlsr3/ZQnoQaoU/zl2GQS0ts/ZuqoxR4g7Mp XJUEmWQfUUcFxwu6IefOn7kzq8xsLg9wfTF6A6glWVg6XZBCTk/4YNH/t3qSuz87iHYMqH 744AhJ4BvAwKSXJxodxn9omLoI6iYARgBFm+81Bsp6RntYGHAentIePQPQgRPjRI5pnRNU fo+mEJd9NZdrYwT+ygwgHxyLTpUQinkJVo28gJkz2YE4H9Dq7mNW+AW/Oyne8Q== 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=1718570288; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/DrlB5HN7hk3ipG2998FIlOjjY2OElBIzAcAijDbAnY=; b=DMhTL2+2LBeJogwDbN1cZ5gEJ/C62ueWcUPFGon/Ifv/vW/k1wWKVWKOLWLSreFJH9MNBz BXo4zcGqieTX7WLiLKlaaKqVY/RRQedLDWEf5dQh4G/s/6hcgk6luXU4vcBqQHD/XqgXgL GJ6pZfMit2CkskfqKBgkPBYvyvHX7z0GRvBKZ2HaWkd8DktC23ZFxDg6P3xTfv4QmtnXEo rmzQNFId/ft9UPGzgL248+QwrfmZy8RUz/2SciFxWM6dbzHivuQbEDkdFb/IzJFgsqUnUL 1eyq4wGopF5c9hnK4QkM/3u6F991CcJ6ulKy8OmMJEPvzi/f2/uBh/nzxtYGZA== 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 4W2Pwc18jjz12KW; Sun, 16 Jun 2024 20:38: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 45GKc8ar079878; Sun, 16 Jun 2024 20:38:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GKc85G079875; Sun, 16 Jun 2024 20:38:08 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:38:08 GMT Message-Id: <202406162038.45GKc85G079875@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: 131c8ee7331a - main - padlock: Use device_set_descf() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 131c8ee7331af701c78e694c9c7051f53600c4fe Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=131c8ee7331af701c78e694c9c7051f53600c4fe commit 131c8ee7331af701c78e694c9c7051f53600c4fe Author: Mark Johnston AuthorDate: 2024-06-05 19:33:59 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:26 +0000 padlock: Use device_set_descf() No functional change intended. MFC after: 1 week --- sys/crypto/via/padlock.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/sys/crypto/via/padlock.c b/sys/crypto/via/padlock.c index 8ff222ef413b..359618409f09 100644 --- a/sys/crypto/via/padlock.c +++ b/sys/crypto/via/padlock.c @@ -79,31 +79,14 @@ padlock_identify(driver_t *drv, device_t parent) static int padlock_probe(device_t dev) { - char capp[256]; - #if defined(__amd64__) || defined(__i386__) /* If there is no AES support, we has nothing to do here. */ if (!(via_feature_xcrypt & VIA_HAS_AES)) { device_printf(dev, "No ACE support.\n"); return (EINVAL); } - strlcpy(capp, "AES-CBC", sizeof(capp)); -#if 0 - strlcat(capp, ",AES-EBC", sizeof(capp)); - strlcat(capp, ",AES-CFB", sizeof(capp)); - strlcat(capp, ",AES-OFB", sizeof(capp)); -#endif - if (via_feature_xcrypt & VIA_HAS_SHA) { - strlcat(capp, ",SHA1", sizeof(capp)); - strlcat(capp, ",SHA256", sizeof(capp)); - } -#if 0 - if (via_feature_xcrypt & VIA_HAS_AESCTR) - strlcat(capp, ",AES-CTR", sizeof(capp)); - if (via_feature_xcrypt & VIA_HAS_MM) - strlcat(capp, ",RSA", sizeof(capp)); -#endif - device_set_desc_copy(dev, capp); + device_set_descf(dev, "AES-CBC%s", + (via_feature_xcrypt & VIA_HAS_SHA) ? ",SHA1,SHA256" : ""); return (0); #else return (EINVAL); From nobody Sun Jun 16 20:38: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 4W2Pwd5Y5Zz5PRML; Sun, 16 Jun 2024 20:38: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 4W2Pwd387nz3xRF; Sun, 16 Jun 2024 20:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718570289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VKCl+d3KvfBmb7MpDhh2NIQ/fdl1H4iQFSQiKVejOJA=; b=YAWiDt6R9UUstLehq66HE6vzg7TTwNWjyTYHcSDkofXGQLvs+cCoVeqnoIzdwTElzedVi7 8ZyTo2kW6oLQElhQOrr11JdEB7GieXuIJRb1aj1AuZmWC/4ppv9mthlEaDQylkyW0aHVi9 PQXKJkICimVywtZ3zoqn0MYrylT04ufdcxKY0P3/VodLrFJUV2PUAYe6yfjphzJHXnjDl8 OBzUAFedwsnKE9aWwy3Miy7HrL7qcmNkngC2rqCeP9br2Hb11HpfWBka+DHrAlfMPN3UI2 8hcAFFbxrMbao2aKOk3InqRaz+odh1Km7xyVkwW9gKGDHnHc7FAP7DXpP8g7eg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718570289; a=rsa-sha256; cv=none; b=PFLns0MJEj7MdEK+dqQZzUZOLwDrJ9nNqUjHBdfdHNQBvQ2TQFlxep/FBdVV5XS51/rgvh u37VVqgw9jr1g5iwDZ5fWVlJjumwlBOLM/mtAfbkbyqXzcX6WBLW3XbaGY4vDlYgs0E8xl Txswm9t9VKeBhCCSegrZn8ctK6/CeRYoCNA1/bMQhT5wCqwJMQtK9GZokllLHjtCJlOf/o Bc9WfijrhSY30uS0tSlNbUyKDyF/6wye/iDe6Inj8hIIVtjtImEQaNl9UVeP0SotcBVcj5 bSOnBDoJPNfrYzMN7HDY70d79e3PN4DjbYWu3UiV00VakeEss/l2nR8Mg1CEqQ== 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=1718570289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VKCl+d3KvfBmb7MpDhh2NIQ/fdl1H4iQFSQiKVejOJA=; b=OfBVNo39qA81+x9bO7jfilUmo/QKQawE7he8CYnaP7W/IimqzRWYuY5QyCCTAboDKzw69Y oY83wb2J8dF94CrSUgAZLW2/ToH4de7cfFh+4wC0K5bQsGWIxCM4evLjYROuV1AUF6C3lj 9yGFQli1TG4VWQkdf9yX7xMiEWxV8Wk5MXicOKhCp1AQB+AKq3ZP7dfiR/mZPPZ6vB1O5Y oaLmeFHFR2sd49nGEJAy/eOnNaJHfkFuIVBWzBvDR53OaB9SLbdMVVkGc7CgvoSjVFocmb EgmcVlFFUaV3JCeowIKxQC65eZ/XyhGjV1hjQ2VVzcoh7ePfHotD7G1XSvXzpQ== 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 4W2Pwd2jglz12wJ; Sun, 16 Jun 2024 20:38:09 +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 45GKc9De079914; Sun, 16 Jun 2024 20:38:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GKc9nw079911; Sun, 16 Jun 2024 20:38:09 GMT (envelope-from git) Date: Sun, 16 Jun 2024 20:38:09 GMT Message-Id: <202406162038.45GKc9nw079911@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: 83caa244bc9e - main - jedec_dimm: Use device_set_descf() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: 83caa244bc9eef6949a1250a875ad1409775a46e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=83caa244bc9eef6949a1250a875ad1409775a46e commit 83caa244bc9eef6949a1250a875ad1409775a46e Author: Mark Johnston AuthorDate: 2024-06-05 19:34:30 +0000 Commit: Mark Johnston CommitDate: 2024-06-16 20:37:26 +0000 jedec_dimm: Use device_set_descf() Note that it is ok to use device_get_desc() as one of the format string parameters because it is set using device_set_desc() (not device_set_desc_copy()) and so won't be freed when the description is updated. No functional change intended. MFC after: 1 week --- sys/dev/jedec_dimm/jedec_dimm.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/sys/dev/jedec_dimm/jedec_dimm.c b/sys/dev/jedec_dimm/jedec_dimm.c index ddaa0e96856e..697e7695a009 100644 --- a/sys/dev/jedec_dimm/jedec_dimm.c +++ b/sys/dev/jedec_dimm/jedec_dimm.c @@ -265,7 +265,6 @@ jedec_dimm_attach(device_t dev) uint16_t vendorid; bool tsod_present; int rc; - int new_desc_len; enum dram_type type; struct jedec_dimm_softc *sc; struct sysctl_ctx_list *ctx; @@ -273,7 +272,6 @@ jedec_dimm_attach(device_t dev) struct sysctl_oid_list *children; const char *tsod_match; const char *slotid_str; - char *new_desc; sc = device_get_softc(dev); ctx = device_get_sysctl_ctx(dev); @@ -447,26 +445,13 @@ no_tsod: * device description. */ if ((tsod_match != NULL) || (sc->slotid_str != NULL)) { - new_desc_len = strlen(device_get_desc(dev)); - if (tsod_match != NULL) { - new_desc_len += strlen(tsod_match); - new_desc_len += 4; /* " w/ " */ - } - if (sc->slotid_str != NULL) { - new_desc_len += strlen(sc->slotid_str); - new_desc_len += 3; /* space + parens */ - } - new_desc_len++; /* terminator */ - new_desc = malloc(new_desc_len, M_TEMP, (M_WAITOK | M_ZERO)); - (void) snprintf(new_desc, new_desc_len, "%s%s%s%s%s%s", + device_set_descf(dev, "%s%s%s%s%s%s", device_get_desc(dev), (tsod_match ? " w/ " : ""), (tsod_match ? tsod_match : ""), (sc->slotid_str ? " (" : ""), (sc->slotid_str ? sc->slotid_str : ""), (sc->slotid_str ? ")" : "")); - device_set_desc_copy(dev, new_desc); - free(new_desc, M_TEMP); } out: From nobody Sun Jun 16 20:51: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 4W2QDZ4g7Dz5PSld; Sun, 16 Jun 2024 20:51:58 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from mx1.sbone.de (cross.sbone.de [195.201.62.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE Root Certificate Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W2QDY0v85z46q1; Sun, 16 Jun 2024 20:51:56 +0000 (UTC) (envelope-from bzeeb-lists@lists.zabbadoz.net) Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=softfail (mx1.freebsd.org: 195.201.62.131 is neither permitted nor denied by domain of bzeeb-lists@lists.zabbadoz.net) smtp.mailfrom=bzeeb-lists@lists.zabbadoz.net Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id D0D808D4A126; Sun, 16 Jun 2024 20:51:54 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 0E76E2D029D8; Sun, 16 Jun 2024 20:51:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id vhRFsDF_t_IO; Sun, 16 Jun 2024 20:51:50 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:b66b:fcff:fef3:e3d2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 080BB2D029D2; Sun, 16 Jun 2024 20:51:49 +0000 (UTC) Date: Sun, 16 Jun 2024 20:51:49 +0000 (UTC) From: "Bjoern A. Zeeb" To: Warner Losh cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 50ecbc5142e1 - main - libipsec: make const-correct In-Reply-To: <202404230452.43N4qhYd063681@gitrepo.freebsd.org> Message-ID: References: <202404230452.43N4qhYd063681@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.10 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; ASN(0.00)[asn:24940, ipnet:195.201.0.0/16, country:DE]; MIME_TRACE(0.00)[0:+]; MISSING_XM_UA(0.00)[]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-src-all@FreeBSD.org,dev-commits-src-main@FreeBSD.org]; RCVD_COUNT_THREE(0.00)[4]; R_SPF_SOFTFAIL(0.00)[~all]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DMARC_NA(0.00)[zabbadoz.net]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_THREE(0.00)[4] X-Rspamd-Queue-Id: 4W2QDY0v85z46q1 On Tue, 23 Apr 2024, Warner Losh wrote: > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=50ecbc5142e1c58f2132b351da19c5e4aa5f4e6a > > commit 50ecbc5142e1c58f2132b351da19c5e4aa5f4e6a > Author: Lexi Winter > AuthorDate: 2024-04-22 21:56:24 +0000 > Commit: Warner Losh > CommitDate: 2024-04-23 04:36:34 +0000 > > libipsec: make const-correct > > - add const to the appropriate places in the libipsec public API and the > relevant internal functions needed to support that. > > - replace caddr_t with c_caddr_t in ipsec_dump_policy() > > - update the ipsec_dump_policy manpage to use c_caddr_t (this manpage > was already wrong as it had "char *" instead of caddr_t previously). > > While here, update pfkeyv2.h to not cast away const in the PFKEY_*() > macros. > > This should not cause any ABI changes as the actual types have not > changed. > > Reviewed by: imp > Pull Request: https://github.com/freebsd/freebsd-src/pull/1099 > --- > lib/libipsec/ipsec_dump_policy.c | 4 ++-- > lib/libipsec/ipsec_get_policylen.c | 2 +- > lib/libipsec/ipsec_set_policy.3 | 6 +++--- > lib/libipsec/policy_parse.y | 20 ++++++++++---------- > sys/net/pfkeyv2.h | 8 ++++---- > sys/netipsec/ipsec.h | 6 +++--- > 6 files changed, 23 insertions(+), 23 deletions(-) I am surprised that this did not break ipsec-tools and/or other ports for conflicting types for ipsec_set_policy(), ipsec_get_policylen() and ipsec_dump_policy(). -- Bjoern A. Zeeb r15:7 From nobody Sun Jun 16 21:18: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 4W2QqF3x4nz5PVyF; Sun, 16 Jun 2024 21:18: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 4W2QqF3Rxcz4GM1; Sun, 16 Jun 2024 21:18:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718572713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Na4NJg6lQePQALkN9f6mvmjSM2eLhftJQpSTfrfzQCQ=; b=U+n0iyQw8PirsNY4gRaHmt4oxkdoJAx7RucCtyq1OcaN46720j7SNXilKuA+3gSAmTWWSh /yuzw/kLznSdS5QVMhDNoGjIBCBJQnLu+K0Uny1VyhbUhvvKkUiNqzAoUYnyqn1MGIP2W9 e7cDhkTJgjKlKWn77s7zsQ5wn5vGEF2dYlEYSGd6vorbd2Bd96EtJrimbhhC2XieFQ9VJp zhDIkE+nuQhy8lYU+0bAahsJ1g5+A5516QP4x6BUDoogRZ6DEKeiRazfXBXyzGQ5Y2sy5b OLb9R85gHpwN34aHBzx0qMafBd/sd0oi7Fl9RGXJ+H6XjKicwKuprctNQUoVMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718572713; a=rsa-sha256; cv=none; b=MWZZBh/2DYmwcB45BAVLdQjzI2cCS3nTLV64diU41IdBnqFX/2CCO65SkDHe3ASW5Nf10F i8GXeLeWy88wA5SHFqsVd4OCh3+g9wloDUlqFkyHIzF9AgRx8ed50iLsI2lAqpBg+d50Uf uC5vA1EcG+U1o1WCX5EtxyxMi8AJzDPEtQ10AwJX8lj2awvA0nhMKz0j6DlKP7od7EOp14 mqOE/MmbWU5mauKzGU8YxJVQ6QFkg9smwZP6dvmxvsNWqaNkdViN9seCoDpCPtv2bLeq0q Tq6KdVcI6w2NMbk6iKIhXay+lz7ukCUhxyMCfGHlisElzjnncX4Ts75DD+gLOw== 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=1718572713; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Na4NJg6lQePQALkN9f6mvmjSM2eLhftJQpSTfrfzQCQ=; b=vVlDcuMUBkGXrIkBCp3QLjgb3+mE5EoDwNZ8lnP4Q45UeIfbEF8O3g1MOc9SgXOFdy7LiY oRURN+nCT5+gCZzQx+tFpnYBntm4+ZwNp7d4up8iN3Qy9iMdxi7a4ZV7lhZOgxw01z6P+e ahELrpKONtEu2JG64F+xDSpVeYG6RImz+PeddyFtuu5k0cYFc4DNDP6dfXRnKpUUur6ukt Ytvskg24kQd6yIbclaXZJp1GZLk0CmLoqmtJjlcwFfC8jgnRDD2KALPxUxj8Rl1EcDkaTG 0aqnvEgX6oU4KL3AoI0Z1sbiDelTa5rPEehPftGBNxyXALyk/XF4hrx15L2iJQ== 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 4W2QqF2l99z13jt; Sun, 16 Jun 2024 21:18: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 45GLIXCA047796; Sun, 16 Jun 2024 21:18:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45GLIXLP047793; Sun, 16 Jun 2024 21:18:33 GMT (envelope-from git) Date: Sun, 16 Jun 2024 21:18:33 GMT Message-Id: <202406162118.45GLIXLP047793@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: 0dc98b57f321 - main - getblk: track "non-sterile" bufobj to avoid bo lock on miss if sterile 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0dc98b57f321945b24a160282eb402bf0a6e4220 Auto-Submitted: auto-generated The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=0dc98b57f321945b24a160282eb402bf0a6e4220 commit 0dc98b57f321945b24a160282eb402bf0a6e4220 Author: Ryan Libby AuthorDate: 2024-06-16 21:09:45 +0000 Commit: Ryan Libby CommitDate: 2024-06-16 21:09:45 +0000 getblk: track "non-sterile" bufobj to avoid bo lock on miss if sterile This is a scheme to avoid taking the bufobj lock and doing a second lookup in the case where in getblk we do an unlocked lookup and find no buf. Was there really no buf, or were we in the middle of a reassignbuf race? By tracking any use of reassignbuf with a flag, we can know if there can't have been a race because there has been no reassignbuf. Because this scheme is spoiled on the first use of reassignbuf, it is mostly only beneficial for cases where a certain vnode is never expected to use dirty bufs at all. Reviewed by: kib Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D45571 --- sys/kern/vfs_bio.c | 8 +++++++- sys/kern/vfs_subr.c | 10 ++++++++++ sys/sys/bufobj.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_bio.c b/sys/kern/vfs_bio.c index 4f1df9711dec..7bcc61c27109 100644 --- a/sys/kern/vfs_bio.c +++ b/sys/kern/vfs_bio.c @@ -4002,9 +4002,15 @@ getblkx(struct vnode *vp, daddr_t blkno, daddr_t dblkno, int size, int slpflag, /* * With GB_NOCREAT we must be sure about not finding the buffer * as it may have been reassigned during unlocked lookup. + * If BO_NONSTERILE is still unset, no reassign has occurred. */ - if ((flags & GB_NOCREAT) != 0) + if ((flags & GB_NOCREAT) != 0) { + /* Ensure bo_flag is loaded after gbincore_unlocked. */ + atomic_thread_fence_acq(); + if ((bo->bo_flag & BO_NONSTERILE) == 0) + return (EEXIST); goto loop; + } goto newbuf_unlocked; } diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 398eda7ed897..f8f4c2a868f3 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -3207,6 +3207,16 @@ reassignbuf(struct buf *bp) bp, bp->b_vp, bp->b_flags); BO_LOCK(bo); + if ((bo->bo_flag & BO_NONSTERILE) == 0) { + /* + * Coordinate with getblk's unlocked lookup. Make + * BO_NONSTERILE visible before the first reassignbuf produces + * any side effect. This could be outside the bo lock if we + * used a separate atomic flag field. + */ + bo->bo_flag |= BO_NONSTERILE; + atomic_thread_fence_rel(); + } buf_vlist_remove(bp); /* diff --git a/sys/sys/bufobj.h b/sys/sys/bufobj.h index a6a9c5c2bf01..1c8fdcebe4d4 100644 --- a/sys/sys/bufobj.h +++ b/sys/sys/bufobj.h @@ -116,6 +116,7 @@ struct bufobj { #define BO_WWAIT (1 << 1) /* Wait for output to complete */ #define BO_DEAD (1 << 2) /* Dead; only with INVARIANTS */ #define BO_NOBUFS (1 << 3) /* No bufs allowed */ +#define BO_NONSTERILE (1 << 4) /* Ever called reassignbuf() */ #define BO_LOCKPTR(bo) (&(bo)->bo_lock) #define BO_LOCK(bo) rw_wlock(BO_LOCKPTR((bo)))