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 66B92C76188 for ; Wed, 5 Apr 2023 17:11:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F2AC96B0083; Wed, 5 Apr 2023 13:11:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EDAB76B0087; Wed, 5 Apr 2023 13:11:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DA2BC6B0089; Wed, 5 Apr 2023 13:11:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id C810E6B0083 for ; Wed, 5 Apr 2023 13:11:32 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 95A22A0CC0 for ; Wed, 5 Apr 2023 17:11:32 +0000 (UTC) X-FDA: 80647978824.25.3BBFACB Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf10.hostedemail.com (Postfix) with ESMTP id 3B1D0C000B for ; Wed, 5 Apr 2023 17:11:30 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=e1NFN637; spf=pass (imf10.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680714690; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=UaGdM0RBcWTEVyOjxj3WXQhiHUXogDiNZgiaLMNlDoc=; b=KGRaPWpScid7HCI8/f5pq+ah1QhlgIQRGtw9KXEEOrLMtO4ye0dKZ4cQPTw4BNZjqzmEj+ fMw2Y7VDH4j0mddo+MsAjlz0v+KbsN2NPVPVbhLm6//gkyqs1Z6NaZkFgyeKxCn0RLjMo9 LjWNtj8+ukzjBwa0dqtlds9Wg3+0oaU= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=e1NFN637; spf=pass (imf10.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680714690; a=rsa-sha256; cv=none; b=bbxLiDbPjilzQsaQrUoJVNaWG5zeVB1yStALDfCa8486Ss5dzgxG6B12ewimt32ApMXtDI ZL2KeTWPdmwmjpIuy3IcdZe4zDiVXWNC2gWISNKEzPqyIg+k/kaSwZSho/NST9DsVA9Fmu lHQcImJXvZQA53rzmnfOT7cmlm8hjs4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680714689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UaGdM0RBcWTEVyOjxj3WXQhiHUXogDiNZgiaLMNlDoc=; b=e1NFN637xjgKs/m7GWH3zb9NuLE8hhyxe8nneQkSzKqu8fbtc+ecmmuEj0s4LJPMaOUCHg NxpSdqecmWfZiW/L8+rEzcKHBjiUt5CtmK1+6f2YJDKF0Ym2ad8pMiHN79Rsi9SGAuCYBy zHD2NS1I7k45BLFYYoGSHbgZxzE+0W4= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-557-6xyMmnxONC2UxdhXCVVGvg-1; Wed, 05 Apr 2023 13:11:28 -0400 X-MC-Unique: 6xyMmnxONC2UxdhXCVVGvg-1 Received: by mail-wm1-f71.google.com with SMTP id n11-20020a05600c3b8b00b003f04739b77aso7450954wms.9 for ; Wed, 05 Apr 2023 10:11:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680714687; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=UaGdM0RBcWTEVyOjxj3WXQhiHUXogDiNZgiaLMNlDoc=; b=dY8fpQFa0S8oHK30Cgn+y6xA6vwJ2E+3G/CgFx1dpKce2gt8A2/SJ1mnud+3GYilfO f/pKkABWVcE0Ok2IM/7cvKW5UCeJtPUZLVvU/QOdyC6XDUB8ziXUIhWYIi5fRrIP9aj9 MwUqtXWvZtspAZ8MN8+gCuAUsWBLog8vJrdayL6Zj/RqFWLNfsEI96HVr8+o7LfUbuwL Uhqi/Qq3iehIFKvYWy2lm9M8QgllKBATFLaqtyHR0GpSJOQCDKuQ4lvRuRvaehKWFKQZ JE9M3EX1vKfUPSSfxrwJOKTJ3hpch5eCk1FkXa1CT0c7sipq3hvaVi+G1SFYlay3CDrN rAnA== X-Gm-Message-State: AAQBX9czQKFbnIXfsM5hQE1R1P6o/BeR0Gb42F0ove84n7I5WzqQth89 LvWg5pt9Hti35p0lffKo4FQsby57nW4FWi4s6FHnW+3H8uAFzHnmzK4Ox9WX/+fI3IVE00Sa3fh rxUZRn7CFWU0= X-Received: by 2002:a5d:6144:0:b0:2e5:5439:6b4c with SMTP id y4-20020a5d6144000000b002e554396b4cmr4762479wrt.27.1680714687210; Wed, 05 Apr 2023 10:11:27 -0700 (PDT) X-Google-Smtp-Source: AKy350Y4zmKmQ3ZM2FZDf69Pi5WOZYFEL/2c2JOaPa9hUYc1dcsd+xnIAEQuULrtZEzO4Y9hgF1aaA== X-Received: by 2002:a5d:6144:0:b0:2e5:5439:6b4c with SMTP id y4-20020a5d6144000000b002e554396b4cmr4762446wrt.27.1680714686866; Wed, 05 Apr 2023 10:11:26 -0700 (PDT) Received: from ?IPV6:2003:cb:c703:d00:ca74:d9ea:11e0:dfb? (p200300cbc7030d00ca74d9ea11e00dfb.dip0.t-ipconnect.de. [2003:cb:c703:d00:ca74:d9ea:11e0:dfb]) by smtp.gmail.com with ESMTPSA id v8-20020a5d4a48000000b002c557f82e27sm15384420wrs.99.2023.04.05.10.11.25 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 05 Apr 2023 10:11:26 -0700 (PDT) Message-ID: Date: Wed, 5 Apr 2023 19:11:24 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.9.1 Subject: Re: [PATCH v2 3/6] module: extract patient module check into helper To: Luis Chamberlain , 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 References: <20230405022702.753323-1-mcgrof@kernel.org> <20230405022702.753323-4-mcgrof@kernel.org> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20230405022702.753323-4-mcgrof@kernel.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: eeefq1jkkpi8tfn8txfy5d65q47ychae X-Rspamd-Queue-Id: 3B1D0C000B X-HE-Tag: 1680714690-770260 X-HE-Meta: U2FsdGVkX1/xxuZr1Y7hw4dZwlD29XquPjS7pK/MxwAgqsZRZV2qgBanusy0n/tNmFipv7YvRNuNeyffQqzCi7LbW+aUnOcORTVVFgxEb97wilqgGANPpTpkxRhcnInxdlKvP5/LjbutoRUXol51kGiXsOKP+OzwMsIVGj6Tu0fxsCKQgUzzzD9ITITMl6CHLjnIgE4uDBx+VRIcjtBppDPq7A/QVFQkV90Wg0zg0fwgpTvRjQLGmGVHSd+llvXyBrrO0Fb2rWGqLx1WRcMTNMXsoR6l8VFc+SsnCtBBEZARS1wqDXzMeK9jx0wTpgZWazrKASWgWQ5nBOxqJP3Z6hvDzxbcgEn/nq0F2hlo2ROa4DTtn4SVSPnqz+28ZAyRtvrtDNeZkKzSY0EhDNJ2E3i73M8l+zX/F+SfagZklsLUUQVAvRnWSP4CgZK/MA1Nrsa5wqfM3Vr7Yym1t+A0cvY/MpPjZ5MMRNpCT9YTKgg90yau1YmTeEM5e5XAnCyNoDDtgmkqFWHY8G03as/z59X80f0Y6K/Dy00knAZhACIq8QyRIK5OiPRqk4jquUlb/ytgyIHmRXPkiqlVYb4UsXaSpyjPDcTDxCwPU/u2iFOMQtn6owMV7doA4+R2t2basIE8Y72//+VFzNRBKLP0ZEjaMB+Rk4mfBM24XE41svnAfJDGcvReorqAf+wUnqo2+mPQkFi5q8cINpdh/YoCkdU1SZeaqdHcPCYUWMDpMq1+h8fa5QSYDxtAYfd3c7iHnCYBdgCnRqBgfjA0X/X7IbVuHUzoqNnekdJoRBl0tEf0vWS3DuybW7hVT2gE9attmA77semwHA6AR5FZn1Vw9ouiYm1EWk6EwMvjYEu6ZmZfLih2oCy0TD3EN0eCYghnALycL9Q2yu8/CHP3nHad88VWe2EkPc9EQsC6k2b6EE+7V4mxjDO/yNUFOcVciFquJ8YKfUCPwoqoqCUF84i estSOfzg SoB8RiN+lpur8z+q63PXXCaaxoNHwP6lYhNEM5cY5kvSyJhldpk1tfTcOn1KHriH+IpD3BXsS4wOCd2qFvmheuD/Xyc7CaoPJJHzu1mwovqqOJcackCQdwX3E9QXTDTCWfeTPpryT2ommwfISisBlOtHpqtzLPTQ8NEy04oMbMJdWLn/rBbaNQe5YEZtzo1ySyDcV9nTqNlWFdBAwfzGUOkAGz8dTomlG2f0VDcfg6mR+I/H4Nswz2bgvCs+NsKzh44SOuJYOCHk2yMJYM7bbqvmisvI5z+zbnOYnSpe3BZyjQUMg5nxPEz0lWQV4mwhlWy5w+yZh/xnlEXOHFEb1KzWk8QwxVzxC/RRjxxpn52TPpfrhJkhivRJ59G+NfY/opzTiSrDaqsjim/lEoL1b+aie3ef0/OQGLhfp7DMxSSeHXT9kq5M25LfE5BbzPCBINab/w4XfHo5dDN0UXNS0nWl/ZUMHYb0qtJ/cY3h8CTFRYM38EESZVVO9GB3Bz1HKHn7jZVFtMuDBvikiQqCYTnHWsg== 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: On 05.04.23 04:26, Luis Chamberlain wrote: > The patient module check inside add_unformed_module() is large > enough as we need it. It is a bit hard to read too, so just > move it to a helper and do the inverse checks first to help > shift the code and make it easier to read. The new helper then > is module_patient_check_exists(). > > Signed-off-by: Luis Chamberlain > --- > kernel/module/main.c | 71 +++++++++++++++++++++++++------------------- > 1 file changed, 40 insertions(+), 31 deletions(-) > > diff --git a/kernel/module/main.c b/kernel/module/main.c > index 98c261928325..8f382580195b 100644 > --- a/kernel/module/main.c > +++ b/kernel/module/main.c > @@ -2638,6 +2638,43 @@ static bool finished_loading(const char *name) > return ret; > } > > +/* Must be called with module_mutex held */ > +static int module_patient_check_exists(const char *name) > +{ > + struct module *old; > + int err = 0; > + > + old = find_module_all(name, strlen(name), true); > + if (old == NULL) > + return 0; > + > + if (old->state == MODULE_STATE_COMING > + || old->state == MODULE_STATE_UNFORMED) { I never understood why people prefer to prefix the || on a newline. But it seems to be a thing in the module/ world :) > + /* Wait in case it fails to load. */ > + mutex_unlock(&module_mutex); > + err = wait_event_interruptible(module_wq, > + finished_loading(name)); > + if (err) > + return err; You return with the mutex unlocked. The caller will unlock again ... > + > + /* The module might have gone in the meantime. */ > + mutex_lock(&module_mutex); > + old = find_module_all(name, strlen(name), true); > + } > + > + /* > + * We are here only when the same module was being loaded. Do > + * not try to load it again right now. It prevents long delays > + * caused by serialized module load failures. It might happen > + * when more devices of the same type trigger load of > + * a particular module. > + */ > + if (old && old->state == MODULE_STATE_LIVE) > + return -EEXIST; > + else > + return -EBUSY; You can drop the else and return right away. > +} > + > /* > * We try to place it in the list now to make sure it's unique before Besides, LGTM. -- Thanks, David / dhildenb