From nobody Sun Dec 28 02:46:20 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 09D93C10F13 for ; Thu, 14 Dec 2023 07:38:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1443377AbjLNHiO (ORCPT ); Thu, 14 Dec 2023 02:38:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235489AbjLNHiI (ORCPT ); Thu, 14 Dec 2023 02:38:08 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E04E107; Wed, 13 Dec 2023 23:38:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1702539494; x=1734075494; h=from:date:subject:mime-version:content-transfer-encoding: message-id:references:in-reply-to:to:cc; bh=g9l8RslOMp5ad/gXCRHw+j360xuk1nb3+acdwFrlL50=; b=YwkX20FX85WUILkbomoDirV2Z5k1yMSdUp9E6Ts3FuH6F4+nCsP3ZXni Q6+MC4fE0X40PmFY0j5bBzji/V7JskXvjHf8dn/apZIbAlQvdxWAcpcfN 5E7QTbNdhA49T1oQURdDokk/HMz3rsnlf5X8PadOU70khIVYtyVEVWne+ RxeoGoAb4Wu9373+sQGqiguK1gDunZbmZIc5rg2cu2gVLlY3BGFOzolYu i4vDQ28vVIW5t/zf5TW/5fMs+jfoeZyuhRAcHo0qQA75ANmruLp1UswZG iWC6yin4mMoLMRvT1dDnblhP40FelKCnixVeTlMTbbgXNukYiohSnj4iK Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10923"; a="481275522" X-IronPort-AV: E=Sophos;i="6.04,274,1695711600"; d="scan'208";a="481275522" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Dec 2023 23:38:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10923"; a="723972064" X-IronPort-AV: E=Sophos;i="6.04,274,1695711600"; d="scan'208";a="723972064" Received: from llblake-mobl1.amr.corp.intel.com (HELO [192.168.1.200]) ([10.213.191.124]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Dec 2023 23:38:12 -0800 From: Vishal Verma Date: Thu, 14 Dec 2023 00:37:55 -0700 Subject: [PATCH v5 2/4] dax/bus: Use guard(device) in sysfs attribute helpers MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20231214-vv-dax_abi-v5-2-3f7b006960b4@intel.com> References: <20231214-vv-dax_abi-v5-0-3f7b006960b4@intel.com> In-Reply-To: <20231214-vv-dax_abi-v5-0-3f7b006960b4@intel.com> To: Dan Williams , Vishal Verma , Dave Jiang , Andrew Morton , Oscar Salvador Cc: linux-kernel@vger.kernel.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, David Hildenbrand , Dave Hansen , Huang Ying , Greg Kroah-Hartman , linux-mm@kvack.org, Joao Martins X-Mailer: b4 0.13-dev-433a8 X-Developer-Signature: v=1; a=openpgp-sha256; l=7001; i=vishal.l.verma@intel.com; h=from:subject:message-id; bh=g9l8RslOMp5ad/gXCRHw+j360xuk1nb3+acdwFrlL50=; b=owGbwMvMwCXGf25diOft7jLG02pJDKlVGx4ZxJv18x/TfPRo6pLQrU05Fp3PElasO7C0qM1kr 5tHY3xlRykLgxgXg6yYIsvfPR8Zj8ltz+cJTHCEmcPKBDKEgYtTACZySoGRoZ9jz78FO0WOfBHN z7hkJdKzWZrxycoHdT8NjQSDuFZGHmZk+Kn/VmUD14viH/ymS1fZFjwx1PJr9J8nFCC9Yf3cLpa H7AA= X-Developer-Key: i=vishal.l.verma@intel.com; a=openpgp; fpr=F8682BE134C67A12332A2ED07AFA61BEA3B84DFF Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the guard(device) macro to lock a 'struct device', and unlock it automatically when going out of scope using Scope Based Resource Management semantics. A lot of the sysfs attribute writes in drivers/dax/bus.c benefit from a cleanup using these, so change these where applicable. Cc: Joao Martins Cc: Dan Williams Signed-off-by: Vishal Verma --- drivers/dax/bus.c | 143 ++++++++++++++++++++++----------------------------= ---- 1 file changed, 59 insertions(+), 84 deletions(-) diff --git a/drivers/dax/bus.c b/drivers/dax/bus.c index 1ff1ab5fa105..6226de131d17 100644 --- a/drivers/dax/bus.c +++ b/drivers/dax/bus.c @@ -294,13 +294,10 @@ static ssize_t available_size_show(struct device *dev, struct device_attribute *attr, char *buf) { struct dax_region *dax_region =3D dev_get_drvdata(dev); - unsigned long long size; =20 - device_lock(dev); - size =3D dax_region_avail_size(dax_region); - device_unlock(dev); + guard(device)(dev); =20 - return sprintf(buf, "%llu\n", size); + return sprintf(buf, "%llu\n", dax_region_avail_size(dax_region)); } static DEVICE_ATTR_RO(available_size); =20 @@ -309,17 +306,14 @@ static ssize_t seed_show(struct device *dev, { struct dax_region *dax_region =3D dev_get_drvdata(dev); struct device *seed; - ssize_t rc; =20 if (is_static(dax_region)) return -EINVAL; =20 - device_lock(dev); + guard(device)(dev); seed =3D dax_region->seed; - rc =3D sprintf(buf, "%s\n", seed ? dev_name(seed) : ""); - device_unlock(dev); =20 - return rc; + return sprintf(buf, "%s\n", seed ? dev_name(seed) : ""); } static DEVICE_ATTR_RO(seed); =20 @@ -328,24 +322,28 @@ static ssize_t create_show(struct device *dev, { struct dax_region *dax_region =3D dev_get_drvdata(dev); struct device *youngest; - ssize_t rc; =20 if (is_static(dax_region)) return -EINVAL; =20 - device_lock(dev); + guard(device)(dev); youngest =3D dax_region->youngest; - rc =3D sprintf(buf, "%s\n", youngest ? dev_name(youngest) : ""); - device_unlock(dev); =20 - return rc; + return sprintf(buf, "%s\n", youngest ? dev_name(youngest) : ""); } =20 static ssize_t create_store(struct device *dev, struct device_attribute *a= ttr, const char *buf, size_t len) { struct dax_region *dax_region =3D dev_get_drvdata(dev); + struct dev_dax_data data =3D { + .dax_region =3D dax_region, + .size =3D 0, + .id =3D -1, + .memmap_on_memory =3D false, + }; unsigned long long avail; + struct dev_dax *dev_dax; ssize_t rc; int val; =20 @@ -358,38 +356,25 @@ static ssize_t create_store(struct device *dev, struc= t device_attribute *attr, if (val !=3D 1) return -EINVAL; =20 - device_lock(dev); + guard(device)(dev); avail =3D dax_region_avail_size(dax_region); if (avail =3D=3D 0) - rc =3D -ENOSPC; - else { - struct dev_dax_data data =3D { - .dax_region =3D dax_region, - .size =3D 0, - .id =3D -1, - .memmap_on_memory =3D false, - }; - struct dev_dax *dev_dax =3D devm_create_dev_dax(&data); + return -ENOSPC; =20 - if (IS_ERR(dev_dax)) - rc =3D PTR_ERR(dev_dax); - else { - /* - * In support of crafting multiple new devices - * simultaneously multiple seeds can be created, - * but only the first one that has not been - * successfully bound is tracked as the region - * seed. - */ - if (!dax_region->seed) - dax_region->seed =3D &dev_dax->dev; - dax_region->youngest =3D &dev_dax->dev; - rc =3D len; - } - } - device_unlock(dev); + dev_dax =3D devm_create_dev_dax(&data); + if (IS_ERR(dev_dax)) + return PTR_ERR(dev_dax); =20 - return rc; + /* + * In support of crafting multiple new devices simultaneously multiple + * seeds can be created, but only the first one that has not been + * successfully bound is tracked as the region seed. + */ + if (!dax_region->seed) + dax_region->seed =3D &dev_dax->dev; + dax_region->youngest =3D &dev_dax->dev; + + return len; } static DEVICE_ATTR_RW(create); =20 @@ -481,12 +466,9 @@ static int __free_dev_dax_id(struct dev_dax *dev_dax) static int free_dev_dax_id(struct dev_dax *dev_dax) { struct device *dev =3D &dev_dax->dev; - int rc; =20 - device_lock(dev); - rc =3D __free_dev_dax_id(dev_dax); - device_unlock(dev); - return rc; + guard(device)(dev); + return __free_dev_dax_id(dev_dax); } =20 static int alloc_dev_dax_id(struct dev_dax *dev_dax) @@ -908,9 +890,8 @@ static ssize_t size_show(struct device *dev, struct dev_dax *dev_dax =3D to_dev_dax(dev); unsigned long long size; =20 - device_lock(dev); + guard(device)(dev); size =3D dev_dax_size(dev_dax); - device_unlock(dev); =20 return sprintf(buf, "%llu\n", size); } @@ -1080,17 +1061,16 @@ static ssize_t size_store(struct device *dev, struc= t device_attribute *attr, return -EINVAL; } =20 - device_lock(dax_region->dev); - if (!dax_region->dev->driver) { - device_unlock(dax_region->dev); + guard(device)(dax_region->dev); + if (!dax_region->dev->driver) return -ENXIO; - } - device_lock(dev); + + guard(device)(dev); rc =3D dev_dax_resize(dax_region, dev_dax, val); - device_unlock(dev); - device_unlock(dax_region->dev); + if (rc) + return rc; =20 - return rc =3D=3D 0 ? len : rc; + return len; } static DEVICE_ATTR_RW(size); =20 @@ -1137,21 +1117,20 @@ static ssize_t mapping_store(struct device *dev, st= ruct device_attribute *attr, if (rc) return rc; =20 - rc =3D -ENXIO; - device_lock(dax_region->dev); - if (!dax_region->dev->driver) { - device_unlock(dax_region->dev); - return rc; - } - device_lock(dev); + guard(device)(dax_region->dev); + if (!dax_region->dev->driver) + return -ENXIO; =20 + guard(device)(dev); to_alloc =3D range_len(&r); - if (alloc_is_aligned(dev_dax, to_alloc)) - rc =3D alloc_dev_dax_range(dev_dax, r.start, to_alloc); - device_unlock(dev); - device_unlock(dax_region->dev); + if (!alloc_is_aligned(dev_dax, to_alloc)) + return -ENXIO; =20 - return rc =3D=3D 0 ? len : rc; + rc =3D alloc_dev_dax_range(dev_dax, r.start, to_alloc); + if (rc) + return rc; + + return len; } static DEVICE_ATTR_WO(mapping); =20 @@ -1196,27 +1175,23 @@ static ssize_t align_store(struct device *dev, stru= ct device_attribute *attr, if (!dax_align_valid(val)) return -EINVAL; =20 - device_lock(dax_region->dev); - if (!dax_region->dev->driver) { - device_unlock(dax_region->dev); + guard(device)(dax_region->dev); + if (!dax_region->dev->driver) return -ENXIO; - } =20 - device_lock(dev); - if (dev->driver) { - rc =3D -EBUSY; - goto out_unlock; - } + guard(device)(dev); + if (dev->driver) + return -EBUSY; =20 align_save =3D dev_dax->align; dev_dax->align =3D val; rc =3D dev_dax_validate_align(dev_dax); - if (rc) + if (rc) { dev_dax->align =3D align_save; -out_unlock: - device_unlock(dev); - device_unlock(dax_region->dev); - return rc =3D=3D 0 ? len : rc; + return rc; + } + + return len; } static DEVICE_ATTR_RW(align); =20 --=20 2.41.0