From patchwork Tue Jan 3 16:59:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Russell King (Oracle)" X-Patchwork-Id: 38527 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp4719828wrt; Tue, 3 Jan 2023 09:00:54 -0800 (PST) X-Google-Smtp-Source: AMrXdXvnMvCK7nBJGTRBCiLkVTcWQnb0MKFPbrnZml8RfWLz/+DKJqNegm8VI9bxJy+9JfbfqcH9 X-Received: by 2002:a05:6402:1508:b0:489:99c1:d3cc with SMTP id f8-20020a056402150800b0048999c1d3ccmr14573663edw.24.1672765254631; Tue, 03 Jan 2023 09:00:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672765254; cv=none; d=google.com; s=arc-20160816; b=CLFXmvLfORcVSuEtrElCcxSnk1vvNkvVohXph+TPnqU8flZQfmrBytSQvsoDhUw7io Q3fjXKBPZTysS/i3sa1qlcC1kaNJ4krwlryJCYWPAQMMJb3QDi/mkX33ico5sxiJskmR 51VaMIy2k5B/3Voy+XIPPpjXfwzpbwkRNSx+MtHLh+9fhP1iJ6+rOzTvrr8Ot1VmHetF Ak32zLQfAr7bsE/rnfqab/GMWP+4pJK26SBCfoGxvigBbU9hyzEHqPqMRKf9dv1JA7Uz kJ9IjI0BFumA8lFNdwOZ48enNXkkNcV4SCjqBbSTMYL6uWsK9i1w8fA5V+jW1K7SNCk1 jVxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:sender:message-id:content-transfer-encoding :content-disposition:mime-version:subject:cc:to:from:references :in-reply-to:dkim-signature; bh=iEP3KCcIVyEejeSlu7Gu5rS787gtmtbFIPKVaN+x0Fw=; b=a5EYXWBFLFY8x64rZwiQpInZ3m66FW2MKxF4H3kTFerilaBhCixrQjvs+VCUKxu3bF LjctUG5EUATe7y/PWSKE5PHbiAd2CoftwUbv9GogVf3ugDjzQp7t/Gu+z97J8+fQGlWr SCSrrX3CgNFgHmKnGFrYELppKD0D176BJRbACvtAZVPAmv58alW44Mg4socTYzO4GdVU 2Xvb8hoir3S0uACWmuaccDcEgJd8Jyn4XX+kr/jSdrZOpiT9/pJ7BivQerb6Cr13k2/d +h/zopHm0PBo7Uf9yYp0p0z68Jkj2jr2AlFEamT78UfVGLOWPpeYCKzspgAMOGZXTbir oXsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@armlinux.org.uk header.s=pandora-2019 header.b=yGhj8cyL; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=armlinux.org.uk Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id cm27-20020a0564020c9b00b00469abb21f9esi27953946edb.129.2023.01.03.09.00.31; Tue, 03 Jan 2023 09:00:54 -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; dkim=fail (test mode) header.i=@armlinux.org.uk header.s=pandora-2019 header.b=yGhj8cyL; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=armlinux.org.uk Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238216AbjACQ7u (ORCPT + 99 others); Tue, 3 Jan 2023 11:59:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238168AbjACQ7n (ORCPT ); Tue, 3 Jan 2023 11:59:43 -0500 Received: from pandora.armlinux.org.uk (pandora.armlinux.org.uk [IPv6:2001:4d48:ad52:32c8:5054:ff:fe00:142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A1F1E13CF0 for ; Tue, 3 Jan 2023 08:59:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=armlinux.org.uk; s=pandora-2019; h=Date:Sender:Message-Id:Content-Type: Content-Transfer-Encoding:MIME-Version:Subject:Cc:To:From:References: In-Reply-To:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=iEP3KCcIVyEejeSlu7Gu5rS787gtmtbFIPKVaN+x0Fw=; b=yGhj8cyLqUStiPXDvK+FYSdLrS 4tdfWIP2WcJbFrsoAOeeBhVrgKOMKab9o0ATNWRK9ciyb9lzFOISRcmbEgqDqzmz8riba+nKBrGXF BCjlakQhprzZkbomupUCzBgim1YRRMHlQvLxlbjOKG63wAWPUWR7CMgGb8v70s+Fl0KQ3irrdYuut zgUWkPElWw4eR1vBunO66WG3fPfJTjqo3UDDEDeWS5NhaMCVu2Vhgb8BVQTRr6xA48S/98K1jnjZY e/fS+RKEFRi8qNUjS5FcrJSnlCG8daTqSg31D9Ig+ew5qZjSVFyJUGsnxxIf897Obxd/kA2pEe5f3 1kBBGKyA==; Received: from e0022681537dd.dyn.armlinux.org.uk ([fd8f:7570:feb6:1:222:68ff:fe15:37dd]:39580 helo=rmk-PC.armlinux.org.uk) by pandora.armlinux.org.uk with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1pCkdW-0005cj-Be; Tue, 03 Jan 2023 16:59:38 +0000 Received: from rmk by rmk-PC.armlinux.org.uk with local (Exim 4.94.2) (envelope-from ) id 1pCkdV-004hwd-Cx; Tue, 03 Jan 2023 16:59:37 +0000 In-Reply-To: References: From: "Russell King (Oracle)" To: Srinivas Kandagatla Cc: Bartosz Golaszewski , Gaosheng Cui , Greg Kroah-Hartman , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Maxime Ripard , Hector Martin Subject: [PATCH v3 5/5] nvmem: core: fix registration vs use race Bartosz Golaszewski ,Gaosheng Cui ,Greg Kroah-Hartman ,linux-arm-kernel@lists.infradead.org,linux-kernel@vger.kernel.org,Maxime Ripard , Hector Martin MIME-Version: 1.0 Content-Disposition: inline Message-Id: Sender: Russell King Date: Tue, 03 Jan 2023 16:59:37 +0000 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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?1754021499519837724?= X-GMAIL-MSGID: =?utf-8?q?1754021499519837724?= The i.MX6 CPU frequency driver sometimes fails to register at boot time due to nvmem_cell_read_u32() sporadically returning -ENOENT. This happens because there is a window where __nvmem_device_get() in of_nvmem_cell_get() is able to return the nvmem device, but as cells have been setup, nvmem_find_cell_entry_by_node() returns NULL. The occurs because the nvmem core registration code violates one of the fundamental principles of kernel programming: do not publish data structures before their setup is complete. Fix this by making nvmem core code conform with this principle. Fixes: eace75cfdcf7 ("nvmem: Add a simple NVMEM framework for nvmem providers") Signed-off-by: Russell King (Oracle) --- drivers/nvmem/core.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index 19497f555e07..082cda7ac199 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -830,22 +830,16 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) nvmem->dev.groups = nvmem_dev_groups; #endif - dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); - - rval = device_add(&nvmem->dev); - if (rval) - goto err_put_device; - if (nvmem->nkeepout) { rval = nvmem_validate_keepouts(nvmem); if (rval) - goto err_device_del; + goto err_put_device; } if (config->compat) { rval = nvmem_sysfs_setup_compat(nvmem, config); if (rval) - goto err_device_del; + goto err_put_device; } if (config->cells) { @@ -862,6 +856,12 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) if (rval) goto err_remove_cells; + dev_dbg(&nvmem->dev, "Registering nvmem device %s\n", config->name); + + rval = device_add(&nvmem->dev); + if (rval) + goto err_remove_cells; + blocking_notifier_call_chain(&nvmem_notifier, NVMEM_ADD, nvmem); return nvmem; @@ -871,8 +871,6 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) err_teardown_compat: if (config->compat) nvmem_sysfs_remove_compat(nvmem, config); -err_device_del: - device_del(&nvmem->dev); err_put_device: put_device(&nvmem->dev);