Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Chuck Lever III <chuck.lever@oracle.com>
To:     Neil Brown <neilb@suse.de>
CC:     Bruce Fields <bfields@fieldses.org>,
        Steve Dickson <SteveD@RedHat.com>,
        Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH v2] mountd/exportd: only log confirmed clients, and poll
 for updates
Thread-Topic: [PATCH v2] mountd/exportd: only log confirmed clients, and poll
 for updates
Thread-Index: AQHXHRDs0zSMi+7X1kiD1aZ7IwRuNaqQFZAA
Date:   Mon, 22 Mar 2021 14:30:04 +0000
Message-ID: <AE89A418-86C1-478A-916E-DC0441ACC8E0@oracle.com>
References: <161456493684.22801.323431390819102360.stgit@noble>
 <20210301185037.GB14881@fieldses.org>
 <874khui7hr.fsf@notabene.neil.brown.name>
 <20210302032733.GC16303@fieldses.org>
 <87y2ejerwn.fsf@notabene.neil.brown.name>
 <87v99neruh.fsf@notabene.neil.brown.name>
 <87sg4rerta.fsf@notabene.neil.brown.name>
 <87eegaepk4.fsf@notabene.neil.brown.name>
In-Reply-To: <87eegaepk4.fsf@notabene.neil.brown.name>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-ID: <DD5360E6F166984EBFAB8FB9101064A0@namprd10.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 8df8ed7a-9080-4504-850e-08d8ed3efc40
X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Mar 2021 14:30:04.7582
 (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: gK3FIstbWVd57NUpKdpdFCsB/J9L2niN2e6ZOHmgGn5xQ7vonAr7yfc+kviwKX+Tgqbx35mDVBIPWvsPviakSw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR10MB3857
X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9931 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 bulkscore=0 phishscore=0
 mlxlogscore=999 suspectscore=0 spamscore=0 malwarescore=0 mlxscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000
 definitions=main-2103220106
X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=9931 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 phishscore=0
 lowpriorityscore=0 suspectscore=0 clxscore=1015 priorityscore=1501
 spamscore=0 adultscore=0 impostorscore=0 mlxlogscore=999 mlxscore=0
 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2009150000 definitions=main-2103220107
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org


> On Mar 19, 2021, at 6:39 PM, NeilBrown <neilb@suse.de> wrote:
>=20
>=20
> It is possible (and common with the Linux NFS client) for the nfs server
> to receive multiple SET_CLIENT_ID or EXCHANGE_ID requests when starting
> a connection.  This results in some clients appearing in
> /proc/fs/nfsd/clients
> which never get confirmed.  mountd currently logs these, but they aren't
> really helpful.
>=20
> If the kernel supports the reporting of the confirmation status of
> clients, we can suppress the message until a client is confirmed.
>=20
> With this patch we:
> - record if the client is confirmed, assuming it is if the status is
>    not reported
> - don't log unconfirmed clients
> - request MODIFY notification from unconfirmed clients.
> - recheck an info file when it is modified.
>=20
> Signed-off-by: NeilBrown <neilb@suse.de>

Hello Neil!

I've committed v2 of this patch to the for-next topic branch at

git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git


> ---
> support/export/v4clients.c | 86 +++++++++++++++++++++++++++++---------
> 1 file changed, 67 insertions(+), 19 deletions(-)
>=20
> diff --git a/support/export/v4clients.c b/support/export/v4clients.c
> index 056ddc9b065d..f2c9bb482ba7 100644
> --- a/support/export/v4clients.c
> +++ b/support/export/v4clients.c
> @@ -48,12 +48,15 @@ void v4clients_set_fds(fd_set *fdset)
> }
>=20
> static void *tree_root;
> +static int have_unconfirmed;
>=20
> struct ent {
> 	unsigned long num;
> 	char *clientid;
> 	char *addr;
> 	int vers;
> +	int unconfirmed;
> +	int wid;
> };
>=20
> static int ent_cmp(const void *av, const void *bv)
> @@ -89,15 +92,14 @@ static char *dup_line(char *line)
> 	return ret;
> }
>=20
> -static void add_id(int id)
> +static void read_info(struct ent *key)
> {
> 	char buf[2048];
> -	struct ent **ent;
> -	struct ent *key;
> 	char *path;
> +	int was_unconfirmed =3D key->unconfirmed;
> 	FILE *f;
>=20
> -	if (asprintf(&path, "/proc/fs/nfsd/clients/%d/info", id) < 0)
> +	if (asprintf(&path, "/proc/fs/nfsd/clients/%lu/info", key->num) < 0)
> 		return;
>=20
> 	f =3D fopen(path, "r");
> @@ -105,35 +107,64 @@ static void add_id(int id)
> 		free(path);
> 		return;
> 	}
> -	key =3D calloc(1, sizeof(*key));
> -	if (!key) {
> -		fclose(f);
> -		free(path);
> -		return;
> -	}
> -	key->num =3D id;
> +	if (key->wid < 0)
> +		key->wid =3D inotify_add_watch(clients_fd, path, IN_MODIFY);
> +
> 	while (fgets(buf, sizeof(buf), f)) {
> -		if (strncmp(buf, "clientid: ", 10) =3D=3D 0)
> +		if (strncmp(buf, "clientid: ", 10) =3D=3D 0) {
> +			free(key->clientid);
> 			key->clientid =3D dup_line(buf+10);
> -		if (strncmp(buf, "address: ", 9) =3D=3D 0)
> +		}
> +		if (strncmp(buf, "address: ", 9) =3D=3D 0) {
> +			free(key->addr);
> 			key->addr =3D dup_line(buf+9);
> +		}
> 		if (strncmp(buf, "minor version: ", 15) =3D=3D 0)
> 			key->vers =3D atoi(buf+15);
> +		if (strncmp(buf, "status: ", 8) =3D=3D 0 &&
> +		    strstr(buf, " unconfirmed") !=3D NULL) {
> +			key->unconfirmed =3D 1;
> +			have_unconfirmed =3D 1;
> +		}
> +		if (strncmp(buf, "status: ", 8) =3D=3D 0 &&
> +		    strstr(buf, " confirmed") !=3D NULL)
> +			key->unconfirmed =3D 0;
> 	}
> 	fclose(f);
> 	free(path);
>=20
> -	xlog(L_NOTICE, "v4.%d client attached: %s from %s",
> -	     key->vers, key->clientid, key->addr);
> +	if (was_unconfirmed && !key->unconfirmed)
> +		xlog(L_NOTICE, "v4.%d client attached: %s from %s",
> +		     key->vers, key->clientid ?: "-none-",
> +		     key->addr ?: "-none-");
> +	if (!key->unconfirmed && ent->wid >=3D 0) {
> +		inotify_rm_watch(clients_fd, ent->wid);
> +		ent->wid =3D -1;
> +	}
> +}
> +
> +static void add_id(int id)
> +{
> +	struct ent **ent;
> +	struct ent *key;
> +
> +	key =3D calloc(1, sizeof(*key));
> +	if (!key) {
> +		return;
> +	}
> +	key->num =3D id;
> +	key->wid =3D -1;
>=20
> 	ent =3D tsearch(key, &tree_root, ent_cmp);
>=20
> 	if (!ent || *ent !=3D key)
> 		/* Already existed, or insertion failed */
> 		free_ent(key);
> +	else
> +		read_info(key);
> }
>=20
> -static void del_id(int id)
> +static void del_id(unsigned long id)
> {
> 	struct ent key =3D {.num =3D id};
> 	struct ent **e, *ent;
> @@ -143,11 +174,27 @@ static void del_id(int id)
> 		return;
> 	ent =3D *e;
> 	tdelete(ent, &tree_root, ent_cmp);
> -	xlog(L_NOTICE, "v4.%d client detached: %s from %s",
> -	     ent->vers, ent->clientid, ent->addr);
> +	if (!ent->unconfirmed)
> +		xlog(L_NOTICE, "v4.%d client detached: %s from %s",
> +		     ent->vers, ent->clientid, ent->addr);
> +	if (ent->wid >=3D 0)
> +		inotify_rm_watch(clients_fd, ent->wid);
> 	free_ent(ent);
> }
>=20
> +static void check_id(unsigned long id)
> +{
> +	struct ent key =3D {.num =3D id};
> +	struct ent **e, *ent;
> +
> +	e =3D tfind(&key, &tree_root, ent_cmp);
> +	if (!e || !*e)
> +		return;
> +	ent =3D *e;
> +	if (ent->unconfirmed)
> +		read_info(ent);
> +}
> +
> int v4clients_process(fd_set *fdset)
> {
> 	char buf[4096] __attribute__((aligned(__alignof__(struct inotify_event))=
));
> @@ -172,8 +219,9 @@ int v4clients_process(fd_set *fdset)
> 				add_id(id);
> 			if (ev->mask & IN_DELETE)
> 				del_id(id);
> +			if (ev->mask & IN_MODIFY)
> +				check_id(id);
> 		}
> 	}
> 	return 1;
> }
> -
> --=20
> 2.30.1
>=20

--
Chuck Lever