Received-SPF: pass (google.com: domain of linux-kernel+bounces-58343-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Thu, 8 Feb 2024 08:21:24 -0800
From: Ira Weiny <ira.weiny@intel.com>
To: Jonathan Cameron <Jonathan.Cameron@huawei.com>, "Fabio M. De Francesco"
	<fabio.maria.de.francesco@linux.intel.com>
CC: Peter Zijlstra <peterz@infradead.org>, Dan Williams
	<dan.j.williams@intel.com>, <linux-kernel@vger.kernel.org>,
	<linux-cxl@vger.kernel.org>, Ingo Molnar <mingo@kernel.org>, Dave Jiang
	<dave.jiang@intel.com>, Ira Weiny <ira.weiny@intel.com>
Subject: Re: [PATCH 1/2 v4] cleanup: Add cond_guard() to conditional guards
Message-ID: <65c4ff84640de_3f44ac294f5@iweiny-mobl.notmuch>
References: <20240208130424.59568-1-fabio.maria.de.francesco@linux.intel.com>
 <20240208130424.59568-2-fabio.maria.de.francesco@linux.intel.com>
 <20240208140403.0000238f@Huawei.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20240208140403.0000238f@Huawei.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?iT9AVBBng91XyY6Lp+Dm7kfN1CiK88OmGURoMBgYdNFwOziGUGp5YcPbFncR?=
 =?us-ascii?Q?vMRVjdRCvuevceVOSRkec3N9+tJ+h47Xr1KZVC2r4ZT6TzIIun5UdKcIR+fO?=
 =?us-ascii?Q?yfnRvHoUcqfYOWZ5zScijT7UWikfDyag2Ikh7NnJm8xSfFPOL0ULVAqWHlr5?=
 =?us-ascii?Q?3RPkXk6JuI9eAqUESLfcaRwH77XYaXcYiXIuGY+GgYNFlwVn+6+OzjJuDw36?=
 =?us-ascii?Q?C5O+gNaPlqC5/8mznIHHWECMxxKLZgGm+RSYB7jYhNDgPsYXsFT7iBc6lwfa?=
 =?us-ascii?Q?2nI7FWPwfoysxbpBekRK5w7S2mVzINbIo8FJJI4UI+btezoC+6fhCtNkbil0?=
 =?us-ascii?Q?sO+Sgc+iGUrdwRzdTQ37nQ7zc125kmiqCHaC2TwkiBQQgi7RMhI3ZfR8DV/R?=
 =?us-ascii?Q?HjsWUZXrrHiMGYkkwvE92i0OapUH4WxgbG3QFTQKie5EEd43oWw3wxRKfif8?=
 =?us-ascii?Q?t3XumKvVUqtWjTez+Pg82vBz0nASrYUTO7MKAaWrtIKi53IJeJC8fmAdI26b?=
 =?us-ascii?Q?QmScIk6sGT7PIFhWszLqNdVwINXoX4by3+uG7l6QRYotSEd0rxWKxW3nFlFT?=
 =?us-ascii?Q?7sk4ivf7TU0YowD7ZQqk64/QLFx26AkA3pAQkiMhUqT+FJHGKcTiHcOrV7mi?=
 =?us-ascii?Q?JCLZ6u37xWhtB82fIDE8p28oxQMYZhoOxWLTrlYD7bkzupqcFhMi5l7UdY3l?=
 =?us-ascii?Q?1jwovM0fDvwsJA0OXaB/wEh+eUHQlQvoLQ8M2E+jH+YcpOBxYC9vsek35qIb?=
 =?us-ascii?Q?LENSZDGXUlNvWq4pJIeDLgr6Bp9AsAyYvkr6rsuxGleyP4wMZaj1kYK53yJn?=
 =?us-ascii?Q?5D//oUZik76AzOppeG2sjrpu292Y7c4BfNw0yucZAW9d7meUpwHsnFpMP2br?=
 =?us-ascii?Q?o3jFi1GMb95eNP0JQJaFHuESNtVgxjG+9NTe+yx3bJjd4K+UAYpKamv+IyKv?=
 =?us-ascii?Q?fQbVlVfgJbPvFfg+9c6Sl2Y4+NsL1J4A/fR01oIntxv97TfUvWpslDBRV2iw?=
 =?us-ascii?Q?Py6v32Vyq6DHrtZo1PdsGZ42Gs1zXT2Svl81mf/5dESpWRPSGtbcc30+O7i6?=
 =?us-ascii?Q?PILDVx364vuUzm15FJ/KcoBqsLj4pwZGaSwNGMeAzUm5RUs0fciweCsN2OvR?=
 =?us-ascii?Q?y6qEN94tGIeIyrgoS1N1LW0BfAlbIOcWIK+iaMROQAMo7sntb1Nb/HsZc++N?=
 =?us-ascii?Q?LMPKRvbiGBUsGYFwUuEo90C+EkvM3CnesTcGPX4CjbddLDQ4ZzT089olVk9Q?=
 =?us-ascii?Q?K1GyLKseX2CZJAtrxvDO4+N65AI58cbdmwqrfyJL/jKcRhjnYCTRhs3jvRZj?=
 =?us-ascii?Q?diAac3Yo03KOPBUG4ETxHLHtkLUNCrgm3NJNueBn2g9+mLTfkc8Y5TlIybnV?=
 =?us-ascii?Q?BCeTKng1ogACuRM2iuROBnp4hv2bDFmpQYhSl503hNb3jhNmsCI1g5DoQR0I?=
 =?us-ascii?Q?sepIV1PMdZju88ceEl0ANsjS5E+R9swj+E+r//+Z67IoIeb9iDCLf6BfVXDQ?=
 =?us-ascii?Q?pTtVKMIHqHbRdFxuDeSSwvf8L0XTuDtCX3elOeMANWvMMYnFTga/caeqvXjV?=
 =?us-ascii?Q?g2zxYoWFLR7BlyJ7djylTLNACBVnjM2SNlCYV0ZQ?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 0193086d-ad10-4f6c-56c0-08dc28c200e3
X-MS-Exchange-CrossTenant-AuthSource: SA1PR11MB6733.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2024 16:21:28.5963
 (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: 02BVOxRlZ8buQXVNwOj+TcqbSNlG2JIo6JSZIaiCVa57h/Hj4kpmJ3KxhNAUODk/1cz4NeMIPpYr+wLryHrPPw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR11MB7243
X-OriginatorOrg: intel.com

Jonathan Cameron wrote:
> On Thu,  8 Feb 2024 14:04:23 +0100
> "Fabio M. De Francesco" <fabio.maria.de.francesco@linux.intel.com> wrote:
> 
> > Add cond_guard() macro to conditional guards.
> > 
> > cond_guard() is a guard to be used with the conditional variants of locks,
> > like down_read_trylock() or mutex_lock_interruptible().
> > 
> > It takes a statement (or statement-expression) that is passed as its
> > second argument. That statement (or statement-expression) is executed if
> > waiting for a lock is interrupted or if a _trylock() fails in case of
> > contention.
> > 
> > Usage example:
> > 
> > 	cond_guard(mutex_intr, return -EINTR, &mutex);
> > 
> > Consistent with other usage of _guard(), locks are unlocked at the exit of the
> > scope where cond_guard() is called.
> > 
> > Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> I like the defensive else {}

Agreed.

Re-

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

> 
> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> 
> 
> > Cc: Peter Zijlstra <peterz@infradead.org>
> > Suggested-by: Dan Williams <dan.j.williams@intel.com>
> > Suggested-by: Ira Weiny <ira.weiny@intel.com>
> > Reviewed-by: Dave Jiang <dave.jiang@intel.com>
> > Reviewed-by: Ira Weiny <ira.weiny@intel.com>
> > Signed-off-by: Fabio M. De Francesco <fabio.maria.de.francesco@linux.intel.com>
> > ---
> >  include/linux/cleanup.h | 15 +++++++++++++++
> >  1 file changed, 15 insertions(+)
> > 
> > diff --git a/include/linux/cleanup.h b/include/linux/cleanup.h
> > index c2d09bc4f976..7b54ee996414 100644
> > --- a/include/linux/cleanup.h
> > +++ b/include/linux/cleanup.h
> > @@ -134,6 +134,16 @@ static inline class_##_name##_t class_##_name##ext##_constructor(_init_args) \
> >   *	an anonymous instance of the (guard) class, not recommended for
> >   *	conditional locks.
> >   *
> > + * cond_guard(name, fail, args...):
> > + *	a guard to be used with the conditional variants of locks, like
> > + *	down_read_trylock() or mutex_lock_interruptible. 'fail' is a
> > + *	statement or statement-expression that is executed if waiting for a
> > + *	lock is interrupted or if a _trylock() fails in case of contention.
> > + *
> > + *	Example:
> > + *
> > + *		cond_guard(mutex_intr, return -EINTR, &mutex);
> > + *
> >   * scoped_guard (name, args...) { }:
> >   *	similar to CLASS(name, scope)(args), except the variable (with the
> >   *	explicit name 'scope') is declard in a for-loop such that its scope is
> > @@ -165,6 +175,11 @@ static inline class_##_name##_t class_##_name##ext##_constructor(_init_args) \
> >  
> >  #define __guard_ptr(_name) class_##_name##_lock_ptr
> >  
> > +#define cond_guard(_name, _fail, args...) \
> > +	CLASS(_name, scope)(args); \
> > +	if (!__guard_ptr(_name)(&scope)) _fail; \
> > +	else { }
> > +
> >  #define scoped_guard(_name, args...)					\
> >  	for (CLASS(_name, scope)(args),					\
> >  	     *done = NULL; __guard_ptr(_name)(&scope) && !done; done = (void *)1)
> 
>