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:     Neil Brown <neilb@suse.de>
CC:     Trond Myklebust <trond.myklebust@hammerspace.com>,
        Anna Schumaker <anna@kernel.org>,
        Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH] NFS: restore module put when manager exits.
Thread-Topic: [PATCH] NFS: restore module put when manager exits.
Thread-Index: AQHYhrxhHae1YJ8NFEO69Q/BlZq8nq1dbXkA
Date:   Thu, 23 Jun 2022 20:11:51 +0000
Message-ID: <34FB98B7-1F1B-4901-B2DF-442B7F212F76@oracle.com>
References: <165595965412.4786.12578338276708392878@noble.neil.brown.name>
In-Reply-To: <165595965412.4786.12578338276708392878@noble.neil.brown.name>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?nasdDAZLlBGAL6uVjE7y+bRITJaV2U4qb1ZTRHZZtyxemThHYJbn6/TIPOz1?=
 =?us-ascii?Q?NgDMFAzK7zavG+7Uwtr3XKN3WbplxcEqp5MwiYAjycEZnFR4M+UDo6J5Esgx?=
 =?us-ascii?Q?bGGcuXMkbqcJl+t7YOLGRtuHCsXq5mUsjbchtnWDpBxT5AcxD+ZJmU9ApcJR?=
 =?us-ascii?Q?Ei79SM8xgmUOIhRwybdCqam2cPFccYsJhTR7byVqrbq2ToJ4WtkBVYYNPSZF?=
 =?us-ascii?Q?wQQptwi8rHlDw8oleM6n8xvzZxW+RipPdqmz3I3jpKYB9ofFAajLsxDyk8G1?=
 =?us-ascii?Q?1jRxJk+XkiuoPQOQ5DfH0j7a9z/vpyuxS7P0upffbr3Hinw76BaX2y3lYOR3?=
 =?us-ascii?Q?o/cbg36TH6aCi8WHcoSic5OOke7U7ZPZtrd27y1Q8v1OC4w8BmerGa0JlTUM?=
 =?us-ascii?Q?xZhBtm8OEyLz9Nxt0DbaHQ7ysq03+j8ngTVMbDSax279/L7A03BV7Qq2B9LL?=
 =?us-ascii?Q?ofjuuCbkgA3TmoP97XKcpPOGUcupp+3w2iHNggzQd3wm+8A26Eau/lXtOPza?=
 =?us-ascii?Q?VLh5+UQaOa9bU5DzkjSP8HPR2kGjhSZdAuYMepjPWX98c2mRNoKHwKw8fGWj?=
 =?us-ascii?Q?IY5k2QDwzy8OQWfv818wEX0EZPpL97Cudt8d784mpCBGudhSq1kzsVTlV0c4?=
 =?us-ascii?Q?GlkTKTu8Fs2Jc2XrYlwSM6VUOyrOcFBUmwVbrt7PJx3IIUEJylsp1SSJP8u6?=
 =?us-ascii?Q?qMVneqwLYnMileXQqM7ExE/1v3tUu7SrgzaSqPgibLOruvr+lDBdGd/ZT7hj?=
 =?us-ascii?Q?YOaP5Cio9/RynRNV5sWvp6jO3zKo4GG4SiPyFd6LB+1PWjspMTkyuees29J+?=
 =?us-ascii?Q?4qUk3v2tSIcFaL9erwYr1BCrxlxbOq8H2QUJ7Xih1ZTq36B9MPvXsTu6C6fr?=
 =?us-ascii?Q?tKL6lK2BYQjZhNIhYuaEgMDbDbiOS16CiJTdSo0I0/Wlwu1ghJ85erhO6uqM?=
 =?us-ascii?Q?FjpvxXDtTPNtHmy9E56M2iM1y0VjjGuqEIWOz52mKNvxSuc1DA58JP2U3N+A?=
 =?us-ascii?Q?Z09fWwqTO0B80Qzl7u2sSnwjDuw3Zkt/SlKkFqVIUpN2v4v9P6NlxaIN0Xbh?=
 =?us-ascii?Q?vtf2YHrWlZ7Lsn2EmV+XKPPpOzz8O05Kbh12KlfEMeomgGQFiFe9VJ/+qNbz?=
 =?us-ascii?Q?3zzIh3uyQ7Spqy4UJHqsuZah+3KudHBNPE1O1gR1l7xNUm+pQ5asRIaBqcVH?=
 =?us-ascii?Q?X8slvoEFawaxZkWKKiD1MgGdwNba+jQFM/NmAvewPkuw+h22s8yuNLE9urOj?=
 =?us-ascii?Q?asXp9UIQHtoA3caXyC32sP1Wx1cCfmZw+3TRRm9biSpnek1alHu2MDacwGBH?=
 =?us-ascii?Q?OdNxBwuYws7XvMmbOw36vMKMTIsN8UIjMIXAMshq9otIIUP2xpcgwETTrX1i?=
 =?us-ascii?Q?br71hLh8IVeA7cJBMvCqhPt/Ru89v3VhtAJC4KaG4JtGnMRB9JmCmvT2qoY+?=
 =?us-ascii?Q?KG1ufvgBhXcpmpoppk1gK8eKX7Mw/nYw7wtNLgBD8cs3WQr+NIksyDiwq9ke?=
 =?us-ascii?Q?NFwWqic3jn+oGfN8GhJV9pOSQRQ/opEIj5uvm3jMDeErFkw+E/Dx8VQzsMvs?=
 =?us-ascii?Q?Oj4K4cXz5/ifdAf1GckjVV/+MW+ua+3IKVJK8aRBBQBFVF8f4RjJ0+jDAibq?=
 =?us-ascii?Q?sETzb+RVTv0d3mNlUJCqxKHAXrAwvTmHj/tu7MLleT2Yr7v1rfyqQrNr04nr?=
 =?us-ascii?Q?zxMw+wV/l69Q0pjJokBW4dkCijOkde4dl4ICHkisPerkGShcnRKHRofc9SRX?=
 =?us-ascii?Q?jdJI9EvUgNQ2QYAeMrooN9zTSdc/KFs=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <00079FCBD3F7864286584281F4985874@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: DS7PR10MB5134.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 747d9078-cf73-41c5-8198-08da55549c31
X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Jun 2022 20:11:51.2137
 (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: 3DgKj5lTMqNVpm6u5jxtJ0qdcDauay1qjG94V7kPdwvMmY9wySj66tjbMN2xYqWvmyDCuQHUz7wyvyCzpdTTnQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5007
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.517,18.0.883
 definitions=2022-06-23_10:2022-06-23,2022-06-23 signatures=0
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 malwarescore=0 mlxscore=0
 phishscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2204290000
 definitions=main-2206230077
X-Proofpoint-GUID: zWEaeF4ZNsmpPoyy4PMHkemH45eUTjf8
X-Proofpoint-ORIG-GUID: zWEaeF4ZNsmpPoyy4PMHkemH45eUTjf8
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org


> On Jun 23, 2022, at 12:47 AM, NeilBrown <neilb@suse.de> wrote:
>=20
>=20
> Commit f49169c97fce ("NFSD: Remove svc_serv_ops::svo_module") removed
> calls to module_put_and_kthread_exit() from threads that acted as SUNRPC
> servers and had a related svc_serv_ops structure.  This was correct.
>=20
> It ALSO removed the module_put_and_kthread_exit() call from
> nfs4_run_state_manager() which is NOT a SUNRPC service.
>=20
> Consequently every time the NFSv4 state manager runs the module count
> increments and won't be decremented.  So the nfsv4 module cannot be
> unloaded.
>=20
> So restore the module_put_and_kthread_exit() call.
>=20
> Fixes: f49169c97fce ("NFSD: Remove svc_serv_ops::svo_module")
> Signed-off-by: NeilBrown <neilb@suse.de>

The fix seems correct to me. I can't remember why I thought this
particular module_put_and_kthread_exit() call site needed to go.


> ---
> fs/nfs/nfs4state.c | 1 +
> 1 file changed, 1 insertion(+)
>=20
> diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
> index 2540b35ec187..9bab3e9c702a 100644
> --- a/fs/nfs/nfs4state.c
> +++ b/fs/nfs/nfs4state.c
> @@ -2753,5 +2753,6 @@ static int nfs4_run_state_manager(void *ptr)
> 		goto again;
>=20
> 	nfs_put_client(clp);
> +	module_put_and_kthread_exit(0);
> 	return 0;
> }
> --=20
> 2.36.1
>=20

--
Chuck Lever