SUNRPC: Add srcaddr and dst_port to sysfs
Subsystems (3)
cover SUNRPC: Add srcaddr and dst_port to sysfs
From: Anna Schumaker <[email protected]>
At the moment we only show dstaddr and src_port in the sysfs files. Let's add the other half of the configuration so admins can get a complete picture of the configuration.
Thanks,
Anna
Anna Schumaker (2):
SUNRPC: Add srcaddr as a file in sysfs
SUNRPC: Add dst_port to the sysfs xprt info file
net/sunrpc/sysfs.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)
Signature · 1 line
2.32.0
PATCH 1/2 SUNRPC: Add srcaddr as a file in sysfs
From: Anna Schumaker <[email protected]>
I don't support changing it right now, but it could be useful information for clients with multiple network cards.
--- net/sunrpc/sysfs.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
net/sunrpc/sysfs.c +26 -0
@@ -100,6 +100,28 @@ static ssize_t rpc_sysfs_xprt_dstaddr_show(struct kobject *kobj,return ret +1 ; } +static ssize_t rpc_sysfs_xprt_srcaddr_show (struct kobject *kobj, +struct kobj_attribute *attr, +char *buf) +{ +struct rpc_xprt *xprt =rpc_sysfs_xprt_kobj_get_xprt (kobj); +struct sockaddr_storage saddr; +struct sock_xprt *sock; +ssize_t ret =-1 ; + +if (!xprt) +return 0 ; + + sock = container_of(xprt, struct sock_xprt, xprt); +if (kernel_getsockname (sock->sock, (struct sockaddr *)&saddr) <0 ) + goto out; + + ret =sprintf (buf,"%pISc\n" , &saddr); +out: +xprt_put (xprt); +return ret +1 ; +} +static ssize_t rpc_sysfs_xprt_info_show (struct kobject *kobj,struct kobj_attribute *attr,char *buf)
@@ -376,6 +398,9 @@ static const void *rpc_sysfs_xprt_namespace(struct kobject *kobj)static struct kobj_attribute rpc_sysfs_xprt_dstaddr =__ATTR (dstaddr,0644 , rpc_sysfs_xprt_dstaddr_show, rpc_sysfs_xprt_dstaddr_store); +static struct kobj_attribute rpc_sysfs_xprt_srcaddr =__ATTR (srcaddr, +0644 , rpc_sysfs_xprt_srcaddr_show,NULL ); +static struct kobj_attribute rpc_sysfs_xprt_info =__ATTR (xprt_info,0444 , rpc_sysfs_xprt_info_show,NULL );
@@ -384,6 +409,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_info.attr, &rpc_sysfs_xprt_change_state.attr,NULL ,
Signature · 1 line
2.32.0
PATCH 2/2 SUNRPC: Add dst_port to the sysfs xprt info file
In reply to [email protected]From: Anna Schumaker <[email protected]>
This is most likely going to be 2049 for NFS, but some servers might be configured to export on a non-standard port. Let's show this information just in case somebody needs it.
--- net/sunrpc/sysfs.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
net/sunrpc/sysfs.c +4 -2
@@ -136,14 +136,16 @@ static ssize_t rpc_sysfs_xprt_info_show(struct kobject *kobj,"max_num_slots=%u\nmin_num_slots=%u\nnum_reqs=%u\n" "binding_q_len=%u\nsending_q_len=%u\npending_q_len=%u\n" "backlog_q_len=%u\nmain_xprt=%d\nsrc_port=%u\n" -"tasks_queuelen=%ld\n" , +"tasks_queuelen=%ld\ndst_port=%s\n" , xprt->last_used, xprt->cong, xprt->cwnd, xprt->max_reqs, xprt->min_reqs, xprt->num_reqs, xprt->binding.qlen, xprt->sending.qlen, xprt->pending.qlen, xprt->backlog.qlen, xprt->main, (xprt->xprt_class->ident ==XPRT_TRANSPORT_TCP ) ?get_srcport (xprt) :0 , - atomic_long_read(&xprt->queuelen)); +atomic_long_read (&xprt->queuelen), + (xprt->xprt_class->ident ==XPRT_TRANSPORT_TCP ) ? + xprt->address_strings[RPC_DISPLAY_PORT] : "0");xprt_put (xprt);return ret +1 ; }
Signature · 1 line
2.32.0