From patchwork Fri Feb 7 20:42:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna Schumaker X-Patchwork-Id: 13965817 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 853121B395F for ; Fri, 7 Feb 2025 20:42:27 +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=1738960947; cv=none; b=kYNIxDEicFuopUFK4sDHw2E3VqHeRkQnwX3PTuIZ1hZAqbDUQUymY9Y3kHHKgdXsc4vwah0C6czTsZKGX3m56CYbnYkbyxUXELeXmGs9nh/l+6ICgUz8Bjer/KkMeV81YFdOn/FRSkFDAmQjVy0Djog2U6RnNmujSIrixXYNihI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738960947; c=relaxed/simple; bh=xPLqPxgnf8Tp5b0hbqy0R+X3KoAGozCXiMNc1COgRrg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lg6Wv/hncxLxgpBaIAIK6nOvyzg8HoTU6tRKUWoyQcs3zb36WhWQu5UfMEIQCBPTIm73V3cBUWUp2sjtGQKD1TDHIuvC7qzA+BrZAcxwr07988OtOkTjjE3MdImBmGuyMIMuHVC9cUAXMKepJX316jtnGvnWTFufqqiSvNWNrAE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Nbe1H5wW; 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="Nbe1H5wW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AD665C4CEE5; Fri, 7 Feb 2025 20:42:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738960947; bh=xPLqPxgnf8Tp5b0hbqy0R+X3KoAGozCXiMNc1COgRrg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nbe1H5wWjVVdcMbNPuImcJWqY4+ccWn/H0FdJy+kWttPYK8cGGyfrgL2UEE3j6vuF Ik91fwW399tvxOQa5mpvFVXKbEG9kJ372DcynieINPi08zIy+2Zxe5ca0naPIol+DH kEH1DMtaK7oDl0Tth5Lpiv9yCGjpWCmgqT1d2N/AqXcHpyLRs7v7ACIPqdnWWkQNwR 0EniDmaYvuY2NWc05H7lzFS5JKiEoNHcKhVXZteCRgLb3m22YhTebRWGsMf7kvgC6x bSq+74BE4XiBbzYepFkIAFVLiZAtVqxpiB0uKdaU6h+xSvV5JEfoEjcqoqeNbjgAl4 hWoSbQHaTe8jw== From: Anna Schumaker To: linux-nfs@vger.kernel.org, trond.myklebust@hammerspace.com Cc: anna@kernel.org Subject: [PATCH v3 1/5] NFS: Add implid to sysfs Date: Fri, 7 Feb 2025 15:42:21 -0500 Message-ID: <20250207204225.594002-2-anna@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250207204225.594002-1-anna@kernel.org> References: <20250207204225.594002-1-anna@kernel.org> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Anna Schumaker The Linux NFS server added support for returning this information during an EXCHANGE_ID in Linux v6.13. This is something and admin might want to query, so let's add it to sysfs. Reviewed-by: Benjamin Coddington Signed-off-by: Anna Schumaker --- fs/nfs/sysfs.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/fs/nfs/sysfs.c b/fs/nfs/sysfs.c index 7b59a40d40c0..b30401b2c939 100644 --- a/fs/nfs/sysfs.c +++ b/fs/nfs/sysfs.c @@ -272,6 +272,38 @@ shutdown_store(struct kobject *kobj, struct kobj_attribute *attr, static struct kobj_attribute nfs_sysfs_attr_shutdown = __ATTR_RW(shutdown); +#if IS_ENABLED(CONFIG_NFS_V4_1) +static ssize_t +implid_domain_show(struct kobject *kobj, struct kobj_attribute *attr, + char *buf) +{ + struct nfs_server *server = container_of(kobj, struct nfs_server, kobj); + struct nfs41_impl_id *impl_id = server->nfs_client->cl_implid; + + if (!impl_id || strlen(impl_id->domain) == 0) + return 0; //sysfs_emit(buf, ""); + return sysfs_emit(buf, "%s\n", impl_id->domain); +} + +static struct kobj_attribute nfs_sysfs_attr_implid_domain = __ATTR_RO(implid_domain); + + +static ssize_t +implid_name_show(struct kobject *kobj, struct kobj_attribute *attr, + char *buf) +{ + struct nfs_server *server = container_of(kobj, struct nfs_server, kobj); + struct nfs41_impl_id *impl_id = server->nfs_client->cl_implid; + + if (!impl_id || strlen(impl_id->name) == 0) + return 0; //sysfs_emit(buf, ""); + return sysfs_emit(buf, "%s\n", impl_id->name); +} + +static struct kobj_attribute nfs_sysfs_attr_implid_name = __ATTR_RO(implid_name); + +#endif /* IS_ENABLED(CONFIG_NFS_V4_1) */ + #define RPC_CLIENT_NAME_SIZE 64 void nfs_sysfs_link_rpc_client(struct nfs_server *server, @@ -309,6 +341,32 @@ static struct kobj_type nfs_sb_ktype = { .child_ns_type = nfs_netns_object_child_ns_type, }; +#if IS_ENABLED(CONFIG_NFS_V4_1) +static void nfs_sysfs_add_nfsv41_server(struct nfs_server *server) +{ + int ret; + + if (!server->nfs_client->cl_implid) + return; + + ret = sysfs_create_file_ns(&server->kobj, &nfs_sysfs_attr_implid_domain.attr, + nfs_netns_server_namespace(&server->kobj)); + if (ret < 0) + pr_warn("NFS: sysfs_create_file_ns for server-%d failed (%d)\n", + server->s_sysfs_id, ret); + + ret = sysfs_create_file_ns(&server->kobj, &nfs_sysfs_attr_implid_name.attr, + nfs_netns_server_namespace(&server->kobj)); + if (ret < 0) + pr_warn("NFS: sysfs_create_file_ns for server-%d failed (%d)\n", + server->s_sysfs_id, ret); +} +#else /* CONFIG_NFS_V4_1 */ +static inline void nfs_sysfs_add_nfsv41_server(struct nfs_server *server) +{ +} +#endif /* CONFIG_NFS_V4_1 */ + void nfs_sysfs_add_server(struct nfs_server *server) { int ret; @@ -325,6 +383,8 @@ void nfs_sysfs_add_server(struct nfs_server *server) if (ret < 0) pr_warn("NFS: sysfs_create_file_ns for server-%d failed (%d)\n", server->s_sysfs_id, ret); + + nfs_sysfs_add_nfsv41_server(server); } EXPORT_SYMBOL_GPL(nfs_sysfs_add_server); From patchwork Fri Feb 7 20:42:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna Schumaker X-Patchwork-Id: 13965818 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 1C5DD1A8F97 for ; Fri, 7 Feb 2025 20:42:27 +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=1738960948; cv=none; b=JQOj1iOs7jjXtavGl1PZo428f0eNSH29C8wpt1jCbW2HcDYUvcsTj67UrskbhRw/5Ymqlg5KshRSu8LRh37b5PwXuNpPmpJ5RracrQkpcKppuJ3fusPrrTTprmH5AsEVUz7BLsu3I/e3oVWD/c3Z8k5wWtBBS+Ae3lXBpa5hhYo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738960948; c=relaxed/simple; bh=U53nYvSfgTlzIynS/URfRQmCYprbBDXVgBSqyV5tYvw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X+6oB9PNmubVIx3xJWzdlUcWQbvDUxFvccHuKNvX6TWSjyIycY5+0cK59mLIEih7PUexDzloHSpTBXRcvkklwXTcPRZdvJedBFs8DuhPw8Mtv5KJrbHGpspHbJNIv6VULj5gl6IubDTFjjFrUHK0ySNP41lGUesbQp6XumEjMrk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=J7GST+YW; 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="J7GST+YW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43979C4CED1; Fri, 7 Feb 2025 20:42:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738960947; bh=U53nYvSfgTlzIynS/URfRQmCYprbBDXVgBSqyV5tYvw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J7GST+YWxRnN56sbRwCd1ak/EJDg8mXRxQX0At2qOKFsJn0rlNufT0HivVfl4Y2wf XsGtlvU4Koma0w6wm8EY30MGOCFUJM/eI1p+pWP0ce1cbGHGWAWOWcMsgFFB6yRpzr I5zvyDrVpP+1gUwjRpH6l5q/tu9X7IuEisSi7Pk1lurHgBOtMdi+Kk5fi9KvRzdxWp MpcSMQOjh5PBpxnpWNTw/zi0WYUEE4anLr6eQO4BuVTrOhwbl+BnIpcUITCJzASyBs Q3qKZ3I/hu6iYwUCGzCJevRvHUpgFk+VpM4SjtMmF+ztMViJoCkCO99wHiIAhlfw9M MLFlfKAdLhEyw== From: Anna Schumaker To: linux-nfs@vger.kernel.org, trond.myklebust@hammerspace.com Cc: anna@kernel.org Subject: [PATCH v3 2/5] sunrpc: Add a sysfs attr for xprtsec Date: Fri, 7 Feb 2025 15:42:22 -0500 Message-ID: <20250207204225.594002-3-anna@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250207204225.594002-1-anna@kernel.org> References: <20250207204225.594002-1-anna@kernel.org> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Anna Schumaker This allows the admin to check the TLS configuration for each xprt. Reviewed-by: Benjamin Coddington Signed-off-by: Anna Schumaker --- net/sunrpc/sysfs.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/net/sunrpc/sysfs.c b/net/sunrpc/sysfs.c index 5c8ecdaaa985..dc3b7cd70000 100644 --- a/net/sunrpc/sysfs.c +++ b/net/sunrpc/sysfs.c @@ -129,6 +129,31 @@ static ssize_t rpc_sysfs_xprt_srcaddr_show(struct kobject *kobj, return ret; } +static const char *xprtsec_strings[] = { + [RPC_XPRTSEC_NONE] = "none", + [RPC_XPRTSEC_TLS_ANON] = "tls-anon", + [RPC_XPRTSEC_TLS_X509] = "tls-x509", +}; + +static ssize_t rpc_sysfs_xprt_xprtsec_show(struct kobject *kobj, + struct kobj_attribute *attr, + char *buf) +{ + struct rpc_xprt *xprt = rpc_sysfs_xprt_kobj_get_xprt(kobj); + ssize_t ret; + + if (!xprt) { + ret = sprintf(buf, "\n"); + goto out; + } + + ret = sprintf(buf, "%s\n", xprtsec_strings[xprt->xprtsec.policy]); + xprt_put(xprt); +out: + return ret; + +} + static ssize_t rpc_sysfs_xprt_info_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) { @@ -404,6 +429,9 @@ static struct kobj_attribute rpc_sysfs_xprt_dstaddr = __ATTR(dstaddr, static struct kobj_attribute rpc_sysfs_xprt_srcaddr = __ATTR(srcaddr, 0644, rpc_sysfs_xprt_srcaddr_show, NULL); +static struct kobj_attribute rpc_sysfs_xprt_xprtsec = __ATTR(xprtsec, + 0644, rpc_sysfs_xprt_xprtsec_show, NULL); + static struct kobj_attribute rpc_sysfs_xprt_info = __ATTR(xprt_info, 0444, rpc_sysfs_xprt_info_show, NULL); @@ -413,6 +441,7 @@ static struct kobj_attribute rpc_sysfs_xprt_change_state = __ATTR(xprt_state, static struct attribute *rpc_sysfs_xprt_attrs[] = { &rpc_sysfs_xprt_dstaddr.attr, &rpc_sysfs_xprt_srcaddr.attr, + &rpc_sysfs_xprt_xprtsec.attr, &rpc_sysfs_xprt_info.attr, &rpc_sysfs_xprt_change_state.attr, NULL, From patchwork Fri Feb 7 20:42:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna Schumaker X-Patchwork-Id: 13965819 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 AF0661A8F97 for ; Fri, 7 Feb 2025 20:42:28 +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=1738960948; cv=none; b=PiVeacKs5iu/BUGYlYF2WeGxrAHG+VelnPbe8o/0bigBKqtpxuklFpc3dQQywJWpjU3XBy4U5ZyvB3RHEzTR6zK3h474rn7P5Q9muNgpq2dcXX1nRxdfnsbzfoB76DWGBfqIHqzpVyBR4GC02qRpBP39ndKEXWm5F12Wz2XZjnQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738960948; c=relaxed/simple; bh=fknGuYnQ1cgfKxMOrI2w1RekboN7nJqSd/hZ3o5Cqrg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gpHSUynQkMPVxpI04XgUyjxTAW6MrydASi2TOj+eGZMgKbqwaUdF5MNwyJNXU+ZF8Ye4qIRKgHZkHKIvc53e/nWkXGjVY1uiBwO1P/W2f8ERWgPV12hg3ZhH8+wf8CcbBEEnkRYG3Sw7VkKjE0OAR13qaBq0kT31DjaKn0+OtPY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UCaYI+XC; 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="UCaYI+XC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CDD27C4CEE2; Fri, 7 Feb 2025 20:42:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738960948; bh=fknGuYnQ1cgfKxMOrI2w1RekboN7nJqSd/hZ3o5Cqrg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UCaYI+XC9V5bh7OwgFRg9S59gmXwBv6l/e2dINmLxyEhRIqQN7SjUFR7bPUfBBAE0 NNn8G+mCpmruwZoZQk0YBV7kO1SFljVWeS0r6eLxNJo0GrrPbfybgWBKFqSlGpgeC0 3/g5rRbFnKS2ziwDM8xHOHczOgBOQYnhaHGzpqOgrUNLmu0gMv/jitZxie+OKna4dj CQeUAv9HPfOosR1sOCphVBuAf6MXZ6/sm+vUWQIphmjC/go42oPi7B6I0pTafznaZJ yxL3xIczY4pIa5SeBeEX1AquCI8wY2ncSGlYF3IaLLTFVRR+vWhKWlGPFbB3Rt8gTm JZnvLTlyxm/RA== From: Anna Schumaker To: linux-nfs@vger.kernel.org, trond.myklebust@hammerspace.com Cc: anna@kernel.org Subject: [PATCH v3 3/5] sunrpc: Add a sysfs files for rpc_clnt information Date: Fri, 7 Feb 2025 15:42:23 -0500 Message-ID: <20250207204225.594002-4-anna@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250207204225.594002-1-anna@kernel.org> References: <20250207204225.594002-1-anna@kernel.org> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Anna Schumaker These files display useful information about the RPC client, such as the rpc version number, program name, and maximum number of connections allowed. Reviewed-by: Benjamin Coddington Signed-off-by: Anna Schumaker --- v3: Fix the mode bits for the max_connect file --- net/sunrpc/sysfs.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/net/sunrpc/sysfs.c b/net/sunrpc/sysfs.c index dc3b7cd70000..dcd579eab50a 100644 --- a/net/sunrpc/sysfs.c +++ b/net/sunrpc/sysfs.c @@ -59,6 +59,16 @@ static struct kobject *rpc_sysfs_object_alloc(const char *name, return NULL; } +static inline struct rpc_clnt * +rpc_sysfs_client_kobj_get_clnt(struct kobject *kobj) +{ + struct rpc_sysfs_client *c = container_of(kobj, + struct rpc_sysfs_client, kobject); + struct rpc_clnt *ret = c->clnt; + + return refcount_inc_not_zero(&ret->cl_count) ? ret : NULL; +} + static inline struct rpc_xprt * rpc_sysfs_xprt_kobj_get_xprt(struct kobject *kobj) { @@ -86,6 +96,51 @@ rpc_sysfs_xprt_switch_kobj_get_xprt(struct kobject *kobj) return xprt_switch_get(x->xprt_switch); } +static ssize_t rpc_sysfs_clnt_version_show(struct kobject *kobj, + struct kobj_attribute *attr, + char *buf) +{ + struct rpc_clnt *clnt = rpc_sysfs_client_kobj_get_clnt(kobj); + ssize_t ret; + + if (!clnt) + return sprintf(buf, "\n"); + + ret = sprintf(buf, "%u", clnt->cl_vers); + refcount_dec(&clnt->cl_count); + return ret; +} + +static ssize_t rpc_sysfs_clnt_program_show(struct kobject *kobj, + struct kobj_attribute *attr, + char *buf) +{ + struct rpc_clnt *clnt = rpc_sysfs_client_kobj_get_clnt(kobj); + ssize_t ret; + + if (!clnt) + return sprintf(buf, "\n"); + + ret = sprintf(buf, "%s", clnt->cl_program->name); + refcount_dec(&clnt->cl_count); + return ret; +} + +static ssize_t rpc_sysfs_clnt_max_connect_show(struct kobject *kobj, + struct kobj_attribute *attr, + char *buf) +{ + struct rpc_clnt *clnt = rpc_sysfs_client_kobj_get_clnt(kobj); + ssize_t ret; + + if (!clnt) + return sprintf(buf, "\n"); + + ret = sprintf(buf, "%u\n", clnt->cl_max_connect); + refcount_dec(&clnt->cl_count); + return ret; +} + static ssize_t rpc_sysfs_xprt_dstaddr_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) @@ -423,6 +478,23 @@ static const void *rpc_sysfs_xprt_namespace(const struct kobject *kobj) kobject)->xprt->xprt_net; } +static struct kobj_attribute rpc_sysfs_clnt_version = __ATTR(rpc_version, + 0444, rpc_sysfs_clnt_version_show, NULL); + +static struct kobj_attribute rpc_sysfs_clnt_program = __ATTR(program, + 0444, rpc_sysfs_clnt_program_show, NULL); + +static struct kobj_attribute rpc_sysfs_clnt_max_connect = __ATTR(max_connect, + 0444, rpc_sysfs_clnt_max_connect_show, NULL); + +static struct attribute *rpc_sysfs_rpc_clnt_attrs[] = { + &rpc_sysfs_clnt_version.attr, + &rpc_sysfs_clnt_program.attr, + &rpc_sysfs_clnt_max_connect.attr, + NULL, +}; +ATTRIBUTE_GROUPS(rpc_sysfs_rpc_clnt); + static struct kobj_attribute rpc_sysfs_xprt_dstaddr = __ATTR(dstaddr, 0644, rpc_sysfs_xprt_dstaddr_show, rpc_sysfs_xprt_dstaddr_store); @@ -459,6 +531,7 @@ ATTRIBUTE_GROUPS(rpc_sysfs_xprt_switch); static const struct kobj_type rpc_sysfs_client_type = { .release = rpc_sysfs_client_release, + .default_groups = rpc_sysfs_rpc_clnt_groups, .sysfs_ops = &kobj_sysfs_ops, .namespace = rpc_sysfs_client_namespace, }; From patchwork Fri Feb 7 20:42:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna Schumaker X-Patchwork-Id: 13965820 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 D4AFA1B4153 for ; Fri, 7 Feb 2025 20:42:28 +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=1738960948; cv=none; b=Wig+Ed7pqOKUIjm/2EP0Wcz2YhxvY9dltl8fFMlCg7jz4bwfn4mz2VD5dolzOn2WWFt6tGF5TNEtRs9nFazDwGkQ7UkFzSPbkLP0P+YVcelcUnG1EzNBlkb6VA6096HhzMHxuaIwomlrcxkeB3sNd6Xf1X01DXb3vBkbZ3srim4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738960948; c=relaxed/simple; bh=LGgk1JfU8J24EXQpVbCW39Bcqm4RwkYaRXTfGP0n8/I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mipfQeauDYbpyutuABa6iIrDs3uPl3My928x88BWKYYMLsNs/fRjGE/WizoJD7G5QmELFMuOrXgyxtiXfKHB5VinET0OXyg8Wwk+ut58tkAIeUYx6G9vyTY9MbNr3PzWTmQcAfryCaiSB+mmK8QnKOWipMxvgG0TyHu6XGo1Bqk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kGuD23zX; 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="kGuD23zX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62FE3C4AF09; Fri, 7 Feb 2025 20:42:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738960948; bh=LGgk1JfU8J24EXQpVbCW39Bcqm4RwkYaRXTfGP0n8/I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kGuD23zXnsWcCeejbIVmsdfkM0iJI7zQCcR5njGi7uoC+ACKYTk5z0MeCVliEpek7 aCrB4PcfeXUyX7vwM/tXd58xRMr/vwiw/xKjyA4cm9HJW28eHD2Vx0Jo+Ph6DT0ZMR 8HYNwjAI7flzkg4BjM7ThM2nC72co1pPcjpWzP/uS8Dhfnn6+QmTzRzTrCsXgUwIqM nO6dODHaHwuGeZkCKtzunJkwQHuKfSrfQhvOZZ6PomMgkxoROoqKuDa7Ms9UeXaRLL s6V1A+J3tVK8bQbiudnPqQqtTGGcAZnqohQPrZBeLatozEfFlPrPA6uGBlTvVxLxn+ 4TVkuoHcRV6bg== From: Anna Schumaker To: linux-nfs@vger.kernel.org, trond.myklebust@hammerspace.com Cc: anna@kernel.org Subject: [PATCH v3 4/5] sunrpc: Add a sysfs file for adding a new xprt Date: Fri, 7 Feb 2025 15:42:24 -0500 Message-ID: <20250207204225.594002-5-anna@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250207204225.594002-1-anna@kernel.org> References: <20250207204225.594002-1-anna@kernel.org> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Anna Schumaker Writing to this file will clone the 'main' xprt of an xprt_switch and add it to be used as an additional connection. Reviewed-by: Benjamin Coddington Signed-off-by: Anna Schumaker --- v3: Replace call to xprt_iter_get_xprt() with xprt_iter_get_next() --- include/linux/sunrpc/xprtmultipath.h | 1 + net/sunrpc/sysfs.c | 54 ++++++++++++++++++++++++++++ net/sunrpc/xprtmultipath.c | 21 +++++++++++ 3 files changed, 76 insertions(+) diff --git a/include/linux/sunrpc/xprtmultipath.h b/include/linux/sunrpc/xprtmultipath.h index e411368cdacf..e4db5022fe92 100644 --- a/include/linux/sunrpc/xprtmultipath.h +++ b/include/linux/sunrpc/xprtmultipath.h @@ -56,6 +56,7 @@ extern void rpc_xprt_switch_add_xprt(struct rpc_xprt_switch *xps, struct rpc_xprt *xprt); extern void rpc_xprt_switch_remove_xprt(struct rpc_xprt_switch *xps, struct rpc_xprt *xprt, bool offline); +extern struct rpc_xprt *rpc_xprt_switch_get_main_xprt(struct rpc_xprt_switch *xps); extern void xprt_iter_init(struct rpc_xprt_iter *xpi, struct rpc_xprt_switch *xps); diff --git a/net/sunrpc/sysfs.c b/net/sunrpc/sysfs.c index dcd579eab50a..8fd1975f2fe8 100644 --- a/net/sunrpc/sysfs.c +++ b/net/sunrpc/sysfs.c @@ -305,6 +305,55 @@ static ssize_t rpc_sysfs_xprt_switch_info_show(struct kobject *kobj, return ret; } +static ssize_t rpc_sysfs_xprt_switch_add_xprt_show(struct kobject *kobj, + struct kobj_attribute *attr, + char *buf) +{ + return sprintf(buf, "# add one xprt to this xprt_switch\n"); +} + +static ssize_t rpc_sysfs_xprt_switch_add_xprt_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t count) +{ + struct rpc_xprt_switch *xprt_switch = + rpc_sysfs_xprt_switch_kobj_get_xprt(kobj); + struct xprt_create xprt_create_args; + struct rpc_xprt *xprt, *new; + + if (!xprt_switch) + return 0; + + xprt = rpc_xprt_switch_get_main_xprt(xprt_switch); + if (!xprt) + goto out; + + xprt_create_args.ident = xprt->xprt_class->ident; + xprt_create_args.net = xprt->xprt_net; + xprt_create_args.dstaddr = (struct sockaddr *)&xprt->addr; + xprt_create_args.addrlen = xprt->addrlen; + xprt_create_args.servername = xprt->servername; + xprt_create_args.bc_xprt = xprt->bc_xprt; + xprt_create_args.xprtsec = xprt->xprtsec; + xprt_create_args.connect_timeout = xprt->connect_timeout; + xprt_create_args.reconnect_timeout = xprt->max_reconnect_timeout; + + new = xprt_create_transport(&xprt_create_args); + if (IS_ERR_OR_NULL(new)) { + count = PTR_ERR(new); + goto out_put_xprt; + } + + rpc_xprt_switch_add_xprt(xprt_switch, new); + xprt_put(new); + +out_put_xprt: + xprt_put(xprt); +out: + xprt_switch_put(xprt_switch); + return count; +} + static ssize_t rpc_sysfs_xprt_dstaddr_store(struct kobject *kobj, struct kobj_attribute *attr, const char *buf, size_t count) @@ -523,8 +572,13 @@ ATTRIBUTE_GROUPS(rpc_sysfs_xprt); static struct kobj_attribute rpc_sysfs_xprt_switch_info = __ATTR(xprt_switch_info, 0444, rpc_sysfs_xprt_switch_info_show, NULL); +static struct kobj_attribute rpc_sysfs_xprt_switch_add_xprt = + __ATTR(add_xprt, 0644, rpc_sysfs_xprt_switch_add_xprt_show, + rpc_sysfs_xprt_switch_add_xprt_store); + static struct attribute *rpc_sysfs_xprt_switch_attrs[] = { &rpc_sysfs_xprt_switch_info.attr, + &rpc_sysfs_xprt_switch_add_xprt.attr, NULL, }; ATTRIBUTE_GROUPS(rpc_sysfs_xprt_switch); diff --git a/net/sunrpc/xprtmultipath.c b/net/sunrpc/xprtmultipath.c index 7e98d4dd9f10..4c5e08b0aa64 100644 --- a/net/sunrpc/xprtmultipath.c +++ b/net/sunrpc/xprtmultipath.c @@ -92,6 +92,27 @@ void rpc_xprt_switch_remove_xprt(struct rpc_xprt_switch *xps, xprt_put(xprt); } +/** + * rpc_xprt_switch_get_main_xprt - Get the 'main' xprt for an xprt switch. + * @xps: pointer to struct rpc_xprt_switch. + */ +struct rpc_xprt *rpc_xprt_switch_get_main_xprt(struct rpc_xprt_switch *xps) +{ + struct rpc_xprt_iter xpi; + struct rpc_xprt *xprt; + + xprt_iter_init_listall(&xpi, xps); + + xprt = xprt_iter_get_next(&xpi); + while (xprt && !xprt->main) { + xprt_put(xprt); + xprt = xprt_iter_get_next(&xpi); + } + + xprt_iter_destroy(&xpi); + return xprt; +} + static DEFINE_IDA(rpc_xprtswitch_ids); void xprt_multipath_cleanup_ids(void) From patchwork Fri Feb 7 20:42:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna Schumaker X-Patchwork-Id: 13965821 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 DD8611B040B for ; Fri, 7 Feb 2025 20:42:29 +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=1738960949; cv=none; b=QGuV5rLv66KHcaJhkIhgQlbCH9QQTrDuF9Qc78dpdzeFWm0wPBVcBDNoAQPmLD9fJustETmMYYHX7qUEt1sFjNaRWiJ8gDqXkRmJMBy0IfJb0O1S1o7BN8hFjy+e8s1G5H6ENzr+eGpAL83nb8okCsYzua6ivJAI4B76zwFlaxo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738960949; c=relaxed/simple; bh=oyXMgYzZBtuVNTlQFq8kagATWP0+OtkEAOtOAtjAe6Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mwQFJtA7AqXLS+NNL+sYd1s93YS+EF/dfzp+ryuXh5JjfI34zTZklF/8wNWJdk4nE4e0M5eQMzIb/jr+MRmr2kdT/IsGpI1gCVkKmCnaTyWTUIMF6SLOJ7F16sqHa/hEj/QRJXTK5Xkwb0P4IzMXWidUYkReeiLalkIk0H796dA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CseMRWOO; 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="CseMRWOO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ED5C9C4CED1; Fri, 7 Feb 2025 20:42:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738960949; bh=oyXMgYzZBtuVNTlQFq8kagATWP0+OtkEAOtOAtjAe6Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CseMRWOOCIWXSZ+tc+8lTfLuyqQOgN409fuIaYCUUDG2U5LQL6sk4VKai0Ts/a+ro YtspERYCyZdKcaEIVc7fWnoymS2+SfMe9ha3WmZNesLdmFCAi887rhPpcjSDpxl4/D POGjIOYLKxEzCn/VifH/LlpZkc2B9TI51r3jSSFapj1+HXKGJqgKhrkn0pSYqxC6eL Myn5rZvoDM63TsS7HCgKjV946W3U3zDirPFtmJcQ4plNMBhXH8VRkNJOkKlV2rwfU7 0imZxjiY330TTJnHhyfc4D8WfPhJ5WkdJqI16uuKYpfMzqMCHd0GFuiuqab/XUNjch FRDVttpOlBT5Q== From: Anna Schumaker To: linux-nfs@vger.kernel.org, trond.myklebust@hammerspace.com Cc: anna@kernel.org Subject: [PATCH v3 5/5] sunrpc: Add a sysfs file for one-step xprt deletion Date: Fri, 7 Feb 2025 15:42:25 -0500 Message-ID: <20250207204225.594002-6-anna@kernel.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250207204225.594002-1-anna@kernel.org> References: <20250207204225.594002-1-anna@kernel.org> Precedence: bulk X-Mailing-List: linux-nfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Anna Schumaker Previously, the admin would need to set the xprt state to "offline" before attempting to remove. This patch adds a new sysfs attr that does both these steps in a single call. Suggested-by: Benjamin Coddington Reviewed-by: Benjamin Coddington Signed-off-by: Anna Schumaker --- net/sunrpc/sysfs.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/net/sunrpc/sysfs.c b/net/sunrpc/sysfs.c index 8fd1975f2fe8..09434e1143c5 100644 --- a/net/sunrpc/sysfs.c +++ b/net/sunrpc/sysfs.c @@ -286,6 +286,14 @@ static ssize_t rpc_sysfs_xprt_state_show(struct kobject *kobj, return ret; } +static ssize_t rpc_sysfs_xprt_del_xprt_show(struct kobject *kobj, + struct kobj_attribute *attr, + char *buf) +{ + return sprintf(buf, "# delete this xprt\n"); +} + + static ssize_t rpc_sysfs_xprt_switch_info_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) @@ -464,6 +472,40 @@ static ssize_t rpc_sysfs_xprt_state_change(struct kobject *kobj, return count; } +static ssize_t rpc_sysfs_xprt_del_xprt(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t count) +{ + struct rpc_xprt *xprt = rpc_sysfs_xprt_kobj_get_xprt(kobj); + struct rpc_xprt_switch *xps = rpc_sysfs_xprt_kobj_get_xprt_switch(kobj); + + if (!xprt || !xps) { + count = 0; + goto out; + } + + if (xprt->main) { + count = -EINVAL; + goto release_tasks; + } + + if (wait_on_bit_lock(&xprt->state, XPRT_LOCKED, TASK_KILLABLE)) { + count = -EINTR; + goto out_put; + } + + xprt_set_offline_locked(xprt, xps); + xprt_delete_locked(xprt, xps); + +release_tasks: + xprt_release_write(xprt, NULL); +out_put: + xprt_put(xprt); + xprt_switch_put(xps); +out: + return count; +} + int rpc_sysfs_init(void) { rpc_sunrpc_kset = kset_create_and_add("sunrpc", NULL, kernel_kobj); @@ -559,12 +601,16 @@ static struct kobj_attribute rpc_sysfs_xprt_info = __ATTR(xprt_info, static struct kobj_attribute rpc_sysfs_xprt_change_state = __ATTR(xprt_state, 0644, rpc_sysfs_xprt_state_show, rpc_sysfs_xprt_state_change); +static struct kobj_attribute rpc_sysfs_xprt_del = __ATTR(del_xprt, + 0644, rpc_sysfs_xprt_del_xprt_show, rpc_sysfs_xprt_del_xprt); + static struct attribute *rpc_sysfs_xprt_attrs[] = { &rpc_sysfs_xprt_dstaddr.attr, &rpc_sysfs_xprt_srcaddr.attr, &rpc_sysfs_xprt_xprtsec.attr, &rpc_sysfs_xprt_info.attr, &rpc_sysfs_xprt_change_state.attr, + &rpc_sysfs_xprt_del.attr, NULL, }; ATTRIBUTE_GROUPS(rpc_sysfs_xprt);