From patchwork Sat Jan 20 17:33:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 13524414 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D668211733; Sat, 20 Jan 2024 17:34:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705772045; cv=none; b=J/2bR5KZdV5Pj5pDT8s7k8UpYFYCz+OO4+qXbmhOJCL/qDOgsSF2/4sB4/fdqfs8MvNIUHFEYzNlQKOHu8a7vEaUPRRbnYjiVW+xeMyiSftiXTsstGhqRwDGrVJ/vTPwSRDDPbn/b+CcRetYzF2u2AT/Z0pa0/+7+IsZqmObyEU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705772045; c=relaxed/simple; bh=faQP214UQVyjOF2wg6Q3l4tSrn9De1BK7U/zsIHTFow=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Lfkd+oepUHJvHXMMkPAeE6N4JfdQR0EylSw992iMGMze985t1ivRHTyG7Um63kdkA/sorNCqMQx9kj9ZWGBNsCRxg2vOEzV1Gk4eqtGmLxnM0pA4Z8a7j8Syl46W7C8+fblq0myvKoViuDw7rWzypN0KIunu7VaP0xp+SsO5Pz0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pgBwypnE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pgBwypnE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 04A49C433C7; Sat, 20 Jan 2024 17:34:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705772045; bh=faQP214UQVyjOF2wg6Q3l4tSrn9De1BK7U/zsIHTFow=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pgBwypnEEMuY6ivfUw0xno7oet450Dlydhnz2UodE9+CFsYBiobFZjOcZK+jbPlAl 7d/cVfuyE2fBifY1xKGsgRNEJakEzwW2somVRDsxHqdocT00w46ZTdMCagc1slZYkS 14OpQn/z6mpIozR67aEi4vNWaVO6xG/vCH/DtbafGURQjycnxcVHGHUU4mc9o0e50T P/+T+DUKBApkmEHNqGif+WqeVJ7/w0DzmJKC9YM0znwwqek7Bs7ywMGFeWb5+DxBYp hXt3hDUtXYD1FGLLDIbckEPcOTPDlh0UOJ6OG+e9oLs0pYCWloeBytW3b7P+RLpHie MDtzG7tDXourw== From: Lorenzo Bianconi To: linux-nfs@vger.kernel.org Cc: lorenzo.bianconi@redhat.com, neilb@suse.de, jlayton@kernel.org, kuba@kernel.org, chuck.lever@oracle.com, horms@kernel.org, netdev@vger.kernel.org Subject: [PATCH v6 1/3] NFSD: convert write_threads to netlink command Date: Sat, 20 Jan 2024 18:33:30 +0100 Message-ID: <054723fd005379bba529b35f26ee5be3a72ce143.1705771400.git.lorenzo@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Introduce write_threads netlink command similar to the one available through the procfs. Reviewed-by: Jeff Layton Signed-off-by: Lorenzo Bianconi --- Documentation/netlink/specs/nfsd.yaml | 23 +++++++ fs/nfsd/netlink.c | 17 +++++ fs/nfsd/netlink.h | 2 + fs/nfsd/nfsctl.c | 60 +++++++++++++++++ include/uapi/linux/nfsd_netlink.h | 9 +++ tools/net/ynl/generated/nfsd-user.c | 93 +++++++++++++++++++++++++++ tools/net/ynl/generated/nfsd-user.h | 47 ++++++++++++++ 7 files changed, 251 insertions(+) diff --git a/Documentation/netlink/specs/nfsd.yaml b/Documentation/netlink/specs/nfsd.yaml index 05acc73e2e33..c92e1425d316 100644 --- a/Documentation/netlink/specs/nfsd.yaml +++ b/Documentation/netlink/specs/nfsd.yaml @@ -62,6 +62,12 @@ attribute-sets: name: compound-ops type: u32 multi-attr: true + - + name: server-worker + attributes: + - + name: threads + type: u32 operations: list: @@ -87,3 +93,20 @@ operations: - sport - dport - compound-ops + - + name: threads-set + doc: set the number of running threads + attribute-set: server-worker + flags: [ admin-perm ] + do: + request: + attributes: + - threads + - + name: threads-get + doc: get the number of running threads + attribute-set: server-worker + do: + reply: + attributes: + - threads diff --git a/fs/nfsd/netlink.c b/fs/nfsd/netlink.c index 0e1d635ec5f9..1a59a8e6c7e2 100644 --- a/fs/nfsd/netlink.c +++ b/fs/nfsd/netlink.c @@ -10,6 +10,11 @@ #include +/* NFSD_CMD_THREADS_SET - do */ +static const struct nla_policy nfsd_threads_set_nl_policy[NFSD_A_SERVER_WORKER_THREADS + 1] = { + [NFSD_A_SERVER_WORKER_THREADS] = { .type = NLA_U32, }, +}; + /* Ops table for nfsd */ static const struct genl_split_ops nfsd_nl_ops[] = { { @@ -19,6 +24,18 @@ static const struct genl_split_ops nfsd_nl_ops[] = { .done = nfsd_nl_rpc_status_get_done, .flags = GENL_CMD_CAP_DUMP, }, + { + .cmd = NFSD_CMD_THREADS_SET, + .doit = nfsd_nl_threads_set_doit, + .policy = nfsd_threads_set_nl_policy, + .maxattr = NFSD_A_SERVER_WORKER_THREADS, + .flags = GENL_ADMIN_PERM | GENL_CMD_CAP_DO, + }, + { + .cmd = NFSD_CMD_THREADS_GET, + .doit = nfsd_nl_threads_get_doit, + .flags = GENL_CMD_CAP_DO, + }, }; struct genl_family nfsd_nl_family __ro_after_init = { diff --git a/fs/nfsd/netlink.h b/fs/nfsd/netlink.h index d83dd6bdee92..4137fac477e4 100644 --- a/fs/nfsd/netlink.h +++ b/fs/nfsd/netlink.h @@ -16,6 +16,8 @@ int nfsd_nl_rpc_status_get_done(struct netlink_callback *cb); int nfsd_nl_rpc_status_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb); +int nfsd_nl_threads_set_doit(struct sk_buff *skb, struct genl_info *info); +int nfsd_nl_threads_get_doit(struct sk_buff *skb, struct genl_info *info); extern struct genl_family nfsd_nl_family; diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 8e6dbe9e0b65..68718448d660 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -1696,6 +1696,66 @@ int nfsd_nl_rpc_status_get_done(struct netlink_callback *cb) return 0; } +/** + * nfsd_nl_threads_set_doit - set the number of running threads + * @skb: reply buffer + * @info: netlink metadata and command arguments + * + * Return 0 on success or a negative errno. + */ +int nfsd_nl_threads_set_doit(struct sk_buff *skb, struct genl_info *info) +{ + u32 nthreads; + int ret; + + if (GENL_REQ_ATTR_CHECK(info, NFSD_A_SERVER_WORKER_THREADS)) + return -EINVAL; + + nthreads = nla_get_u32(info->attrs[NFSD_A_SERVER_WORKER_THREADS]); + ret = nfsd_svc(nthreads, + genl_info_net(info), get_current_cred()); + + return ret == nthreads ? 0 : -EINVAL; +} + +/** + * nfsd_nl_threads_get_doit - get the number of running threads + * @skb: reply buffer + * @info: netlink metadata and command arguments + * + * Return 0 on success or a negative errno. + */ +int nfsd_nl_threads_get_doit(struct sk_buff *skb, struct genl_info *info) +{ + void *hdr; + int err; + + skb = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL); + if (!skb) + return -ENOMEM; + + hdr = genlmsg_iput(skb, info); + if (!hdr) { + err = -EMSGSIZE; + goto err_free_msg; + } + + if (nla_put_u32(skb, NFSD_A_SERVER_WORKER_THREADS, + nfsd_nrthreads(genl_info_net(info)))) { + err = -EINVAL; + goto err_free_msg; + } + + genlmsg_end(skb, hdr); + + return genlmsg_reply(skb, info); + +err_free_msg: + nlmsg_free(skb); + + return err; +} + /** * nfsd_net_init - Prepare the nfsd_net portion of a new net namespace * @net: a freshly-created network namespace diff --git a/include/uapi/linux/nfsd_netlink.h b/include/uapi/linux/nfsd_netlink.h index 3cd044edee5d..1b6fe1f9ed0e 100644 --- a/include/uapi/linux/nfsd_netlink.h +++ b/include/uapi/linux/nfsd_netlink.h @@ -29,8 +29,17 @@ enum { NFSD_A_RPC_STATUS_MAX = (__NFSD_A_RPC_STATUS_MAX - 1) }; +enum { + NFSD_A_SERVER_WORKER_THREADS = 1, + + __NFSD_A_SERVER_WORKER_MAX, + NFSD_A_SERVER_WORKER_MAX = (__NFSD_A_SERVER_WORKER_MAX - 1) +}; + enum { NFSD_CMD_RPC_STATUS_GET = 1, + NFSD_CMD_THREADS_SET, + NFSD_CMD_THREADS_GET, __NFSD_CMD_MAX, NFSD_CMD_MAX = (__NFSD_CMD_MAX - 1) diff --git a/tools/net/ynl/generated/nfsd-user.c b/tools/net/ynl/generated/nfsd-user.c index 360b6448c6e9..f4121a52ccf8 100644 --- a/tools/net/ynl/generated/nfsd-user.c +++ b/tools/net/ynl/generated/nfsd-user.c @@ -15,6 +15,8 @@ /* Enums */ static const char * const nfsd_op_strmap[] = { [NFSD_CMD_RPC_STATUS_GET] = "rpc-status-get", + [NFSD_CMD_THREADS_SET] = "threads-set", + [NFSD_CMD_THREADS_GET] = "threads-get", }; const char *nfsd_op_str(int op) @@ -47,6 +49,15 @@ struct ynl_policy_nest nfsd_rpc_status_nest = { .table = nfsd_rpc_status_policy, }; +struct ynl_policy_attr nfsd_server_worker_policy[NFSD_A_SERVER_WORKER_MAX + 1] = { + [NFSD_A_SERVER_WORKER_THREADS] = { .name = "threads", .type = YNL_PT_U32, }, +}; + +struct ynl_policy_nest nfsd_server_worker_nest = { + .max_attr = NFSD_A_SERVER_WORKER_MAX, + .table = nfsd_server_worker_policy, +}; + /* Common nested types */ /* ============== NFSD_CMD_RPC_STATUS_GET ============== */ /* NFSD_CMD_RPC_STATUS_GET - dump */ @@ -198,6 +209,88 @@ nfsd_rpc_status_get_dump(struct ynl_sock *ys) return NULL; } +/* ============== NFSD_CMD_THREADS_SET ============== */ +/* NFSD_CMD_THREADS_SET - do */ +void nfsd_threads_set_req_free(struct nfsd_threads_set_req *req) +{ + free(req); +} + +int nfsd_threads_set(struct ynl_sock *ys, struct nfsd_threads_set_req *req) +{ + struct ynl_req_state yrs = { .yarg = { .ys = ys, }, }; + struct nlmsghdr *nlh; + int err; + + nlh = ynl_gemsg_start_req(ys, ys->family_id, NFSD_CMD_THREADS_SET, 1); + ys->req_policy = &nfsd_server_worker_nest; + + if (req->_present.threads) + mnl_attr_put_u32(nlh, NFSD_A_SERVER_WORKER_THREADS, req->threads); + + err = ynl_exec(ys, nlh, &yrs); + if (err < 0) + return -1; + + return 0; +} + +/* ============== NFSD_CMD_THREADS_GET ============== */ +/* NFSD_CMD_THREADS_GET - do */ +void nfsd_threads_get_rsp_free(struct nfsd_threads_get_rsp *rsp) +{ + free(rsp); +} + +int nfsd_threads_get_rsp_parse(const struct nlmsghdr *nlh, void *data) +{ + struct ynl_parse_arg *yarg = data; + struct nfsd_threads_get_rsp *dst; + const struct nlattr *attr; + + dst = yarg->data; + + mnl_attr_for_each(attr, nlh, sizeof(struct genlmsghdr)) { + unsigned int type = mnl_attr_get_type(attr); + + if (type == NFSD_A_SERVER_WORKER_THREADS) { + if (ynl_attr_validate(yarg, attr)) + return MNL_CB_ERROR; + dst->_present.threads = 1; + dst->threads = mnl_attr_get_u32(attr); + } + } + + return MNL_CB_OK; +} + +struct nfsd_threads_get_rsp *nfsd_threads_get(struct ynl_sock *ys) +{ + struct ynl_req_state yrs = { .yarg = { .ys = ys, }, }; + struct nfsd_threads_get_rsp *rsp; + struct nlmsghdr *nlh; + int err; + + nlh = ynl_gemsg_start_req(ys, ys->family_id, NFSD_CMD_THREADS_GET, 1); + ys->req_policy = &nfsd_server_worker_nest; + yrs.yarg.rsp_policy = &nfsd_server_worker_nest; + + rsp = calloc(1, sizeof(*rsp)); + yrs.yarg.data = rsp; + yrs.cb = nfsd_threads_get_rsp_parse; + yrs.rsp_cmd = NFSD_CMD_THREADS_GET; + + err = ynl_exec(ys, nlh, &yrs); + if (err < 0) + goto err_free; + + return rsp; + +err_free: + nfsd_threads_get_rsp_free(rsp); + return NULL; +} + const struct ynl_family ynl_nfsd_family = { .name = "nfsd", }; diff --git a/tools/net/ynl/generated/nfsd-user.h b/tools/net/ynl/generated/nfsd-user.h index 989c6e209ced..e162a4f20d91 100644 --- a/tools/net/ynl/generated/nfsd-user.h +++ b/tools/net/ynl/generated/nfsd-user.h @@ -64,4 +64,51 @@ nfsd_rpc_status_get_rsp_list_free(struct nfsd_rpc_status_get_rsp_list *rsp); struct nfsd_rpc_status_get_rsp_list * nfsd_rpc_status_get_dump(struct ynl_sock *ys); +/* ============== NFSD_CMD_THREADS_SET ============== */ +/* NFSD_CMD_THREADS_SET - do */ +struct nfsd_threads_set_req { + struct { + __u32 threads:1; + } _present; + + __u32 threads; +}; + +static inline struct nfsd_threads_set_req *nfsd_threads_set_req_alloc(void) +{ + return calloc(1, sizeof(struct nfsd_threads_set_req)); +} +void nfsd_threads_set_req_free(struct nfsd_threads_set_req *req); + +static inline void +nfsd_threads_set_req_set_threads(struct nfsd_threads_set_req *req, + __u32 threads) +{ + req->_present.threads = 1; + req->threads = threads; +} + +/* + * set the number of running threads + */ +int nfsd_threads_set(struct ynl_sock *ys, struct nfsd_threads_set_req *req); + +/* ============== NFSD_CMD_THREADS_GET ============== */ +/* NFSD_CMD_THREADS_GET - do */ + +struct nfsd_threads_get_rsp { + struct { + __u32 threads:1; + } _present; + + __u32 threads; +}; + +void nfsd_threads_get_rsp_free(struct nfsd_threads_get_rsp *rsp); + +/* + * get the number of running threads + */ +struct nfsd_threads_get_rsp *nfsd_threads_get(struct ynl_sock *ys); + #endif /* _LINUX_NFSD_GEN_H */ From patchwork Sat Jan 20 17:33:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 13524415 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7545412B65; Sat, 20 Jan 2024 17:34:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705772049; cv=none; b=guF4w6XMlUheLWLfRqU3QiAN1bgYzs/EY2G4S7vX7BLFb37iJWDyzpMUSKjfpouDVmbDy8AXeeO2gm0qLB4vU+ZhjlaM35GUCuwXtH0efj+Gi+E0VaN+SgYmSqAjpezqEkTlBr01bp1Y9D/Z9gMGkwAqktrO3yhsjSX7dJ3dkPE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705772049; c=relaxed/simple; bh=ecXWJnApMveHoNdqgWpRkzzuCExAaGIrUSwoj/SFdAU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lOjcUCNjfn9HXoILOMXIAq9MOZ7bm1oTEXgXrfV4f0BmtVU5LG+5r1UMzPElqiqzn7DMU6s/Ob3k+dax3ygLS+ACLRJFJU4LzClWlicuZYjyCCutvWz6mojlC+aR+ENWe9O9f5ecMP7Q0yGjQpCy9A98/cFe/bdkeVAE3xCmYp4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=jMZxR+OM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="jMZxR+OM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E621FC433C7; Sat, 20 Jan 2024 17:34:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705772049; bh=ecXWJnApMveHoNdqgWpRkzzuCExAaGIrUSwoj/SFdAU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jMZxR+OM+RPPOiMCcPuC/xXzgcLqDcP1FrfXi4uBJqcGOR6CXHulFHim2L4A4oOPY C+nj7Y3N7Y2l52Jmc/2FaV0W5v/Xj0hTHdPSfepfvmkan2F8zbpzPRCMd/A5+eJBCq /zK95WmB7bilG7TdrDBf1ftTnRvmMNrLwToJsn/04dc7HyYMYigVvfscMuY7HA6DNM hA+d/FyzTuHT3Em/W/ewPGmEEIZRmBkdBviLMgUMJqkWbyKMbk85Il4u8oTINBsGb+ DWJJzecjxP7mTMkEJHoiSpknNZ4XcVA6VSqHxEfs2LR0BONT5PiPSkG/IFpKlX6Zj2 6Roqb0KlCKTWw== From: Lorenzo Bianconi To: linux-nfs@vger.kernel.org Cc: lorenzo.bianconi@redhat.com, neilb@suse.de, jlayton@kernel.org, kuba@kernel.org, chuck.lever@oracle.com, horms@kernel.org, netdev@vger.kernel.org Subject: [PATCH v6 2/3] NFSD: add write_version to netlink command Date: Sat, 20 Jan 2024 18:33:31 +0100 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Introduce write_version netlink command. For version-set, userspace is expected to provide a NFS major/minor version list it wants to enable (all the other ones will be disabled). Signed-off-by: Lorenzo Bianconi --- Documentation/netlink/specs/nfsd.yaml | 34 +++++ fs/nfsd/netlink.c | 23 ++++ fs/nfsd/netlink.h | 5 + fs/nfsd/nfsctl.c | 140 ++++++++++++++++++++ include/uapi/linux/nfsd_netlink.h | 17 +++ tools/net/ynl/generated/nfsd-user.c | 176 ++++++++++++++++++++++++++ tools/net/ynl/generated/nfsd-user.h | 53 ++++++++ 7 files changed, 448 insertions(+) diff --git a/Documentation/netlink/specs/nfsd.yaml b/Documentation/netlink/specs/nfsd.yaml index c92e1425d316..30f18798e84e 100644 --- a/Documentation/netlink/specs/nfsd.yaml +++ b/Documentation/netlink/specs/nfsd.yaml @@ -68,6 +68,23 @@ attribute-sets: - name: threads type: u32 + - + name: nfs-version + attributes: + - + name: major + type: u32 + - + name: minor + type: u32 + - + name: server-proto + attributes: + - + name: version + type: nest + nested-attributes: nfs-version + multi-attr: true operations: list: @@ -110,3 +127,20 @@ operations: reply: attributes: - threads + - + name: version-set + doc: set nfs enabled versions + attribute-set: server-proto + flags: [ admin-perm ] + do: + request: + attributes: + - version + - + name: version-get + doc: get nfs enabled versions + attribute-set: server-proto + do: + reply: + attributes: + - version diff --git a/fs/nfsd/netlink.c b/fs/nfsd/netlink.c index 1a59a8e6c7e2..5cbbd3295543 100644 --- a/fs/nfsd/netlink.c +++ b/fs/nfsd/netlink.c @@ -10,11 +10,22 @@ #include +/* Common nested types */ +const struct nla_policy nfsd_nfs_version_nl_policy[NFSD_A_NFS_VERSION_MINOR + 1] = { + [NFSD_A_NFS_VERSION_MAJOR] = { .type = NLA_U32, }, + [NFSD_A_NFS_VERSION_MINOR] = { .type = NLA_U32, }, +}; + /* NFSD_CMD_THREADS_SET - do */ static const struct nla_policy nfsd_threads_set_nl_policy[NFSD_A_SERVER_WORKER_THREADS + 1] = { [NFSD_A_SERVER_WORKER_THREADS] = { .type = NLA_U32, }, }; +/* NFSD_CMD_VERSION_SET - do */ +static const struct nla_policy nfsd_version_set_nl_policy[NFSD_A_SERVER_PROTO_VERSION + 1] = { + [NFSD_A_SERVER_PROTO_VERSION] = NLA_POLICY_NESTED(nfsd_nfs_version_nl_policy), +}; + /* Ops table for nfsd */ static const struct genl_split_ops nfsd_nl_ops[] = { { @@ -36,6 +47,18 @@ static const struct genl_split_ops nfsd_nl_ops[] = { .doit = nfsd_nl_threads_get_doit, .flags = GENL_CMD_CAP_DO, }, + { + .cmd = NFSD_CMD_VERSION_SET, + .doit = nfsd_nl_version_set_doit, + .policy = nfsd_version_set_nl_policy, + .maxattr = NFSD_A_SERVER_PROTO_VERSION, + .flags = GENL_ADMIN_PERM | GENL_CMD_CAP_DO, + }, + { + .cmd = NFSD_CMD_VERSION_GET, + .doit = nfsd_nl_version_get_doit, + .flags = GENL_CMD_CAP_DO, + }, }; struct genl_family nfsd_nl_family __ro_after_init = { diff --git a/fs/nfsd/netlink.h b/fs/nfsd/netlink.h index 4137fac477e4..c9a1be693fef 100644 --- a/fs/nfsd/netlink.h +++ b/fs/nfsd/netlink.h @@ -11,6 +11,9 @@ #include +/* Common nested types */ +extern const struct nla_policy nfsd_nfs_version_nl_policy[NFSD_A_NFS_VERSION_MINOR + 1]; + int nfsd_nl_rpc_status_get_start(struct netlink_callback *cb); int nfsd_nl_rpc_status_get_done(struct netlink_callback *cb); @@ -18,6 +21,8 @@ int nfsd_nl_rpc_status_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb); int nfsd_nl_threads_set_doit(struct sk_buff *skb, struct genl_info *info); int nfsd_nl_threads_get_doit(struct sk_buff *skb, struct genl_info *info); +int nfsd_nl_version_set_doit(struct sk_buff *skb, struct genl_info *info); +int nfsd_nl_version_get_doit(struct sk_buff *skb, struct genl_info *info); extern struct genl_family nfsd_nl_family; diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 68718448d660..53af82303f93 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -1756,6 +1756,146 @@ int nfsd_nl_threads_get_doit(struct sk_buff *skb, struct genl_info *info) return err; } +/** + * nfsd_nl_version_set_doit - set the nfs enabled versions + * @skb: reply buffer + * @info: netlink metadata and command arguments + * + * Return 0 on success or a negative errno. + */ +int nfsd_nl_version_set_doit(struct sk_buff *skb, struct genl_info *info) +{ + const struct nlattr *attr; + struct nfsd_net *nn; + int i, rem; + + if (GENL_REQ_ATTR_CHECK(info, NFSD_A_SERVER_PROTO_VERSION)) + return -EINVAL; + + mutex_lock(&nfsd_mutex); + + nn = net_generic(genl_info_net(info), nfsd_net_id); + if (nn->nfsd_serv) { + mutex_unlock(&nfsd_mutex); + return -EBUSY; + } + + /* clear current supported versions. */ + nfsd_vers(nn, 2, NFSD_CLEAR); + nfsd_vers(nn, 3, NFSD_CLEAR); + for (i = 0; i <= NFSD_SUPPORTED_MINOR_VERSION; i++) + nfsd_minorversion(nn, i, NFSD_CLEAR); + + nlmsg_for_each_attr(attr, info->nlhdr, GENL_HDRLEN, rem) { + struct nlattr *tb[ARRAY_SIZE(nfsd_nfs_version_nl_policy)]; + u32 major, minor = 0; + + if (nla_type(attr) != NFSD_A_SERVER_PROTO_VERSION) + continue; + + if (nla_parse_nested(tb, ARRAY_SIZE(tb), attr, + nfsd_nfs_version_nl_policy, + info->extack) < 0) + continue; + + if (!tb[NFSD_A_NFS_VERSION_MAJOR]) + continue; + + major = nla_get_u32(tb[NFSD_A_NFS_VERSION_MAJOR]); + if (tb[NFSD_A_NFS_VERSION_MINOR]) + minor = nla_get_u32(tb[NFSD_A_NFS_VERSION_MINOR]); + + switch (major) { + case 4: + nfsd_minorversion(nn, minor, NFSD_SET); + break; + case 3: + case 2: + if (!minor) + nfsd_vers(nn, major, NFSD_SET); + break; + default: + break; + } + } + + mutex_unlock(&nfsd_mutex); + + return 0; +} + +/** + * nfsd_nl_version_get_doit - get the nfs enabled versions + * @skb: reply buffer + * @info: netlink metadata and command arguments + * + * Return 0 on success or a negative errno. + */ +int nfsd_nl_version_get_doit(struct sk_buff *skb, struct genl_info *info) +{ + struct nfsd_net *nn; + int i, err; + void *hdr; + + skb = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL); + if (!skb) + return -ENOMEM; + + hdr = genlmsg_iput(skb, info); + if (!hdr) { + err = -EMSGSIZE; + goto err_free_msg; + } + + mutex_lock(&nfsd_mutex); + nn = net_generic(genl_info_net(info), nfsd_net_id); + + for (i = 2; i <= 4; i++) { + int j; + + for (j = 0; j <= NFSD_SUPPORTED_MINOR_VERSION; j++) { + struct nlattr *attr; + + if (!nfsd_vers(nn, i, NFSD_TEST)) + continue; + + /* NFSv{2,3} does not support minor numbers */ + if (i < 4 && j) + continue; + + if (i == 4 && !nfsd_minorversion(nn, j, NFSD_TEST)) + continue; + + attr = nla_nest_start_noflag(skb, + NFSD_A_SERVER_PROTO_VERSION); + if (!attr) { + err = -EINVAL; + goto err_nfsd_unlock; + } + + if (nla_put_u32(skb, NFSD_A_NFS_VERSION_MAJOR, i) || + nla_put_u32(skb, NFSD_A_NFS_VERSION_MINOR, j)) { + err = -EINVAL; + goto err_nfsd_unlock; + } + + nla_nest_end(skb, attr); + } + } + + mutex_unlock(&nfsd_mutex); + genlmsg_end(skb, hdr); + + return genlmsg_reply(skb, info); + +err_nfsd_unlock: + mutex_unlock(&nfsd_mutex); +err_free_msg: + nlmsg_free(skb); + + return err; +} + /** * nfsd_net_init - Prepare the nfsd_net portion of a new net namespace * @net: a freshly-created network namespace diff --git a/include/uapi/linux/nfsd_netlink.h b/include/uapi/linux/nfsd_netlink.h index 1b6fe1f9ed0e..2a06f9fe6fe9 100644 --- a/include/uapi/linux/nfsd_netlink.h +++ b/include/uapi/linux/nfsd_netlink.h @@ -36,10 +36,27 @@ enum { NFSD_A_SERVER_WORKER_MAX = (__NFSD_A_SERVER_WORKER_MAX - 1) }; +enum { + NFSD_A_NFS_VERSION_MAJOR = 1, + NFSD_A_NFS_VERSION_MINOR, + + __NFSD_A_NFS_VERSION_MAX, + NFSD_A_NFS_VERSION_MAX = (__NFSD_A_NFS_VERSION_MAX - 1) +}; + +enum { + NFSD_A_SERVER_PROTO_VERSION = 1, + + __NFSD_A_SERVER_PROTO_MAX, + NFSD_A_SERVER_PROTO_MAX = (__NFSD_A_SERVER_PROTO_MAX - 1) +}; + enum { NFSD_CMD_RPC_STATUS_GET = 1, NFSD_CMD_THREADS_SET, NFSD_CMD_THREADS_GET, + NFSD_CMD_VERSION_SET, + NFSD_CMD_VERSION_GET, __NFSD_CMD_MAX, NFSD_CMD_MAX = (__NFSD_CMD_MAX - 1) diff --git a/tools/net/ynl/generated/nfsd-user.c b/tools/net/ynl/generated/nfsd-user.c index f4121a52ccf8..ad498543f464 100644 --- a/tools/net/ynl/generated/nfsd-user.c +++ b/tools/net/ynl/generated/nfsd-user.c @@ -17,6 +17,8 @@ static const char * const nfsd_op_strmap[] = { [NFSD_CMD_RPC_STATUS_GET] = "rpc-status-get", [NFSD_CMD_THREADS_SET] = "threads-set", [NFSD_CMD_THREADS_GET] = "threads-get", + [NFSD_CMD_VERSION_SET] = "version-set", + [NFSD_CMD_VERSION_GET] = "version-get", }; const char *nfsd_op_str(int op) @@ -27,6 +29,16 @@ const char *nfsd_op_str(int op) } /* Policies */ +struct ynl_policy_attr nfsd_nfs_version_policy[NFSD_A_NFS_VERSION_MAX + 1] = { + [NFSD_A_NFS_VERSION_MAJOR] = { .name = "major", .type = YNL_PT_U32, }, + [NFSD_A_NFS_VERSION_MINOR] = { .name = "minor", .type = YNL_PT_U32, }, +}; + +struct ynl_policy_nest nfsd_nfs_version_nest = { + .max_attr = NFSD_A_NFS_VERSION_MAX, + .table = nfsd_nfs_version_policy, +}; + struct ynl_policy_attr nfsd_rpc_status_policy[NFSD_A_RPC_STATUS_MAX + 1] = { [NFSD_A_RPC_STATUS_XID] = { .name = "xid", .type = YNL_PT_U32, }, [NFSD_A_RPC_STATUS_FLAGS] = { .name = "flags", .type = YNL_PT_U32, }, @@ -58,7 +70,60 @@ struct ynl_policy_nest nfsd_server_worker_nest = { .table = nfsd_server_worker_policy, }; +struct ynl_policy_attr nfsd_server_proto_policy[NFSD_A_SERVER_PROTO_MAX + 1] = { + [NFSD_A_SERVER_PROTO_VERSION] = { .name = "version", .type = YNL_PT_NEST, .nest = &nfsd_nfs_version_nest, }, +}; + +struct ynl_policy_nest nfsd_server_proto_nest = { + .max_attr = NFSD_A_SERVER_PROTO_MAX, + .table = nfsd_server_proto_policy, +}; + /* Common nested types */ +void nfsd_nfs_version_free(struct nfsd_nfs_version *obj) +{ +} + +int nfsd_nfs_version_put(struct nlmsghdr *nlh, unsigned int attr_type, + struct nfsd_nfs_version *obj) +{ + struct nlattr *nest; + + nest = mnl_attr_nest_start(nlh, attr_type); + if (obj->_present.major) + mnl_attr_put_u32(nlh, NFSD_A_NFS_VERSION_MAJOR, obj->major); + if (obj->_present.minor) + mnl_attr_put_u32(nlh, NFSD_A_NFS_VERSION_MINOR, obj->minor); + mnl_attr_nest_end(nlh, nest); + + return 0; +} + +int nfsd_nfs_version_parse(struct ynl_parse_arg *yarg, + const struct nlattr *nested) +{ + struct nfsd_nfs_version *dst = yarg->data; + const struct nlattr *attr; + + mnl_attr_for_each_nested(attr, nested) { + unsigned int type = mnl_attr_get_type(attr); + + if (type == NFSD_A_NFS_VERSION_MAJOR) { + if (ynl_attr_validate(yarg, attr)) + return MNL_CB_ERROR; + dst->_present.major = 1; + dst->major = mnl_attr_get_u32(attr); + } else if (type == NFSD_A_NFS_VERSION_MINOR) { + if (ynl_attr_validate(yarg, attr)) + return MNL_CB_ERROR; + dst->_present.minor = 1; + dst->minor = mnl_attr_get_u32(attr); + } + } + + return 0; +} + /* ============== NFSD_CMD_RPC_STATUS_GET ============== */ /* NFSD_CMD_RPC_STATUS_GET - dump */ int nfsd_rpc_status_get_rsp_dump_parse(const struct nlmsghdr *nlh, void *data) @@ -291,6 +356,117 @@ struct nfsd_threads_get_rsp *nfsd_threads_get(struct ynl_sock *ys) return NULL; } +/* ============== NFSD_CMD_VERSION_SET ============== */ +/* NFSD_CMD_VERSION_SET - do */ +void nfsd_version_set_req_free(struct nfsd_version_set_req *req) +{ + unsigned int i; + + for (i = 0; i < req->n_version; i++) + nfsd_nfs_version_free(&req->version[i]); + free(req->version); + free(req); +} + +int nfsd_version_set(struct ynl_sock *ys, struct nfsd_version_set_req *req) +{ + struct ynl_req_state yrs = { .yarg = { .ys = ys, }, }; + struct nlmsghdr *nlh; + int err; + + nlh = ynl_gemsg_start_req(ys, ys->family_id, NFSD_CMD_VERSION_SET, 1); + ys->req_policy = &nfsd_server_proto_nest; + + for (unsigned int i = 0; i < req->n_version; i++) + nfsd_nfs_version_put(nlh, NFSD_A_SERVER_PROTO_VERSION, &req->version[i]); + + err = ynl_exec(ys, nlh, &yrs); + if (err < 0) + return -1; + + return 0; +} + +/* ============== NFSD_CMD_VERSION_GET ============== */ +/* NFSD_CMD_VERSION_GET - do */ +void nfsd_version_get_rsp_free(struct nfsd_version_get_rsp *rsp) +{ + unsigned int i; + + for (i = 0; i < rsp->n_version; i++) + nfsd_nfs_version_free(&rsp->version[i]); + free(rsp->version); + free(rsp); +} + +int nfsd_version_get_rsp_parse(const struct nlmsghdr *nlh, void *data) +{ + struct ynl_parse_arg *yarg = data; + struct nfsd_version_get_rsp *dst; + unsigned int n_version = 0; + const struct nlattr *attr; + struct ynl_parse_arg parg; + int i; + + dst = yarg->data; + parg.ys = yarg->ys; + + if (dst->version) + return ynl_error_parse(yarg, "attribute already present (server-proto.version)"); + + mnl_attr_for_each(attr, nlh, sizeof(struct genlmsghdr)) { + unsigned int type = mnl_attr_get_type(attr); + + if (type == NFSD_A_SERVER_PROTO_VERSION) { + n_version++; + } + } + + if (n_version) { + dst->version = calloc(n_version, sizeof(*dst->version)); + dst->n_version = n_version; + i = 0; + parg.rsp_policy = &nfsd_nfs_version_nest; + mnl_attr_for_each(attr, nlh, sizeof(struct genlmsghdr)) { + if (mnl_attr_get_type(attr) == NFSD_A_SERVER_PROTO_VERSION) { + parg.data = &dst->version[i]; + if (nfsd_nfs_version_parse(&parg, attr)) + return MNL_CB_ERROR; + i++; + } + } + } + + return MNL_CB_OK; +} + +struct nfsd_version_get_rsp *nfsd_version_get(struct ynl_sock *ys) +{ + struct ynl_req_state yrs = { .yarg = { .ys = ys, }, }; + struct nfsd_version_get_rsp *rsp; + struct nlmsghdr *nlh; + int err; + + nlh = ynl_gemsg_start_req(ys, ys->family_id, NFSD_CMD_VERSION_GET, 1); + ys->req_policy = &nfsd_server_proto_nest; + yrs.yarg.rsp_policy = &nfsd_server_proto_nest; + + rsp = calloc(1, sizeof(*rsp)); + yrs.yarg.data = rsp; + yrs.cb = nfsd_version_get_rsp_parse; + yrs.rsp_cmd = NFSD_CMD_VERSION_GET; + + err = ynl_exec(ys, nlh, &yrs); + if (err < 0) + goto err_free; + + return rsp; + +err_free: + nfsd_version_get_rsp_free(rsp); + return NULL; +} + const struct ynl_family ynl_nfsd_family = { .name = "nfsd", }; diff --git a/tools/net/ynl/generated/nfsd-user.h b/tools/net/ynl/generated/nfsd-user.h index e162a4f20d91..d062ee8fa8b6 100644 --- a/tools/net/ynl/generated/nfsd-user.h +++ b/tools/net/ynl/generated/nfsd-user.h @@ -19,6 +19,16 @@ extern const struct ynl_family ynl_nfsd_family; const char *nfsd_op_str(int op); /* Common nested types */ +struct nfsd_nfs_version { + struct { + __u32 major:1; + __u32 minor:1; + } _present; + + __u32 major; + __u32 minor; +}; + /* ============== NFSD_CMD_RPC_STATUS_GET ============== */ /* NFSD_CMD_RPC_STATUS_GET - dump */ struct nfsd_rpc_status_get_rsp_dump { @@ -111,4 +121,47 @@ void nfsd_threads_get_rsp_free(struct nfsd_threads_get_rsp *rsp); */ struct nfsd_threads_get_rsp *nfsd_threads_get(struct ynl_sock *ys); +/* ============== NFSD_CMD_VERSION_SET ============== */ +/* NFSD_CMD_VERSION_SET - do */ +struct nfsd_version_set_req { + unsigned int n_version; + struct nfsd_nfs_version *version; +}; + +static inline struct nfsd_version_set_req *nfsd_version_set_req_alloc(void) +{ + return calloc(1, sizeof(struct nfsd_version_set_req)); +} +void nfsd_version_set_req_free(struct nfsd_version_set_req *req); + +static inline void +__nfsd_version_set_req_set_version(struct nfsd_version_set_req *req, + struct nfsd_nfs_version *version, + unsigned int n_version) +{ + free(req->version); + req->version = version; + req->n_version = n_version; +} + +/* + * set nfs enabled versions + */ +int nfsd_version_set(struct ynl_sock *ys, struct nfsd_version_set_req *req); + +/* ============== NFSD_CMD_VERSION_GET ============== */ +/* NFSD_CMD_VERSION_GET - do */ + +struct nfsd_version_get_rsp { + unsigned int n_version; + struct nfsd_nfs_version *version; +}; + +void nfsd_version_get_rsp_free(struct nfsd_version_get_rsp *rsp); + +/* + * get nfs enabled versions + */ +struct nfsd_version_get_rsp *nfsd_version_get(struct ynl_sock *ys); + #endif /* _LINUX_NFSD_GEN_H */ From patchwork Sat Jan 20 17:33:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 13524416 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7126812E69; Sat, 20 Jan 2024 17:34:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705772053; cv=none; b=s2ib3z+HZCofQuYrlodU/qgYJ57dbPDjp1u3YFngqLdMBbRxNjgw49VmaLsT1/zQbKpnh6JAstu0dPMj50eP2W8HRm6Z93+yAAEYhTVau7pWGjCIQUH7AMJXDxswEcjIBcDi283sRmbaN+BMzWpLxGWFTNd+LO7QXOOzOlb9orI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705772053; c=relaxed/simple; bh=ruM2NBGtCaMvPwK4jKMWDCEJ5nTyHnabdH5DAh7BMUQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tF34N/XivnFJVv5cX9YsRnqj8CPmoFR9VNaQDUGs9OpxuIeyhoGeFKKW8QKyoXqrxkBK7krMRAfZcE6Ki1S9Vj+1lDmWNwDUJzZLptbd06Y/dOzevShcJ6dFEzMTOyvabwbszzfQcK+/6U+sFR395manlP4v0K241okj//LK5UI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ixCXJbcZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ixCXJbcZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 90283C433C7; Sat, 20 Jan 2024 17:34:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705772053; bh=ruM2NBGtCaMvPwK4jKMWDCEJ5nTyHnabdH5DAh7BMUQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ixCXJbcZBIKdr1NGeJ2gqzn+OIj94ssPXKFo9Y5DiGv63nkOBM8raATmVXsJ6dGir YuNYC1T/RiQJNmZBIdfjC8wisrUQLUhFV1YBzZkinocsqrVyWGh08ke0B7r/o2bgga Z22dtGc5iPPfhypS0A/bhfY5DTNpdX4aV++bUbHb6EKkrJumcTmmbZRhjgBxIT1X5a 193d5ygs2tYgZGjQinYthXYam2OT5FDC5qze6mj0YFCZzxqvcD87kLuJGBcE+RP6/h AG+O84JSaqtDqdFQlqc2Ccx2Q1e0/PfddMbU+aVdZ6Iy/RE66pYKZHK6ar3uIfa4Hy SlDEXj0JB3Efg== From: Lorenzo Bianconi To: linux-nfs@vger.kernel.org Cc: lorenzo.bianconi@redhat.com, neilb@suse.de, jlayton@kernel.org, kuba@kernel.org, chuck.lever@oracle.com, horms@kernel.org, netdev@vger.kernel.org Subject: [PATCH v6 3/3] NFSD: add write_ports to netlink command Date: Sat, 20 Jan 2024 18:33:32 +0100 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Introduce write_ports netlink command. For listener-set, userspace is expected to provide a NFS listeners list it wants to enable (all the other ports will be closed). Signed-off-by: Lorenzo Bianconi --- Documentation/netlink/specs/nfsd.yaml | 37 +++++ fs/nfsd/netlink.c | 23 +++ fs/nfsd/netlink.h | 3 + fs/nfsd/nfsctl.c | 196 ++++++++++++++++++++++++++ include/uapi/linux/nfsd_netlink.h | 18 +++ tools/net/ynl/generated/nfsd-user.c | 191 +++++++++++++++++++++++++ tools/net/ynl/generated/nfsd-user.h | 55 ++++++++ 7 files changed, 523 insertions(+) diff --git a/Documentation/netlink/specs/nfsd.yaml b/Documentation/netlink/specs/nfsd.yaml index 30f18798e84e..296ff24b23ac 100644 --- a/Documentation/netlink/specs/nfsd.yaml +++ b/Documentation/netlink/specs/nfsd.yaml @@ -85,6 +85,26 @@ attribute-sets: type: nest nested-attributes: nfs-version multi-attr: true + - + name: server-instance + attributes: + - + name: transport-name + type: string + - + name: port + type: u32 + - + name: inet-proto + type: u16 + - + name: server-listener + attributes: + - + name: instance + type: nest + nested-attributes: server-instance + multi-attr: true operations: list: @@ -144,3 +164,20 @@ operations: reply: attributes: - version + - + name: listener-set + doc: set nfs running listeners + attribute-set: server-listener + flags: [ admin-perm ] + do: + request: + attributes: + - instance + - + name: listener-get + doc: get nfs running listeners + attribute-set: server-listener + do: + reply: + attributes: + - instance diff --git a/fs/nfsd/netlink.c b/fs/nfsd/netlink.c index 5cbbd3295543..c772f9e14761 100644 --- a/fs/nfsd/netlink.c +++ b/fs/nfsd/netlink.c @@ -16,6 +16,12 @@ const struct nla_policy nfsd_nfs_version_nl_policy[NFSD_A_NFS_VERSION_MINOR + 1] [NFSD_A_NFS_VERSION_MINOR] = { .type = NLA_U32, }, }; +const struct nla_policy nfsd_server_instance_nl_policy[NFSD_A_SERVER_INSTANCE_INET_PROTO + 1] = { + [NFSD_A_SERVER_INSTANCE_TRANSPORT_NAME] = { .type = NLA_NUL_STRING, }, + [NFSD_A_SERVER_INSTANCE_PORT] = { .type = NLA_U32, }, + [NFSD_A_SERVER_INSTANCE_INET_PROTO] = { .type = NLA_U16, }, +}; + /* NFSD_CMD_THREADS_SET - do */ static const struct nla_policy nfsd_threads_set_nl_policy[NFSD_A_SERVER_WORKER_THREADS + 1] = { [NFSD_A_SERVER_WORKER_THREADS] = { .type = NLA_U32, }, @@ -26,6 +32,11 @@ static const struct nla_policy nfsd_version_set_nl_policy[NFSD_A_SERVER_PROTO_VE [NFSD_A_SERVER_PROTO_VERSION] = NLA_POLICY_NESTED(nfsd_nfs_version_nl_policy), }; +/* NFSD_CMD_LISTENER_SET - do */ +static const struct nla_policy nfsd_listener_set_nl_policy[NFSD_A_SERVER_LISTENER_INSTANCE + 1] = { + [NFSD_A_SERVER_LISTENER_INSTANCE] = NLA_POLICY_NESTED(nfsd_server_instance_nl_policy), +}; + /* Ops table for nfsd */ static const struct genl_split_ops nfsd_nl_ops[] = { { @@ -59,6 +70,18 @@ static const struct genl_split_ops nfsd_nl_ops[] = { .doit = nfsd_nl_version_get_doit, .flags = GENL_CMD_CAP_DO, }, + { + .cmd = NFSD_CMD_LISTENER_SET, + .doit = nfsd_nl_listener_set_doit, + .policy = nfsd_listener_set_nl_policy, + .maxattr = NFSD_A_SERVER_LISTENER_INSTANCE, + .flags = GENL_ADMIN_PERM | GENL_CMD_CAP_DO, + }, + { + .cmd = NFSD_CMD_LISTENER_GET, + .doit = nfsd_nl_listener_get_doit, + .flags = GENL_CMD_CAP_DO, + }, }; struct genl_family nfsd_nl_family __ro_after_init = { diff --git a/fs/nfsd/netlink.h b/fs/nfsd/netlink.h index c9a1be693fef..10a26ad32cd0 100644 --- a/fs/nfsd/netlink.h +++ b/fs/nfsd/netlink.h @@ -13,6 +13,7 @@ /* Common nested types */ extern const struct nla_policy nfsd_nfs_version_nl_policy[NFSD_A_NFS_VERSION_MINOR + 1]; +extern const struct nla_policy nfsd_server_instance_nl_policy[NFSD_A_SERVER_INSTANCE_INET_PROTO + 1]; int nfsd_nl_rpc_status_get_start(struct netlink_callback *cb); int nfsd_nl_rpc_status_get_done(struct netlink_callback *cb); @@ -23,6 +24,8 @@ int nfsd_nl_threads_set_doit(struct sk_buff *skb, struct genl_info *info); int nfsd_nl_threads_get_doit(struct sk_buff *skb, struct genl_info *info); int nfsd_nl_version_set_doit(struct sk_buff *skb, struct genl_info *info); int nfsd_nl_version_get_doit(struct sk_buff *skb, struct genl_info *info); +int nfsd_nl_listener_set_doit(struct sk_buff *skb, struct genl_info *info); +int nfsd_nl_listener_get_doit(struct sk_buff *skb, struct genl_info *info); extern struct genl_family nfsd_nl_family; diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 53af82303f93..562b209f2921 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -1896,6 +1896,202 @@ int nfsd_nl_version_get_doit(struct sk_buff *skb, struct genl_info *info) return err; } +/** + * nfsd_nl_listener_set_doit - set the nfs running listeners + * @skb: reply buffer + * @info: netlink metadata and command arguments + * + * Return 0 on success or a negative errno. + */ +int nfsd_nl_listener_set_doit(struct sk_buff *skb, struct genl_info *info) +{ + struct nlattr *tb[ARRAY_SIZE(nfsd_server_instance_nl_policy)]; + struct net *net = genl_info_net(info); + struct svc_xprt *xprt, *tmp_xprt; + const struct nlattr *attr; + struct svc_serv *serv; + const char *xcl_name; + struct nfsd_net *nn; + int port, err, rem; + sa_family_t af; + + if (GENL_REQ_ATTR_CHECK(info, NFSD_A_SERVER_LISTENER_INSTANCE)) + return -EINVAL; + + mutex_lock(&nfsd_mutex); + + err = nfsd_create_serv(net); + if (err) { + mutex_unlock(&nfsd_mutex); + return err; + } + + nn = net_generic(net, nfsd_net_id); + serv = nn->nfsd_serv; + + /* 1- create brand new listeners */ + nlmsg_for_each_attr(attr, info->nlhdr, GENL_HDRLEN, rem) { + if (nla_type(attr) != NFSD_A_SERVER_LISTENER_INSTANCE) + continue; + + if (nla_parse_nested(tb, ARRAY_SIZE(tb), attr, + nfsd_server_instance_nl_policy, + info->extack) < 0) + continue; + + if (!tb[NFSD_A_SERVER_INSTANCE_TRANSPORT_NAME] || + !tb[NFSD_A_SERVER_INSTANCE_PORT]) + continue; + + xcl_name = nla_data(tb[NFSD_A_SERVER_INSTANCE_TRANSPORT_NAME]); + port = nla_get_u32(tb[NFSD_A_SERVER_INSTANCE_PORT]); + if (port < 1 || port > USHRT_MAX) + continue; + + af = nla_get_u32(tb[NFSD_A_SERVER_INSTANCE_INET_PROTO]); + if (af != PF_INET && af != PF_INET6) + continue; + + xprt = svc_find_xprt(serv, xcl_name, net, PF_INET, port); + if (xprt) { + svc_xprt_put(xprt); + continue; + } + + /* create new listerner */ + if (svc_xprt_create(serv, xcl_name, net, af, port, + SVC_SOCK_ANONYMOUS, get_current_cred())) + continue; + } + + /* 2- remove stale listeners */ + spin_lock_bh(&serv->sv_lock); + list_for_each_entry_safe(xprt, tmp_xprt, &serv->sv_permsocks, + xpt_list) { + struct svc_xprt *rqt_xprt = NULL; + + nlmsg_for_each_attr(attr, info->nlhdr, GENL_HDRLEN, rem) { + if (nla_type(attr) != NFSD_A_SERVER_LISTENER_INSTANCE) + continue; + + if (nla_parse_nested(tb, ARRAY_SIZE(tb), attr, + nfsd_server_instance_nl_policy, + info->extack) < 0) + continue; + + if (!tb[NFSD_A_SERVER_INSTANCE_TRANSPORT_NAME] || + !tb[NFSD_A_SERVER_INSTANCE_PORT]) + continue; + + xcl_name = nla_data( + tb[NFSD_A_SERVER_INSTANCE_TRANSPORT_NAME]); + port = nla_get_u32(tb[NFSD_A_SERVER_INSTANCE_PORT]); + if (port < 1 || port > USHRT_MAX) + continue; + + af = nla_get_u32(tb[NFSD_A_SERVER_INSTANCE_INET_PROTO]); + if (af != PF_INET && af != PF_INET6) + continue; + + if (!strcmp(xprt->xpt_class->xcl_name, xcl_name) && + port == svc_xprt_local_port(xprt) && + af == xprt->xpt_local.ss_family && + xprt->xpt_net == net) { + rqt_xprt = xprt; + break; + } + } + + /* remove stale listener */ + if (!rqt_xprt) { + spin_unlock_bh(&serv->sv_lock); + svc_xprt_close(xprt); + spin_lock_bh(&serv->sv_lock); + } + } + spin_unlock_bh(&serv->sv_lock); + + if (!serv->sv_nrthreads && list_empty(&nn->nfsd_serv->sv_permsocks)) + nfsd_destroy_serv(net); + + mutex_unlock(&nfsd_mutex); + + return 0; +} + +/** + * nfsd_nl_listener_get_doit - get the nfs running listeners + * @skb: reply buffer + * @info: netlink metadata and command arguments + * + * Return 0 on success or a negative errno. + */ +int nfsd_nl_listener_get_doit(struct sk_buff *skb, struct genl_info *info) +{ + struct svc_xprt *xprt; + struct svc_serv *serv; + struct nfsd_net *nn; + void *hdr; + int err; + + skb = genlmsg_new(GENLMSG_DEFAULT_SIZE, GFP_KERNEL); + if (!skb) + return -ENOMEM; + + hdr = genlmsg_iput(skb, info); + if (!hdr) { + err = -EMSGSIZE; + goto err_free_msg; + } + + mutex_lock(&nfsd_mutex); + nn = net_generic(genl_info_net(info), nfsd_net_id); + if (!nn->nfsd_serv) { + err = -EINVAL; + goto err_nfsd_unlock; + } + + serv = nn->nfsd_serv; + spin_lock_bh(&serv->sv_lock); + list_for_each_entry(xprt, &serv->sv_permsocks, xpt_list) { + struct nlattr *attr; + + attr = nla_nest_start_noflag(skb, + NFSD_A_SERVER_LISTENER_INSTANCE); + if (!attr) { + err = -EINVAL; + goto err_serv_unlock; + } + + if (nla_put_string(skb, NFSD_A_SERVER_INSTANCE_TRANSPORT_NAME, + xprt->xpt_class->xcl_name) || + nla_put_u32(skb, NFSD_A_SERVER_INSTANCE_PORT, + svc_xprt_local_port(xprt)) || + nla_put_u16(skb, NFSD_A_SERVER_INSTANCE_INET_PROTO, + xprt->xpt_local.ss_family)) { + err = -EINVAL; + goto err_serv_unlock; + } + + nla_nest_end(skb, attr); + } + spin_unlock_bh(&serv->sv_lock); + mutex_unlock(&nfsd_mutex); + + genlmsg_end(skb, hdr); + + return genlmsg_reply(skb, info); + +err_serv_unlock: + spin_unlock_bh(&serv->sv_lock); +err_nfsd_unlock: + mutex_unlock(&nfsd_mutex); +err_free_msg: + nlmsg_free(skb); + + return err; +} + /** * nfsd_net_init - Prepare the nfsd_net portion of a new net namespace * @net: a freshly-created network namespace diff --git a/include/uapi/linux/nfsd_netlink.h b/include/uapi/linux/nfsd_netlink.h index 2a06f9fe6fe9..659ab76b8840 100644 --- a/include/uapi/linux/nfsd_netlink.h +++ b/include/uapi/linux/nfsd_netlink.h @@ -51,12 +51,30 @@ enum { NFSD_A_SERVER_PROTO_MAX = (__NFSD_A_SERVER_PROTO_MAX - 1) }; +enum { + NFSD_A_SERVER_INSTANCE_TRANSPORT_NAME = 1, + NFSD_A_SERVER_INSTANCE_PORT, + NFSD_A_SERVER_INSTANCE_INET_PROTO, + + __NFSD_A_SERVER_INSTANCE_MAX, + NFSD_A_SERVER_INSTANCE_MAX = (__NFSD_A_SERVER_INSTANCE_MAX - 1) +}; + +enum { + NFSD_A_SERVER_LISTENER_INSTANCE = 1, + + __NFSD_A_SERVER_LISTENER_MAX, + NFSD_A_SERVER_LISTENER_MAX = (__NFSD_A_SERVER_LISTENER_MAX - 1) +}; + enum { NFSD_CMD_RPC_STATUS_GET = 1, NFSD_CMD_THREADS_SET, NFSD_CMD_THREADS_GET, NFSD_CMD_VERSION_SET, NFSD_CMD_VERSION_GET, + NFSD_CMD_LISTENER_SET, + NFSD_CMD_LISTENER_GET, __NFSD_CMD_MAX, NFSD_CMD_MAX = (__NFSD_CMD_MAX - 1) diff --git a/tools/net/ynl/generated/nfsd-user.c b/tools/net/ynl/generated/nfsd-user.c index ad498543f464..d52f392c7f59 100644 --- a/tools/net/ynl/generated/nfsd-user.c +++ b/tools/net/ynl/generated/nfsd-user.c @@ -19,6 +19,8 @@ static const char * const nfsd_op_strmap[] = { [NFSD_CMD_THREADS_GET] = "threads-get", [NFSD_CMD_VERSION_SET] = "version-set", [NFSD_CMD_VERSION_GET] = "version-get", + [NFSD_CMD_LISTENER_SET] = "listener-set", + [NFSD_CMD_LISTENER_GET] = "listener-get", }; const char *nfsd_op_str(int op) @@ -39,6 +41,17 @@ struct ynl_policy_nest nfsd_nfs_version_nest = { .table = nfsd_nfs_version_policy, }; +struct ynl_policy_attr nfsd_server_instance_policy[NFSD_A_SERVER_INSTANCE_MAX + 1] = { + [NFSD_A_SERVER_INSTANCE_TRANSPORT_NAME] = { .name = "transport-name", .type = YNL_PT_NUL_STR, }, + [NFSD_A_SERVER_INSTANCE_PORT] = { .name = "port", .type = YNL_PT_U32, }, + [NFSD_A_SERVER_INSTANCE_INET_PROTO] = { .name = "inet-proto", .type = YNL_PT_U16, }, +}; + +struct ynl_policy_nest nfsd_server_instance_nest = { + .max_attr = NFSD_A_SERVER_INSTANCE_MAX, + .table = nfsd_server_instance_policy, +}; + struct ynl_policy_attr nfsd_rpc_status_policy[NFSD_A_RPC_STATUS_MAX + 1] = { [NFSD_A_RPC_STATUS_XID] = { .name = "xid", .type = YNL_PT_U32, }, [NFSD_A_RPC_STATUS_FLAGS] = { .name = "flags", .type = YNL_PT_U32, }, @@ -79,6 +92,15 @@ struct ynl_policy_nest nfsd_server_proto_nest = { .table = nfsd_server_proto_policy, }; +struct ynl_policy_attr nfsd_server_listener_policy[NFSD_A_SERVER_LISTENER_MAX + 1] = { + [NFSD_A_SERVER_LISTENER_INSTANCE] = { .name = "instance", .type = YNL_PT_NEST, .nest = &nfsd_server_instance_nest, }, +}; + +struct ynl_policy_nest nfsd_server_listener_nest = { + .max_attr = NFSD_A_SERVER_LISTENER_MAX, + .table = nfsd_server_listener_policy, +}; + /* Common nested types */ void nfsd_nfs_version_free(struct nfsd_nfs_version *obj) { @@ -124,6 +146,64 @@ int nfsd_nfs_version_parse(struct ynl_parse_arg *yarg, return 0; } +void nfsd_server_instance_free(struct nfsd_server_instance *obj) +{ + free(obj->transport_name); +} + +int nfsd_server_instance_put(struct nlmsghdr *nlh, unsigned int attr_type, + struct nfsd_server_instance *obj) +{ + struct nlattr *nest; + + nest = mnl_attr_nest_start(nlh, attr_type); + if (obj->_present.transport_name_len) + mnl_attr_put_strz(nlh, NFSD_A_SERVER_INSTANCE_TRANSPORT_NAME, obj->transport_name); + if (obj->_present.port) + mnl_attr_put_u32(nlh, NFSD_A_SERVER_INSTANCE_PORT, obj->port); + if (obj->_present.inet_proto) + mnl_attr_put_u16(nlh, NFSD_A_SERVER_INSTANCE_INET_PROTO, obj->inet_proto); + mnl_attr_nest_end(nlh, nest); + + return 0; +} + +int nfsd_server_instance_parse(struct ynl_parse_arg *yarg, + const struct nlattr *nested) +{ + struct nfsd_server_instance *dst = yarg->data; + const struct nlattr *attr; + + mnl_attr_for_each_nested(attr, nested) { + unsigned int type = mnl_attr_get_type(attr); + + if (type == NFSD_A_SERVER_INSTANCE_TRANSPORT_NAME) { + unsigned int len; + + if (ynl_attr_validate(yarg, attr)) + return MNL_CB_ERROR; + + len = strnlen(mnl_attr_get_str(attr), mnl_attr_get_payload_len(attr)); + dst->_present.transport_name_len = len; + dst->transport_name = malloc(len + 1); + memcpy(dst->transport_name, mnl_attr_get_str(attr), len); + dst->transport_name[len] = 0; + } else if (type == NFSD_A_SERVER_INSTANCE_PORT) { + if (ynl_attr_validate(yarg, attr)) + return MNL_CB_ERROR; + dst->_present.port = 1; + dst->port = mnl_attr_get_u32(attr); + } else if (type == NFSD_A_SERVER_INSTANCE_INET_PROTO) { + if (ynl_attr_validate(yarg, attr)) + return MNL_CB_ERROR; + dst->_present.inet_proto = 1; + dst->inet_proto = mnl_attr_get_u16(attr); + } + } + + return 0; +} + /* ============== NFSD_CMD_RPC_STATUS_GET ============== */ /* NFSD_CMD_RPC_STATUS_GET - dump */ int nfsd_rpc_status_get_rsp_dump_parse(const struct nlmsghdr *nlh, void *data) @@ -467,6 +547,117 @@ struct nfsd_version_get_rsp *nfsd_version_get(struct ynl_sock *ys) return NULL; } +/* ============== NFSD_CMD_LISTENER_SET ============== */ +/* NFSD_CMD_LISTENER_SET - do */ +void nfsd_listener_set_req_free(struct nfsd_listener_set_req *req) +{ + unsigned int i; + + for (i = 0; i < req->n_instance; i++) + nfsd_server_instance_free(&req->instance[i]); + free(req->instance); + free(req); +} + +int nfsd_listener_set(struct ynl_sock *ys, struct nfsd_listener_set_req *req) +{ + struct ynl_req_state yrs = { .yarg = { .ys = ys, }, }; + struct nlmsghdr *nlh; + int err; + + nlh = ynl_gemsg_start_req(ys, ys->family_id, NFSD_CMD_LISTENER_SET, 1); + ys->req_policy = &nfsd_server_listener_nest; + + for (unsigned int i = 0; i < req->n_instance; i++) + nfsd_server_instance_put(nlh, NFSD_A_SERVER_LISTENER_INSTANCE, &req->instance[i]); + + err = ynl_exec(ys, nlh, &yrs); + if (err < 0) + return -1; + + return 0; +} + +/* ============== NFSD_CMD_LISTENER_GET ============== */ +/* NFSD_CMD_LISTENER_GET - do */ +void nfsd_listener_get_rsp_free(struct nfsd_listener_get_rsp *rsp) +{ + unsigned int i; + + for (i = 0; i < rsp->n_instance; i++) + nfsd_server_instance_free(&rsp->instance[i]); + free(rsp->instance); + free(rsp); +} + +int nfsd_listener_get_rsp_parse(const struct nlmsghdr *nlh, void *data) +{ + struct nfsd_listener_get_rsp *dst; + struct ynl_parse_arg *yarg = data; + unsigned int n_instance = 0; + const struct nlattr *attr; + struct ynl_parse_arg parg; + int i; + + dst = yarg->data; + parg.ys = yarg->ys; + + if (dst->instance) + return ynl_error_parse(yarg, "attribute already present (server-listener.instance)"); + + mnl_attr_for_each(attr, nlh, sizeof(struct genlmsghdr)) { + unsigned int type = mnl_attr_get_type(attr); + + if (type == NFSD_A_SERVER_LISTENER_INSTANCE) { + n_instance++; + } + } + + if (n_instance) { + dst->instance = calloc(n_instance, sizeof(*dst->instance)); + dst->n_instance = n_instance; + i = 0; + parg.rsp_policy = &nfsd_server_instance_nest; + mnl_attr_for_each(attr, nlh, sizeof(struct genlmsghdr)) { + if (mnl_attr_get_type(attr) == NFSD_A_SERVER_LISTENER_INSTANCE) { + parg.data = &dst->instance[i]; + if (nfsd_server_instance_parse(&parg, attr)) + return MNL_CB_ERROR; + i++; + } + } + } + + return MNL_CB_OK; +} + +struct nfsd_listener_get_rsp *nfsd_listener_get(struct ynl_sock *ys) +{ + struct ynl_req_state yrs = { .yarg = { .ys = ys, }, }; + struct nfsd_listener_get_rsp *rsp; + struct nlmsghdr *nlh; + int err; + + nlh = ynl_gemsg_start_req(ys, ys->family_id, NFSD_CMD_LISTENER_GET, 1); + ys->req_policy = &nfsd_server_listener_nest; + yrs.yarg.rsp_policy = &nfsd_server_listener_nest; + + rsp = calloc(1, sizeof(*rsp)); + yrs.yarg.data = rsp; + yrs.cb = nfsd_listener_get_rsp_parse; + yrs.rsp_cmd = NFSD_CMD_LISTENER_GET; + + err = ynl_exec(ys, nlh, &yrs); + if (err < 0) + goto err_free; + + return rsp; + +err_free: + nfsd_listener_get_rsp_free(rsp); + return NULL; +} + const struct ynl_family ynl_nfsd_family = { .name = "nfsd", }; diff --git a/tools/net/ynl/generated/nfsd-user.h b/tools/net/ynl/generated/nfsd-user.h index d062ee8fa8b6..5765fb6f2ef5 100644 --- a/tools/net/ynl/generated/nfsd-user.h +++ b/tools/net/ynl/generated/nfsd-user.h @@ -29,6 +29,18 @@ struct nfsd_nfs_version { __u32 minor; }; +struct nfsd_server_instance { + struct { + __u32 transport_name_len; + __u32 port:1; + __u32 inet_proto:1; + } _present; + + char *transport_name; + __u32 port; + __u16 inet_proto; +}; + /* ============== NFSD_CMD_RPC_STATUS_GET ============== */ /* NFSD_CMD_RPC_STATUS_GET - dump */ struct nfsd_rpc_status_get_rsp_dump { @@ -164,4 +176,47 @@ void nfsd_version_get_rsp_free(struct nfsd_version_get_rsp *rsp); */ struct nfsd_version_get_rsp *nfsd_version_get(struct ynl_sock *ys); +/* ============== NFSD_CMD_LISTENER_SET ============== */ +/* NFSD_CMD_LISTENER_SET - do */ +struct nfsd_listener_set_req { + unsigned int n_instance; + struct nfsd_server_instance *instance; +}; + +static inline struct nfsd_listener_set_req *nfsd_listener_set_req_alloc(void) +{ + return calloc(1, sizeof(struct nfsd_listener_set_req)); +} +void nfsd_listener_set_req_free(struct nfsd_listener_set_req *req); + +static inline void +__nfsd_listener_set_req_set_instance(struct nfsd_listener_set_req *req, + struct nfsd_server_instance *instance, + unsigned int n_instance) +{ + free(req->instance); + req->instance = instance; + req->n_instance = n_instance; +} + +/* + * set nfs running listeners + */ +int nfsd_listener_set(struct ynl_sock *ys, struct nfsd_listener_set_req *req); + +/* ============== NFSD_CMD_LISTENER_GET ============== */ +/* NFSD_CMD_LISTENER_GET - do */ + +struct nfsd_listener_get_rsp { + unsigned int n_instance; + struct nfsd_server_instance *instance; +}; + +void nfsd_listener_get_rsp_free(struct nfsd_listener_get_rsp *rsp); + +/* + * get nfs running listeners + */ +struct nfsd_listener_get_rsp *nfsd_listener_get(struct ynl_sock *ys); + #endif /* _LINUX_NFSD_GEN_H */