From:   Chuck Lever III <chuck.lever@oracle.com>
To:     Neil Brown <neilb@suse.de>
CC:     Bruce Fields <bfields@fieldses.org>,
        Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH 02/19] NFSD: handle error better in write_ports_addfd()
Thread-Topic: [PATCH 02/19] NFSD: handle error better in write_ports_addfd()
Thread-Index: AQHX4AnL7ZLjXXV6dUG8wvLXqxTiAawRUo0A
Date:   Tue, 23 Nov 2021 16:44:00 +0000
Message-ID: <3B93593B-861F-4816-9259-EBB20FDB4375@oracle.com>
References: <163763078330.7284.10141477742275086758.stgit@noble.brown>
 <163763097543.7284.12067402792054742606.stgit@noble.brown>
In-Reply-To: <163763097543.7284.12067402792054742606.stgit@noble.brown>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?ard5WXUB+945ZxZ/Mwm1zErmAvPOG4U7DynF+5esdiILkqMJmoyyaAOemTL0?=
 =?us-ascii?Q?uIljlqv/bRnPuOuI7dw1Uv/C+RgbdfPrwzNFuQcB5rar6fcs7Fmn5NVCgJmY?=
 =?us-ascii?Q?I1QdOMV13hiAvZ0hr77bBDVXNn7e+Iyd+mnxII3b62LT9Gh4EcI3I4seuWHe?=
 =?us-ascii?Q?75Xq6ZCcn3C1uRCfvEDjafFDtTNTTWymVZrEZlZJU2TikhcMZmy09/XTYZKG?=
 =?us-ascii?Q?SkVCqIZNTKFPQ1PDdZ+7dY1BDQky/0FODrRqZ0co0BG25Ppa2ND8IQeJh9ag?=
 =?us-ascii?Q?WParMpUg+LfOENAzNrdCUt9KxxgxMzGmBUHNJJrXKJ0l7Fkh4uzeXIV3LgaF?=
 =?us-ascii?Q?71vADeCQTF6BW4adbwdXlNPKS4CgnOqLWWQ4hHkwhhoUSWPefBxzzD+yYLJq?=
 =?us-ascii?Q?APYaU190+hwOh130JYozgQB/L3KB+1ut3mRHuV7vUTd1wrHUlD71hOEKqC6P?=
 =?us-ascii?Q?UcLVndt1WTnS+4THB5iST0VA1UhCNGTtqTivZO8p/zrMG5SzlT7PTteBodWV?=
 =?us-ascii?Q?0e+QNPyPWsptWb3yB0NzkPCicmwJPZweC83LsGi9OyEZdKD+Y0Oq2NHt+ojr?=
 =?us-ascii?Q?lw3KrU+qvnskxubY+lm+wROcuCEaYJoRkMtkKdGUp26m7Ug9d4qK9BgbsG+g?=
 =?us-ascii?Q?CvIW33GVDYYEaUSb7K1WhDh+228auvsMwiEf8XqwBLQWMEYwMkhajrTQI09q?=
 =?us-ascii?Q?Iu2TnYS+ZNb21nYSB34/vB11zTQE2xTHyxgB3iJZyRzvCXMJxiDsoSevQEiz?=
 =?us-ascii?Q?g69TWbMBEtR9U35mIE6Y/oU1rUgB2y6yNL/s03aavaB03VTOJ8j3PJxH22qU?=
 =?us-ascii?Q?zl3+akEX3RkA+f3DOhM/5MTRVoP5ljZhj1V7n/0DVrZkLomYxwCsYUPdxF/x?=
 =?us-ascii?Q?5FYcPV+2Q/v2W9U8y0LuhXcuA7dpGqjjdb4ofUYI7FxA80cj1hpsQiV+4adl?=
 =?us-ascii?Q?WO6qaGh1EXizAi7MV+z5b2YukAZ0M2WuB21UXf0lnYlOBE9b2/xmQplTCmby?=
 =?us-ascii?Q?PMHlG7Xtf/3wTVU641ivPcvpurHnJoMQxN3l82xi5wF5KUQW1aCNbcNURyob?=
 =?us-ascii?Q?APoMftwbYtZWjhRUNSH2+ysIM0Gc1QeptvXzAhhqTP7Khd3ohLkpK7KPLbzL?=
 =?us-ascii?Q?14+yOrMQ8phQzDhxOhHkQq41Jv5uYyDQ41owN/xTWmZvwo8jKAguyPut4VKW?=
 =?us-ascii?Q?Y86WK7GaChKHygiIM2wHdzyCb3LpXPA4U4T31PMX+MyeDpmOPzJOXBKw+pb7?=
 =?us-ascii?Q?g/gyLMvv7JJcyKJjoKtd1IjR42n1R2e8P3QNriLynfdR2+4ekU14IkNeDSQb?=
 =?us-ascii?Q?UnS5hozmbE15iCsFcNnIVnLq143npkrV9frv+iJ1RrDvZNw8NV+rlN3rC1nY?=
 =?us-ascii?Q?ld5gxYJG3r658Q5oYfXEi2EyeTPcXuOP+IsV+bDDrNOvbT+4v6tO6gkFachh?=
 =?us-ascii?Q?7klWoPTKR04LT7jJYuOx+hmjIDEQqV1qRDWYqg1VXObhWIoy4ruch+lOhhlo?=
 =?us-ascii?Q?pAKOxD+pwPgj7P6EoTosNGu2KRrALDtafPWe3u28Vf5odbKhqiznDTPYtyhE?=
 =?us-ascii?Q?Bg3Vmb9VuUy5AvUww6iUJJ5acICUv7YgSS8mZWOozTJg/GQq52ZsJ1GLuLoz?=
 =?us-ascii?Q?S4p0d7KXEMqgW67L3RrStD0=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <7A70796A637B334A8A16AEFB0F587650@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: SJ0PR10MB4688.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6d68b8d8-d0db-4962-ce4d-08d9aea07375
X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Nov 2021 16:44:00.3661
 (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: 7z2LS/1myFQdLF5AhYrn/NGkAeL9swOPZP340LfuBrhqKTN/z/3Y9YY4B8+Vg7BMERptmGUEiRnemg2NuB1/0Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB3720
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10177 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 mlxscore=0 spamscore=0
 mlxlogscore=999 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000
 definitions=main-2111230084
X-Proofpoint-GUID: T33nyBhU8UFqhfLnTUw-M3YVvthLpiEV
X-Proofpoint-ORIG-GUID: T33nyBhU8UFqhfLnTUw-M3YVvthLpiEV
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org


> On Nov 22, 2021, at 8:29 PM, NeilBrown <neilb@suse.de> wrote:
>=20
> If write_ports_add() fails, we shouldn't destroy the serv, unless we had
> only just created it.  So if there are any permanent sockets already
> attached, leave the serv in place.
>=20
> Signed-off-by: NeilBrown <neilb@suse.de>

This needs to go at the front of the series, IMO, to make it
more straightforward to backport if needed.

Though ea068bad27ce ("NFSD: move lockd_up() before svc_addsock()")
appears to have introduced "if (err < 0)" I'm not sure that's
actually where problems were introduced. Is Cc: stable warranted?


> ---
> fs/nfsd/nfsctl.c |    2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>=20
> diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
> index 5eb564e58a9b..93d417871302 100644
> --- a/fs/nfsd/nfsctl.c
> +++ b/fs/nfsd/nfsctl.c
> @@ -742,7 +742,7 @@ static ssize_t __write_ports_addfd(char *buf, struct =
net *net, const struct cred
> 		return err;
>=20
> 	err =3D svc_addsock(nn->nfsd_serv, fd, buf, SIMPLE_TRANSACTION_LIMIT, cr=
ed);
> -	if (err < 0) {
> +	if (err < 0 && list_empty(&nn->nfsd_serv->sv_permsocks)) {
> 		nfsd_put(net);
> 		return err;
> 	}
>=20
>=20

--
Chuck Lever