From patchwork Fri Apr 14 05:13:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 13210937 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE4C3C77B71 for ; Fri, 14 Apr 2023 05:14:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7938B900009; Fri, 14 Apr 2023 01:14:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7449C900003; Fri, 14 Apr 2023 01:14:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 54804900009; Fri, 14 Apr 2023 01:14:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 4591A900003 for ; Fri, 14 Apr 2023 01:14:00 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 0A91B16010E for ; Fri, 14 Apr 2023 05:14:00 +0000 (UTC) X-FDA: 80678829840.17.37F143A Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf28.hostedemail.com (Postfix) with ESMTP id 66CDFC0005 for ; Fri, 14 Apr 2023 05:13:57 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b="DAZ/9FV+"; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none); spf=none (imf28.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1681449237; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=E0LjocQZXclRQB8l3IvaHDmnaUKbJERLnQeMcmNYaaY=; b=kAAsfUI5vQlcrofl3dj4ypsVzl9TA77JbuZ+CeKb9Tk1c6rhYnCoxWRcLcenPTIeB7QH2Y kdYvRY2Ag6t/JzfmVBmEdnl8/etNLwQgkdHqgekFb5p8beE5pXNmzd2bTZJXy6t1bn4VRC kAVQfJpdsXxoz6xEJ5sh9S7OS+9rxPA= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b="DAZ/9FV+"; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none); spf=none (imf28.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1681449237; a=rsa-sha256; cv=none; b=7ev+ybhbj34gbacgRq7kgSSaa6GrSdnLC0D3ao5SZ5Z/rZkssss6J2wWwCkh88405iFq03 vep2X0lWjXgAV+T2QpW404nRvi6dS8bo9sclB/6O9U4H+w+oreR6nmP1Xk5Hajdmltyx8I /TxtdL5yoYf7AGb5lNwD1qrAb95ZpPI= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=E0LjocQZXclRQB8l3IvaHDmnaUKbJERLnQeMcmNYaaY=; b=DAZ/9FV+DD7XCMmi7Ry/72YGZA hStOFcdNHpzcexPjDdDvn4/I3GzlDg3xmazuaJyrD8MDVpXMlJQGDprz6SaDCVp9+OF6Zh+kIOk0L DVTpi5+W658yOpIzK2D7xQd6BPHUZ86qlyKhB4VRDhUaVcEi4F2xNwt1tZob++B0ed6NMJxJO8Yeq I1D+uJZgTaJeh+2fwBbp2/0RB78r9GhkOL0LJzdu+WBD0Qpb9Pan//1/QzRqloeBRkj4SgEoHqnWN q48Bc4ZQoHCCOn+Er3owoW6C7EWltqr7ULK1OlQjTs6+aZi+Sgm1BXgUx1wNDg6K7SP38lypvLfOx WHW5aWkg==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.96 #2 (Red Hat Linux)) id 1pnBks-008KqY-1v; Fri, 14 Apr 2023 05:13:50 +0000 From: Luis Chamberlain To: david@redhat.com, patches@lists.linux.dev, linux-modules@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, pmladek@suse.com, petr.pavlu@suse.com, prarit@redhat.com, torvalds@linux-foundation.org, gregkh@linuxfoundation.org, rafael@kernel.org Cc: christophe.leroy@csgroup.eu, tglx@linutronix.de, peterz@infradead.org, song@kernel.org, rppt@kernel.org, dave@stgolabs.net, willy@infradead.org, vbabka@suse.cz, mhocko@suse.com, dave.hansen@linux.intel.com, colin.i.king@gmail.com, jim.cromie@gmail.com, catalin.marinas@arm.com, jbaron@akamai.com, rick.p.edgecombe@intel.com, mcgrof@kernel.org Subject: [PATCH v3 2/2] modules/kmod: replace implementation with a semaphore Date: Thu, 13 Apr 2023 22:13:49 -0700 Message-Id: <20230414051349.1986744-3-mcgrof@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230414051349.1986744-1-mcgrof@kernel.org> References: <20230414051349.1986744-1-mcgrof@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 66CDFC0005 X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: r4965uemcemet1upgkad8piw57f1mkh9 X-HE-Tag: 1681449237-511666 X-HE-Meta: U2FsdGVkX18o36ndJNzyZp9FdfkQzyY+CrA3ZfwDXabOgd1SlGPgUyUsuXNp7hD8Ld/PxyaTnU7/ysJTz1vETXyOo8BN1S6gULQatTcp/FUKNPm8ZWAfMX5vn/mizkWBmOpcsGnSKQFF75//T9q82dtl4lnkUVvV9rPzx8KZzM30sBuIlx7nYsZ+A35ClR2gqLPkfOMeGub/M8BxWU9PoimH10hSCKOnPfaeki7o4xvMZVK9/NVLWYpz7rbmfrV/1BViSXo9Q45KubsXWcpFtJ7bu8opT71zf4VlfMjhbN4ZDlPg3771RkBZWCOEDJTgB09Gv3MLPtj72EW5JCCbEa+Pncdxw32A6Z45HPkczwExtFlcOubbRs4yoJHyx+1/q1cZ+/px3ggQN9bGOXCC1XRn8b42aDTjDgNeO9f24ufWg60MMNYU1rbSZRjBtLo1rCGn1VMlsmmltgYP9IwhnMbmrSUQ9Yt3hzGKYidVw9BuTaxHoYarjOXWIEy8v3gSjBXNhKJLQ3VXfs075MYOzGjvKgE7+SPVmPfleFxvEYE52SEsws5BZ9gYTZwNyG32AoohXRfbZwB8QPG5pfvbnDMraVpE9we6tqfcOC8XtQj0MpuydAy1xqGozgrhFJIDxtVA6tf7VlAtYqtHWhWkFNoZqEUQ/UQccmAeT/zZTEtwcSyfqKWbVHo2lvtFkzQhLFVgVUf3l9/2ZXUapdWkFwLFMay9k2lwGrNGzrlpsctm7H322p/e33V0h1oizpXtHNfGOU88q8WXSsOQp//VnLGKHePkzbH5K+YoWG9Waf4dyrW5Kh3gPYl6fxgHaDC2LFpDOHhPQ4ApYrRoIayCt+rqLJ5Y37AcRG/GMEI6N45nhCepidoqvOwFqj9oYuZ+HhUQ/RusSdJjWvV2U1+c4hq+YO0MsDnlMMNCaypIXb9OxNC6Xatxl455DgwE9oaY5CKWuR3GfS/nH2l/sJ2 ZHYF+84l +NCxfspZN47k5RxdWlJNlMFpGb01rPNcJ59crZvhQqcLJaE/pASwGBwl2kybGukqreyLBgj30iHzirRm7jXDNSKs59T/2VL80AnD20TFOYR9Rvp1iWOhWd9+J+2wCgw7UxEWl6BLnVBJR9ZCoXo9kTdZ24+ukDJrVQTT62eXDMoaecTNUIX8C9efpR2UWEu/uVfYaIVSPiJEM8Fg9jK9GMB8vepI6l+azQYKiFK0a4GTT5VIIaUTIIqX3fwG30LFpu3MVFhmSrM/wip+fZbeb5twDxuL0Pb+FlSdCvNuSeEldekrOg3F2HILocgffesykB26I6GSzjcyza7v8XPFlwkF2igbaLJ89fC38bVdoozTu8EXDBs/SHyQ1fFYMI5tTuOwuKkazAUKhQ/ROP4i9BBC02SPTZwWW6LCC3Ng9JbeR/C1IjFwBEQ5UzOpu4ROerFvyeQ+a3k8xOk0/+oe03AK4LTmb9Ys6vxWZJUtrxDT6MkU= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Simplify the concurrency delimiter we use for kmod with the semaphore. I had used the kmod strategy to try to implement a similar concurrency delimiter for the kernel_read*() calls from the finit_module() path so to reduce vmalloc() memory pressure. That effort didn't provide yet conclusive results, but one thing that became clear is we can use the suggested alternative solution with semaphores which Linus hinted at instead of using the atomic / wait strategy. I've stress tested this with kmod test 0008: time /data/linux-next/tools/testing/selftests/kmod/kmod.sh -t 0008 And I get only a *slight* delay. That delay however is small, a few seconds for a full test loop run that runs 150 times, for about ~30-40 seconds. The small delay is worth the simplfication IMHO. Signed-off-by: Luis Chamberlain Reviewed-by: Miroslav Benes Reviewed-by: David Hildenbrand --- kernel/module/kmod.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/kernel/module/kmod.c b/kernel/module/kmod.c index b717134ebe17..5899083436a3 100644 --- a/kernel/module/kmod.c +++ b/kernel/module/kmod.c @@ -40,8 +40,7 @@ * effect. Systems like these are very unlikely if modules are enabled. */ #define MAX_KMOD_CONCURRENT 50 -static atomic_t kmod_concurrent_max = ATOMIC_INIT(MAX_KMOD_CONCURRENT); -static DECLARE_WAIT_QUEUE_HEAD(kmod_wq); +static DEFINE_SEMAPHORE(kmod_concurrent_max, MAX_KMOD_CONCURRENT); /* * This is a restriction on having *all* MAX_KMOD_CONCURRENT threads @@ -148,29 +147,18 @@ int __request_module(bool wait, const char *fmt, ...) if (ret) return ret; - if (atomic_dec_if_positive(&kmod_concurrent_max) < 0) { - pr_warn_ratelimited("request_module: kmod_concurrent_max (%u) close to 0 (max_modprobes: %u), for module %s, throttling...", - atomic_read(&kmod_concurrent_max), - MAX_KMOD_CONCURRENT, module_name); - ret = wait_event_killable_timeout(kmod_wq, - atomic_dec_if_positive(&kmod_concurrent_max) >= 0, - MAX_KMOD_ALL_BUSY_TIMEOUT * HZ); - if (!ret) { - pr_warn_ratelimited("request_module: modprobe %s cannot be processed, kmod busy with %d threads for more than %d seconds now", - module_name, MAX_KMOD_CONCURRENT, MAX_KMOD_ALL_BUSY_TIMEOUT); - return -ETIME; - } else if (ret == -ERESTARTSYS) { - pr_warn_ratelimited("request_module: sigkill sent for modprobe %s, giving up", module_name); - return ret; - } + ret = down_timeout(&kmod_concurrent_max, MAX_KMOD_ALL_BUSY_TIMEOUT * HZ); + if (ret) { + pr_warn_ratelimited("request_module: modprobe %s cannot be processed, kmod busy with %d threads for more than %d seconds now", + module_name, MAX_KMOD_CONCURRENT, MAX_KMOD_ALL_BUSY_TIMEOUT); + return ret; } trace_module_request(module_name, wait, _RET_IP_); ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC); - atomic_inc(&kmod_concurrent_max); - wake_up(&kmod_wq); + up(&kmod_concurrent_max); return ret; }