Received-SPF: pass (google.com: domain of linux-kernel+bounces-53060-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Mon, 5 Feb 2024 09:06:49 -0800
From: Ira Weiny <ira.weiny@intel.com>
To: "Fabio M. De Francesco" <fabio.maria.de.francesco@linux.intel.com>, "Peter
 Zijlstra" <peterz@infradead.org>, Dan Williams <dan.j.williams@intel.com>,
	<linux-kernel@vger.kernel.org>
CC: Ingo Molnar <mingo@kernel.org>, <linux-cxl@vger.kernel.org>, "Fabio M. De
 Francesco" <fabio.maria.de.francesco@linux.intel.com>, Ira Weiny
	<ira.weiny@intel.com>
Subject: Re: [PATCH 2/2] cxl/region: Use cond_guard() in show_targetN()
Message-ID: <65c115a94e1d5_36bf7d294de@iweiny-mobl.notmuch>
References: <20240204173105.935612-1-fabio.maria.de.francesco@linux.intel.com>
 <20240204173105.935612-3-fabio.maria.de.francesco@linux.intel.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20240204173105.935612-3-fabio.maria.de.francesco@linux.intel.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lmvP1ClyMaMKVwHYmZuR3+OmCho/z3LUiFBKbyRsS4orYtbNOJudhTZN4wKO?=
 =?us-ascii?Q?QsanSbVNzJGJnkALKAQf7gTYuK22mWrODxlAlA/n9+nA9yl5ER/TlrJOs5Yf?=
 =?us-ascii?Q?xrxEETGPBd7VKrm3amYP4rDbi+ANlJ1bnrCk6hCBWseMAkCDv8t970XK6OhU?=
 =?us-ascii?Q?A2s1u0PWrkx1Q9KqBTPzzgas2zNyOmVzSFMbObW+/L1EWoQ8cESiW2s3W+0G?=
 =?us-ascii?Q?BcLjiuAfRQGtpVH6s1pej+98Qmh6T3NV+DaHUx3CC9uhId9u9+lupu15IuI7?=
 =?us-ascii?Q?CsFxSTJ5JFFLb3/vhVS00a/zbsoX/Dzvi26bQKYOafHTl7+u5DUWxvkNjRF7?=
 =?us-ascii?Q?or9V3jXDM8m4hm1YHJbV3g0yIAMRNsJZWyBo2rRrb8YK230hVHy44alIq872?=
 =?us-ascii?Q?uziTsTRK34L+l8ZzAV3reGUWrdFO9vOScdYUYHM0UDqS0s6xXXZz4Jq5jcub?=
 =?us-ascii?Q?aESpiYJ9Zj929LAHgNbB8SKbdMMVkRTXKJbPIgFC2JlmMaW6g81Ha9CPLumJ?=
 =?us-ascii?Q?pQSA58TKH5I249h/Nck89m7AY+i6wMd1G7+x8whfUVsiSLW2ooR/lrH41tug?=
 =?us-ascii?Q?BPsKDGEdNHsxljMxkntK6qUqIqi59FQwRuwmMx2c1GurI87xo+yLuX7gsQcM?=
 =?us-ascii?Q?1ZLdNVgXSLvGL95/WIaBYjUoG1DUE1zNPT28VP1tH5cqaCQFY0mAaeVDwJ0r?=
 =?us-ascii?Q?y4OPuq52duEqwR3/hl5P2N00BaqatrvsV17ntwZiNKZay8SlZsNlz2PI31EM?=
 =?us-ascii?Q?WBGRktbSGgrrD84XJ9Gg95HIy8VE4m4YU/s6bAYnMWD1Jp4AxIaZX9+SQqR0?=
 =?us-ascii?Q?yNQjFRD12sCyDKyE3aQyXYSpBqCOUliszpk59+LE7Xy4BbYS1qL/qEe36qgP?=
 =?us-ascii?Q?HwlLTrVvqYx+iFXsdGQbxVApZoZvw+v8Sc1mIExpiOjGrAW9faKLUdHJ+m4+?=
 =?us-ascii?Q?nkETpGAlAE2iUoG0vOiMWZ3xipl+X1Y2ESnwmeMVaqX7q5vBbRFAZVa+WI0L?=
 =?us-ascii?Q?xclu9baKwiZuqi8DrS+5fyByzsTmVdsX2hSLLQY+w7MOH3CDd/YQ9JQ80LpA?=
 =?us-ascii?Q?Im3KpQjQ5j7UA6mKokdG6ERVKUtD8UywQliix1k2Ady7ufLdPY/t46GHalJC?=
 =?us-ascii?Q?veIIHH0/34BKqRH4irjLY59I5tVMpRomPkSGWgmC4ruD0V5SM7A9jh8qXYTw?=
 =?us-ascii?Q?+224JyahSi/X35Zcqr2Wap4D0UZ/2/OUY5PTl8Z5nqezuQDemkVlF73tqdyN?=
 =?us-ascii?Q?zH3LsfIKE860IjRdNY7eMSAwFkS12HyUUVY8jSIwBkg8ft2v+2bdBUaNRF/S?=
 =?us-ascii?Q?UkjmjJ2elaaFm4tFsXJ6PQ2pBR7CwMN6wBmxbaxsywuTokXz0bwO2MCEuje5?=
 =?us-ascii?Q?bP7j55pYXz56tg46UucNrrA2dqfBwKbZhU2LQKBpChi15Cpd5XYB4YvpctV/?=
 =?us-ascii?Q?iJxsf+VTuZJU0FP3PxSJHGUoXn20IV+/+hZkeHj348NzXjm15gtiyWyI6oHX?=
 =?us-ascii?Q?U4sjT0g9IAToN8lKNd0cRTmOcioZOx7tkEAZe/MG6Py7zLrPki7PTzkFC36G?=
 =?us-ascii?Q?AxmyGpX5vpUhcL81K19gvceqiAzGhQKMVT6Mf4O5?=
X-MS-Exchange-CrossTenant-Network-Message-Id: b14f8e6d-61ca-4523-1ff2-08dc266cd937
X-MS-Exchange-CrossTenant-AuthSource: SA1PR11MB6733.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 17:06:52.4192
 (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: k5bAKtLrRGgLFcE+2V3wE/WVnlNiLnuKqXx5mgvmgvg0nLPP5izrdTYSPaVt5TeVqEQThdt4QDgwyaEeqQ+eJw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB5808
X-OriginatorOrg: intel.com

Fabio M. De Francesco wrote:
> Use cond_guard() in show_target() to not open code an up_read() in an 'out'
> block. If the down_read_interruptible() fails, the statement passed to the
> second argument of cond_guard() returns -EINTR.
> 
> Cc: Peter Zijlstra <peterz@infradead.org>
> Suggested-by: Dan Williams <dan.j.williams@intel.com>
> Suggested-by: Ira Weiny <ira.weiny@intel.com>
> Signed-off-by: Fabio M. De Francesco <fabio.maria.de.francesco@linux.intel.com>
> ---
>  drivers/cxl/core/region.c | 16 ++++------------
>  1 file changed, 4 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c
> index 0f05692bfec3..bd3236786a25 100644
> --- a/drivers/cxl/core/region.c
> +++ b/drivers/cxl/core/region.c
> @@ -666,28 +666,20 @@ static size_t show_targetN(struct cxl_region *cxlr, char *buf, int pos)
>  {
>  	struct cxl_region_params *p = &cxlr->params;
>  	struct cxl_endpoint_decoder *cxled;
> -	int rc;
>  
> -	rc = down_read_interruptible(&cxl_region_rwsem);
> -	if (rc)
> -		return rc;
> +	cond_guard(rwsem_read_intr, return -EINTR, &cxl_region_rwsem);
>  
>  	if (pos >= p->interleave_ways) {
>  		dev_dbg(&cxlr->dev, "position %d out of range %d\n", pos,
>  			p->interleave_ways);
> -		rc = -ENXIO;
> -		goto out;
> +		return -ENXIO;
>  	}
>  
>  	cxled = p->targets[pos];
>  	if (!cxled)
> -		rc = sysfs_emit(buf, "\n");
> +		return sysfs_emit(buf, "\n");
>  	else

NIT: This else is not needed anymore.

Reviewed-by: Ira Weiny <ira.weiny@intel.com>

> -		rc = sysfs_emit(buf, "%s\n", dev_name(&cxled->cxld.dev));
> -out:
> -	up_read(&cxl_region_rwsem);
> -
> -	return rc;
> +		return sysfs_emit(buf, "%s\n", dev_name(&cxled->cxld.dev));
>  }
>  
>  static int match_free_decoder(struct device *dev, void *data)
> -- 
> 2.43.0
>