From nobody Wed May 17 22:18:16 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QM6tx07tFz4Bfcx; Wed, 17 May 2023 22:18: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 4QM6tw6kPvz3K2r; Wed, 17 May 2023 22:18:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684361896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zQUL0wSXilCdvRS81PcoiqC8QZ0NxWztRihUxdP7ggA=; b=wGREwA1cC+Q3kRPcrNGL1LB8jLoNzKzRmwLuyhsatgpseBykVbq5N6RHq1CtE9xfDJOg8o 9erbmHHu1GntqaKMCKK6M5Ty8Qj0MR9WXpI+p+tK6uaIX8Gi8r1v2ITlD3igU+orLV9RmQ rBYGBE0BRGeFsYWgsi3BZVTlA4gU3GpvrYLkhWWKHiZpWTiHeGJypwDMSKzBA+KX3zANj4 3WNuSLyJ6/7bvtgFjuxB1An/TGG5urgREk/yTCB8GtB7vWS0by3OTsU+KVwmGgFiX96ClO V8cT3o1UzhYkLQrR8OF/m9D3XfaXRmrih1wMChZ9nq+PJQIa2ZAE/Uq1FYFf6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684361896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zQUL0wSXilCdvRS81PcoiqC8QZ0NxWztRihUxdP7ggA=; b=e91UWAJRXOXJe2ouJp/GBnfmPZB+mpuv+qCA0+3TVklh9PATL+qQ4F+Q+PSZdom0ITwUaK SG06Yr6Y8gh7g7TEIIk2VbnkWdpPEuN18JOE19oSBej8zobX+kLa4pU+ilkn2A8A3VVPSZ Jf9ivjnZn+T/8SltN+oCVJ5GmyNrwSJRnbpjhKWBxhVB98VKWu/3mmiHjpfBLX0WzC2uEy B2zC9CgByoFcK3H8uOLlgrbLUqb2qMAGmzMuPYwQUGFVLqYPFCvTQQgVsex8gHADJPAYxY vevXnQVJ0hCtcROWNE92nkKyErkaz3QKRbxhRCzLch7XU94sUMSlsHaIQgy7FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684361896; a=rsa-sha256; cv=none; b=o4xIAxlZGoaGxRx74wXykvniq753Ft5SpCkk+tjrLH7HmMogc2a6uTKvVyY2qE0NPP3RQi OHViVlRrX6CMtcRgneBf0tmm06oOcf9ASS/c7xjOqALu2r9c90ghlsLcJ35ZuJoRTwWeiR ud0rIK7sjrlWLS037Eb7wVevERa75HfRGjQUgN4SWyljcdJ+4pL4seJEs9QfXS+ZF4KDZP OQ9k/hX970gg/fTfNxDrrFi6V4PPGDgc/WcU9iSn016F1dh9hCY+1QuUTM1cZIp/JUwqF6 j4efyyFJFIkBK0jfvoAv2dIz2W+143cCVG2UpH6WnAppuRw+IGJepZgbJEbpug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QM6tw5q2CzLT2; Wed, 17 May 2023 22:18:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34HMIG1Y058661; Wed, 17 May 2023 22:18:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34HMIGWJ058660; Wed, 17 May 2023 22:18:16 GMT (envelope-from git) Date: Wed, 17 May 2023 22:18:16 GMT Message-Id: <202305172218.34HMIGWJ058660@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: 967e9ddfb839 - stable/13 - krpc: Replace !jailed() with IS_DEFAULT_VNET() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 967e9ddfb83936386870b5533f31b875be574929 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=967e9ddfb83936386870b5533f31b875be574929 commit 967e9ddfb83936386870b5533f31b875be574929 Author: Rick Macklem AuthorDate: 2023-02-16 22:32:50 +0000 Commit: Rick Macklem CommitDate: 2023-05-17 22:17:22 +0000 krpc: Replace !jailed() with IS_DEFAULT_VNET() Since svcpool_create() is now called from an initialization function, !jailed() no longer works. Replace it with IS_DEFAULT_VNET(). (cherry picked from commit 780bae23b8e6c386e4b2f971eb27fa3bd1a6edd1) --- sys/rpc/svc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/rpc/svc.c b/sys/rpc/svc.c index 065da0cc23a4..0b07d2751f4a 100644 --- a/sys/rpc/svc.c +++ b/sys/rpc/svc.c @@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$"); */ #include -#include #include #include #include @@ -63,6 +62,8 @@ __FBSDID("$FreeBSD$"); #include #include +#include + #include #include #include @@ -127,7 +128,7 @@ svcpool_create(const char *name, struct sysctl_oid_list *sysctl_base) pool->sp_space_low = (pool->sp_space_high / 3) * 2; sysctl_ctx_init(&pool->sp_sysctl); - if (!jailed(curthread->td_ucred) && sysctl_base) { + if (IS_DEFAULT_VNET(curvnet) && sysctl_base) { SYSCTL_ADD_PROC(&pool->sp_sysctl, sysctl_base, OID_AUTO, "minthreads", CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_MPSAFE, pool, 0, svcpool_minthread_sysctl, "I",