Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Chuck Lever III <chuck.lever@oracle.com>
To:     Jeff Layton <jlayton@redhat.com>
CC:     Dai Ngo <dai.ngo@oracle.com>, Bruce Fields <bfields@fieldses.org>,
        Al Viro <viro@zeniv.linux.org.uk>,
        Linux NFS Mailing List <linux-nfs@vger.kernel.org>,
        linux-fsdevel <linux-fsdevel@vger.kernel.org>
Subject: Re: [PATCH RFC 2/3] fs/lock: only call lm_breaker_owns_lease if there
 is conflict.
Thread-Topic: [PATCH RFC 2/3] fs/lock: only call lm_breaker_owns_lease if
 there is conflict.
Thread-Index: AQHYFH7W0rGCTsT7ak+Nt+Sdq6K0MayCQHkA
Date:   Thu, 3 Feb 2022 19:32:09 +0000
Message-ID: <7CA3D081-8AC4-4B24-849C-7840457D18F8@oracle.com>
References: <1643398773-29149-1-git-send-email-dai.ngo@oracle.com>
 <1643398773-29149-3-git-send-email-dai.ngo@oracle.com>
In-Reply-To: <1643398773-29149-3-git-send-email-dai.ngo@oracle.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?Ol3liXdTjZnCTWG92YtZf/LShWGwHwjBq/6MQzNGKP0NBqbIkRFTrAHgNEgU?=
 =?us-ascii?Q?Y5mT8Ov3On2igES/FYlDdenIRIxMYStxPd5dmkijZ7pGLIQogBtebSUEU9Fa?=
 =?us-ascii?Q?bjPr2uIZQKK64FtXAAlxMI2hc3K9bkwjFzgyVRlvRUv8n5jyTnjjL4YoCiFc?=
 =?us-ascii?Q?BA0ymbvL1UpsL2Lzg+cdfLa4xJK8gQZrbDvom8ZVJQxkP6g8A830ZVFHQgAH?=
 =?us-ascii?Q?2sotDMP5jduHMfQb9DWoZ2ZDvAd0k84rcB6U2bumpO0wXoBTqpVoSGva0TtU?=
 =?us-ascii?Q?uFF+7HEQm5CJsfrr4misfLyHdx1buir17dc2dIbpWM1yv9PaImO+RXaU6n9M?=
 =?us-ascii?Q?zeagxgPdzDHZ4PrRUnN9JQYDvSHiay4lwGchva21CmQdTReCS5NXP1fzdRCj?=
 =?us-ascii?Q?DhzTNoObyb0jNWVOswvdZytNU+nJNz1HEu3AivT/7DFw1M4vW4lVSWWOZimr?=
 =?us-ascii?Q?dMij2KU6/evom9IVYL1NL4FmCuJtbXX0Pw/4hFzV6EassKktt0QUMfjATNC3?=
 =?us-ascii?Q?mj3Iw6K5/0ysimTifAtLqSTmCc83q9V73XYPD5xEFHJeYTe2Tqb2jRNQp9YN?=
 =?us-ascii?Q?gMuZYJrVPeBZ0HlZw/4mkkW76M++TvrWj8CXVwAsIXfqT3DkWOm/wVebry17?=
 =?us-ascii?Q?Szj2iXQo6CNbup39ZQVvOLPrhpaqU7IZC3BOydotvbGzEMtbqDhoNEKGqMGS?=
 =?us-ascii?Q?WhOE2Tqoxu5QNWZ7PChup1NGa7z2wYv6n1qJ3AC/5jpCiXFbyMkWL8cx66R2?=
 =?us-ascii?Q?bSMkNhbOjvUihDpuz+ufggg6qTsvIxnztsRyIksAACXBcfP/LJ0ee/HYhEcS?=
 =?us-ascii?Q?iphK7jCVHD4i/HUet0KyHuisDV+OYW/reZSP9hYY1A0kJ1g9Yjs9isNTv2E8?=
 =?us-ascii?Q?culkNG0Q2FRNvgMzfzhm+JtTVe3d/Kf0vu6dNSx7VqfEHqNUOr/gYhJof/LJ?=
 =?us-ascii?Q?hP86cqOXtTY0d4VDglYLdb73fKDQp44PJ+eZG2namVgWiWrCYZI1l3jXsVKM?=
 =?us-ascii?Q?/qtnL5u29F9ZvA/vQurscGLnShzb/HPo9hVUqe6rZFrmXQhpPioDZqsPEMKx?=
 =?us-ascii?Q?SrxIH5wz3C+uaWm1JIjR4LjIUO3p3ET0A1CLtshd0YmEg3UtA83UJqzwoTm6?=
 =?us-ascii?Q?dmrYSsjY8krZqBk7kdqS8DmTsKQAMecweqGNdFWAGNeBvUNUu7rRHSv/19y0?=
 =?us-ascii?Q?uea4OS+B31TnuP2bV1/twc7W0GN2gqzP4mDaTZu/qaK4c4ZFy2jIi4YUk/cD?=
 =?us-ascii?Q?m701VDXbbYxbo+022c2y/KoPtXWg5x9Ac1Dc9vcTIqOvszVkFkDc+qszPQB+?=
 =?us-ascii?Q?HjsAYvc953ilgI3BRBURaL0OFlcnphkddkJjH+Ghz7RNT0Nt8id24rDmM3KH?=
 =?us-ascii?Q?NBefmPH5YEv+ObvsknJvYLs0r9rTrVePVJF94wyTHi+XzIK7GVL5e0aCPdZO?=
 =?us-ascii?Q?Ox9SvbUgM2j3Ldu1cBQxIfh2cFGyTLlFAtrbDo+VESQ/blD3It3zdcZ3lZvj?=
 =?us-ascii?Q?s125xjCsCik28mvEkYosfunXY5xryb3QuGXpmzWCktMoo8mxqrr1VbNeea9Q?=
 =?us-ascii?Q?pU8eaZqfHXSR5nGRtuaUQW4qAb7d0PRnC3GayUVGpWkqBiuWAQUuZCMDmef0?=
 =?us-ascii?Q?dPJG4tiC4KcuW8CE9t967H4=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <16751B1856D9C34BADA3C27A50C2F55A@namprd10.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: CH0PR10MB4858.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 961227dd-1eba-4811-d56b-08d9e74bdeda
X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Feb 2022 19:32:09.6216
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: H8SON7q1ooBoiG76Hm+zAkf5ExC0cXvbfH7h9fCnctHHTIHCPuqmKTEO78Q8JWQLif0nUFoJs2wC1cuO5wkAIQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR10MB3385
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10247 signatures=673430
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxlogscore=999
 adultscore=0 malwarescore=0 bulkscore=0 suspectscore=0 mlxscore=0
 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2201110000 definitions=main-2202030116
X-Proofpoint-ORIG-GUID: HZ1C_32tS73GD78d07RLrAg7D3QUee5C
X-Proofpoint-GUID: HZ1C_32tS73GD78d07RLrAg7D3QUee5C
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org

Hi Jeff-

> On Jan 28, 2022, at 2:39 PM, Dai Ngo <dai.ngo@oracle.com> wrote:
>=20
> Modify leases_conflict to call lm_breaker_owns_lease only if
> there is real conflict.  This is to allow the lock manager to
> resolve the conflict if possible.
>=20
> Signed-off-by: Dai Ngo <dai.ngo@oracle.com>

If we are to take 1/3 and 2/3 through the nfsd tree,
can you send an Acked-by: ?


> ---
> fs/locks.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>=20
> diff --git a/fs/locks.c b/fs/locks.c
> index 052b42cc7f25..456717873cff 100644
> --- a/fs/locks.c
> +++ b/fs/locks.c
> @@ -1357,9 +1357,6 @@ static bool leases_conflict(struct file_lock *lease=
, struct file_lock *breaker)
> {
> 	bool rc;
>=20
> -	if (lease->fl_lmops->lm_breaker_owns_lease
> -			&& lease->fl_lmops->lm_breaker_owns_lease(lease))
> -		return false;
> 	if ((breaker->fl_flags & FL_LAYOUT) !=3D (lease->fl_flags & FL_LAYOUT)) =
{
> 		rc =3D false;
> 		goto trace;
> @@ -1370,6 +1367,9 @@ static bool leases_conflict(struct file_lock *lease=
, struct file_lock *breaker)
> 	}
>=20
> 	rc =3D locks_conflict(breaker, lease);
> +	if (rc && lease->fl_lmops->lm_breaker_owns_lease &&
> +		lease->fl_lmops->lm_breaker_owns_lease(lease))
> +		rc =3D false;
> trace:
> 	trace_leases_conflict(rc, lease, breaker);
> 	return rc;
> --=20
> 2.9.5
>=20

--
Chuck Lever