From mboxrd@z Thu Jan 1 00:00:00 1970 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 6E37FC74A5B for ; Wed, 29 Mar 2023 05:31:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 085506B0078; Wed, 29 Mar 2023 01:31:58 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 034B16B007B; Wed, 29 Mar 2023 01:31:57 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E3D8A6B007D; Wed, 29 Mar 2023 01:31:57 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id D4DE76B0078 for ; Wed, 29 Mar 2023 01:31:57 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id A6997AC087 for ; Wed, 29 Mar 2023 05:31:57 +0000 (UTC) X-FDA: 80620814274.18.9BD65FA Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf13.hostedemail.com (Postfix) with ESMTP id 04DB02000B for ; Wed, 29 Mar 2023 05:31:54 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=xGWh2JgK; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none); spf=none (imf13.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=1680067915; 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=gd8HbSo5xrQsR5kA4HVA4gKzlE/8w/S5arnYzQjZrxg=; b=0cAytsk36+cP47L1u0Z0PXVcwil7Bq/TGMbOPtL9WU6N7BwxEM2yJHI9soRFU22jJ6n6I7 Z5U5jKK1+NUjsc7K/sElfCxXlBp9IX+p09Jyz1TgFzTLdtMJVIUNWFjM/jdzmIFQgXFhUc Qa8vhnP30ey+JunRb2Y8xIS37HDkLf4= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=xGWh2JgK; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none); spf=none (imf13.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=1680067915; a=rsa-sha256; cv=none; b=TXBlYV528IFlJvzChwvQSPiRzn8SfiBoTq7sYjwUTVxdcheVzYAa9NXLWwph32Zey44Rfb epR4VLVCmXKk7/RnuNFbVz7PKfavplrzoNwHzIfloKNLyYweFGYxDx7x0jGLALLGC8qDe2 s+WzQocGZEVcwdGlKdWvN5Ez9bd1Qbs= 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=gd8HbSo5xrQsR5kA4HVA4gKzlE/8w/S5arnYzQjZrxg=; b=xGWh2JgKRYwpppiRzsWetlki5t SVeBNZzs7bh2gAzAdY3c4dPLIqKQ56oSDKzinEazY6EhcXBffYAE1BcrA4RD1I8UB8UxwhlyXHxmK E/JKeSfdBahNY/fWI+b38Kf0WHEmp5qRM+J5c2Tc9/0JMZB29rDgeZCoKqc2+pse21WP1cvPGgv2j +TS3Aw0BoqVz0XL2rSKX9QyduwIqa0AUcLUQCZUPeNvFM4L5JQcEMNtqv0yXiYcXImRcc4tRvL5c5 GbPvsKhY/FQ4y+Bc0G6I1sdi/F3VcHfN6n+zJlt617XOG53+obPbnyIdgO6d3lukOl04AKooj4asy zW1gZagw==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.96 #2 (Red Hat Linux)) id 1phOPW-00GgRS-1v; Wed, 29 Mar 2023 05:31: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, willy@infradead.org, vbabka@suse.cz, mhocko@suse.com, dave.hansen@linux.intel.com, mcgrof@kernel.org Subject: [PATCH 1/7] module: move finished_loading() Date: Tue, 28 Mar 2023 22:31:43 -0700 Message-Id: <20230329053149.3976378-2-mcgrof@kernel.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230329053149.3976378-1-mcgrof@kernel.org> References: <20230329053149.3976378-1-mcgrof@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 04DB02000B X-Stat-Signature: gsjt81fcmcqjmqir1m6b69xbxnj4pkk1 X-HE-Tag: 1680067914-179123 X-HE-Meta: U2FsdGVkX19SS6Koz9zl9rDwI8dcmDtXSwpFBkPXLDnBIFOfyg9BI5bb1Jr7sYifvhuFSxKrckJorQaP6m9C+MHGACYl5Qk9j0uQ8l2uoV7sngPUiTjacwRV+dvVMCfoap6pT4cE9yvxpoVeGSuejFImwJFa7UavmDU0ROh9m6bl2PgiiUSQyngfVtwIpNqBBFi1s6XVNMY2XJJ8ehi5AplRxItKvyZHuSUd4hNVkkfe5fSklC7V/wgWhYtxGGGuhUz2HkBnFKh8Bc4ZuysZp+SXSUAa5ikx3aeKksmz+ex0jvdJ4X4uNPhBkGAeRDOCIK7h21eqcBVtl1JNHdqx0kcFVusd4jYplhLk6xgpG8Rxal2YEg5NUEmFYHPYH7OA9JzRS3yPyPa9NbMR/zU+peh3EmRaQUvhtm6bWnCYLdsC1mGvqN69ach8Ir+Il2RYHjX6s3WlCX3RZWWzUD7iomfVkz+/4yK6FaL0oX24PimtR5UezoHTvU4PdUHAQOK6YFcUJaXlXJQ0XMyouXFcxOQD5G9jrtfsqEE8lvz1mPNCOEwKHr1xlleWOEZdUI+VvvXUdQ+2ujC4HjD30KxVL4l4AjGS9JGImbRkkbc2u7tgilYlI/P9GCu+diIW3KmbK0K+hrndDLlXgjpVw+FpUivh8fwZwcCgJCI364Xcmbp0rk5APGFoaT3PSct9y2TKdZYDXuoHDi/Giih5Oo2Ul0uw5QaDnyAPpw+N/jn01Ehq+Se3bvNiw3bvfB118bZuA5tcrvcb1D4+y3DBJ3DHONCIJTiLP1lIVEMho/HPURGt97LcMjXYvww0zUGqE6RXz4jAAVusqwdjjiKBudrbSsVNMLewQtiJ4e242q/86r3OaWIk774dKEzYlXCdKXn+ibO7N8nokgMyktfUnk/nd1afCU0IJUPVS6g+ErVoO/H0JJhR46XVSLV/ZpzYP0l4UFoD7x9lzsLjsZA6/7B IW3IZe/l mt0dBlFe4XVFn6thuelhBybpTBSZwjcz1cf4XvI4Y4ecrsV20CB9e3zjcWF9iF7AONm53DklSW1kD0VOj3ztatNM2ZESLec/+PzipNw2q5TfieA3n0GbHi0+ejicgLLocln57qUqWccx/RAqkffNBfoPoxALWDCCfMPtj8jI75k3AsiGy19R5gwRoyWJyZne52j+iVfmC3jXtm9MbzuO6hc6IH4YQqXYDzMlQ14ZwfHKK6Msg3TtecCZNsMMtVTV/Pd6/wix2JgD0bRBCm59xzTeffep6+pkV4qKMtQlNii3/6hKjHHL+MOYsuXA3dsmf3i+RPmd7UgqHh9T5kynCFujYsr6JpjEfAnIFyKyo4dMPiS8zb/tp0HpFIMnLdpVuY1VMX7WjcugVgUVfq5O3V31WR1fjEtqdmufXSxSAbFvI1mALrbdCGjWA7bGWAR07TqXX5Yc7R92zLniCAGj36NBosg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: This has no functional change, just moves a routine earlier as we'll make use of it next. Signed-off-by: Luis Chamberlain --- kernel/module/main.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/kernel/module/main.c b/kernel/module/main.c index 5cc21083af04..af58e63e5daf 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -2442,27 +2442,6 @@ static int post_relocation(struct module *mod, const struct load_info *info) return module_finalize(info->hdr, info->sechdrs, mod); } -/* Is this module of this name done loading? No locks held. */ -static bool finished_loading(const char *name) -{ - struct module *mod; - bool ret; - - /* - * The module_mutex should not be a heavily contended lock; - * if we get the occasional sleep here, we'll go an extra iteration - * in the wait_event_interruptible(), which is harmless. - */ - sched_annotate_sleep(); - mutex_lock(&module_mutex); - mod = find_module_all(name, strlen(name), true); - ret = !mod || mod->state == MODULE_STATE_LIVE - || mod->state == MODULE_STATE_GOING; - mutex_unlock(&module_mutex); - - return ret; -} - /* Call module constructors. */ static void do_mod_ctors(struct module *mod) { @@ -2626,6 +2605,27 @@ static int may_init_module(void) return 0; } +/* Is this module of this name done loading? No locks held. */ +static bool finished_loading(const char *name) +{ + struct module *mod; + bool ret; + + /* + * The module_mutex should not be a heavily contended lock; + * if we get the occasional sleep here, we'll go an extra iteration + * in the wait_event_interruptible(), which is harmless. + */ + sched_annotate_sleep(); + mutex_lock(&module_mutex); + mod = find_module_all(name, strlen(name), true); + ret = !mod || mod->state == MODULE_STATE_LIVE + || mod->state == MODULE_STATE_GOING; + mutex_unlock(&module_mutex); + + return ret; +} + /* * We try to place it in the list now to make sure it's unique before * we dedicate too many resources. In particular, temporary percpu -- 2.39.2