Hi Chuck, Thanks for the discussion! On Fri, Jan 31, 2020 at 12:10 PM Chuck Lever <chuck.lever@xxxxxxxxxx> wrote: > > Hi Olga- > > > On Jan 31, 2020, at 11:57 AM, Olga Kornievskaia <olga.kornievskaia@xxxxxxxxx> wrote: > > > > From: Olga Kornievskaia <kolga@xxxxxxxxxx> > > > > It helps some servers to be able to identify if the incoming client is > > doing nconnect mount or not. While creating the unique client id for > > the SETCLIENTID operation add nconnect=X to it. > > This makes me itch uncomfortably. I was asked... > The long-form client ID string is not supposed to be used to communicate > client implementation details. In fact, this string is supposed to be > opaque to the server -- it can only compare these strings for equality. Indeed, to servers it should only be using it for equality no argument there but I don't think they are prohibited from deriving info from it but shouldn't complain if something changed. My reasoning was that we are currently already putting some descriptive stuff into the clientid string. We specify what version this client is. So why not add something that speaks about its nconnect ability? > IMO you would also need to write something akin to a standard that describes > this convention so that servers can depend on the form of the string. > > How would a server use this information? The server is interested in identifying whether or not client is doing nconnect or not in order to decide whether or not to apply extra locking for a given client mount in order to provide best performance. In 4.1 spec, we clearly define how to bind connections to session/clientid so server can use that information but 4.0 is lacking that and a server is left to just deal with existence of multiple connection (trunking) at any give time. > > > > Signed-off-by: Olga Kornievskaia <kolga@xxxxxxxxxx> > > --- > > fs/nfs/nfs4proc.c | 20 +++++++++++--------- > > 1 file changed, 11 insertions(+), 9 deletions(-) > > > > diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c > > index 402410c..a90ea28 100644 > > --- a/fs/nfs/nfs4proc.c > > +++ b/fs/nfs/nfs4proc.c > > @@ -5950,7 +5950,7 @@ static void nfs4_init_boot_verifier(const struct nfs_client *clp, > > return 0; > > > > rcu_read_lock(); > > - len = 14 + > > + len = 14 + 12 + > > strlen(clp->cl_rpcclient->cl_nodename) + > > 1 + > > strlen(rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_ADDR)) + > > @@ -5972,13 +5972,15 @@ static void nfs4_init_boot_verifier(const struct nfs_client *clp, > > > > rcu_read_lock(); > > if (nfs4_client_id_uniquifier[0] != '\0') > > - scnprintf(str, len, "Linux NFSv4.0 %s/%s/%s", > > + scnprintf(str, len, "Linux NFSv4.0 nconnect=%d %s/%s/%s", > > + clp->cl_nconnect, > > clp->cl_rpcclient->cl_nodename, > > nfs4_client_id_uniquifier, > > rpc_peeraddr2str(clp->cl_rpcclient, > > RPC_DISPLAY_ADDR)); > > else > > - scnprintf(str, len, "Linux NFSv4.0 %s/%s", > > + scnprintf(str, len, "Linux NFSv4.0 nconnect=%d %s/%s", > > + clp->cl_nconnect, > > clp->cl_rpcclient->cl_nodename, > > rpc_peeraddr2str(clp->cl_rpcclient, > > RPC_DISPLAY_ADDR)); > > @@ -5994,7 +5996,7 @@ static void nfs4_init_boot_verifier(const struct nfs_client *clp, > > size_t len; > > char *str; > > > > - len = 10 + 10 + 1 + 10 + 1 + > > + len = 10 + 10 + 1 + 10 + 1 + 12 + > > strlen(nfs4_client_id_uniquifier) + 1 + > > strlen(clp->cl_rpcclient->cl_nodename) + 1; > > > > @@ -6010,9 +6012,9 @@ static void nfs4_init_boot_verifier(const struct nfs_client *clp, > > if (!str) > > return -ENOMEM; > > > > - scnprintf(str, len, "Linux NFSv%u.%u %s/%s", > > + scnprintf(str, len, "Linux NFSv%u.%u nconnect=%d %s/%s", > > clp->rpc_ops->version, clp->cl_minorversion, > > - nfs4_client_id_uniquifier, > > + clp->cl_nconnect, nfs4_client_id_uniquifier, > > clp->cl_rpcclient->cl_nodename); > > Doesn't this also change the client ID string used for EXCHANGE_ID ? I didn't think it would hurt there. But honestly, I just didn't know which of the 3 functions that we have to create clientid were used for what protocols so I added nconnect to all. > > > > clp->cl_owner_id = str; > > return 0; > > @@ -6030,7 +6032,7 @@ static void nfs4_init_boot_verifier(const struct nfs_client *clp, > > if (nfs4_client_id_uniquifier[0] != '\0') > > return nfs4_init_uniquifier_client_string(clp); > > > > - len = 10 + 10 + 1 + 10 + 1 + > > + len = 10 + 10 + 1 + 10 + 1 + 12 + > > strlen(clp->cl_rpcclient->cl_nodename) + 1; > > > > if (len > NFS4_OPAQUE_LIMIT + 1) > > @@ -6045,9 +6047,9 @@ static void nfs4_init_boot_verifier(const struct nfs_client *clp, > > if (!str) > > return -ENOMEM; > > > > - scnprintf(str, len, "Linux NFSv%u.%u %s", > > + scnprintf(str, len, "Linux NFSv%u.%u nconnect=%d %s", > > clp->rpc_ops->version, clp->cl_minorversion, > > - clp->cl_rpcclient->cl_nodename); > > + clp->cl_nconnect, clp->cl_rpcclient->cl_nodename); > > clp->cl_owner_id = str; > > return 0; > > } > > -- > > 1.8.3.1 > > > > -- > Chuck Lever > > >
