From patchwork Fri Jan 27 18:46:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rik van Riel X-Patchwork-Id: 49599 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp990525wrn; Fri, 27 Jan 2023 10:52:23 -0800 (PST) X-Google-Smtp-Source: AK7set+vG59X+HixZTjSIV2fe5HSqefmyHnY5kC80CPVP57kmcp/1oGvf52eoniHDy88YMzqdL3C X-Received: by 2002:a05:6402:510d:b0:4a0:b601:4a74 with SMTP id m13-20020a056402510d00b004a0b6014a74mr13234521edd.28.1674845543028; Fri, 27 Jan 2023 10:52:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674845543; cv=none; d=google.com; s=arc-20160816; b=WK1VMmVtM9V2M55/EfqSqyl9Mqa8cnuhtxHEUMCWnNQzmvQecYZDaFi76L1clAFNIP BCnSvNd/UDoi4s8OpkXDs7Avnbf0soxVMQ6jdioti3ve+04p+rhoSnRDr5ysvHogJtuW 0ZYFiiPYcI56T/lIkHEC1yvOtxpUVpBdVrVAQYO8HqddOAbOhhrDdIlTsowCiVQR2riO 5Mws1CPXhXg8ZJyACXCjjytndxA1eBp6xKktYbE23HrwIFkCHTTP82Uk2XkfxSm5OXdc JUarRjb7rE9TeNmzAuJbLl9aiYdGTDH1vyvCvJPET4sYUBgX/JjUkzwHyt987ngYTggY I7lQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=jGvZZJZuQJdxoBz3CCm4G0l/dvMXn1lHJuCxsosHcXY=; b=e/HKg5jbJwVk4w+mFjFgLYH7QzGtE+l+UR+U4AxpiWwd0+mSPUjs6tEovXZvILlNO6 2WIiDVpg2pnRGPpgrC+De0FpZt7gpiyZyZhbSq2hqiYVpuwI9uyidTSRDNHWvK8MhZ62 ctP4EF6EUYpNBlOeYPTjbHf59GRb0Pv8y2wWS/js/AuklgClXU8NvswVKNUNzdHkMlIE wSTxyi+N6YShO1wsW/z/MOhYsqbpsF5oS3sXDbTmZKwwXwkiHS9GF35qQ8CMfVLZHzEE SA8A7V9KzoN9IF2t5GsUJYxc9D+7NGm3oDulgMHAvAnsLVNr870PG7+kjD7VflqXRYsB IzgQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o10-20020a056402038a00b004a0a6b8328fsi5700752edv.13.2023.01.27.10.51.59; Fri, 27 Jan 2023 10:52:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233502AbjA0Srl (ORCPT + 99 others); Fri, 27 Jan 2023 13:47:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235264AbjA0SrT (ORCPT ); Fri, 27 Jan 2023 13:47:19 -0500 Received: from shelob.surriel.com (shelob.surriel.com [96.67.55.147]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1A2186E9D; Fri, 27 Jan 2023 10:47:14 -0800 (PST) Received: from imladris.home.surriel.com ([10.0.13.28] helo=imladris.surriel.com) by shelob.surriel.com with esmtpsa (TLS1.2) tls TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1pLTkW-0008Mm-1C; Fri, 27 Jan 2023 13:46:56 -0500 From: Rik van Riel To: viro@zeniv.linux.org.uk, linux-kernel@vger.kernel.org, kernel-team@meta.com, linux-fsdevel@vger.kernel.org, gscrivan@redhat.com Cc: Rik van Riel , Chris Mason Subject: [PATCH 1/2] ipc,namespace: make ipc namespace allocation wait for pending free Date: Fri, 27 Jan 2023 13:46:50 -0500 Message-Id: <20230127184651.3681682-2-riel@surriel.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230127184651.3681682-1-riel@surriel.com> References: <20230127184651.3681682-1-riel@surriel.com> MIME-Version: 1.0 Sender: riel@shelob.surriel.com X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756202840205998847?= X-GMAIL-MSGID: =?utf-8?q?1756202840205998847?= Currently the ipc namespace allocation will fail when there are ipc_namespace structures pending to be freed. This results in the simple test case below, as well as some real world workloads, to get allocation failures even when the number of ipc namespaces in actual use is way below the limit. int main() { int i; for (i = 0; i < 100000; i++) { if (unshare(CLONE_NEWIPC) < 0) error(EXIT_FAILURE, errno, "unshare"); } } Make the allocation of an ipc_namespace wait for pending frees, so it will succeed. real 6m19.197s user 0m0.041s sys 0m1.019s Signed-off-by: Rik van Riel Reported-by: Chris Mason --- ipc/namespace.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/ipc/namespace.c b/ipc/namespace.c index 8316ea585733..a26860a41dac 100644 --- a/ipc/namespace.c +++ b/ipc/namespace.c @@ -19,6 +19,12 @@ #include "util.h" +/* + * The work queue is used to avoid the cost of synchronize_rcu in kern_unmount. + */ +static void free_ipc(struct work_struct *unused); +static DECLARE_WORK(free_ipc_work, free_ipc); + static struct ucounts *inc_ipc_namespaces(struct user_namespace *ns) { return inc_ucount(ns, current_euid(), UCOUNT_IPC_NAMESPACES); @@ -37,9 +43,18 @@ static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns, int err; err = -ENOSPC; + again: ucounts = inc_ipc_namespaces(user_ns); - if (!ucounts) + if (!ucounts) { + /* + * IPC namespaces are freed asynchronously, by free_ipc_work. + * If frees were pending, flush_work will wait, and + * return true. Fail the allocation if no frees are pending. + */ + if (flush_work(&free_ipc_work)) + goto again; goto fail; + } err = -ENOMEM; ns = kzalloc(sizeof(struct ipc_namespace), GFP_KERNEL_ACCOUNT); @@ -157,11 +172,6 @@ static void free_ipc(struct work_struct *unused) free_ipc_ns(n); } -/* - * The work queue is used to avoid the cost of synchronize_rcu in kern_unmount. - */ -static DECLARE_WORK(free_ipc_work, free_ipc); - /* * put_ipc_ns - drop a reference to an ipc namespace. * @ns: the namespace to put