nfsd: Adjust nfs.conf setting/parsing of rdma port
Subsystems (2)
PATCH 1/1 nfsd: Adjust nfs.conf setting/parsing of rdma port
The rpc.nfsd program can use option "--rdma" to enable RDMA on the standard port (nfsrdma/20049) or "--rdma=port" for an alternate port.
But now in /etc/nfs.conf, we need to specify the port number (e.g. rdma=nfsrdma) to enable it, which is not convenient.
The default setting "rdma=n" may cause more confusion.
Update to enable RDMA on standard port when setting boolean YES to "rdma=". And using "rdma-port=" for an alternate port if necessary.
Also let previous config (e.g. rdma=nfsrdma) work as well.
---
Hello SteveD,
I did some simple test:
~~~~~~~~~~~~~~~~~~~~~~~
[root@ rpc-nfsd]# cp rpc.nfsd.new /usr/sbin/rpc.nfsd
cp: overwrite '/usr/sbin/rpc.nfsd'? y
[root@ rpc-nfsd]# vi /etc/nfs.conf
[root@ rpc-nfsd]# cat /etc/nfs.conf
[nfsd]
rdma=nfsrdma <<<<<<<<< previous pattern
[root@ rpc-nfsd]# systemctl restart nfs-server && cat /proc/fs/nfsd/portlist | grep -w rdma [nfsd]
rdma 20049
rdma 20049
[root@ rpc-nfsd]# vi /etc/nfs.conf
[root@ rpc-nfsd]# cat /etc/nfs.conf
[nfsd]
rdma=y <<<<<<<<< boolean YES
[root@ rpc-nfsd]# systemctl restart nfs-server && cat /proc/fs/nfsd/portlist | grep -w rdma rdma 20049
rdma 20049
[root@ rpc-nfsd]# vi /etc/nfs.conf
[root@ rpc-nfsd]# cat /etc/nfs.conf
[nfsd]
rdma=n <<<<<<<<< boolean NO
[root@ rpc-nfsd]# systemctl restart nfs-server && cat /proc/fs/nfsd/portlist | grep -w rdma [root@ rpc-nfsd]# vi /etc/nfs.conf
[root@ rpc-nfsd]# cat /etc/nfs.conf
[nfsd]
rdma=12345 <<<<<<<<< previous pattern
[root@ rpc-nfsd]# systemctl restart nfs-server && cat /proc/fs/nfsd/portlist | grep -w rdma rdma 12345
rdma 12345
[root@ rpc-nfsd]# vi /etc/nfs.conf
[root@ rpc-nfsd]# cat /etc/nfs.conf
[nfsd]
rdma=yes <<<<<<<<< boolean YES
rdma-port=54321 <<<<<<<<< another port number
[root@ rpc-nfsd]# systemctl restart nfs-server && cat /proc/fs/nfsd/portlist | grep -w rdma rdma 54321
rdma 54321
[root@ rpc-nfsd]# vi /etc/nfs.conf
[root@ rpc-nfsd]# cat /etc/nfs.conf
[nfsd]
rdma=n <<<<<<<<< boolean NO won't enable it even with rdma-port set
rdma-port=54321
[root@ rpc-nfsd]# systemctl restart nfs-server && cat /proc/fs/nfsd/portlist | grep -w rdma [root@ rpc-nfsd]# vi /etc/nfs.conf
[root@ rpc-nfsd]# cat /etc/nfs.conf
[nfsd]
#rdma=n
rdma-port=54321
[root@ rpc-nfsd]# systemctl restart nfs-server && cat /proc/fs/nfsd/portlist | grep -w rdma [root@ rpc-nfsd]#
~~~~~~~~~~~~~~~~~~~~~~~
Thanks,
Yongcheng
--- nfs.conf | 1 + utils/nfsd/nfsd.c | 9 ++++++++- utils/nfsd/nfsd.man | 6 +++++- 3 files changed, 14 insertions(+), 2 deletions(-)
nfs.conf +1 -0
@@ -63,6 +63,7 @@ # vers4.1=y # vers4.2=y # rdma=n +# rdma-port=20049 # [statd] # debug=0
utils/nfsd/nfsd.c +8 -1
@@ -92,7 +92,14 @@ main(int argc, char **argv) port =conf_get_str ("nfsd" ,"port" );if (!port) port ="nfs" ; - rdma_port =conf_get_str ("nfsd" ,"rdma" ); +if (conf_get_bool ("nfsd" ,"rdma" , false)) { + rdma_port =conf_get_str ("nfsd" ,"rdma-port" ); +if (!rdma_port) + rdma_port ="nfsrdma" ; + } +/* backward compatibility - nfs.conf used to set rdma port directly */ +if (!rdma_port) + rdma_port =conf_get_str ("nfsd" ,"rdma" );if (conf_get_bool ("nfsd" ,"udp" ,NFSCTL_UDPISSET (protobits)))NFSCTL_UDPSET (protobits);else
utils/nfsd/nfsd.man +5 -1
@@ -144,7 +144,11 @@ The lease time for NFSv4, in seconds. Set the port for TCP/UDP to bind to. .TP .B rdma -Set RDMA port. Use "rdma=nfsrdma" to enable standard port. +Enable RDMA port (with "on" or "yes" etc) on the standard port +("nfsrdma", port 20049). +.TP +.B rdma-port +Set an alternate RDMA port. .TP .B UDP Enable (with "on" or "yes" etc) or disable ("off", "no") UDP support.
Signature · 1 line
2.20.1
Quoted 9 lines · Yongcheng Yang
The rpc.nfsd program can use option "--rdma" to enable RDMA on the standard port (nfsrdma/20049) or "--rdma=port" for an alternate port.
But now in
/etc/nfs.conf, we need to specify the port number (e.g. rdma=nfsrdma) to enable it, which is not convenient.
The default setting "rdma=n" may cause more confusion.
Quoted 7 lines
Update to enable RDMA on standard port when setting boolean YES to "rdma=". And using "rdma-port=" for an alternate port if necessary.
Also let previous config (e.g. rdma=nfsrdma) work as well.
Signed-off-by Yongcheng Yang <[email protected]>
Committed....
steved.
Quoted 116 lines
---
Hello SteveD,I did some simple test:
~~~~~~~~~~~~~~~~~~~~~~~
[root@ rpc-nfsd]# cp rpc.nfsd.new/usr/sbin/rpc.nfsd
cp: overwrite '/usr/sbin/rpc.nfsd'? y
[root@ rpc-nfsd]# vi/etc/nfs.conf
[root@ rpc-nfsd]# cat/etc/nfs.conf
[nfsd]
rdma=nfsrdma <<<<<<<<< previous pattern
[root@ rpc-nfsd]# systemctl restart nfs-server && cat/proc/fs/nfsd/portlist| grep -w rdma [nfsd]
rdma 20049
rdma 20049
[root@ rpc-nfsd]# vi/etc/nfs.conf
[root@ rpc-nfsd]# cat/etc/nfs.conf
[nfsd]
rdma=y <<<<<<<<< boolean YES
[root@ rpc-nfsd]# systemctl restart nfs-server && cat/proc/fs/nfsd/portlist| grep -w rdma rdma 20049
rdma 20049
[root@ rpc-nfsd]# vi/etc/nfs.conf
[root@ rpc-nfsd]# cat/etc/nfs.conf
[nfsd]
rdma=n <<<<<<<<< boolean NO
[root@ rpc-nfsd]# systemctl restart nfs-server && cat/proc/fs/nfsd/portlist| grep -w rdma [root@ rpc-nfsd]# vi/etc/nfs.conf
[root@ rpc-nfsd]# cat/etc/nfs.conf
[nfsd]
rdma=12345 <<<<<<<<< previous pattern
[root@ rpc-nfsd]# systemctl restart nfs-server && cat/proc/fs/nfsd/portlist| grep -w rdma rdma 12345
rdma 12345
[root@ rpc-nfsd]# vi/etc/nfs.conf
[root@ rpc-nfsd]# cat/etc/nfs.conf
[nfsd]
rdma=yes <<<<<<<<< boolean YES
rdma-port=54321 <<<<<<<<< another port number
[root@ rpc-nfsd]# systemctl restart nfs-server && cat/proc/fs/nfsd/portlist| grep -w rdma rdma 54321
rdma 54321
[root@ rpc-nfsd]# vi/etc/nfs.conf
[root@ rpc-nfsd]# cat/etc/nfs.conf
[nfsd]
rdma=n <<<<<<<<< boolean NO won't enable it even with rdma-port set
rdma-port=54321
[root@ rpc-nfsd]# systemctl restart nfs-server && cat/proc/fs/nfsd/portlist| grep -w rdma [root@ rpc-nfsd]# vi/etc/nfs.conf
[root@ rpc-nfsd]# cat/etc/nfs.conf
[nfsd]
#rdma=n
rdma-port=54321
[root@ rpc-nfsd]# systemctl restart nfs-server && cat/proc/fs/nfsd/portlist| grep -w rdma [root@ rpc-nfsd]#
~~~~~~~~~~~~~~~~~~~~~~~Thanks,
Yongcheng--- nfs.conf | 1 + utils/nfsd/nfsd.c | 9 ++++++++- utils/nfsd/nfsd.man | 6 +++++- 3 files changed, 14 insertions(+), 2 deletions(-)nfs.conf +1
-0@@ -63,6 +63,7 @@ # vers4.1=y # vers4.2=y # rdma=n +# rdma-port=20049 # [statd] # debug=0utils/nfsd/nfsd.c +8
-1@@ -92,7 +92,14 @@ main(int argc, char **argv) port =conf_get_str ("nfsd" ,"port" );if (!port) port ="nfs" ; - rdma_port =conf_get_str ("nfsd" ,"rdma" ); +if (conf_get_bool ("nfsd" ,"rdma" , false)) { + rdma_port =conf_get_str ("nfsd" ,"rdma-port" ); +if (!rdma_port) + rdma_port ="nfsrdma" ; + } +/* backward compatibility - nfs.conf used to set rdma port directly */ +if (!rdma_port) + rdma_port =conf_get_str ("nfsd" ,"rdma" );if (conf_get_bool ("nfsd" ,"udp" ,NFSCTL_UDPISSET (protobits)))NFSCTL_UDPSET (protobits);else utils/nfsd/nfsd.man +5
-1@@ -144,7 +144,11 @@ The lease time for NFSv4, in seconds. Set the port for TCP/UDP to bind to. .TP .B rdma -Set RDMA port. Use "rdma=nfsrdma" to enable standard port. +Enable RDMA port (with "on" or "yes" etc) on the standard port +("nfsrdma", port 20049). +.TP +.B rdma-port +Set an alternate RDMA port. .TP .B UDP Enable (with "on" or "yes" etc) or disable ("off", "no") UDP support.