Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp2200414rdh; Tue, 26 Sep 2023 16:14:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHeWE3EisXYZEUnDajblQDjr9F0PFJl8665ePG5hxC2Eg34MYJxiPyVMIiyay/NjR1c8TOV X-Received: by 2002:a05:6358:7e92:b0:143:9827:5f71 with SMTP id o18-20020a0563587e9200b0014398275f71mr625233rwn.8.1695770047747; Tue, 26 Sep 2023 16:14:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695770047; cv=none; d=google.com; s=arc-20160816; b=xuIfwXnefwHY1Q0T/guAa6x+oIRuaawc46AvwssJqtpV906Gk/eP83MHnZ40N53JIL ZFIpBMq6P5pnPEs0Wj0o5GmrF7SCECH4scrzXGSlsrlUFS2HkihJh734VSQVOFp2W109 N1J/Y4wrj8FLOIRrAjY85zve3Nq0PUNF3KaDG3kHlenGDR2UofxnUkDTwk8eQvM649Xn 7Xg/xgRfEBOtjG5v//D7B4bkBrUCuuT0CP+u3MNYoUnlsWCAsXB/crNqcMfTW0FSq0rl eOALbkmmc6RvNSFmkfEivev0N5p6ZKwhM//UQv3tf0/XkSPcwDSwl9re5Q0K2q4vlG0i a2zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=RKtQcvcG+6ePIuUuVvBsQ56VimrcPBONWA1/wBK12s8=; fh=T6C57b+gMvcyzD541NbgyHYx/fvLX+dOfSaeLnE9AJg=; b=VcoUtMO9J4xZVjqXTaSd7f8uRBsJSxdNhhAaBeYUTOCOOZNQpJTtRhc6e4uKxRL6Ef Sr5f8HtusaBEKxSdCvku1uhe89lFUQ7YGwo5QHAg00ELUXIdCnwTKrzzzGz4ONzHGLIM t0f6+zsHjWI9/86FUGqhFTvxHLsVjZ4mRsOHfuegBMum+sAXGcllZTHTzH7UglRsFscb ctd6r4+j/c4z8HtheZs7kG2CvJEWoqY94CxxkVGhCzoCrd1ar0ZLSYV58cVLCX8ObZCc X0Mi31JXIzWDB7n/ukQS5axrnObs2qD5uxW92TzRhFn6x+hMbapaTtDcukKF6rZtMMhs dr5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ifx44+vt; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id z16-20020a656650000000b0056a1ea34f45si12973200pgv.670.2023.09.26.16.14.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 16:14:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ifx44+vt; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 9B60281A3294; Tue, 26 Sep 2023 16:13:57 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230422AbjIZXN4 (ORCPT + 99 others); Tue, 26 Sep 2023 19:13:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232180AbjIZXLz (ORCPT ); Tue, 26 Sep 2023 19:11:55 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0ED418685 for ; Tue, 26 Sep 2023 15:13:45 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 210E7C07618; Tue, 26 Sep 2023 22:13:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695766424; bh=a5Z2neTdugVmg7K1HhjX6bASrU1Jyg72MbNWHLTI7Xs=; h=From:To:Cc:Subject:Date:From; b=Ifx44+vt+ujNB4+kNP85xRzvAfLGzzZn8upPJhq31eNwfm314biho9Z3wUF3MGzFK tYo4XHJHpBXV8NkXUwfM7yJA6qMT+7HXdCAUXy5g0cn/JtQL6Bu2lNjZZa9Ln3MEZ9 fPQkRbP/x8Rv3ziLdp5RUFt6CngwiIlyOy4QmUy4x94pyt6KEvkaUfklBQKtt1NAXf MDvrimZ+W/0JN2SfziPaZmBv9aAKj/Ld4kBw8WYTS9BlSvM4iFyGJGI1xRn4uPzr3V i5/rZ2yOkAiqNXhO36AO5F83MrWfc4/jp9D/M0+xHj+e9HgkGAEmmAt0Ugt/3D/zyk lk2p9a54CnZZw== From: Lorenzo Bianconi To: linux-nfs@vger.kernel.org Cc: lorenzo.bianconi@redhat.com, jlayton@kernel.org, neilb@suse.de, chuck.lever@oracle.com, netdev@vger.kernel.org Subject: [PATCH v3] NFSD: convert write_threads, write_maxblksize and write_maxconn to netlink commands Date: Wed, 27 Sep 2023 00:13:15 +0200 Message-ID: <27646a34a3ddac3e0b0ad9b49aaf66b3cee5844f.1695766257.git.lorenzo@kernel.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.2 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Tue, 26 Sep 2023 16:13:58 -0700 (PDT) Introduce write_threads, write_maxblksize and write_maxconn netlink commands similar to the ones available through the procfs. Signed-off-by: Lorenzo Bianconi --- Changes since v2: - use u32 to store nthreads in nfsd_nl_threads_set_doit - rename server-attr in control-plane in nfsd.yaml specs Changes since v1: - remove write_v4_end_grace command - add write_maxblksize and write_maxconn netlink commands This patch can be tested with user-space tool reported below: https://github.com/LorenzoBianconi/nfsd-netlink.git --- Documentation/netlink/specs/nfsd.yaml | 63 ++++++++++++ fs/nfsd/netlink.c | 51 ++++++++++ fs/nfsd/netlink.h | 9 ++ fs/nfsd/nfsctl.c | 141 ++++++++++++++++++++++++++ include/uapi/linux/nfsd_netlink.h | 15 +++ 5 files changed, 279 insertions(+) diff --git a/Documentation/netlink/specs/nfsd.yaml b/Documentation/netlink/specs/nfsd.yaml index 403d3e3a04f3..c6af1653bc1d 100644 --- a/Documentation/netlink/specs/nfsd.yaml +++ b/Documentation/netlink/specs/nfsd.yaml @@ -62,6 +62,18 @@ attribute-sets: name: compound-ops type: u32 multi-attr: true + - + name: control-plane + attributes: + - + name: threads + type: u32 + - + name: max-blksize + type: u32 + - + name: max-conn + type: u32 operations: list: @@ -72,3 +84,54 @@ operations: dump: pre: nfsd-nl-rpc-status-get-start post: nfsd-nl-rpc-status-get-done + - + name: threads-set + doc: set the number of running threads + attribute-set: control-plane + flags: [ admin-perm ] + do: + request: + attributes: + - threads + - + name: threads-get + doc: dump the number of running threads + attribute-set: control-plane + dump: + reply: + attributes: + - threads + - + name: max-blksize-set + doc: set the nfs block size + attribute-set: control-plane + flags: [ admin-perm ] + do: + request: + attributes: + - max-blksize + - + name: max-blksize-get + doc: dump the nfs block size + attribute-set: control-plane + dump: + reply: + attributes: + - max-blksize + - + name: max-conn-set + doc: set the max number of connections + attribute-set: control-plane + flags: [ admin-perm ] + do: + request: + attributes: + - max-conn + - + name: max-conn-get + doc: dump the max number of connections + attribute-set: control-plane + dump: + reply: + attributes: + - max-conn diff --git a/fs/nfsd/netlink.c b/fs/nfsd/netlink.c index 0e1d635ec5f9..8f7d72ae60d6 100644 --- a/fs/nfsd/netlink.c +++ b/fs/nfsd/netlink.c @@ -10,6 +10,21 @@ #include +/* NFSD_CMD_THREADS_SET - do */ +static const struct nla_policy nfsd_threads_set_nl_policy[NFSD_A_CONTROL_PLANE_THREADS + 1] = { + [NFSD_A_CONTROL_PLANE_THREADS] = { .type = NLA_U32, }, +}; + +/* NFSD_CMD_MAX_BLKSIZE_SET - do */ +static const struct nla_policy nfsd_max_blksize_set_nl_policy[NFSD_A_CONTROL_PLANE_MAX_BLKSIZE + 1] = { + [NFSD_A_CONTROL_PLANE_MAX_BLKSIZE] = { .type = NLA_U32, }, +}; + +/* NFSD_CMD_MAX_CONN_SET - do */ +static const struct nla_policy nfsd_max_conn_set_nl_policy[NFSD_A_CONTROL_PLANE_MAX_CONN + 1] = { + [NFSD_A_CONTROL_PLANE_MAX_CONN] = { .type = NLA_U32, }, +}; + /* Ops table for nfsd */ static const struct genl_split_ops nfsd_nl_ops[] = { { @@ -19,6 +34,42 @@ 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_CONTROL_PLANE_THREADS, + .flags = GENL_ADMIN_PERM | GENL_CMD_CAP_DO, + }, + { + .cmd = NFSD_CMD_THREADS_GET, + .dumpit = nfsd_nl_threads_get_dumpit, + .flags = GENL_CMD_CAP_DUMP, + }, + { + .cmd = NFSD_CMD_MAX_BLKSIZE_SET, + .doit = nfsd_nl_max_blksize_set_doit, + .policy = nfsd_max_blksize_set_nl_policy, + .maxattr = NFSD_A_CONTROL_PLANE_MAX_BLKSIZE, + .flags = GENL_ADMIN_PERM | GENL_CMD_CAP_DO, + }, + { + .cmd = NFSD_CMD_MAX_BLKSIZE_GET, + .dumpit = nfsd_nl_max_blksize_get_dumpit, + .flags = GENL_CMD_CAP_DUMP, + }, + { + .cmd = NFSD_CMD_MAX_CONN_SET, + .doit = nfsd_nl_max_conn_set_doit, + .policy = nfsd_max_conn_set_nl_policy, + .maxattr = NFSD_A_CONTROL_PLANE_MAX_CONN, + .flags = GENL_ADMIN_PERM | GENL_CMD_CAP_DO, + }, + { + .cmd = NFSD_CMD_MAX_CONN_GET, + .dumpit = nfsd_nl_max_conn_get_dumpit, + .flags = GENL_CMD_CAP_DUMP, + }, }; struct genl_family nfsd_nl_family __ro_after_init = { diff --git a/fs/nfsd/netlink.h b/fs/nfsd/netlink.h index d83dd6bdee92..41b95651c638 100644 --- a/fs/nfsd/netlink.h +++ b/fs/nfsd/netlink.h @@ -16,6 +16,15 @@ 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_dumpit(struct sk_buff *skb, + struct netlink_callback *cb); +int nfsd_nl_max_blksize_set_doit(struct sk_buff *skb, struct genl_info *info); +int nfsd_nl_max_blksize_get_dumpit(struct sk_buff *skb, + struct netlink_callback *cb); +int nfsd_nl_max_conn_set_doit(struct sk_buff *skb, struct genl_info *info); +int nfsd_nl_max_conn_get_dumpit(struct sk_buff *skb, + struct netlink_callback *cb); extern struct genl_family nfsd_nl_family; diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index b71744e355a8..07e7a09e28e3 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -1694,6 +1694,147 @@ 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 (!info->attrs[NFSD_A_CONTROL_PLANE_THREADS]) + return -EINVAL; + + nthreads = nla_get_u32(info->attrs[NFSD_A_CONTROL_PLANE_THREADS]); + + ret = nfsd_svc(nthreads, genl_info_net(info), get_current_cred()); + return ret == nthreads ? 0 : ret; +} + +static int nfsd_nl_get_dump(struct sk_buff *skb, struct netlink_callback *cb, + int cmd, int attr, u32 val) +{ + void *hdr; + + if (cb->args[0]) /* already consumed */ + return 0; + + hdr = genlmsg_put(skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, + &nfsd_nl_family, NLM_F_MULTI, cmd); + if (!hdr) + return -ENOBUFS; + + if (nla_put_u32(skb, attr, val)) + return -ENOBUFS; + + genlmsg_end(skb, hdr); + cb->args[0] = 1; + + return skb->len; +} + +/** + * nfsd_nl_threads_get_dumpit - dump the number of running threads + * @skb: reply buffer + * @cb: netlink metadata and command arguments + * + * Returns the size of the reply or a negative errno. + */ +int nfsd_nl_threads_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb) +{ + return nfsd_nl_get_dump(skb, cb, NFSD_CMD_THREADS_GET, + NFSD_A_CONTROL_PLANE_THREADS, + nfsd_nrthreads(sock_net(skb->sk))); +} + +/** + * nfsd_nl_max_blksize_set_doit - set the nfs block size + * @skb: reply buffer + * @info: netlink metadata and command arguments + * + * Return 0 on success or a negative errno. + */ +int nfsd_nl_max_blksize_set_doit(struct sk_buff *skb, struct genl_info *info) +{ + struct nfsd_net *nn = net_generic(genl_info_net(info), nfsd_net_id); + struct nlattr *attr = info->attrs[NFSD_A_CONTROL_PLANE_MAX_BLKSIZE]; + int ret = 0; + + if (!attr) + return -EINVAL; + + mutex_lock(&nfsd_mutex); + if (nn->nfsd_serv) { + ret = -EBUSY; + goto out; + } + + nfsd_max_blksize = nla_get_u32(attr); + nfsd_max_blksize = max_t(int, nfsd_max_blksize, 1024); + nfsd_max_blksize = min_t(int, nfsd_max_blksize, NFSSVC_MAXBLKSIZE); + nfsd_max_blksize &= ~1023; +out: + mutex_unlock(&nfsd_mutex); + + return ret; +} + +/** + * nfsd_nl_max_blksize_get_dumpit - dump the nfs block size + * @skb: reply buffer + * @cb: netlink metadata and command arguments + * + * Returns the size of the reply or a negative errno. + */ +int nfsd_nl_max_blksize_get_dumpit(struct sk_buff *skb, + struct netlink_callback *cb) +{ + return nfsd_nl_get_dump(skb, cb, NFSD_CMD_MAX_BLKSIZE_GET, + NFSD_A_CONTROL_PLANE_MAX_BLKSIZE, + nfsd_max_blksize); +} + +/** + * nfsd_nl_max_conn_set_doit - set the max number of connections + * @skb: reply buffer + * @info: netlink metadata and command arguments + * + * Return 0 on success or a negative errno. + */ +int nfsd_nl_max_conn_set_doit(struct sk_buff *skb, struct genl_info *info) +{ + struct nfsd_net *nn = net_generic(genl_info_net(info), nfsd_net_id); + struct nlattr *attr = info->attrs[NFSD_A_CONTROL_PLANE_MAX_CONN]; + + if (!attr) + return -EINVAL; + + nn->max_connections = nla_get_u32(attr); + + return 0; +} + +/** + * nfsd_nl_max_conn_get_dumpit - dump the max number of connections + * @skb: reply buffer + * @cb: netlink metadata and command arguments + * + * Returns the size of the reply or a negative errno. + */ +int nfsd_nl_max_conn_get_dumpit(struct sk_buff *skb, + struct netlink_callback *cb) +{ + struct nfsd_net *nn = net_generic(sock_net(cb->skb->sk), nfsd_net_id); + + return nfsd_nl_get_dump(skb, cb, NFSD_CMD_MAX_CONN_GET, + NFSD_A_CONTROL_PLANE_MAX_CONN, + nn->max_connections); +} + /** * 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 c8ae72466ee6..145f4811f3d9 100644 --- a/include/uapi/linux/nfsd_netlink.h +++ b/include/uapi/linux/nfsd_netlink.h @@ -29,8 +29,23 @@ enum { NFSD_A_RPC_STATUS_MAX = (__NFSD_A_RPC_STATUS_MAX - 1) }; +enum { + NFSD_A_CONTROL_PLANE_THREADS = 1, + NFSD_A_CONTROL_PLANE_MAX_BLKSIZE, + NFSD_A_CONTROL_PLANE_MAX_CONN, + + __NFSD_A_CONTROL_PLANE_MAX, + NFSD_A_CONTROL_PLANE_MAX = (__NFSD_A_CONTROL_PLANE_MAX - 1) +}; + enum { NFSD_CMD_RPC_STATUS_GET = 1, + NFSD_CMD_THREADS_SET, + NFSD_CMD_THREADS_GET, + NFSD_CMD_MAX_BLKSIZE_SET, + NFSD_CMD_MAX_BLKSIZE_GET, + NFSD_CMD_MAX_CONN_SET, + NFSD_CMD_MAX_CONN_GET, __NFSD_CMD_MAX, NFSD_CMD_MAX = (__NFSD_CMD_MAX - 1) -- 2.41.0