hc
2024-05-10 9999e48639b3cecb08ffb37358bcba3b48161b29
kernel/fs/nfs/nfs4client.c
....@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23 * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved.
34 * Written by David Howells (dhowells@redhat.com)
....@@ -42,7 +43,7 @@
4243 }
4344
4445 #ifdef CONFIG_NFS_V4_1
45
-/**
46
+/*
4647 * Per auth flavor data server rpc clients
4748 */
4849 struct nfs4_ds_server {
....@@ -51,7 +52,9 @@
5152 };
5253
5354 /**
54
- * Common lookup case for DS I/O
55
+ * nfs4_find_ds_client - Common lookup case for DS I/O
56
+ * @ds_clp: pointer to the DS's nfs_client
57
+ * @flavor: rpc auth flavour to match
5558 */
5659 static struct nfs4_ds_server *
5760 nfs4_find_ds_client(struct nfs_client *ds_clp, rpc_authflavor_t flavor)
....@@ -118,9 +121,13 @@
118121 }
119122
120123 /**
121
-* Find or create a DS rpc client with th MDS server rpc client auth flavor
122
-* in the nfs_client cl_ds_clients list.
123
-*/
124
+ * nfs4_find_or_create_ds_client - Find or create a DS rpc client
125
+ * @ds_clp: pointer to the DS's nfs_client
126
+ * @inode: pointer to the inode
127
+ *
128
+ * Find or create a DS rpc client with th MDS server rpc client auth flavor
129
+ * in the nfs_client cl_ds_clients list.
130
+ */
124131 struct rpc_clnt *
125132 nfs4_find_or_create_ds_client(struct nfs_client *ds_clp, struct inode *inode)
126133 {
....@@ -145,7 +152,6 @@
145152 nfs4_shutdown_ds_clients(struct nfs_client *clp)
146153 {
147154 struct nfs4_ds_server *dss;
148
- LIST_HEAD(shutdown_list);
149155
150156 while (!list_empty(&clp->cl_ds_clients)) {
151157 dss = list_entry(clp->cl_ds_clients.next,
....@@ -324,7 +330,7 @@
324330
325331 /**
326332 * nfs40_init_client - nfs_client initialization tasks for NFSv4.0
327
- * @clp - nfs_client to initialize
333
+ * @clp: nfs_client to initialize
328334 *
329335 * Returns zero on success, or a negative errno if some error occurred.
330336 */
....@@ -340,6 +346,7 @@
340346 ret = nfs4_setup_slot_table(tbl, NFS4_MAX_SLOT_TABLE,
341347 "NFSv4.0 transport Slot table");
342348 if (ret) {
349
+ nfs4_shutdown_slot_table(tbl);
343350 kfree(tbl);
344351 return ret;
345352 }
....@@ -352,7 +359,7 @@
352359
353360 /**
354361 * nfs41_init_client - nfs_client initialization tasks for NFSv4.1+
355
- * @clp - nfs_client to initialize
362
+ * @clp: nfs_client to initialize
356363 *
357364 * Returns zero on success, or a negative errno if some error occurred.
358365 */
....@@ -400,9 +407,7 @@
400407 * nfs4_init_client - Initialise an NFS4 client record
401408 *
402409 * @clp: nfs_client to initialise
403
- * @timeparms: timeout parameters for underlying RPC transport
404
- * @ip_addr: callback IP address in presentation format
405
- * @authflavor: authentication flavor for underlying RPC transport
410
+ * @cl_init: pointer to nfs_client_initdata
406411 *
407412 * Returns pointer to an NFS client, or an ERR_PTR value.
408413 */
....@@ -546,7 +551,7 @@
546551 */
547552 int nfs40_walk_client_list(struct nfs_client *new,
548553 struct nfs_client **result,
549
- struct rpc_cred *cred)
554
+ const struct cred *cred)
550555 {
551556 struct nfs_net *nn = net_generic(new->cl_net, nfs_net_id);
552557 struct nfs_client *pos, *prev = NULL;
....@@ -626,7 +631,7 @@
626631 /*
627632 * Returns true if the server major ids match
628633 */
629
-static bool
634
+bool
630635 nfs4_check_serverowner_major_id(struct nfs41_server_owner *o1,
631636 struct nfs41_server_owner *o2)
632637 {
....@@ -650,13 +655,13 @@
650655
651656 /**
652657 * nfs4_detect_session_trunking - Checks for session trunking.
653
- *
654
- * Called after a successful EXCHANGE_ID on a multi-addr connection.
655
- * Upon success, add the transport.
656
- *
657658 * @clp: original mount nfs_client
658659 * @res: result structure from an exchange_id using the original mount
659660 * nfs_client with a new multi_addr transport
661
+ * @xprt: pointer to the transport to add.
662
+ *
663
+ * Called after a successful EXCHANGE_ID on a multi-addr connection.
664
+ * Upon success, add the transport.
660665 *
661666 * Returns zero on success, otherwise -EINVAL
662667 *
....@@ -712,7 +717,7 @@
712717 */
713718 int nfs41_walk_client_list(struct nfs_client *new,
714719 struct nfs_client **result,
715
- struct rpc_cred *cred)
720
+ const struct cred *cred)
716721 {
717722 struct nfs_net *nn = net_generic(new->cl_net, nfs_net_id);
718723 struct nfs_client *pos, *prev = NULL;
....@@ -859,7 +864,8 @@
859864 const size_t addrlen,
860865 const char *ip_addr,
861866 int proto, const struct rpc_timeout *timeparms,
862
- u32 minorversion, struct net *net)
867
+ u32 minorversion, unsigned int nconnect,
868
+ struct net *net)
863869 {
864870 struct nfs_client_initdata cl_init = {
865871 .hostname = hostname,
....@@ -871,15 +877,21 @@
871877 .minorversion = minorversion,
872878 .net = net,
873879 .timeparms = timeparms,
880
+ .cred = server->cred,
874881 };
875882 struct nfs_client *clp;
876883
884
+ if (minorversion == 0)
885
+ __set_bit(NFS_CS_REUSEPORT, &cl_init.init_flags);
886
+ if (proto == XPRT_TRANSPORT_TCP)
887
+ cl_init.nconnect = nconnect;
888
+
877889 if (server->flags & NFS_MOUNT_NORESVPORT)
878
- set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags);
890
+ __set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags);
879891 if (server->options & NFS_OPTION_MIGRATION)
880
- set_bit(NFS_CS_MIGRATION, &cl_init.init_flags);
892
+ __set_bit(NFS_CS_MIGRATION, &cl_init.init_flags);
881893 if (test_bit(NFS_MIG_TSM_POSSIBLE, &server->mig_status))
882
- set_bit(NFS_CS_TSM_POSSIBLE, &cl_init.init_flags);
894
+ __set_bit(NFS_CS_TSM_POSSIBLE, &cl_init.init_flags);
883895 server->port = rpc_get_port(addr);
884896
885897 /* Allocate or find a client reference we can use */
....@@ -932,12 +944,16 @@
932944 .minorversion = minor_version,
933945 .net = mds_clp->cl_net,
934946 .timeparms = &ds_timeout,
947
+ .cred = mds_srv->cred,
935948 };
936949 char buf[INET6_ADDRSTRLEN + 1];
937950
938951 if (rpc_ntop(ds_addr, buf, sizeof(buf)) <= 0)
939952 return ERR_PTR(-EINVAL);
940953 cl_init.hostname = buf;
954
+
955
+ if (mds_clp->cl_nconnect > 1 && ds_proto == XPRT_TRANSPORT_TCP)
956
+ cl_init.nconnect = mds_clp->cl_nconnect;
941957
942958 if (mds_srv->flags & NFS_MOUNT_NORESVPORT)
943959 __set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags);
....@@ -979,6 +995,36 @@
979995 #endif /* CONFIG_NFS_V4_1 */
980996 }
981997
998
+/*
999
+ * Limit xattr sizes using the channel attributes.
1000
+ */
1001
+static void nfs4_session_limit_xasize(struct nfs_server *server)
1002
+{
1003
+#ifdef CONFIG_NFS_V4_2
1004
+ struct nfs4_session *sess;
1005
+ u32 server_gxa_sz;
1006
+ u32 server_sxa_sz;
1007
+ u32 server_lxa_sz;
1008
+
1009
+ if (!nfs4_has_session(server->nfs_client))
1010
+ return;
1011
+
1012
+ sess = server->nfs_client->cl_session;
1013
+
1014
+ server_gxa_sz = sess->fc_attrs.max_resp_sz - nfs42_maxgetxattr_overhead;
1015
+ server_sxa_sz = sess->fc_attrs.max_rqst_sz - nfs42_maxsetxattr_overhead;
1016
+ server_lxa_sz = sess->fc_attrs.max_resp_sz -
1017
+ nfs42_maxlistxattrs_overhead;
1018
+
1019
+ if (server->gxasize > server_gxa_sz)
1020
+ server->gxasize = server_gxa_sz;
1021
+ if (server->sxasize > server_sxa_sz)
1022
+ server->sxasize = server_sxa_sz;
1023
+ if (server->lxasize > server_lxa_sz)
1024
+ server->lxasize = server_lxa_sz;
1025
+#endif
1026
+}
1027
+
9821028 static int nfs4_server_common_setup(struct nfs_server *server,
9831029 struct nfs_fh *mntfh, bool auth_probe)
9841030 {
....@@ -1002,6 +1048,8 @@
10021048 server->caps |= server->nfs_client->cl_mvops->init_caps;
10031049 if (server->flags & NFS_MOUNT_NORDIRPLUS)
10041050 server->caps &= ~NFS_CAP_READDIRPLUS;
1051
+ if (server->nfs_client->cl_proto == XPRT_TRANSPORT_RDMA)
1052
+ server->caps &= ~NFS_CAP_READ_PLUS;
10051053 /*
10061054 * Don't use NFS uid/gid mapping if we're using AUTH_SYS or lower
10071055 * authentication.
....@@ -1026,6 +1074,7 @@
10261074 goto out;
10271075
10281076 nfs4_session_limit_rwsize(server);
1077
+ nfs4_session_limit_xasize(server);
10291078
10301079 if (server->namelen == 0 || server->namelen > NFS4_MAXNAMLEN)
10311080 server->namelen = NFS4_MAXNAMLEN;
....@@ -1041,65 +1090,64 @@
10411090 /*
10421091 * Create a version 4 volume record
10431092 */
1044
-static int nfs4_init_server(struct nfs_server *server,
1045
- struct nfs_parsed_mount_data *data)
1093
+static int nfs4_init_server(struct nfs_server *server, struct fs_context *fc)
10461094 {
1095
+ struct nfs_fs_context *ctx = nfs_fc2context(fc);
10471096 struct rpc_timeout timeparms;
10481097 int error;
10491098
1050
- nfs_init_timeout_values(&timeparms, data->nfs_server.protocol,
1051
- data->timeo, data->retrans);
1099
+ nfs_init_timeout_values(&timeparms, ctx->nfs_server.protocol,
1100
+ ctx->timeo, ctx->retrans);
10521101
10531102 /* Initialise the client representation from the mount data */
1054
- server->flags = data->flags;
1055
- server->options = data->options;
1056
- server->auth_info = data->auth_info;
1103
+ server->flags = ctx->flags;
1104
+ server->options = ctx->options;
1105
+ server->auth_info = ctx->auth_info;
10571106
10581107 /* Use the first specified auth flavor. If this flavor isn't
10591108 * allowed by the server, use the SECINFO path to try the
10601109 * other specified flavors */
1061
- if (data->auth_info.flavor_len >= 1)
1062
- data->selected_flavor = data->auth_info.flavors[0];
1110
+ if (ctx->auth_info.flavor_len >= 1)
1111
+ ctx->selected_flavor = ctx->auth_info.flavors[0];
10631112 else
1064
- data->selected_flavor = RPC_AUTH_UNIX;
1113
+ ctx->selected_flavor = RPC_AUTH_UNIX;
10651114
10661115 /* Get a client record */
10671116 error = nfs4_set_client(server,
1068
- data->nfs_server.hostname,
1069
- (const struct sockaddr *)&data->nfs_server.address,
1070
- data->nfs_server.addrlen,
1071
- data->client_address,
1072
- data->nfs_server.protocol,
1073
- &timeparms,
1074
- data->minorversion,
1075
- data->net);
1117
+ ctx->nfs_server.hostname,
1118
+ &ctx->nfs_server.address,
1119
+ ctx->nfs_server.addrlen,
1120
+ ctx->client_address,
1121
+ ctx->nfs_server.protocol,
1122
+ &timeparms,
1123
+ ctx->minorversion,
1124
+ ctx->nfs_server.nconnect,
1125
+ fc->net_ns);
10761126 if (error < 0)
10771127 return error;
10781128
1079
- if (data->rsize)
1080
- server->rsize = nfs_block_size(data->rsize, NULL);
1081
- if (data->wsize)
1082
- server->wsize = nfs_block_size(data->wsize, NULL);
1129
+ if (ctx->rsize)
1130
+ server->rsize = nfs_block_size(ctx->rsize, NULL);
1131
+ if (ctx->wsize)
1132
+ server->wsize = nfs_block_size(ctx->wsize, NULL);
10831133
1084
- server->acregmin = data->acregmin * HZ;
1085
- server->acregmax = data->acregmax * HZ;
1086
- server->acdirmin = data->acdirmin * HZ;
1087
- server->acdirmax = data->acdirmax * HZ;
1088
- server->port = data->nfs_server.port;
1134
+ server->acregmin = ctx->acregmin * HZ;
1135
+ server->acregmax = ctx->acregmax * HZ;
1136
+ server->acdirmin = ctx->acdirmin * HZ;
1137
+ server->acdirmax = ctx->acdirmax * HZ;
1138
+ server->port = ctx->nfs_server.port;
10891139
10901140 return nfs_init_server_rpcclient(server, &timeparms,
1091
- data->selected_flavor);
1141
+ ctx->selected_flavor);
10921142 }
10931143
10941144 /*
10951145 * Create a version 4 volume record
10961146 * - keyed on server and FSID
10971147 */
1098
-/*struct nfs_server *nfs4_create_server(const struct nfs_parsed_mount_data *data,
1099
- struct nfs_fh *mntfh)*/
1100
-struct nfs_server *nfs4_create_server(struct nfs_mount_info *mount_info,
1101
- struct nfs_subversion *nfs_mod)
1148
+struct nfs_server *nfs4_create_server(struct fs_context *fc)
11021149 {
1150
+ struct nfs_fs_context *ctx = nfs_fc2context(fc);
11031151 struct nfs_server *server;
11041152 bool auth_probe;
11051153 int error;
....@@ -1108,14 +1156,16 @@
11081156 if (!server)
11091157 return ERR_PTR(-ENOMEM);
11101158
1111
- auth_probe = mount_info->parsed->auth_info.flavor_len < 1;
1159
+ server->cred = get_cred(current_cred());
1160
+
1161
+ auth_probe = ctx->auth_info.flavor_len < 1;
11121162
11131163 /* set up the general RPC client */
1114
- error = nfs4_init_server(server, mount_info->parsed);
1164
+ error = nfs4_init_server(server, fc);
11151165 if (error < 0)
11161166 goto error;
11171167
1118
- error = nfs4_server_common_setup(server, mount_info->mntfh, auth_probe);
1168
+ error = nfs4_server_common_setup(server, ctx->mntfh, auth_probe);
11191169 if (error < 0)
11201170 goto error;
11211171
....@@ -1129,9 +1179,9 @@
11291179 /*
11301180 * Create an NFS4 referral server record
11311181 */
1132
-struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *data,
1133
- struct nfs_fh *mntfh)
1182
+struct nfs_server *nfs4_create_referral_server(struct fs_context *fc)
11341183 {
1184
+ struct nfs_fs_context *ctx = nfs_fc2context(fc);
11351185 struct nfs_client *parent_client;
11361186 struct nfs_server *server, *parent_server;
11371187 bool auth_probe;
....@@ -1141,35 +1191,41 @@
11411191 if (!server)
11421192 return ERR_PTR(-ENOMEM);
11431193
1144
- parent_server = NFS_SB(data->sb);
1194
+ parent_server = NFS_SB(ctx->clone_data.sb);
11451195 parent_client = parent_server->nfs_client;
1196
+
1197
+ server->cred = get_cred(parent_server->cred);
11461198
11471199 /* Initialise the client representation from the parent server */
11481200 nfs_server_copy_userdata(server, parent_server);
11491201
11501202 /* Get a client representation */
11511203 #if IS_ENABLED(CONFIG_SUNRPC_XPRT_RDMA)
1152
- rpc_set_port(data->addr, NFS_RDMA_PORT);
1153
- error = nfs4_set_client(server, data->hostname,
1154
- data->addr,
1155
- data->addrlen,
1204
+ rpc_set_port(&ctx->nfs_server.address, NFS_RDMA_PORT);
1205
+ error = nfs4_set_client(server,
1206
+ ctx->nfs_server.hostname,
1207
+ &ctx->nfs_server.address,
1208
+ ctx->nfs_server.addrlen,
11561209 parent_client->cl_ipaddr,
11571210 XPRT_TRANSPORT_RDMA,
11581211 parent_server->client->cl_timeout,
11591212 parent_client->cl_mvops->minor_version,
1213
+ parent_client->cl_nconnect,
11601214 parent_client->cl_net);
11611215 if (!error)
11621216 goto init_server;
11631217 #endif /* IS_ENABLED(CONFIG_SUNRPC_XPRT_RDMA) */
11641218
1165
- rpc_set_port(data->addr, NFS_PORT);
1166
- error = nfs4_set_client(server, data->hostname,
1167
- data->addr,
1168
- data->addrlen,
1219
+ rpc_set_port(&ctx->nfs_server.address, NFS_PORT);
1220
+ error = nfs4_set_client(server,
1221
+ ctx->nfs_server.hostname,
1222
+ &ctx->nfs_server.address,
1223
+ ctx->nfs_server.addrlen,
11691224 parent_client->cl_ipaddr,
11701225 XPRT_TRANSPORT_TCP,
11711226 parent_server->client->cl_timeout,
11721227 parent_client->cl_mvops->minor_version,
1228
+ parent_client->cl_nconnect,
11731229 parent_client->cl_net);
11741230 if (error < 0)
11751231 goto error;
....@@ -1177,13 +1233,14 @@
11771233 #if IS_ENABLED(CONFIG_SUNRPC_XPRT_RDMA)
11781234 init_server:
11791235 #endif
1180
- error = nfs_init_server_rpcclient(server, parent_server->client->cl_timeout, data->authflavor);
1236
+ error = nfs_init_server_rpcclient(server, parent_server->client->cl_timeout,
1237
+ ctx->selected_flavor);
11811238 if (error < 0)
11821239 goto error;
11831240
11841241 auth_probe = parent_server->auth_info.flavor_len < 1;
11851242
1186
- error = nfs4_server_common_setup(server, mntfh, auth_probe);
1243
+ error = nfs4_server_common_setup(server, ctx->mntfh, auth_probe);
11871244 if (error < 0)
11881245 goto error;
11891246
....@@ -1265,7 +1322,8 @@
12651322 set_bit(NFS_MIG_TSM_POSSIBLE, &server->mig_status);
12661323 error = nfs4_set_client(server, hostname, sap, salen, buf,
12671324 clp->cl_proto, clnt->cl_timeout,
1268
- clp->cl_minorversion, net);
1325
+ clp->cl_minorversion,
1326
+ clp->cl_nconnect, net);
12691327 clear_bit(NFS_MIG_TSM_POSSIBLE, &server->mig_status);
12701328 if (error != 0) {
12711329 nfs_server_insert_lists(server);