From nobody Mon Feb 9 11:07:27 2026 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C6E921D3F9 for ; Fri, 9 May 2025 07:33:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746776006; cv=none; b=dcNx0pf3THz5VteP1HXIbEqQ2Ct4CA3iH59+JhWmerz5f5TL/NCwC9jwtEgbGsV8BOpe7tMkZQGooGxfNm0gMcwPAiYyKkLT0/4eDpw0rS/9yrhp93mbVqbMYpQSaYBMo6RDM1Q+bSKHdTQwyac/M96NhmmwC75VSggkfvqJK4o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746776006; c=relaxed/simple; bh=EZlt0cvhp3NrCL+YaqANcp2crpQa/wInckL0SK34i5E=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Z2ik/p+FzZXCjjmh166hbvMGQ4WEHKLMhd8vlTcE8g+9vaQKmopZ2Vd9qT+Nl9IAuhSZapCELshLhnpNHvaq6kXvYbKSaCOewT6tLozs/IHBT9F1rCFVvc4+/i6WQ0GPZUuxlaQAr8I1WdnGei1axpG6pMQMtJw+MyZONnln0hI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Zv11n0v0hz4f3k6W for ; Fri, 9 May 2025 15:33:01 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.252]) by mail.maildlp.com (Postfix) with ESMTP id 734CB1A1A03 for ; Fri, 9 May 2025 15:33:20 +0800 (CST) Received: from hulk-vt.huawei.com (unknown [10.67.174.121]) by APP3 (Coremail) with SMTP id _Ch0CgCHJsG1rx1oiZnNLg--.58746S3; Fri, 09 May 2025 15:33:20 +0800 (CST) From: Chen Ridong To: akpm@linux-foundation.org, paulmck@kernel.org, bigeasy@linutronix.de, legion@kernel.org, roman.gushchin@linux.dev, brauner@kernel.org, tglx@linutronix.de, frederic@kernel.org, peterz@infradead.org, oleg@redhat.com, joel.granados@kernel.org, viro@zeniv.linux.org.uk, lorenzo.stoakes@oracle.com, avagin@google.com, mengensun@tencent.com, linux@weissschuh.net, jlayton@kernel.org, ruanjinjie@huawei.com, kees@kernel.org Cc: linux-kernel@vger.kernel.org, lujialin4@huawei.com, chenridong@huaweicloud.com Subject: [RFC next v2 1/5] user_namespace: add children list node Date: Fri, 9 May 2025 07:20:50 +0000 Message-Id: <20250509072054.148257-2-chenridong@huaweicloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509072054.148257-1-chenridong@huaweicloud.com> References: <20250509072054.148257-1-chenridong@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _Ch0CgCHJsG1rx1oiZnNLg--.58746S3 X-Coremail-Antispam: 1UD129KBjvJXoW7AF1Uur13ZFy8ZFWxtr1kXwb_yoW8uFy3pF ZIyr9xGws3Jr1qkryUWan5u34xWw48JF17Ca4v934rtryagFy0kr4UC3Wj9r15Xr48GrWY qFWjgrs0y3yUW37anT9S1TB71UUUUUJqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUQj14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jr4l82xGYIkIc2 x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAa w2AFwI0_Jrv_JF1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrV C2j2WlYx0E2Ix0cI8IcVAFwI0_JF0_Jw1lYx0Ex4A2jsIE14v26r4j6F4UMcvjeVCFs4IE 7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lFIxGxc IEc7CjxVA2Y2ka0xkIwI1lc7CjxVAaw2AFwI0_ZF0_GFyUMxAIw28IcxkI7VAKI48JMxC2 0s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI 0_JrI_JrWlx4CE17CEb7AF67AKxVW8ZVWrXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE 14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8JVWxJwCI42IY6xAIw20EY4v20x vaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8 Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUUxhJUUUUU= X-CM-SenderInfo: hfkh02xlgr0w46kxt4xhlfz01xgou0bp/ Content-Type: text/plain; charset="utf-8" From: Chen Ridong Add the 'children' and 'ns_node' fields to the user_namespace structure. This addition enables the user_namespace to locate all of its nested child namespaces efficiently. Signed-off-by: Chen Ridong --- include/linux/user_namespace.h | 2 ++ kernel/user.c | 2 ++ kernel/user_namespace.c | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h index a0bb6d012137..7b1e180227c8 100644 --- a/include/linux/user_namespace.h +++ b/include/linux/user_namespace.h @@ -78,6 +78,8 @@ struct user_namespace { struct uid_gid_map gid_map; struct uid_gid_map projid_map; struct user_namespace *parent; + struct list_head ns_node; + struct list_head children; int level; kuid_t owner; kgid_t group; diff --git a/kernel/user.c b/kernel/user.c index f46b1d41163b..3a712a6894fd 100644 --- a/kernel/user.c +++ b/kernel/user.c @@ -65,6 +65,8 @@ struct user_namespace init_user_ns =3D { .nr_extents =3D 1, }, }, + .ns_node =3D LIST_HEAD_INIT(init_user_ns.ns_node), + .children =3D LIST_HEAD_INIT(init_user_ns.children), .ns.count =3D REFCOUNT_INIT(3), .owner =3D GLOBAL_ROOT_UID, .group =3D GLOBAL_ROOT_GID, diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c index 682f40d5632d..b570536934cc 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -135,6 +135,9 @@ int create_user_ns(struct cred *new) ns->level =3D parent_ns->level + 1; ns->owner =3D owner; ns->group =3D group; + INIT_LIST_HEAD(&ns->children); + INIT_LIST_HEAD(&ns->ns_node); + list_add_tail_rcu(&ns->ns_node, &parent_ns->children); INIT_WORK(&ns->work, free_user_ns); for (i =3D 0; i < UCOUNT_COUNTS; i++) { ns->ucount_max[i] =3D INT_MAX; @@ -217,6 +220,7 @@ static void free_user_ns(struct work_struct *work) kfree(ns->binfmt_misc); #endif retire_userns_sysctls(ns); + list_del_rcu(&ns->ns_node); key_free_user_ns(ns); ns_free_inum(&ns->ns); kmem_cache_free(user_ns_cachep, ns); --=20 2.34.1 From nobody Mon Feb 9 11:07:27 2026 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C68E20A5E5 for ; Fri, 9 May 2025 07:33:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746776006; cv=none; b=YKDu5V5tGUGR2cqaESqH8tASF/eWFi/Kk9JMvoUY1baqMslPBzzwmDLHBpnq9mxGLMOVaKXtJsj1KsbRWP9PUm9vFio8f/RYTQYw+jT9kgIJV+/J75lyF5kDqh70S9TV/YGh7EJvzOR5pElhWUMiux3af4rbGOAjfDB50oF2wdY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746776006; c=relaxed/simple; bh=ty5BFu9gW6qxlgzjuzhCGDP4r6MgxNpDMaV/Ale1lok=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CqXWtmRABmNWB5FMO1UCOONKImuA8IIKQRpTu5hGLnH1jgVWp7pAKaB2Tk19o7kf7DqaeZ6NxzzTNQeHnrYPV3K2qbQZhGVoNoKECMkqPhNZEvKQpjf7/i3fM/JGSsbRcckUbnTvBrNbOzCIjcX+2B4us4FRtI/OYxsRYVDLXBQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Zv11n1bYbz4f3k6f for ; Fri, 9 May 2025 15:33:01 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.252]) by mail.maildlp.com (Postfix) with ESMTP id 8B6D61A0F46 for ; Fri, 9 May 2025 15:33:20 +0800 (CST) Received: from hulk-vt.huawei.com (unknown [10.67.174.121]) by APP3 (Coremail) with SMTP id _Ch0CgCHJsG1rx1oiZnNLg--.58746S4; Fri, 09 May 2025 15:33:20 +0800 (CST) From: Chen Ridong To: akpm@linux-foundation.org, paulmck@kernel.org, bigeasy@linutronix.de, legion@kernel.org, roman.gushchin@linux.dev, brauner@kernel.org, tglx@linutronix.de, frederic@kernel.org, peterz@infradead.org, oleg@redhat.com, joel.granados@kernel.org, viro@zeniv.linux.org.uk, lorenzo.stoakes@oracle.com, avagin@google.com, mengensun@tencent.com, linux@weissschuh.net, jlayton@kernel.org, ruanjinjie@huawei.com, kees@kernel.org Cc: linux-kernel@vger.kernel.org, lujialin4@huawei.com, chenridong@huaweicloud.com Subject: [RFC next v2 2/5] usernamespace: make usernamespace rcu safe Date: Fri, 9 May 2025 07:20:51 +0000 Message-Id: <20250509072054.148257-3-chenridong@huaweicloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509072054.148257-1-chenridong@huaweicloud.com> References: <20250509072054.148257-1-chenridong@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _Ch0CgCHJsG1rx1oiZnNLg--.58746S4 X-Coremail-Antispam: 1UD129KBjvJXoW7Cw4rKw1DZryrKF43Kr4UJwb_yoW8CFyrpF 92kr9xGa1xJr1qkw1UZFs5u34fWr4FqFyUCa1ku3s5tFyagryjyr4xAa48Zr15Gr48G3y3 XFWjgrWDKr4UW37anT9S1TB71UUUUUJqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUQ014x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_Jryl82xGYIkIc2 x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAa w2AFwI0_Jrv_JF1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrV C2j2WlYx0E2Ix0cI8IcVAFwI0_JF0_Jw1lYx0Ex4A2jsIE14v26r4j6F4UMcvjeVCFs4IE 7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lFIxGxc IEc7CjxVA2Y2ka0xkIwI1lc7CjxVAaw2AFwI0_ZF0_GFyUMxAIw28IcxkI7VAKI48JMxC2 0s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI 0_JrI_JrWlx4CE17CEb7AF67AKxVW8ZVWrXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE 14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWxJVW8Jr1lIxAIcVCF04k26cxKx2 IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_ Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjTRRdgAUUUUU X-CM-SenderInfo: hfkh02xlgr0w46kxt4xhlfz01xgou0bp/ Content-Type: text/plain; charset="utf-8" From: Chen Ridong To ensure a safe top-down iteration, the user namespace should be made RCU safe. This way, it is safe to iterate over all the child namespaces of a root namespace while holding an RCU read lock. Signed-off-by: Chen Ridong --- include/linux/user_namespace.h | 1 + kernel/user_namespace.c | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h index 7b1e180227c8..d84b2703caab 100644 --- a/include/linux/user_namespace.h +++ b/include/linux/user_namespace.h @@ -80,6 +80,7 @@ struct user_namespace { struct user_namespace *parent; struct list_head ns_node; struct list_head children; + struct rcu_head rcu; int level; kuid_t owner; kgid_t group; diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c index b570536934cc..cbe8f96c3e60 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -196,6 +196,15 @@ int unshare_userns(unsigned long unshare_flags, struct= cred **new_cred) return err; } =20 +static void __free_user_ns(struct rcu_head *p) +{ + struct user_namespace *ns =3D + container_of(p, struct user_namespace, rcu); + + list_del_rcu(&ns->ns_node); + kmem_cache_free(user_ns_cachep, ns); +} + static void free_user_ns(struct work_struct *work) { struct user_namespace *parent, *ns =3D @@ -220,10 +229,9 @@ static void free_user_ns(struct work_struct *work) kfree(ns->binfmt_misc); #endif retire_userns_sysctls(ns); - list_del_rcu(&ns->ns_node); key_free_user_ns(ns); ns_free_inum(&ns->ns); - kmem_cache_free(user_ns_cachep, ns); + call_rcu(&ns->rcu, __free_user_ns); dec_user_namespaces(ucounts); ns =3D parent; } while (refcount_dec_and_test(&parent->ns.count)); --=20 2.34.1 From nobody Mon Feb 9 11:07:27 2026 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A8D5526A1DA for ; Fri, 9 May 2025 07:33:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746776005; cv=none; b=Cc0ffjUFMbDK/Q7foOFG/i2i0P6ZSxeVsMo27sIL/GQI7IyOgDk8S+GF3m65OwBwxsp7KCIJTu4u0Tu0Qx+uoO0Uqn+F6+a6/T4aSTG+p1drgc4//ra+evsVfGjDtO69zghOs7yICTRmfKo6HnG5dTXYUdRqPNf0vwcnMv8Zjd4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746776005; c=relaxed/simple; bh=xuh3+d3PyJHPLx/vRAjNd3dPRlG+l4xvonJuqToDVxA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=M0TSsWWuglTjp1W/VKF8tDK/Ih7nWt/4jVjF+ueq20yRvQ/OtI42stNd4c8pKSmmsw6oGLN16bUy+O9N3HwEUqdJifVa6t5Xuo9AfBkzMH7o35aZDDvAJ9eqSnK9eOw17KxGIUEPJQ7hsX8Qj/oaxXzCzNQpOypeEnq6F9lsBco= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=none smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Zv11n25CXz4f3kJq for ; Fri, 9 May 2025 15:33:01 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.252]) by mail.maildlp.com (Postfix) with ESMTP id A36731A1AD7 for ; Fri, 9 May 2025 15:33:20 +0800 (CST) Received: from hulk-vt.huawei.com (unknown [10.67.174.121]) by APP3 (Coremail) with SMTP id _Ch0CgCHJsG1rx1oiZnNLg--.58746S5; Fri, 09 May 2025 15:33:20 +0800 (CST) From: Chen Ridong To: akpm@linux-foundation.org, paulmck@kernel.org, bigeasy@linutronix.de, legion@kernel.org, roman.gushchin@linux.dev, brauner@kernel.org, tglx@linutronix.de, frederic@kernel.org, peterz@infradead.org, oleg@redhat.com, joel.granados@kernel.org, viro@zeniv.linux.org.uk, lorenzo.stoakes@oracle.com, avagin@google.com, mengensun@tencent.com, linux@weissschuh.net, jlayton@kernel.org, ruanjinjie@huawei.com, kees@kernel.org Cc: linux-kernel@vger.kernel.org, lujialin4@huawei.com, chenridong@huaweicloud.com Subject: [RFC next v2 3/5] user_namespace: add user_ns iteration helper Date: Fri, 9 May 2025 07:20:52 +0000 Message-Id: <20250509072054.148257-4-chenridong@huaweicloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509072054.148257-1-chenridong@huaweicloud.com> References: <20250509072054.148257-1-chenridong@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _Ch0CgCHJsG1rx1oiZnNLg--.58746S5 X-Coremail-Antispam: 1UD129KBjvJXoWxGF43KFWfZF1Utry7Gw4fGrg_yoW5XFWDpF 4Skr9xAw47JrnrKwn8ZFs5u34fWr10vFy8JFyxu3s3tF1agFy5Arn7A3WrZr9xGr4UGrW5 XFWUKws8Kr4Uu37anT9S1TB71UUUUUJqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUQ014x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JrWl82xGYIkIc2 x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0 Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F4UJw A2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAa w2AFwI0_Jrv_JF1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrV C2j2WlYx0E2Ix0cI8IcVAFwI0_JF0_Jw1lYx0Ex4A2jsIE14v26r4j6F4UMcvjeVCFs4IE 7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lFIxGxc IEc7CjxVA2Y2ka0xkIwI1lc7CjxVAaw2AFwI0_ZF0_GFyUMxAIw28IcxkI7VAKI48JMxC2 0s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI 0_JrI_JrWlx4CE17CEb7AF67AKxVW8ZVWrXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE 14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWxJVW8Jr1lIxAIcVCF04k26cxKx2 IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_ Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjfUUnmRUUUUU X-CM-SenderInfo: hfkh02xlgr0w46kxt4xhlfz01xgou0bp/ Content-Type: text/plain; charset="utf-8" From: Chen Ridong Add a helper function named 'ns_next_child_pre' that performs a pre-order traversal of a namespace's descendants. Signed-off-by: Chen Ridong --- include/linux/user_namespace.h | 9 +++++++ kernel/user_namespace.c | 44 ++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h index d84b2703caab..823df9267a4a 100644 --- a/include/linux/user_namespace.h +++ b/include/linux/user_namespace.h @@ -169,6 +169,15 @@ static inline void set_userns_rlimit_max(struct user_n= amespace *ns, ns->rlimit_max[type] =3D max <=3D LONG_MAX ? max : LONG_MAX; } =20 +struct user_namespace *ns_next_child(struct user_namespace *pos, + struct user_namespace *parent); +struct user_namespace *ns_next_child_pre(struct user_namespace *pos, + struct user_namespace *root); + +#define ns_for_each_child_pre(pos, ns) \ + for ((pos) =3D ns_next_child_pre(NULL, (ns)); (pos); \ + (pos) =3D ns_next_child_pre((pos), (ns))) + #ifdef CONFIG_USER_NS =20 static inline struct user_namespace *get_user_ns(struct user_namespace *ns) diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c index cbe8f96c3e60..9a2e77505b97 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -30,6 +30,50 @@ static bool new_idmap_permitted(const struct file *file, struct uid_gid_map *map); static void free_user_ns(struct work_struct *work); =20 +struct user_namespace *ns_next_child(struct user_namespace *pos, + struct user_namespace *parent) +{ + struct user_namespace *next; + + if (!pos) + /* Get the first child of the parent. */ + next =3D list_entry_rcu(parent->children.next, struct user_namespace, ns= _node); + else + next =3D list_entry_rcu(pos->ns_node.next, struct user_namespace, ns_nod= e); + + if (&next->ns_node !=3D &parent->children) + return next; + + return NULL; +} + +/* Should be called under rcu_read_lock() */ +struct user_namespace *ns_next_child_pre(struct user_namespace *pos, + struct user_namespace *root) +{ + struct user_namespace *next; + + + /* if first iteration, visit @root */ + if (!pos) + return root; + + /* visit the first child if exists */ + next =3D ns_next_child(NULL, pos); + if (next) + return next; + + /* no child, visit my or the closest ancestor's next ns_node */ + while (pos !=3D root) { + next =3D ns_next_child(pos, pos->parent); + if (next) + return next; + pos =3D pos->parent; + } + + return NULL; +} + static struct ucounts *inc_user_namespaces(struct user_namespace *ns, kuid= _t uid) { return inc_ucount(ns, uid, UCOUNT_USER_NAMESPACES); --=20 2.34.1 From nobody Mon Feb 9 11:07:27 2026 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C7D4269B18 for ; Fri, 9 May 2025 07:33:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746776005; cv=none; b=mfBgM8U50s+AKYOf7ybChnz//a/Dkv3eZh1EzZi8RvTKGAYKXi/0wF0ajH+pIubuTpP42Y6ermO9HHImVBq5X9odfEbmUBB3HdxKNhE70+xVYSlSd3wzvmEzn9DEkW+NMvUMS3UClrY9IkA+CBNfuXliLetGShxSZ52IZHKTg3o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746776005; c=relaxed/simple; bh=us+ZJ6WIK8Ixr9HGqe8c7I6zbm6KW5ujWB5Obyd2WO8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=swcIKDnX7HCRuLx74JmYyqowmdJVvVPrzDiReeuS1EiLDgZaaSAcZUM1Z0i0qYxiSup84fIupYzMMrHGJKdeOFZyFtjZD/jPwgtqFE8gQsURAMIsIizj5CsP04yqSTVvJ+c+ZOorLxUuHuQedsYxc62pj6ivctjex/ibMlAu+Vc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.93.142]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Zv11f5Mgtz4f3lfJ for ; Fri, 9 May 2025 15:32:54 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.252]) by mail.maildlp.com (Postfix) with ESMTP id C56111A018D for ; Fri, 9 May 2025 15:33:20 +0800 (CST) Received: from hulk-vt.huawei.com (unknown [10.67.174.121]) by APP3 (Coremail) with SMTP id _Ch0CgCHJsG1rx1oiZnNLg--.58746S6; Fri, 09 May 2025 15:33:20 +0800 (CST) From: Chen Ridong To: akpm@linux-foundation.org, paulmck@kernel.org, bigeasy@linutronix.de, legion@kernel.org, roman.gushchin@linux.dev, brauner@kernel.org, tglx@linutronix.de, frederic@kernel.org, peterz@infradead.org, oleg@redhat.com, joel.granados@kernel.org, viro@zeniv.linux.org.uk, lorenzo.stoakes@oracle.com, avagin@google.com, mengensun@tencent.com, linux@weissschuh.net, jlayton@kernel.org, ruanjinjie@huawei.com, kees@kernel.org Cc: linux-kernel@vger.kernel.org, lujialin4@huawei.com, chenridong@huaweicloud.com Subject: [RFC next v2 4/5] uounts: factor out __inc_rlimit_get_ucounts/__dec_rlimit_put_ucounts Date: Fri, 9 May 2025 07:20:53 +0000 Message-Id: <20250509072054.148257-5-chenridong@huaweicloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509072054.148257-1-chenridong@huaweicloud.com> References: <20250509072054.148257-1-chenridong@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _Ch0CgCHJsG1rx1oiZnNLg--.58746S6 X-Coremail-Antispam: 1UD129KBjvJXoWxGF1Dtr15Jr47WrWruw1UAwb_yoW5trW7pr 4xJ34UAw4kJF43trn5Ja95AryrArWSvry5AFy7Wrn3t3W3tr1Fgw12vryYga47t3yrJ34a qasrWFWqk3WUZrUanT9S1TB71UUUUUJqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUQI14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq 3wAaw2AFwI0_Jrv_JF1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I 8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_JF0_Jw1lYx0Ex4A2jsIE14v26r4j6F4UMcvjeVCF s4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lFI xGxcIEc7CjxVA2Y2ka0xkIwI1lc7CjxVAaw2AFwI0_ZF0_GFyUMxAIw28IcxkI7VAKI48J MxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwV AFwI0_JrI_JrWlx4CE17CEb7AF67AKxVW8ZVWrXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv2 0xvE14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UMIIF0xvE42xK8V AvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E 14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZEXa7sRRZqWUUUUUU== X-CM-SenderInfo: hfkh02xlgr0w46kxt4xhlfz01xgou0bp/ Content-Type: text/plain; charset="utf-8" From: Chen Ridong The __inc_rlimit_get_ucounts function has been factored out. This function can increment the rlimit by a variable number and acquires an additional ucount reference when the rlimit count was previously zero. Correspondingly, the __dec_rlimit_put_ucounts function has also been factored out. This function releases the ucount reference when the rlimit reaches zero. These functions not only make the code more concise but also serve as a foundation for subsequent patches. Signed-off-by: Chen Ridong --- kernel/ucount.c | 56 +++++++++++++++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 20 deletions(-) diff --git a/kernel/ucount.c b/kernel/ucount.c index 8686e329b8f2..33605e416724 100644 --- a/kernel/ucount.c +++ b/kernel/ucount.c @@ -276,22 +276,46 @@ bool dec_rlimit_ucounts(struct ucounts *ucounts, enum= rlimit_type type, long v) return (new =3D=3D 0); } =20 +static void __dec_rlimit_put_ucounts(struct ucounts *ucounts, + enum rlimit_type type, long v) +{ + long dec =3D atomic_long_sub_return(v, &ucounts->rlimit[type]); + + WARN_ON_ONCE(dec < 0); + if (dec =3D=3D 0) + put_ucounts(ucounts); +} + +static long __inc_rlimit_get_ucounts(struct ucounts *ucounts, enum rlimit_= type type, long v) +{ + long new =3D atomic_long_add_return(v, &ucounts->rlimit[type]); + + /* + * Grab an extra ucount reference for the caller when + * the rlimit count was previously 0. + */ + if (new =3D=3D v && !get_ucounts(ucounts)) { + long dec =3D atomic_long_sub_return(v, &ucounts->rlimit[type]); + + WARN_ON_ONCE(dec < 0); + return 0; + } + return new; +} + static void do_dec_rlimit_put_ucounts(struct ucounts *ucounts, - struct ucounts *last, enum rlimit_type type) + struct ucounts *last, enum rlimit_type type, long v) { struct ucounts *iter, *next; for (iter =3D ucounts; iter !=3D last; iter =3D next) { - long dec =3D atomic_long_sub_return(1, &iter->rlimit[type]); - WARN_ON_ONCE(dec < 0); next =3D iter->ns->ucounts; - if (dec =3D=3D 0) - put_ucounts(iter); + __dec_rlimit_put_ucounts(ucounts, type, v); } } =20 void dec_rlimit_put_ucounts(struct ucounts *ucounts, enum rlimit_type type) { - do_dec_rlimit_put_ucounts(ucounts, NULL, type); + do_dec_rlimit_put_ucounts(ucounts, NULL, type, 1); } =20 long inc_rlimit_get_ucounts(struct ucounts *ucounts, enum rlimit_type type, @@ -300,30 +324,22 @@ long inc_rlimit_get_ucounts(struct ucounts *ucounts, = enum rlimit_type type, /* Caller must hold a reference to ucounts */ struct ucounts *iter; long max =3D LONG_MAX; - long dec, ret =3D 0; + long ret =3D 0; =20 for (iter =3D ucounts; iter; iter =3D iter->ns->ucounts) { - long new =3D atomic_long_add_return(1, &iter->rlimit[type]); - if (new < 0 || new > max) + long new =3D __inc_rlimit_get_ucounts(iter, type, 1); + + if (new <=3D 0 || new > max) goto dec_unwind; if (iter =3D=3D ucounts) ret =3D new; if (!override_rlimit) max =3D get_userns_rlimit_max(iter->ns, type); - /* - * Grab an extra ucount reference for the caller when - * the rlimit count was previously 0. - */ - if (new !=3D 1) - continue; - if (!get_ucounts(iter)) - goto dec_unwind; } return ret; + dec_unwind: - dec =3D atomic_long_sub_return(1, &iter->rlimit[type]); - WARN_ON_ONCE(dec < 0); - do_dec_rlimit_put_ucounts(ucounts, iter, type); + do_dec_rlimit_put_ucounts(ucounts, iter, type, 1); return 0; } =20 --=20 2.34.1 From nobody Mon Feb 9 11:07:27 2026 Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BECDF26FA42 for ; Fri, 9 May 2025 07:33:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746776006; cv=none; b=csNFOy+iNwMUYQlAWcEFCDJScy8GP0jFZ42YhokUQQHk4BQqVzc9e3jstD0Rw48H7F+ZKKSSBoA6rxjXwP1ZYviawtap2MHby1gkM3Qb60Jip+TElnTY9IsKQwomZA5EhJh3Z7yeE5adAUCU9S0yIdewxrWxOCYSjNJRou9k6Pw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746776006; c=relaxed/simple; bh=DeBb3Y+XWScfnqwEU5Q9GlaoCLY2ynWxUuVwmcUq9kY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=neE5vtZlvNwSO/BDsV80uNhBqRrO88P09lxexWr37Z7QC5AO5yIsuVvyyMnws0Ez5NIVnb8L26O+1d6qpe4UoUyMReYfd2yhiCoAaVxhB/fgKoe02BMKjIiR7MGRE1dibrJBgVeJrK4NOS8nyVk82FwLC4ymdIRxtVTXdU1S/bE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com; spf=pass smtp.mailfrom=huaweicloud.com; arc=none smtp.client-ip=45.249.212.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=huaweicloud.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huaweicloud.com Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Zv11n3wKZz4f3kJw for ; Fri, 9 May 2025 15:33:01 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.252]) by mail.maildlp.com (Postfix) with ESMTP id E2ABF1A0E7E for ; Fri, 9 May 2025 15:33:20 +0800 (CST) Received: from hulk-vt.huawei.com (unknown [10.67.174.121]) by APP3 (Coremail) with SMTP id _Ch0CgCHJsG1rx1oiZnNLg--.58746S7; Fri, 09 May 2025 15:33:20 +0800 (CST) From: Chen Ridong To: akpm@linux-foundation.org, paulmck@kernel.org, bigeasy@linutronix.de, legion@kernel.org, roman.gushchin@linux.dev, brauner@kernel.org, tglx@linutronix.de, frederic@kernel.org, peterz@infradead.org, oleg@redhat.com, joel.granados@kernel.org, viro@zeniv.linux.org.uk, lorenzo.stoakes@oracle.com, avagin@google.com, mengensun@tencent.com, linux@weissschuh.net, jlayton@kernel.org, ruanjinjie@huawei.com, kees@kernel.org Cc: linux-kernel@vger.kernel.org, lujialin4@huawei.com, chenridong@huaweicloud.com Subject: [RFC next v2 5/5] ucount: add rlimit cache for ucount Date: Fri, 9 May 2025 07:20:54 +0000 Message-Id: <20250509072054.148257-6-chenridong@huaweicloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250509072054.148257-1-chenridong@huaweicloud.com> References: <20250509072054.148257-1-chenridong@huaweicloud.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _Ch0CgCHJsG1rx1oiZnNLg--.58746S7 X-Coremail-Antispam: 1UD129KBjvJXoWfGrWfWr18Cr1kKw17AF1UWrg_yoWkZrWrpF WfG347Ar48XFsxtr1kt3yxZ34rGryrZry3JFWrG3sayF1agr1ruw17AFy5u343Jr4rJ3y2 qFW2gaykC3WUZ3DanT9S1TB71UUUUUJqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUQI14x267AKxVWrJVCq3wAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2048vs2IY020E87I2jVAFwI0_JF0E3s1l82xGYI kIc2x26xkF7I0E14v26ryj6s0DM28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2 z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j6F 4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq 3wAaw2AFwI0_Jrv_JF1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I 8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_JF0_Jw1lYx0Ex4A2jsIE14v26r4j6F4UMcvjeVCF s4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwACjI8F5VA0II8E6IAqYI8I648v4I1lFI xGxcIEc7CjxVA2Y2ka0xkIwI1lc7CjxVAaw2AFwI0_ZF0_GFyUMxAIw28IcxkI7VAKI48J MxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwV AFwI0_JrI_JrWlx4CE17CEb7AF67AKxVW8ZVWrXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv2 0xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UMIIF0xvE42xK8V AvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E 14v26r4UJVWxJrUvcSsGvfC2KfnxnUUI43ZEXa7sRRZqWUUUUUU== X-CM-SenderInfo: hfkh02xlgr0w46kxt4xhlfz01xgou0bp/ Content-Type: text/plain; charset="utf-8" From: Chen Ridong The will-it-scale test case signal1 [1] has been observed. and the test results reveal that the signal sending system call lacks linearity. To further investigate this issue, we initiated a series of tests by launching varying numbers of dockers and closely monitored the throughput of each individual docker. The detailed test outcomes are presented as follows: | Dockers |1 |4 |8 |16 |32 |64 | | Throughput |380068 |353204 |308948 |306453 |180659 |129152 | The data clearly demonstrates a discernible trend: as the quantity of dockers increases, the throughput per container progressively declines. In-depth analysis has identified the root cause of this performance degradation. The ucouts module conducts statistics on rlimit, which involves a significant number of atomic operations. These atomic operations, when acting on the same variable, trigger a substantial number of cache misses or remote accesses, ultimately resulting in a drop in performance. Notably, even though a new user_namespace is created upon docker startup, the problem persists. This is because all these dockers share the same parent node, meaning that rlimit statistics continuously modify the same atomic variable. Currently, when incrementing a specific rlimit within a child user namespace by 1, the corresponding rlimit in the parent node must also be incremented by 1. Specifically, if the ucounts corresponding to a task in Docker B is ucount_b_1, after incrementing the rlimit of ucount_b_1 by 1, the rlimit of the parent node, init_ucounts, must also be incremented by 1. This operation should be ensured to stay within the limits set for the user namespaces. init_user_ns init_ucounts ^ ^ | | | |<---- usr_ns_a(docker A)|usr_ns_a->ucount---->| | | | |<---- usr_ns_b(docker B)|usr_ns_b->ucount---->| ^ ^ | | (add) cache_rlimit--->| | ucount_b_1(user1) What is expected is that dockers operating within separate namespaces should remain isolated and not interfere with one another. Regrettably, the current signal system call fails to achieve this desired level of isolation. To address the aforementioned issues, the concept of implementing a cache for each namespace's rlimit has been proposed. If a cache is added for each user namespace's rlimit, a certain amount of rlimits can be allocated to a particular namespace in one go. When resources are abundant, these resources do not need to be immediately returned to the parent node. Within a user namespace, if there are available values in the cache, there is no need to request additional resources from the parent node. The ultimate objective of this solution is to achieve complete isolation among namespaces. After applying this patch set, the final test results indicate that in the signal1 test case, the performance does not deteriorate as the number of containers increases. This effectively meets the goal of linear scalability. | Dockers |1 |4 |8 |16 |32 |64 | | Throughput |381809 |382284 |380640 |383515 |381318 |380120 | [1] https://github.com/antonblanchard/will-it-scale/blob/master/tests/ Signed-off-by: Chen Ridong --- include/linux/user_namespace.h | 11 ++- kernel/signal.c | 2 +- kernel/ucount.c | 131 +++++++++++++++++++++++++++++++-- kernel/user_namespace.c | 2 + 4 files changed, 139 insertions(+), 7 deletions(-) diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h index 823df9267a4a..30e80d46ab5f 100644 --- a/include/linux/user_namespace.h +++ b/include/linux/user_namespace.h @@ -113,6 +113,7 @@ struct user_namespace { struct ucounts *ucounts; long ucount_max[UCOUNT_COUNTS]; long rlimit_max[UCOUNT_RLIMIT_COUNTS]; + atomic_t rlimit_cache[UCOUNT_RLIMIT_COUNTS]; =20 #if IS_ENABLED(CONFIG_BINFMT_MISC) struct binfmt_misc *binfmt_misc; @@ -139,6 +140,8 @@ void dec_ucount(struct ucounts *ucounts, enum ucount_ty= pe type); struct ucounts *alloc_ucounts(struct user_namespace *ns, kuid_t uid); void put_ucounts(struct ucounts *ucounts); =20 +void rlimit_drain_cache(struct user_namespace *root); + static inline struct ucounts * __must_check get_ucounts(struct ucounts *uc= ounts) { if (rcuref_get(&ucounts->count)) @@ -154,7 +157,7 @@ static inline long get_rlimit_value(struct ucounts *uco= unts, enum rlimit_type ty long inc_rlimit_ucounts(struct ucounts *ucounts, enum rlimit_type type, lo= ng v); bool dec_rlimit_ucounts(struct ucounts *ucounts, enum rlimit_type type, lo= ng v); long inc_rlimit_get_ucounts(struct ucounts *ucounts, enum rlimit_type type, - bool override_rlimit); + bool override_rlimit, long tlimit); void dec_rlimit_put_ucounts(struct ucounts *ucounts, enum rlimit_type type= ); bool is_rlimit_overlimit(struct ucounts *ucounts, enum rlimit_type type, u= nsigned long max); =20 @@ -169,6 +172,12 @@ static inline void set_userns_rlimit_max(struct user_n= amespace *ns, ns->rlimit_max[type] =3D max <=3D LONG_MAX ? max : LONG_MAX; } =20 +static inline void init_userns_rlimit_cache(struct user_namespace *ns) +{ + for (int i =3D 0; i < UCOUNT_RLIMIT_COUNTS; ++i) + atomic_set(&ns->rlimit_cache[i], 0); +} + struct user_namespace *ns_next_child(struct user_namespace *pos, struct user_namespace *parent); struct user_namespace *ns_next_child_pre(struct user_namespace *pos, diff --git a/kernel/signal.c b/kernel/signal.c index 148082db9a55..e7147fcaa55f 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -416,7 +416,7 @@ static struct ucounts *sig_get_ucounts(struct task_stru= ct *t, int sig, rcu_read_lock(); ucounts =3D task_ucounts(t); sigpending =3D inc_rlimit_get_ucounts(ucounts, UCOUNT_RLIMIT_SIGPENDING, - override_rlimit); + override_rlimit, task_rlimit(t, RLIMIT_SIGPENDING)); rcu_read_unlock(); if (!sigpending) return NULL; diff --git a/kernel/ucount.c b/kernel/ucount.c index 33605e416724..f29ed2d3b3c8 100644 --- a/kernel/ucount.c +++ b/kernel/ucount.c @@ -16,6 +16,8 @@ struct ucounts init_ucounts =3D { =20 #define UCOUNTS_HASHTABLE_BITS 10 #define UCOUNTS_HASHTABLE_ENTRIES (1 << UCOUNTS_HASHTABLE_BITS) +#define UCOUNT_BATCH_SIZE 16 + static struct hlist_nulls_head ucounts_hashtable[UCOUNTS_HASHTABLE_ENTRIES= ] =3D { [0 ... UCOUNTS_HASHTABLE_ENTRIES - 1] =3D HLIST_NULLS_HEAD_INIT(0) }; @@ -315,24 +317,143 @@ static void do_dec_rlimit_put_ucounts(struct ucounts= *ucounts, =20 void dec_rlimit_put_ucounts(struct ucounts *ucounts, enum rlimit_type type) { - do_dec_rlimit_put_ucounts(ucounts, NULL, type, 1); + struct user_namespace *ns =3D ucounts->ns; + int cache; + + if (ns !=3D &init_user_ns) { + __dec_rlimit_put_ucounts(ucounts, type, 1); + cache =3D atomic_add_return(1, &ns->rlimit_cache[type]); + if (cache > UCOUNT_BATCH_SIZE) { + cache =3D atomic_sub_return(UCOUNT_BATCH_SIZE, + &ns->rlimit_cache[type]); + if (cache > 0) + do_dec_rlimit_put_ucounts(ns->ucounts, NULL, + type, UCOUNT_BATCH_SIZE); + else + atomic_add(UCOUNT_BATCH_SIZE, &ns->rlimit_cache[type]); + } + } else { + do_dec_rlimit_put_ucounts(ucounts, NULL, type, 1); + } +} + +/* Drain the root cache, return how many cache have been relcaimed */ +static int rlimit_drain_type_cache(struct user_namespace *root, enum rlimi= t_type type) +{ + struct user_namespace *child; + int reclaim_cache =3D 0; + + rcu_read_lock(); + ns_for_each_child_pre(child, root) { + int cache; +retry: + cache =3D atomic_read(&child->rlimit_cache[type]); + if (cache > 0) { + int old =3D atomic_cmpxchg(&child->rlimit_cache[type], cache, 0); + + if (cache =3D=3D old) { + reclaim_cache +=3D cache; + do_dec_rlimit_put_ucounts(child->ucounts, NULL, type, cache); + } else { + goto retry; + } + } + } + rcu_read_unlock(); + return reclaim_cache; +} + +void rlimit_drain_cache(struct user_namespace *root) +{ + for (int i =3D 0; i < UCOUNT_RLIMIT_COUNTS; i++) + rlimit_drain_type_cache(root, i); +} + +static bool rlimit_charge_cache(struct ucounts *ucounts, enum rlimit_type = type) +{ + struct ucounts *iter; + long max =3D LONG_MAX; + long new; + struct user_namespace *ns =3D ucounts->ns; + + for (iter =3D ns->ucounts; iter; iter =3D iter->ns->ucounts) { + max =3D get_userns_rlimit_max(iter->ns, type); + new =3D __inc_rlimit_get_ucounts(iter, type, UCOUNT_BATCH_SIZE); + if (new <=3D 0 || new > max) + goto dec_unwind; + } + + /* charge ok, add the ns's cache */ + atomic_add_return(UCOUNT_BATCH_SIZE, &ucounts->ns->rlimit_cache[type]); + return true; + +dec_unwind: + do_dec_rlimit_put_ucounts(ns->ucounts, iter, type, UCOUNT_BATCH_SIZE); + return false; } =20 long inc_rlimit_get_ucounts(struct ucounts *ucounts, enum rlimit_type type, - bool override_rlimit) + bool override_rlimit, long tlimit) { /* Caller must hold a reference to ucounts */ struct ucounts *iter; long max =3D LONG_MAX; long ret =3D 0; + struct user_namespace *ns =3D ucounts->ns; + bool is_trying =3D false; + bool non_cache =3D false; + long new; + +try_cache: + /* If the ucounts.ns is not init_user_ns, and it has cache in its ns, con= sume cache */ + if (ns !=3D &init_user_ns) { + if (atomic_dec_return(&ns->rlimit_cache[type]) >=3D 0) { + new =3D __inc_rlimit_get_ucounts(ucounts, type, 1); + /* + * If new is below tlimit, return success + * Otherwise, goto non-cache logic. It should keep the + * rlimit below the tlimit as much as possible + */ + if (new <=3D tlimit) + return new; + non_cache =3D true; + } + /* Restore the previously incremented value */ + atomic_inc(&ns->rlimit_cache[type]); + + if (!non_cache && !is_trying && + rlimit_charge_cache(ucounts, type)) { + is_trying =3D true; + goto try_cache; + } + } =20 for (iter =3D ucounts; iter; iter =3D iter->ns->ucounts) { - long new =3D __inc_rlimit_get_ucounts(iter, type, 1); +retry_inc: + new =3D __inc_rlimit_get_ucounts(iter, type, 1); + + /* + * When the 'iter' is equal to 'ucounts', the 'new' value is what will b= e returned. + * + * Case 1: If the return value is larger than 'tlimit'. + * Case 2: If the 'new' value is larger than the maximum of 'rlimit_max'. + * + * In both cases, we need to drain the cache. This is because when the c= ache is + * present, the value might exceed the acceptable threshold. However, wh= en the + * cache is removed,the value should fall within the allowed limit + */ + if (iter =3D=3D ucounts) + ret =3D new; + + if ((new > max || ret > tlimit) && + rlimit_drain_type_cache(iter->ns, type) > 0) { + __dec_rlimit_put_ucounts(iter, type, 1); + goto retry_inc; + } =20 if (new <=3D 0 || new > max) goto dec_unwind; - if (iter =3D=3D ucounts) - ret =3D new; + if (!override_rlimit) max =3D get_userns_rlimit_max(iter->ns, type); } diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c index 9a2e77505b97..bc77c9acf426 100644 --- a/kernel/user_namespace.c +++ b/kernel/user_namespace.c @@ -190,6 +190,7 @@ int create_user_ns(struct cred *new) set_userns_rlimit_max(ns, UCOUNT_RLIMIT_MSGQUEUE, rlimit(RLIMIT_MSGQUEUE)= ); set_userns_rlimit_max(ns, UCOUNT_RLIMIT_SIGPENDING, rlimit(RLIMIT_SIGPEND= ING)); set_userns_rlimit_max(ns, UCOUNT_RLIMIT_MEMLOCK, rlimit(RLIMIT_MEMLOCK)); + init_userns_rlimit_cache(ns); ns->ucounts =3D ucounts; =20 /* Inherit USERNS_SETGROUPS_ALLOWED from our parent */ @@ -273,6 +274,7 @@ static void free_user_ns(struct work_struct *work) kfree(ns->binfmt_misc); #endif retire_userns_sysctls(ns); + rlimit_drain_cache(ns); key_free_user_ns(ns); ns_free_inum(&ns->ns); call_rcu(&ns->rcu, __free_user_ns); --=20 2.34.1