Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33;
Message-ID: <ceebb128-91c4-33ea-5f2c-495bee270445@intel.com>
Date:   Tue, 26 Sep 2023 11:50:25 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Betterbird/102.13.0
Subject: Re: [PATCH v1 2/2] ACPI: NFIT: Use modern scope based rollback
To:     Michal Wilczynski <michal.wilczynski@intel.com>,
        <linux-acpi@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        <nvdimm@lists.linux.dev>
CC:     <rafael.j.wysocki@intel.com>, <andriy.shevchenko@intel.com>,
        <lenb@kernel.org>, <dan.j.williams@intel.com>,
        <vishal.l.verma@intel.com>, <ira.weiny@intel.com>,
        Andy Shevchenko <andy.shevchenko@gmail.com>
References: <20230926184520.2239723-1-michal.wilczynski@intel.com>
 <20230926184520.2239723-3-michal.wilczynski@intel.com>
Content-Language: en-US
From:   Dave Jiang <dave.jiang@intel.com>
In-Reply-To: <20230926184520.2239723-3-michal.wilczynski@intel.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UDZrTzhTR3BwUDhwQ21pVTNHUTVZUmJuMUxXR2VUaGhDckJITVVhMklEYVpm?=
 =?utf-8?B?UHdYM25sZy9qNTVqVWlKZ1VEQVlnd3RMa3ZHWFgzaGJ3N25kaUN2MjdhWndO?=
 =?utf-8?B?Zk54Vi8vdWI2TjV4SVRyV0k0YnVhcXNNOFA5dTh5Qkg2clliKzdESStHaCtB?=
 =?utf-8?B?Wi82b1I2cStqRWdOL1JsdXEzd1JPNlQ4K1VMLzB0YWs2dnhQQkZMMUVwVWhJ?=
 =?utf-8?B?TFFZc200YitVOUZxcnJobUt2OE03S3VydlRmMzhaNXd4RnJCc3VQQ0cxWmN5?=
 =?utf-8?B?YVR6cmszWlg5dTNCelNvUHJLZEdOZk5KSXR6d2kxTGZwUEFWVnFOL1c3NUwx?=
 =?utf-8?B?dG1SOUk3ZG14YTFUd3VNUFlwMFIyOXlNTVgrVUEyWUhEQWx2c0JQK0NXZGhm?=
 =?utf-8?B?dnNubFQxenVCM1BOTXdyK05GUGtQbm9ZV29KOU4rQ0hZMlBDMFRWUjNJYmRm?=
 =?utf-8?B?Sm9PR3BZVndQRjNoT2E5elA0Sk5zSDBKd2p0NGNYUHBTUlRKTjRKWkl2WEM1?=
 =?utf-8?B?Q1NrR0ltYmxUNEp4Vmg5cWZPaHBOWXBGRU9NcFdsRllFZVdDNzdob2RobVc5?=
 =?utf-8?B?cCs3bVUxb3ZnWWNTZnpEa3hDWVIwRU5zTDUyUjgreFppMDFhRTlMcEQ3T3lU?=
 =?utf-8?B?WXphZEk4eGswUGJjVXh4cVdaTFdsQ3h3NjBQUE9qaHU2YWxCY2tvZjJVNUxH?=
 =?utf-8?B?Rm95TGk3L1B1THhkZDIvOE5IRTZrV3A1cUE5T0loYzQ5SUV6Y0VtWDNSL21w?=
 =?utf-8?B?SGNTdTJXVXc1Zmt6L0plVERTVVhldDZVaWRTM2pyemlOdXJBeTRWTWtNTUE5?=
 =?utf-8?B?NTcvQThZdnBWT01KMGlWSkplZFp6WEhsWmI5RGtiMWgyWm9EMFlpNEowYnFn?=
 =?utf-8?B?b0tLS2FSSjdCSFRaNDJkRTEzOVZ6QWQ2S0k0RVMxWW1NMm15eWQ1VXY4OTlQ?=
 =?utf-8?B?MGhDWk1uL1BkRUd2V0V6Si9FeVRDNURJYzBwd2RmOWlrc2hsN21iVWVDZ3Zl?=
 =?utf-8?B?UXgvdlJyM2VPcmlWSVUrcHIrYURsRXdCdmRLeVlvdlZIOWN3dG1LOXNNdmtl?=
 =?utf-8?B?SnBlWDdGTkJWTEdZbnowaFY1cnFpbEdZd25Bb3FObUR0LzV4Y3VWeUVyWjM0?=
 =?utf-8?B?Y1NYbmpibEtOZzJmTkc3N1MwSzV4di9NN1hpbUQwQnVHMVppK2FneEp6WmJ0?=
 =?utf-8?B?Q2ZDMTg3dE9HTy9SWVo2eDdjZHhab09Ud0RSQkh3czl1alg0c0hjVlBzOUtw?=
 =?utf-8?B?c1BhaUF1YVAxUFhJd21CRGNJRlJ3WjNoNGZ3Q2p1dXlZZHJ6RVVkZ2tQdHZJ?=
 =?utf-8?B?OW4yRTl6K3BSWWQ1Z2JSQ2Vlbm05SzI4dnN6bkNraFh5eG8wMWNxUXhuSzBz?=
 =?utf-8?B?YllwRGt1VjBmaUhoNlNjbHFsR09NRFRmc3lFTzJwaUVEQ3c1RGsxaUpodHFH?=
 =?utf-8?B?dVJZY2xDNVQ4cDFLM1lUVnE0QVQzTTJtUExJQWU2NUFBcWJzNm8yUmI2L0dn?=
 =?utf-8?B?T09KT1FBQ3UwTUJaeVZaOEM0anY0ZXg1Z0l4QU14ZkFxRFR3RGM3ODZHdE9T?=
 =?utf-8?B?WGo2dWJtSlFzeWo5Ti9kQ01xWFBHRjVudlV3UCtNM0VKYWtvbHlTMVVEQmd4?=
 =?utf-8?B?V01UaW5qSU1IVkJ0Mm9YcmdpS0t1OUFrZUx3WWVGMXVwSEphMm1RZVB0dmY4?=
 =?utf-8?B?VWJiYURIU3BFWjlPZVdhUUhDZkIxOXhVcUJzSHRzNkdQWUJKQ2ZDbmJkK3NP?=
 =?utf-8?B?V1BpTlVBSlh0Um9UMHczVnFqeGhuZzlpcUh5ZDJuclhIZlJmK2Jwbmp0clJS?=
 =?utf-8?B?eHVIdEh1aTlRY00vNDRIcDIwTmRqZ2pGNEFFNXN3T2puQ25JWHNJN3pzVU5C?=
 =?utf-8?B?NzQwczRqRDRhWWZlSEJtZlFiMFFXY0dkMnNqVGRtT28xVzdhSHAyUW9oZ1Vz?=
 =?utf-8?B?YXppbzBDam1INU9ZYzcyb0tocFJoVmJMVGQwK2lRcW4zODRmUUl5T2FpTmZX?=
 =?utf-8?B?QjQ2cG9QaEFPK0xnU1FMaTZiR0NtM0l3dHRaWFM0QXk1eEVVOGgvM0psS3Uz?=
 =?utf-8?B?UHRzVkxLTUpYYzExTk1MV3paMWVkU2FGOXR1aFZsM3lzVlBzM1NHdEwra1BP?=
 =?utf-8?B?Mko2eGJiV0h3TlNQOWUyUXl6UmxibWV1MlRsTFYyazUxS29vUEk3bGJtNGJH?=
 =?utf-8?B?V1E9PQ==?=
X-MS-Exchange-CrossTenant-Network-Message-Id: c03af9fe-0b6a-4cb3-ca32-08dbbec17460
X-MS-Exchange-CrossTenant-AuthSource: PH7PR11MB5984.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Sep 2023 18:50:29.5496
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: /yWhN0j8wBRnCJbgEyzwDSKHRicSqLcZmb/C10v+l6KMQ1MsTmzoQFUzb65FP6qG48ajWEsveQEfKIM7VtBrsg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB5202
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-2.3 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,NICE_REPLY_A,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 lipwig.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 26 Sep 2023 11:51:07 -0700 (PDT)


On 9/26/23 11:45, Michal Wilczynski wrote:
> Change rollback in acpi_nfit_init_interleave_set() to use modern scope
> based attribute __free(). This is similar to C++ RAII and is a preferred
> way for handling local memory allocations.
> 
> Suggested-by: Dave Jiang <dave.jiang@intel.com>
> Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> Signed-off-by: Michal Wilczynski <michal.wilczynski@intel.com>

Reviewed-by: Dave Jiang <dave.jiang@intel.com>
> ---
>  drivers/acpi/nfit/core.c | 32 ++++++++++----------------------
>  1 file changed, 10 insertions(+), 22 deletions(-)
> 
> diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
> index 78f0f855c4de..079bd663495f 100644
> --- a/drivers/acpi/nfit/core.c
> +++ b/drivers/acpi/nfit/core.c
> @@ -2257,29 +2257,23 @@ static int acpi_nfit_init_interleave_set(struct acpi_nfit_desc *acpi_desc,
>  		struct nd_region_desc *ndr_desc,
>  		struct acpi_nfit_system_address *spa)
>  {
> +	u16 nr = ndr_desc->num_mappings;
> +	struct nfit_set_info2 *info2 __free(kfree) =
> +		kcalloc(nr, sizeof(*info2), GFP_KERNEL);
> +	struct nfit_set_info *info __free(kfree) =
> +		kcalloc(nr, sizeof(*info), GFP_KERNEL);
>  	struct device *dev = acpi_desc->dev;
>  	struct nd_interleave_set *nd_set;
> -	u16 nr = ndr_desc->num_mappings;
> -	struct nfit_set_info2 *info2;
> -	struct nfit_set_info *info;
> -	int err = 0;
>  	int i;
>  
> +	if (!info || !info2)
> +		return -ENOMEM;
> +
>  	nd_set = devm_kzalloc(dev, sizeof(*nd_set), GFP_KERNEL);
>  	if (!nd_set)
>  		return -ENOMEM;
>  	import_guid(&nd_set->type_guid, spa->range_guid);
>  
> -	info = kcalloc(nr, sizeof(*info), GFP_KERNEL);
> -	if (!info)
> -		return -ENOMEM;
> -
> -	info2 = kcalloc(nr, sizeof(*info2), GFP_KERNEL);
> -	if (!info2) {
> -		err = -ENOMEM;
> -		goto free_info;
> -	}
> -
>  	for (i = 0; i < nr; i++) {
>  		struct nd_mapping_desc *mapping = &ndr_desc->mapping[i];
>  		struct nvdimm *nvdimm = mapping->nvdimm;
> @@ -2292,8 +2286,7 @@ static int acpi_nfit_init_interleave_set(struct acpi_nfit_desc *acpi_desc,
>  
>  		if (!memdev || !nfit_mem->dcr) {
>  			dev_err(dev, "%s: failed to find DCR\n", __func__);
> -			err = -ENODEV;
> -			goto free_info2;
> +			return -ENODEV;
>  		}
>  
>  		map->region_offset = memdev->region_offset;
> @@ -2342,12 +2335,7 @@ static int acpi_nfit_init_interleave_set(struct acpi_nfit_desc *acpi_desc,
>  
>  	ndr_desc->nd_set = nd_set;
>  
> -free_info2:
> -	kfree(info2);
> -free_info:
> -	kfree(info);
> -
> -	return err;
> +	return 0;
>  }
>  
>  static int ars_get_cap(struct acpi_nfit_desc *acpi_desc,