Received: by 2002:a05:7412:37c9:b0:e2:908c:2ebd with SMTP id jz9csp1347570rdb; Wed, 20 Sep 2023 06:54:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE0WcVFts8a3Dpq3O4kddycIekzZIoDR4c5Vi6H1TityZj1Nq5kXe9UYQixw6VLwprgZGiI X-Received: by 2002:a05:6808:2a75:b0:3a7:60f7:c9ad with SMTP id fu21-20020a0568082a7500b003a760f7c9admr2150282oib.13.1695218091956; Wed, 20 Sep 2023 06:54:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695218091; cv=none; d=google.com; s=arc-20160816; b=aseq0XX8hCRE/mYW/aBbCttuZu8trbrPFgj2OOi+6VfDQX2mqnrt+dRxjMeySADs3q Ln4i3gEE9gZzdv9FLU252rqct1SsLaMfyUym4rBtzF5QwzHeQQT+I/7erA6HliFp7pw5 JgnHpc6PQHUWg7p4yNVG3RtO4DLc1oeKPt0DtY0k8jyA1SedqR0TQ/IRSdhbv6DnDu06 B54OiXYCCtZkart6r/F8w9OYZN7X97+hhEsh6UzMbz/tnrDRJsvKLwx0eAOWSFP4TN/4 jVjzWeUR3N4N/+zpx2Eca7swA/8JA/0FDFi+ktJqFEgnUOXI+E04cgbTRofwGmdgK80X rGqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-transfer-encoding :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=aBiMXbXmouAt1FhN2hp6g0M8KJjw7St2eIGYrGSv/Y8=; fh=/3zH3jdupflJcoEKMA/ElIPhWX4Ah/wVczWBEUw0VT4=; b=GC9OeTupp4xpro0SsOjDgz+NQfXMxZc1iNWqOVS7ffj0ZdpCkfZWsvXJYUmr2PEw1X oVtcXD3d8+P6qUGVOQTTF9g9c1XsuaJcHSBlCets3kVV0LCZ9lKQTBxnjj70E5e92/ZC AWIDz+K4I1z+2VFqIpYKVp3ZnsLloMOUykLZlOOw91INDveBtc0N4WlNfNQtfsQ8Bb1C psn/5s8ua6ecSGvuz5pvsQgLoFtJmVXTqSoPNG3m6q52QKs/svEcPaqG/kdU1E+NkiVb sf8AqkFrQPXeYBpbp+Uw0AjUU7YC2CqxxCBi6CnuJOf7erBbxMRMWs+KguE6feOjGtkv UhKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Lb8uPbzu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id bq25-20020a056a000e1900b0068fb2dfe679si11726509pfb.355.2023.09.20.06.54.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 06:54:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Lb8uPbzu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id A93538256215; Wed, 20 Sep 2023 02:34:54 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234235AbjITJet (ORCPT + 99 others); Wed, 20 Sep 2023 05:34:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234220AbjITJeq (ORCPT ); Wed, 20 Sep 2023 05:34:46 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 66BEB93; Wed, 20 Sep 2023 02:34:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695202480; x=1726738480; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=daA+8WUnrisnNAHI3xd2zdlB9Zrw2I7xkKHBIHY3+hM=; b=Lb8uPbzuQG3/c57LZOie3Yjt5Y8x9aOcHtY6fYcKClvIAVCcLCQJ8+ax a6UcyUtwRNwOpacniO+VIICwmwAWAT/hj9+jI3J1jHDfG064jwcS4BtUw lWbCoedu5qZHvAz/KxuHRGwDYAKL+a9FhAN6cEfb+asbHh2Pm+Fryu6uu dEt3l4TWK9aEy+Ko/5jKnsmfOo+APUPC0MPq66Z7r06jmjLWdk4zdWAF6 FS5DFzqoQKShotGMI39GqzTYhJzMVBuFiIV642a4n4ki/pcnDq+o9MrLv qe0XXWLDcIvwhZ7G6YhhITY8Ufm8tOxiZKyn8xGKWIdxcI3pYrBktUiek w==; X-IronPort-AV: E=McAfee;i="6600,9927,10838"; a="360431944" X-IronPort-AV: E=Sophos;i="6.02,161,1688454000"; d="scan'208";a="360431944" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Sep 2023 02:33:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10838"; a="740126368" X-IronPort-AV: E=Sophos;i="6.02,161,1688454000"; d="scan'208";a="740126368" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga007.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Sep 2023 02:33:14 -0700 Date: Wed, 20 Sep 2023 12:33:11 +0300 From: Raag Jadav To: Paul Cercueil Cc: rafael@kernel.org, len.brown@intel.com, pavel@ucw.cz, Jonathan.Cameron@huawei.com, andriy.shevchenko@linux.intel.com, rf@opensource.cirrus.com, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, mallikarjunappa.sangannavar@intel.com, bala.senthil@intel.com Subject: Re: [PATCH v3] PM: Fix symbol export for _SIMPLE_ variants of _PM_OPS() Message-ID: References: <20230920084121.14131-1-raag.jadav@intel.com> <790fac97ce79534733fe0bbd93cc0c9eaa835bf2.camel@crapouillou.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <790fac97ce79534733fe0bbd93cc0c9eaa835bf2.camel@crapouillou.net> X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 20 Sep 2023 02:34:54 -0700 (PDT) On Wed, Sep 20, 2023 at 10:53:23AM +0200, Paul Cercueil wrote: > Le mercredi 20 septembre 2023 ? 14:11 +0530, Raag Jadav a ?crit?: > > Currently EXPORT_*_SIMPLE_DEV_PM_OPS() use EXPORT_*_DEV_PM_OPS() set > > of macros to export dev_pm_ops symbol, which export the symbol in > > case > > CONFIG_PM=y but don't take CONFIG_PM_SLEEP into consideration. > > > > Since _SIMPLE_ variants of _PM_OPS() do not include runtime PM > > handles > > and are only used in case CONFIG_PM_SLEEP=y, we should not be > > exporting > > their dev_pm_ops symbol in case CONFIG_PM_SLEEP=n. > > > > This can be fixed by having two distinct set of export macros for > > both > > _RUNTIME_ and _SIMPLE_ variants of _PM_OPS(), such that the export of > > dev_pm_ops symbol used in each variant depends on CONFIG_PM and > > CONFIG_PM_SLEEP respectively. > > > > Introduce _DEV_SLEEP_PM_OPS() set of export macros for _SIMPLE_ > > variants > > of _PM_OPS(), which export dev_pm_ops symbol only in case > > CONFIG_PM_SLEEP=y > > and discard it otherwise. > > > > Fixes: 34e1ed189fab ("PM: Improve EXPORT_*_DEV_PM_OPS macros") > > Signed-off-by: Raag Jadav > > --- > > PS: This is a standalone fix and works without updating any drivers. > > I had to double-check that, to make sure that none of the drivers using > these macros also use pm_ptr() instead of pm_sleep_ptr() to access the > exported dev_pm_ops. > > I did not check extensively but everything seems to use pm_sleep_ptr(), > so it looks safe enough. I have tested it against -rc2 without any problems. > > Changes since v2: > > - Drop redundant patches > > > > Changes since v1: > > - Update drivers to new set of macros > > > > ?include/linux/pm.h | 43 +++++++++++++++++++++++++++++-------------- > > ?1 file changed, 29 insertions(+), 14 deletions(-) > > > > diff --git a/include/linux/pm.h b/include/linux/pm.h > > index 1400c37b29c7..99a8146fa479 100644 > > --- a/include/linux/pm.h > > +++ b/include/linux/pm.h > > @@ -374,24 +374,39 @@ const struct dev_pm_ops name = { \ > > ????????RUNTIME_PM_OPS(runtime_suspend_fn, runtime_resume_fn, > > idle_fn) \ > > ?} > > ? > > -#ifdef CONFIG_PM > > -#define _EXPORT_DEV_PM_OPS(name, license, > > ns)??????????????????????????\ > > +#define _EXPORT_PM_OPS(name, license, > > ns)??????????????????????????????\ > > ????????const struct dev_pm_ops > > name;???????????????????????????????????\ > > ????????__EXPORT_SYMBOL(name, license, > > ns);?????????????????????????????\ > > ????????const struct dev_pm_ops name > > -#define EXPORT_PM_FN_GPL(name)?????????EXPORT_SYMBOL_GPL(name) > > -#define EXPORT_PM_FN_NS_GPL(name, ns)??EXPORT_SYMBOL_NS_GPL(name, > > ns) > > -#else > > -#define _EXPORT_DEV_PM_OPS(name, license, > > ns)??????????????????????????\ > > + > > +#define _PM_OPS(name, license, > > This macro creates a dev_pm_ops that's meant to be garbage-collected by > the compiler; so maybe name it _USELESS_PM_OPS() or something like > that. _USELESS_PM_OPS() sounds a bit heavy handed ;) Gives the impression that the macro itelf is not used anywhere in code. Something like _DISCARD_PM_OPS() makes more sense. Raag