[PATCH 0/3] nfsdctl: add support for new lockd configuration interface

[PATCH 0/3] nfsdctl: add support for new lockd configuration interface

[Jeff Layton]

This patch series adds support for the new lockd configuration interface
that should fix this RH bug:

    https://issues.redhat.com/browse/RHEL-71698

There are some other improvements here too, notably a switch to xlog.
Only lightly tested, but seems to do the right thing.

Port handling with lockd still needs more work. Currently that is
usually configured by rpc.statd. I think we need to convert it to
use netlink to configure the ports as well, when it's able.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
Jeff Layton (3):
      nfsdctl: convert to xlog()
      nfsdctl: fix the --version option
      nfsdctl: add necessary bits to configure lockd

 configure.ac                  |   4 +
 utils/nfsdctl/lockd_netlink.h |  29 ++++
 utils/nfsdctl/nfsdctl.adoc    |   8 ++
 utils/nfsdctl/nfsdctl.c       | 323 ++++++++++++++++++++++++++++++++++--------
 4 files changed, 301 insertions(+), 63 deletions(-)
---
base-commit: 3423eb18c80db7ac2bfebe10b1e2e9586b84679b
change-id: 20250109-lockd-nl-6272fa9e8a5d

Best regards,
-- 
Jeff Layton <jlayton@kernel.org>

[PATCH 1/3] nfsdctl: convert to xlog()

[Jeff Layton]

Convert all of the fprintf(stderr, ...) calls to xlog(L_ERROR, ...)
calls.  Change the -d option to not take an argument, and add a -s
option that will make nfsdctl log to syslog instead of stderr.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
 utils/nfsdctl/nfsdctl.adoc |   3 ++
 utils/nfsdctl/nfsdctl.c    | 103 ++++++++++++++++++++++++---------------------
 2 files changed, 59 insertions(+), 47 deletions(-)

diff --git a/utils/nfsdctl/nfsdctl.adoc b/utils/nfsdctl/nfsdctl.adoc
index c5921458a8e81e749d264cc7dd8344889ec71ac5..2114693042594297b7c5d8600ca16813a0f2356c 100644
--- a/utils/nfsdctl/nfsdctl.adoc
+++ b/utils/nfsdctl/nfsdctl.adoc
@@ -30,6 +30,9 @@ To get information about different subcommand usage, pass the subcommand the
 *-h, --help*::
   Print program help text
 
+*-s, --syslog*::
+  Log to syslog instead of to stderr (the default)
+
 *-V, --version*::
   Print program version
 
diff --git a/utils/nfsdctl/nfsdctl.c b/utils/nfsdctl/nfsdctl.c
index b138f06d8b5504e4bf0362041ba36a68aeb12508..11fa4363907a0897ddf79f21916f9e25b9e88dbb 100644
--- a/utils/nfsdctl/nfsdctl.c
+++ b/utils/nfsdctl/nfsdctl.c
@@ -45,8 +45,6 @@
  * gcc -I/usr/include/libnl3/ -o <prog-name> <prog-name>.c -lnl-3 -lnl-genl-3
  */
 
-static int debug_level;
-
 struct nfs_version {
 	uint8_t	major;
 	uint8_t	minor;
@@ -390,7 +388,7 @@ static struct nl_sock *netlink_sock_alloc(void)
 		return NULL;
 
 	if (genl_connect(sock)) {
-		fprintf(stderr, "Failed to connect to generic netlink\n");
+		xlog(L_ERROR, "Failed to connect to generic netlink");
 		nl_socket_free(sock);
 		return NULL;
 	}
@@ -409,18 +407,18 @@ static struct nl_msg *netlink_msg_alloc(struct nl_sock *sock)
 
 	id = genl_ctrl_resolve(sock, NFSD_FAMILY_NAME);
 	if (id < 0) {
-		fprintf(stderr, "%s not found\n", NFSD_FAMILY_NAME);
+		xlog(L_ERROR, "%s not found", NFSD_FAMILY_NAME);
 		return NULL;
 	}
 
 	msg = nlmsg_alloc();
 	if (!msg) {
-		fprintf(stderr, "failed to allocate netlink message\n");
+		xlog(L_ERROR, "failed to allocate netlink message");
 		return NULL;
 	}
 
 	if (!genlmsg_put(msg, 0, 0, id, 0, 0, 0, 0)) {
-		fprintf(stderr, "failed to allocate netlink message\n");
+		xlog(L_ERROR, "failed to allocate netlink message");
 		nlmsg_free(msg);
 		return NULL;
 	}
@@ -462,7 +460,7 @@ static int status_func(struct nl_sock *sock, int argc, char ** argv)
 
 	cb = nl_cb_alloc(NL_CB_CUSTOM);
 	if (!cb) {
-		fprintf(stderr, "failed to allocate netlink callbacks\n");
+		xlog(L_ERROR, "failed to allocate netlink callbacks");
 		ret = 1;
 		goto out;
 	}
@@ -480,7 +478,7 @@ static int status_func(struct nl_sock *sock, int argc, char ** argv)
 	while (ret > 0)
 		nl_recvmsgs(sock, cb);
 	if (ret < 0) {
-		fprintf(stderr, "Error: %s\n", strerror(-ret));
+		xlog(L_ERROR, "Error: %s", strerror(-ret));
 		ret = 1;
 	}
 out_cb:
@@ -521,14 +519,14 @@ static int threads_doit(struct nl_sock *sock, int cmd, int grace, int lease,
 
 	cb = nl_cb_alloc(NL_CB_CUSTOM);
 	if (!cb) {
-		fprintf(stderr, "failed to allocate netlink callbacks\n");
+		xlog(L_ERROR, "failed to allocate netlink callbacks");
 		ret = 1;
 		goto out;
 	}
 
 	ret = nl_send_auto(sock, msg);
 	if (ret < 0) {
-		fprintf(stderr, "send failed (%d)!\n", ret);
+		xlog(L_ERROR, "send failed (%d)!", ret);
 		goto out_cb;
 	}
 
@@ -541,7 +539,7 @@ static int threads_doit(struct nl_sock *sock, int cmd, int grace, int lease,
 	while (ret > 0)
 		nl_recvmsgs(sock, cb);
 	if (ret < 0) {
-		fprintf(stderr, "Error: %s\n", strerror(-ret));
+		xlog(L_ERROR, "Error: %s", strerror(-ret));
 		ret = 1;
 	}
 out_cb:
@@ -586,13 +584,13 @@ static int threads_func(struct nl_sock *sock, int argc, char **argv)
 
 			/* empty string? */
 			if (targv[i][0] == '\0') {
-				fprintf(stderr, "Invalid threads value %s.\n", targv[i]);
+				xlog(L_ERROR, "Invalid threads value %s.", targv[i]);
 				return 1;
 			}
 
 			pool_threads[i] = strtol(targv[i], &endptr, 0);
 			if (!endptr || *endptr != '\0') {
-				fprintf(stderr, "Invalid threads value %s.\n", argv[1]);
+				xlog(L_ERROR, "Invalid threads value %s.", argv[1]);
 				return 1;
 			}
 		}
@@ -621,14 +619,14 @@ static int fetch_nfsd_versions(struct nl_sock *sock)
 
 	cb = nl_cb_alloc(NL_CB_CUSTOM);
 	if (!cb) {
-		fprintf(stderr, "failed to allocate netlink callbacks\n");
+		xlog(L_ERROR, "failed to allocate netlink callbacks");
 		ret = 1;
 		goto out;
 	}
 
 	ret = nl_send_auto(sock, msg);
 	if (ret < 0) {
-		fprintf(stderr, "send failed: %d\n", ret);
+		xlog(L_ERROR, "send failed: %d", ret);
 		goto out_cb;
 	}
 
@@ -641,7 +639,7 @@ static int fetch_nfsd_versions(struct nl_sock *sock)
 	while (ret > 0)
 		nl_recvmsgs(sock, cb);
 	if (ret < 0) {
-		fprintf(stderr, "Error: %s\n", strerror(-ret));
+		xlog(L_ERROR, "Error: %s", strerror(-ret));
 		ret = 1;
 	}
 out_cb:
@@ -690,7 +688,7 @@ static int set_nfsd_versions(struct nl_sock *sock)
 
 		a = nla_nest_start(msg, NLA_F_NESTED | NFSD_A_SERVER_PROTO_VERSION);
 		if (!a) {
-			fprintf(stderr, "Unable to allocate version nest!\n");
+			xlog(L_ERROR, "Unable to allocate version nest!");
 			ret = 1;
 			goto out;
 		}
@@ -707,14 +705,14 @@ static int set_nfsd_versions(struct nl_sock *sock)
 
 	cb = nl_cb_alloc(NL_CB_CUSTOM);
 	if (!cb) {
-		fprintf(stderr, "Failed to allocate netlink callbacks\n");
+		xlog(L_ERROR, "Failed to allocate netlink callbacks");
 		ret = 1;
 		goto out;
 	}
 
 	ret = nl_send_auto(sock, msg);
 	if (ret < 0) {
-		fprintf(stderr, "Send failed: %d\n", ret);
+		xlog(L_ERROR, "Send failed: %d", ret);
 		goto out_cb;
 	}
 
@@ -727,7 +725,7 @@ static int set_nfsd_versions(struct nl_sock *sock)
 	while (ret > 0)
 		nl_recvmsgs(sock, cb);
 	if (ret < 0) {
-		fprintf(stderr, "Error: %s\n", strerror(-ret));
+		xlog(L_ERROR, "Error: %s", strerror(-ret));
 		ret = 1;
 	}
 out_cb:
@@ -752,7 +750,7 @@ static int update_nfsd_version(int major, int minor, bool enabled)
 	/* the kernel doesn't support this version */
 	if (!enabled)
 		return 0;
-	fprintf(stderr, "This kernel does not support NFS version %d.%d\n", major, minor);
+	xlog(L_ERROR, "This kernel does not support NFS version %d.%d", major, minor);
 	return -EINVAL;
 }
 
@@ -794,7 +792,7 @@ static int version_func(struct nl_sock *sock, int argc, char ** argv)
 
 			ret = sscanf(str, "%c%d.%d\n", &sign, &major, &minor);
 			if (ret < 2) {
-				fprintf(stderr, "Invalid version string (%d) %s\n", ret, str);
+				xlog(L_ERROR, "Invalid version string (%d) %s", ret, str);
 				return -EINVAL;
 			}
 
@@ -806,7 +804,7 @@ static int version_func(struct nl_sock *sock, int argc, char ** argv)
 				enabled = false;
 				break;
 			default:
-				fprintf(stderr, "Invalid version string %s\n", str);
+				xlog(L_ERROR, "Invalid version string %s", str);
 				return -EINVAL;
 			}
 
@@ -839,14 +837,14 @@ static int fetch_current_listeners(struct nl_sock *sock)
 
 	cb = nl_cb_alloc(NL_CB_CUSTOM);
 	if (!cb) {
-		fprintf(stderr, "failed to allocate netlink callbacks\n");
+		xlog(L_ERROR, "failed to allocate netlink callbacks");
 		ret = 1;
 		goto out;
 	}
 
 	ret = nl_send_auto(sock, msg);
 	if (ret < 0) {
-		fprintf(stderr, "send failed: %d\n", ret);
+		xlog(L_ERROR, "send failed: %d", ret);
 		goto out_cb;
 	}
 
@@ -859,7 +857,7 @@ static int fetch_current_listeners(struct nl_sock *sock)
 	while (ret > 0)
 		nl_recvmsgs(sock, cb);
 	if (ret < 0) {
-		fprintf(stderr, "Error: %s\n", strerror(-ret));
+		xlog(L_ERROR, "Error: %s", strerror(-ret));
 		ret = 1;
 	}
 out_cb:
@@ -994,7 +992,7 @@ static int update_listeners(const char *str)
 	 */
 	ret = getaddrinfo(addr, port, &hints, &res);
 	if (ret) {
-		fprintf(stderr, "getaddrinfo of \"%s\" failed: %s\n",
+		xlog(L_ERROR, "getaddrinfo of \"%s\" failed: %s",
 			addr, gai_strerror(ret));
 		return -EINVAL;
 	}
@@ -1046,7 +1044,7 @@ static int update_listeners(const char *str)
 	}
 	return 0;
 out_inval:
-	fprintf(stderr, "Invalid listener update string: %s", str);
+	xlog(L_ERROR, "Invalid listener update string: %s", str);
 	return -EINVAL;
 }
 
@@ -1076,7 +1074,7 @@ static int set_listeners(struct nl_sock *sock)
 
 		a = nla_nest_start(msg, NLA_F_NESTED | NFSD_A_SERVER_SOCK_ADDR);
 		if (!a) {
-			fprintf(stderr, "Unable to allocate listener nest!\n");
+			xlog(L_ERROR, "Unable to allocate listener nest!");
 			ret = 1;
 			goto out;
 		}
@@ -1091,14 +1089,14 @@ static int set_listeners(struct nl_sock *sock)
 
 	cb = nl_cb_alloc(NL_CB_CUSTOM);
 	if (!cb) {
-		fprintf(stderr, "Failed to allocate netlink callbacks\n");
+		xlog(L_ERROR, "Failed to allocate netlink callbacks");
 		ret = 1;
 		goto out;
 	}
 
 	ret = nl_send_auto(sock, msg);
 	if (ret < 0) {
-		fprintf(stderr, "Send failed: %d\n", ret);
+		xlog(L_ERROR, "Send failed: %d", ret);
 		goto out_cb;
 	}
 
@@ -1111,7 +1109,7 @@ static int set_listeners(struct nl_sock *sock)
 	while (ret > 0)
 		nl_recvmsgs(sock, cb);
 	if (ret < 0) {
-		fprintf(stderr, "Error: %s\n", strerror(-ret));
+		xlog(L_ERROR, "Error: %s", strerror(-ret));
 		ret = 1;
 	}
 out_cb:
@@ -1188,14 +1186,14 @@ static int pool_mode_doit(struct nl_sock *sock, int cmd, const char *pool_mode)
 
 	cb = nl_cb_alloc(NL_CB_CUSTOM);
 	if (!cb) {
-		fprintf(stderr, "failed to allocate netlink callbacks\n");
+		xlog(L_ERROR, "failed to allocate netlink callbacks");
 		ret = 1;
 		goto out;
 	}
 
 	ret = nl_send_auto(sock, msg);
 	if (ret < 0) {
-		fprintf(stderr, "send failed (%d)!\n", ret);
+		xlog(L_ERROR, "send failed (%d)!", ret);
 		goto out_cb;
 	}
 
@@ -1208,7 +1206,7 @@ static int pool_mode_doit(struct nl_sock *sock, int cmd, const char *pool_mode)
 	while (ret > 0)
 		nl_recvmsgs(sock, cb);
 	if (ret < 0) {
-		fprintf(stderr, "Error: %s\n", strerror(-ret));
+		xlog(L_ERROR, "Error: %s", strerror(-ret));
 		ret = 1;
 	}
 out_cb:
@@ -1245,7 +1243,7 @@ static int pool_mode_func(struct nl_sock *sock, int argc, char **argv)
 
 		/* empty string? */
 		if (*targv[0] == '\0') {
-			fprintf(stderr, "Invalid threads value %s.\n", targv[0]);
+			xlog(L_ERROR, "Invalid threads value %s.", targv[0]);
 			return 1;
 		}
 		pool_mode = targv[0];
@@ -1397,7 +1395,7 @@ static int autostart_func(struct nl_sock *sock, int argc, char ** argv)
 
 			threads[idx++] = strtol(n->field, &endptr, 0);
 			if (!endptr || *endptr != '\0') {
-				fprintf(stderr, "Invalid threads value %s.\n", n->field);
+				xlog(L_ERROR, "Invalid threads value %s.", n->field);
 				ret = -EINVAL;
 				goto out;
 			}
@@ -1470,7 +1468,8 @@ static void usage(void)
 /* Options given before the command string */
 static const struct option pre_options[] = {
 	{ "help", no_argument, NULL, 'h' },
-	{ "debug", required_argument, NULL, 'd' },
+	{ "debug", no_argument, NULL, 'd' },
+	{ "syslog", no_argument, NULL, 's' },
 	{ "version", no_argument, NULL, 'V' },
 	{ },
 };
@@ -1524,7 +1523,7 @@ static int run_commandline(struct nl_sock *sock)
 		if (!ret)
 			ret = run_one_command(sock, argc, argv);
 		if (ret)
-			fprintf(stderr, "Error: %s\n", strerror(ret));
+			xlog(L_ERROR, "Error: %s", strerror(ret));
 		free(line);
 	}
 	return 0;
@@ -1533,23 +1532,25 @@ static int run_commandline(struct nl_sock *sock)
 int main(int argc, char **argv)
 {
 	int opt, ret;
-	struct nl_sock *sock = netlink_sock_alloc();
-
-	if (!sock) {
-		fprintf(stderr, "Unable to allocate netlink socket!");
-		return 1;
-	}
+	struct nl_sock *sock;
 
 	taskname = argv[0];
 
+	xlog_syslog(0);
+	xlog_stderr(1);
+
 	/* Parse the preliminary options */
-	while ((opt = getopt_long(argc, argv, "+hd:V", pre_options, NULL)) != -1) {
+	while ((opt = getopt_long(argc, argv, "+hdsV", pre_options, NULL)) != -1) {
 		switch (opt) {
 		case 'h':
 			usage();
 			return 0;
 		case 'd':
-			debug_level = atoi(optarg);
+			xlog_config(D_ALL, 1);
+			break;
+		case 's':
+			xlog_syslog(1);
+			xlog_stderr(0);
 			break;
 		case 'V':
 			// FIXME: print_version();
@@ -1557,6 +1558,14 @@ int main(int argc, char **argv)
 		}
 	}
 
+	xlog_open(basename(argv[0]));
+
+	sock = netlink_sock_alloc();
+	if (!sock) {
+		xlog(L_ERROR, "Unable to allocate netlink socket!");
+		return 1;
+	}
+
 	if (optind > argc) {
 		usage();
 		return 1;

-- 
2.47.1

Re: [PATCH 1/3] nfsdctl: convert to xlog()

[Scott Mayhew]

On Thu, 09 Jan 2025, Jeff Layton wrote:

> Convert all of the fprintf(stderr, ...) calls to xlog(L_ERROR, ...)
> calls.  Change the -d option to not take an argument, and add a -s
> option that will make nfsdctl log to syslog instead of stderr.

I think there should be few xlog(D_GENERAL) calls, otherwise we'll wind
up getting bug reports from users saying they turned on debug logging
and they're not getting any output.  I was working on a similar patch,
with before each of the nl_send_auto() calls.

xlog(D_GENERAL, "%s: sending netlink message", __func__);

Even a single "nfsdctl started" log message would be better than
nothing.

> 
> Signed-off-by: Jeff Layton <jlayton@kernel.org>
> ---
>  utils/nfsdctl/nfsdctl.adoc |   3 ++
>  utils/nfsdctl/nfsdctl.c    | 103 ++++++++++++++++++++++++---------------------
>  2 files changed, 59 insertions(+), 47 deletions(-)
> 
> diff --git a/utils/nfsdctl/nfsdctl.adoc b/utils/nfsdctl/nfsdctl.adoc
> index c5921458a8e81e749d264cc7dd8344889ec71ac5..2114693042594297b7c5d8600ca16813a0f2356c 100644
> --- a/utils/nfsdctl/nfsdctl.adoc
> +++ b/utils/nfsdctl/nfsdctl.adoc
> @@ -30,6 +30,9 @@ To get information about different subcommand usage, pass the subcommand the
>  *-h, --help*::
>    Print program help text
>  
> +*-s, --syslog*::
> +  Log to syslog instead of to stderr (the default)
> +
>  *-V, --version*::
>    Print program version
>  

You updated the adoc file but didn't regenerate the man page.

> diff --git a/utils/nfsdctl/nfsdctl.c b/utils/nfsdctl/nfsdctl.c
> index b138f06d8b5504e4bf0362041ba36a68aeb12508..11fa4363907a0897ddf79f21916f9e25b9e88dbb 100644
> --- a/utils/nfsdctl/nfsdctl.c
> +++ b/utils/nfsdctl/nfsdctl.c
> @@ -45,8 +45,6 @@
>   * gcc -I/usr/include/libnl3/ -o <prog-name> <prog-name>.c -lnl-3 -lnl-genl-3
>   */
>  
> -static int debug_level;
> -
>  struct nfs_version {
>  	uint8_t	major;
>  	uint8_t	minor;
> @@ -390,7 +388,7 @@ static struct nl_sock *netlink_sock_alloc(void)
>  		return NULL;
>  
>  	if (genl_connect(sock)) {
> -		fprintf(stderr, "Failed to connect to generic netlink\n");
> +		xlog(L_ERROR, "Failed to connect to generic netlink");
>  		nl_socket_free(sock);
>  		return NULL;
>  	}
> @@ -409,18 +407,18 @@ static struct nl_msg *netlink_msg_alloc(struct nl_sock *sock)
>  
>  	id = genl_ctrl_resolve(sock, NFSD_FAMILY_NAME);
>  	if (id < 0) {
> -		fprintf(stderr, "%s not found\n", NFSD_FAMILY_NAME);
> +		xlog(L_ERROR, "%s not found", NFSD_FAMILY_NAME);
>  		return NULL;
>  	}
>  
>  	msg = nlmsg_alloc();
>  	if (!msg) {
> -		fprintf(stderr, "failed to allocate netlink message\n");
> +		xlog(L_ERROR, "failed to allocate netlink message");
>  		return NULL;
>  	}
>  
>  	if (!genlmsg_put(msg, 0, 0, id, 0, 0, 0, 0)) {
> -		fprintf(stderr, "failed to allocate netlink message\n");
> +		xlog(L_ERROR, "failed to allocate netlink message");
>  		nlmsg_free(msg);
>  		return NULL;
>  	}
> @@ -462,7 +460,7 @@ static int status_func(struct nl_sock *sock, int argc, char ** argv)
>  
>  	cb = nl_cb_alloc(NL_CB_CUSTOM);
>  	if (!cb) {
> -		fprintf(stderr, "failed to allocate netlink callbacks\n");
> +		xlog(L_ERROR, "failed to allocate netlink callbacks");
>  		ret = 1;
>  		goto out;
>  	}
> @@ -480,7 +478,7 @@ static int status_func(struct nl_sock *sock, int argc, char ** argv)
>  	while (ret > 0)
>  		nl_recvmsgs(sock, cb);
>  	if (ret < 0) {
> -		fprintf(stderr, "Error: %s\n", strerror(-ret));
> +		xlog(L_ERROR, "Error: %s", strerror(-ret));
>  		ret = 1;
>  	}
>  out_cb:
> @@ -521,14 +519,14 @@ static int threads_doit(struct nl_sock *sock, int cmd, int grace, int lease,
>  
>  	cb = nl_cb_alloc(NL_CB_CUSTOM);
>  	if (!cb) {
> -		fprintf(stderr, "failed to allocate netlink callbacks\n");
> +		xlog(L_ERROR, "failed to allocate netlink callbacks");
>  		ret = 1;
>  		goto out;
>  	}
>  
>  	ret = nl_send_auto(sock, msg);
>  	if (ret < 0) {
> -		fprintf(stderr, "send failed (%d)!\n", ret);
> +		xlog(L_ERROR, "send failed (%d)!", ret);
>  		goto out_cb;
>  	}
>  
> @@ -541,7 +539,7 @@ static int threads_doit(struct nl_sock *sock, int cmd, int grace, int lease,
>  	while (ret > 0)
>  		nl_recvmsgs(sock, cb);
>  	if (ret < 0) {
> -		fprintf(stderr, "Error: %s\n", strerror(-ret));
> +		xlog(L_ERROR, "Error: %s", strerror(-ret));
>  		ret = 1;
>  	}
>  out_cb:
> @@ -586,13 +584,13 @@ static int threads_func(struct nl_sock *sock, int argc, char **argv)
>  
>  			/* empty string? */
>  			if (targv[i][0] == '\0') {
> -				fprintf(stderr, "Invalid threads value %s.\n", targv[i]);
> +				xlog(L_ERROR, "Invalid threads value %s.", targv[i]);
>  				return 1;
>  			}
>  
>  			pool_threads[i] = strtol(targv[i], &endptr, 0);
>  			if (!endptr || *endptr != '\0') {
> -				fprintf(stderr, "Invalid threads value %s.\n", argv[1]);
> +				xlog(L_ERROR, "Invalid threads value %s.", argv[1]);
>  				return 1;
>  			}
>  		}
> @@ -621,14 +619,14 @@ static int fetch_nfsd_versions(struct nl_sock *sock)
>  
>  	cb = nl_cb_alloc(NL_CB_CUSTOM);
>  	if (!cb) {
> -		fprintf(stderr, "failed to allocate netlink callbacks\n");
> +		xlog(L_ERROR, "failed to allocate netlink callbacks");
>  		ret = 1;
>  		goto out;
>  	}
>  
>  	ret = nl_send_auto(sock, msg);
>  	if (ret < 0) {
> -		fprintf(stderr, "send failed: %d\n", ret);
> +		xlog(L_ERROR, "send failed: %d", ret);
>  		goto out_cb;
>  	}
>  
> @@ -641,7 +639,7 @@ static int fetch_nfsd_versions(struct nl_sock *sock)
>  	while (ret > 0)
>  		nl_recvmsgs(sock, cb);
>  	if (ret < 0) {
> -		fprintf(stderr, "Error: %s\n", strerror(-ret));
> +		xlog(L_ERROR, "Error: %s", strerror(-ret));
>  		ret = 1;
>  	}
>  out_cb:
> @@ -690,7 +688,7 @@ static int set_nfsd_versions(struct nl_sock *sock)
>  
>  		a = nla_nest_start(msg, NLA_F_NESTED | NFSD_A_SERVER_PROTO_VERSION);
>  		if (!a) {
> -			fprintf(stderr, "Unable to allocate version nest!\n");
> +			xlog(L_ERROR, "Unable to allocate version nest!");
>  			ret = 1;
>  			goto out;
>  		}
> @@ -707,14 +705,14 @@ static int set_nfsd_versions(struct nl_sock *sock)
>  
>  	cb = nl_cb_alloc(NL_CB_CUSTOM);
>  	if (!cb) {
> -		fprintf(stderr, "Failed to allocate netlink callbacks\n");
> +		xlog(L_ERROR, "Failed to allocate netlink callbacks");
>  		ret = 1;
>  		goto out;
>  	}
>  
>  	ret = nl_send_auto(sock, msg);
>  	if (ret < 0) {
> -		fprintf(stderr, "Send failed: %d\n", ret);
> +		xlog(L_ERROR, "Send failed: %d", ret);
>  		goto out_cb;
>  	}
>  
> @@ -727,7 +725,7 @@ static int set_nfsd_versions(struct nl_sock *sock)
>  	while (ret > 0)
>  		nl_recvmsgs(sock, cb);
>  	if (ret < 0) {
> -		fprintf(stderr, "Error: %s\n", strerror(-ret));
> +		xlog(L_ERROR, "Error: %s", strerror(-ret));
>  		ret = 1;
>  	}
>  out_cb:
> @@ -752,7 +750,7 @@ static int update_nfsd_version(int major, int minor, bool enabled)
>  	/* the kernel doesn't support this version */
>  	if (!enabled)
>  		return 0;
> -	fprintf(stderr, "This kernel does not support NFS version %d.%d\n", major, minor);
> +	xlog(L_ERROR, "This kernel does not support NFS version %d.%d", major, minor);
>  	return -EINVAL;
>  }
>  
> @@ -794,7 +792,7 @@ static int version_func(struct nl_sock *sock, int argc, char ** argv)
>  
>  			ret = sscanf(str, "%c%d.%d\n", &sign, &major, &minor);
>  			if (ret < 2) {
> -				fprintf(stderr, "Invalid version string (%d) %s\n", ret, str);
> +				xlog(L_ERROR, "Invalid version string (%d) %s", ret, str);
>  				return -EINVAL;
>  			}
>  
> @@ -806,7 +804,7 @@ static int version_func(struct nl_sock *sock, int argc, char ** argv)
>  				enabled = false;
>  				break;
>  			default:
> -				fprintf(stderr, "Invalid version string %s\n", str);
> +				xlog(L_ERROR, "Invalid version string %s", str);
>  				return -EINVAL;
>  			}
>  
> @@ -839,14 +837,14 @@ static int fetch_current_listeners(struct nl_sock *sock)
>  
>  	cb = nl_cb_alloc(NL_CB_CUSTOM);
>  	if (!cb) {
> -		fprintf(stderr, "failed to allocate netlink callbacks\n");
> +		xlog(L_ERROR, "failed to allocate netlink callbacks");
>  		ret = 1;
>  		goto out;
>  	}
>  
>  	ret = nl_send_auto(sock, msg);
>  	if (ret < 0) {
> -		fprintf(stderr, "send failed: %d\n", ret);
> +		xlog(L_ERROR, "send failed: %d", ret);
>  		goto out_cb;
>  	}
>  
> @@ -859,7 +857,7 @@ static int fetch_current_listeners(struct nl_sock *sock)
>  	while (ret > 0)
>  		nl_recvmsgs(sock, cb);
>  	if (ret < 0) {
> -		fprintf(stderr, "Error: %s\n", strerror(-ret));
> +		xlog(L_ERROR, "Error: %s", strerror(-ret));
>  		ret = 1;
>  	}
>  out_cb:
> @@ -994,7 +992,7 @@ static int update_listeners(const char *str)
>  	 */
>  	ret = getaddrinfo(addr, port, &hints, &res);
>  	if (ret) {
> -		fprintf(stderr, "getaddrinfo of \"%s\" failed: %s\n",
> +		xlog(L_ERROR, "getaddrinfo of \"%s\" failed: %s",
>  			addr, gai_strerror(ret));
>  		return -EINVAL;
>  	}
> @@ -1046,7 +1044,7 @@ static int update_listeners(const char *str)
>  	}
>  	return 0;
>  out_inval:
> -	fprintf(stderr, "Invalid listener update string: %s", str);
> +	xlog(L_ERROR, "Invalid listener update string: %s", str);
>  	return -EINVAL;
>  }
>  
> @@ -1076,7 +1074,7 @@ static int set_listeners(struct nl_sock *sock)
>  
>  		a = nla_nest_start(msg, NLA_F_NESTED | NFSD_A_SERVER_SOCK_ADDR);
>  		if (!a) {
> -			fprintf(stderr, "Unable to allocate listener nest!\n");
> +			xlog(L_ERROR, "Unable to allocate listener nest!");
>  			ret = 1;
>  			goto out;
>  		}
> @@ -1091,14 +1089,14 @@ static int set_listeners(struct nl_sock *sock)
>  
>  	cb = nl_cb_alloc(NL_CB_CUSTOM);
>  	if (!cb) {
> -		fprintf(stderr, "Failed to allocate netlink callbacks\n");
> +		xlog(L_ERROR, "Failed to allocate netlink callbacks");
>  		ret = 1;
>  		goto out;
>  	}
>  
>  	ret = nl_send_auto(sock, msg);
>  	if (ret < 0) {
> -		fprintf(stderr, "Send failed: %d\n", ret);
> +		xlog(L_ERROR, "Send failed: %d", ret);
>  		goto out_cb;
>  	}
>  
> @@ -1111,7 +1109,7 @@ static int set_listeners(struct nl_sock *sock)
>  	while (ret > 0)
>  		nl_recvmsgs(sock, cb);
>  	if (ret < 0) {
> -		fprintf(stderr, "Error: %s\n", strerror(-ret));
> +		xlog(L_ERROR, "Error: %s", strerror(-ret));
>  		ret = 1;
>  	}
>  out_cb:
> @@ -1188,14 +1186,14 @@ static int pool_mode_doit(struct nl_sock *sock, int cmd, const char *pool_mode)
>  
>  	cb = nl_cb_alloc(NL_CB_CUSTOM);
>  	if (!cb) {
> -		fprintf(stderr, "failed to allocate netlink callbacks\n");
> +		xlog(L_ERROR, "failed to allocate netlink callbacks");
>  		ret = 1;
>  		goto out;
>  	}
>  
>  	ret = nl_send_auto(sock, msg);
>  	if (ret < 0) {
> -		fprintf(stderr, "send failed (%d)!\n", ret);
> +		xlog(L_ERROR, "send failed (%d)!", ret);
>  		goto out_cb;
>  	}
>  
> @@ -1208,7 +1206,7 @@ static int pool_mode_doit(struct nl_sock *sock, int cmd, const char *pool_mode)
>  	while (ret > 0)
>  		nl_recvmsgs(sock, cb);
>  	if (ret < 0) {
> -		fprintf(stderr, "Error: %s\n", strerror(-ret));
> +		xlog(L_ERROR, "Error: %s", strerror(-ret));
>  		ret = 1;
>  	}
>  out_cb:
> @@ -1245,7 +1243,7 @@ static int pool_mode_func(struct nl_sock *sock, int argc, char **argv)
>  
>  		/* empty string? */
>  		if (*targv[0] == '\0') {
> -			fprintf(stderr, "Invalid threads value %s.\n", targv[0]);
> +			xlog(L_ERROR, "Invalid threads value %s.", targv[0]);
>  			return 1;
>  		}
>  		pool_mode = targv[0];
> @@ -1397,7 +1395,7 @@ static int autostart_func(struct nl_sock *sock, int argc, char ** argv)
>  
>  			threads[idx++] = strtol(n->field, &endptr, 0);
>  			if (!endptr || *endptr != '\0') {
> -				fprintf(stderr, "Invalid threads value %s.\n", n->field);
> +				xlog(L_ERROR, "Invalid threads value %s.", n->field);
>  				ret = -EINVAL;
>  				goto out;
>  			}
> @@ -1470,7 +1468,8 @@ static void usage(void)

You missed some other changes in the usage() function (some boilerplate
stuff in the printf's).

-Scott
>  /* Options given before the command string */
>  static const struct option pre_options[] = {
>  	{ "help", no_argument, NULL, 'h' },
> -	{ "debug", required_argument, NULL, 'd' },
> +	{ "debug", no_argument, NULL, 'd' },
> +	{ "syslog", no_argument, NULL, 's' },
>  	{ "version", no_argument, NULL, 'V' },
>  	{ },
>  };
> @@ -1524,7 +1523,7 @@ static int run_commandline(struct nl_sock *sock)
>  		if (!ret)
>  			ret = run_one_command(sock, argc, argv);
>  		if (ret)
> -			fprintf(stderr, "Error: %s\n", strerror(ret));
> +			xlog(L_ERROR, "Error: %s", strerror(ret));
>  		free(line);
>  	}
>  	return 0;
> @@ -1533,23 +1532,25 @@ static int run_commandline(struct nl_sock *sock)
>  int main(int argc, char **argv)
>  {
>  	int opt, ret;
> -	struct nl_sock *sock = netlink_sock_alloc();
> -
> -	if (!sock) {
> -		fprintf(stderr, "Unable to allocate netlink socket!");
> -		return 1;
> -	}
> +	struct nl_sock *sock;
>  
>  	taskname = argv[0];
>  
> +	xlog_syslog(0);
> +	xlog_stderr(1);
> +
>  	/* Parse the preliminary options */
> -	while ((opt = getopt_long(argc, argv, "+hd:V", pre_options, NULL)) != -1) {
> +	while ((opt = getopt_long(argc, argv, "+hdsV", pre_options, NULL)) != -1) {
>  		switch (opt) {
>  		case 'h':
>  			usage();
>  			return 0;
>  		case 'd':
> -			debug_level = atoi(optarg);
> +			xlog_config(D_ALL, 1);
> +			break;
> +		case 's':
> +			xlog_syslog(1);
> +			xlog_stderr(0);
>  			break;
>  		case 'V':
>  			// FIXME: print_version();
> @@ -1557,6 +1558,14 @@ int main(int argc, char **argv)
>  		}
>  	}
>  
> +	xlog_open(basename(argv[0]));
> +
> +	sock = netlink_sock_alloc();
> +	if (!sock) {
> +		xlog(L_ERROR, "Unable to allocate netlink socket!");
> +		return 1;
> +	}
> +
>  	if (optind > argc) {
>  		usage();
>  		return 1;
> 
> -- 
> 2.47.1
> 

Re: [PATCH 1/3] nfsdctl: convert to xlog()

[Jeff Layton]

On Thu, 2025-01-09 at 15:29 -0500, Scott Mayhew wrote:
> On Thu, 09 Jan 2025, Jeff Layton wrote:
> 
> > Convert all of the fprintf(stderr, ...) calls to xlog(L_ERROR, ...)
> > calls.  Change the -d option to not take an argument, and add a -s
> > option that will make nfsdctl log to syslog instead of stderr.
> 
> I think there should be few xlog(D_GENERAL) calls, otherwise we'll wind
> up getting bug reports from users saying they turned on debug logging
> and they're not getting any output.  I was working on a similar patch,
> with before each of the nl_send_auto() calls.
> 
> xlog(D_GENERAL, "%s: sending netlink message", __func__);
> 
> Even a single "nfsdctl started" log message would be better than
> nothing.
> 

Good point. The autostart one, in particular probably needs something.

> > 
> > Signed-off-by: Jeff Layton <jlayton@kernel.org>
> > ---
> >  utils/nfsdctl/nfsdctl.adoc |   3 ++
> >  utils/nfsdctl/nfsdctl.c    | 103 ++++++++++++++++++++++++---------------------
> >  2 files changed, 59 insertions(+), 47 deletions(-)
> > 
> > diff --git a/utils/nfsdctl/nfsdctl.adoc b/utils/nfsdctl/nfsdctl.adoc
> > index c5921458a8e81e749d264cc7dd8344889ec71ac5..2114693042594297b7c5d8600ca16813a0f2356c 100644
> > --- a/utils/nfsdctl/nfsdctl.adoc
> > +++ b/utils/nfsdctl/nfsdctl.adoc
> > @@ -30,6 +30,9 @@ To get information about different subcommand usage, pass the subcommand the
> >  *-h, --help*::
> >    Print program help text
> >  
> > +*-s, --syslog*::
> > +  Log to syslog instead of to stderr (the default)
> > +
> >  *-V, --version*::
> >    Print program version
> >  
> 
> You updated the adoc file but didn't regenerate the man page.
> 

Yeah, forgot to git add it. I'll include it in the next version.

> > diff --git a/utils/nfsdctl/nfsdctl.c b/utils/nfsdctl/nfsdctl.c
> > index b138f06d8b5504e4bf0362041ba36a68aeb12508..11fa4363907a0897ddf79f21916f9e25b9e88dbb 100644
> > --- a/utils/nfsdctl/nfsdctl.c
> > +++ b/utils/nfsdctl/nfsdctl.c
> > @@ -45,8 +45,6 @@
> >   * gcc -I/usr/include/libnl3/ -o <prog-name> <prog-name>.c -lnl-3 -lnl-genl-3
> >   */
> >  
> > -static int debug_level;
> > -
> >  struct nfs_version {
> >  	uint8_t	major;
> >  	uint8_t	minor;
> > @@ -390,7 +388,7 @@ static struct nl_sock *netlink_sock_alloc(void)
> >  		return NULL;
> >  
> >  	if (genl_connect(sock)) {
> > -		fprintf(stderr, "Failed to connect to generic netlink\n");
> > +		xlog(L_ERROR, "Failed to connect to generic netlink");
> >  		nl_socket_free(sock);
> >  		return NULL;
> >  	}
> > @@ -409,18 +407,18 @@ static struct nl_msg *netlink_msg_alloc(struct nl_sock *sock)
> >  
> >  	id = genl_ctrl_resolve(sock, NFSD_FAMILY_NAME);
> >  	if (id < 0) {
> > -		fprintf(stderr, "%s not found\n", NFSD_FAMILY_NAME);
> > +		xlog(L_ERROR, "%s not found", NFSD_FAMILY_NAME);
> >  		return NULL;
> >  	}
> >  
> >  	msg = nlmsg_alloc();
> >  	if (!msg) {
> > -		fprintf(stderr, "failed to allocate netlink message\n");
> > +		xlog(L_ERROR, "failed to allocate netlink message");
> >  		return NULL;
> >  	}
> >  
> >  	if (!genlmsg_put(msg, 0, 0, id, 0, 0, 0, 0)) {
> > -		fprintf(stderr, "failed to allocate netlink message\n");
> > +		xlog(L_ERROR, "failed to allocate netlink message");
> >  		nlmsg_free(msg);
> >  		return NULL;
> >  	}
> > @@ -462,7 +460,7 @@ static int status_func(struct nl_sock *sock, int argc, char ** argv)
> >  
> >  	cb = nl_cb_alloc(NL_CB_CUSTOM);
> >  	if (!cb) {
> > -		fprintf(stderr, "failed to allocate netlink callbacks\n");
> > +		xlog(L_ERROR, "failed to allocate netlink callbacks");
> >  		ret = 1;
> >  		goto out;
> >  	}
> > @@ -480,7 +478,7 @@ static int status_func(struct nl_sock *sock, int argc, char ** argv)
> >  	while (ret > 0)
> >  		nl_recvmsgs(sock, cb);
> >  	if (ret < 0) {
> > -		fprintf(stderr, "Error: %s\n", strerror(-ret));
> > +		xlog(L_ERROR, "Error: %s", strerror(-ret));
> >  		ret = 1;
> >  	}
> >  out_cb:
> > @@ -521,14 +519,14 @@ static int threads_doit(struct nl_sock *sock, int cmd, int grace, int lease,
> >  
> >  	cb = nl_cb_alloc(NL_CB_CUSTOM);
> >  	if (!cb) {
> > -		fprintf(stderr, "failed to allocate netlink callbacks\n");
> > +		xlog(L_ERROR, "failed to allocate netlink callbacks");
> >  		ret = 1;
> >  		goto out;
> >  	}
> >  
> >  	ret = nl_send_auto(sock, msg);
> >  	if (ret < 0) {
> > -		fprintf(stderr, "send failed (%d)!\n", ret);
> > +		xlog(L_ERROR, "send failed (%d)!", ret);
> >  		goto out_cb;
> >  	}
> >  
> > @@ -541,7 +539,7 @@ static int threads_doit(struct nl_sock *sock, int cmd, int grace, int lease,
> >  	while (ret > 0)
> >  		nl_recvmsgs(sock, cb);
> >  	if (ret < 0) {
> > -		fprintf(stderr, "Error: %s\n", strerror(-ret));
> > +		xlog(L_ERROR, "Error: %s", strerror(-ret));
> >  		ret = 1;
> >  	}
> >  out_cb:
> > @@ -586,13 +584,13 @@ static int threads_func(struct nl_sock *sock, int argc, char **argv)
> >  
> >  			/* empty string? */
> >  			if (targv[i][0] == '\0') {
> > -				fprintf(stderr, "Invalid threads value %s.\n", targv[i]);
> > +				xlog(L_ERROR, "Invalid threads value %s.", targv[i]);
> >  				return 1;
> >  			}
> >  
> >  			pool_threads[i] = strtol(targv[i], &endptr, 0);
> >  			if (!endptr || *endptr != '\0') {
> > -				fprintf(stderr, "Invalid threads value %s.\n", argv[1]);
> > +				xlog(L_ERROR, "Invalid threads value %s.", argv[1]);
> >  				return 1;
> >  			}
> >  		}
> > @@ -621,14 +619,14 @@ static int fetch_nfsd_versions(struct nl_sock *sock)
> >  
> >  	cb = nl_cb_alloc(NL_CB_CUSTOM);
> >  	if (!cb) {
> > -		fprintf(stderr, "failed to allocate netlink callbacks\n");
> > +		xlog(L_ERROR, "failed to allocate netlink callbacks");
> >  		ret = 1;
> >  		goto out;
> >  	}
> >  
> >  	ret = nl_send_auto(sock, msg);
> >  	if (ret < 0) {
> > -		fprintf(stderr, "send failed: %d\n", ret);
> > +		xlog(L_ERROR, "send failed: %d", ret);
> >  		goto out_cb;
> >  	}
> >  
> > @@ -641,7 +639,7 @@ static int fetch_nfsd_versions(struct nl_sock *sock)
> >  	while (ret > 0)
> >  		nl_recvmsgs(sock, cb);
> >  	if (ret < 0) {
> > -		fprintf(stderr, "Error: %s\n", strerror(-ret));
> > +		xlog(L_ERROR, "Error: %s", strerror(-ret));
> >  		ret = 1;
> >  	}
> >  out_cb:
> > @@ -690,7 +688,7 @@ static int set_nfsd_versions(struct nl_sock *sock)
> >  
> >  		a = nla_nest_start(msg, NLA_F_NESTED | NFSD_A_SERVER_PROTO_VERSION);
> >  		if (!a) {
> > -			fprintf(stderr, "Unable to allocate version nest!\n");
> > +			xlog(L_ERROR, "Unable to allocate version nest!");
> >  			ret = 1;
> >  			goto out;
> >  		}
> > @@ -707,14 +705,14 @@ static int set_nfsd_versions(struct nl_sock *sock)
> >  
> >  	cb = nl_cb_alloc(NL_CB_CUSTOM);
> >  	if (!cb) {
> > -		fprintf(stderr, "Failed to allocate netlink callbacks\n");
> > +		xlog(L_ERROR, "Failed to allocate netlink callbacks");
> >  		ret = 1;
> >  		goto out;
> >  	}
> >  
> >  	ret = nl_send_auto(sock, msg);
> >  	if (ret < 0) {
> > -		fprintf(stderr, "Send failed: %d\n", ret);
> > +		xlog(L_ERROR, "Send failed: %d", ret);
> >  		goto out_cb;
> >  	}
> >  
> > @@ -727,7 +725,7 @@ static int set_nfsd_versions(struct nl_sock *sock)
> >  	while (ret > 0)
> >  		nl_recvmsgs(sock, cb);
> >  	if (ret < 0) {
> > -		fprintf(stderr, "Error: %s\n", strerror(-ret));
> > +		xlog(L_ERROR, "Error: %s", strerror(-ret));
> >  		ret = 1;
> >  	}
> >  out_cb:
> > @@ -752,7 +750,7 @@ static int update_nfsd_version(int major, int minor, bool enabled)
> >  	/* the kernel doesn't support this version */
> >  	if (!enabled)
> >  		return 0;
> > -	fprintf(stderr, "This kernel does not support NFS version %d.%d\n", major, minor);
> > +	xlog(L_ERROR, "This kernel does not support NFS version %d.%d", major, minor);
> >  	return -EINVAL;
> >  }
> >  
> > @@ -794,7 +792,7 @@ static int version_func(struct nl_sock *sock, int argc, char ** argv)
> >  
> >  			ret = sscanf(str, "%c%d.%d\n", &sign, &major, &minor);
> >  			if (ret < 2) {
> > -				fprintf(stderr, "Invalid version string (%d) %s\n", ret, str);
> > +				xlog(L_ERROR, "Invalid version string (%d) %s", ret, str);
> >  				return -EINVAL;
> >  			}
> >  
> > @@ -806,7 +804,7 @@ static int version_func(struct nl_sock *sock, int argc, char ** argv)
> >  				enabled = false;
> >  				break;
> >  			default:
> > -				fprintf(stderr, "Invalid version string %s\n", str);
> > +				xlog(L_ERROR, "Invalid version string %s", str);
> >  				return -EINVAL;
> >  			}
> >  
> > @@ -839,14 +837,14 @@ static int fetch_current_listeners(struct nl_sock *sock)
> >  
> >  	cb = nl_cb_alloc(NL_CB_CUSTOM);
> >  	if (!cb) {
> > -		fprintf(stderr, "failed to allocate netlink callbacks\n");
> > +		xlog(L_ERROR, "failed to allocate netlink callbacks");
> >  		ret = 1;
> >  		goto out;
> >  	}
> >  
> >  	ret = nl_send_auto(sock, msg);
> >  	if (ret < 0) {
> > -		fprintf(stderr, "send failed: %d\n", ret);
> > +		xlog(L_ERROR, "send failed: %d", ret);
> >  		goto out_cb;
> >  	}
> >  
> > @@ -859,7 +857,7 @@ static int fetch_current_listeners(struct nl_sock *sock)
> >  	while (ret > 0)
> >  		nl_recvmsgs(sock, cb);
> >  	if (ret < 0) {
> > -		fprintf(stderr, "Error: %s\n", strerror(-ret));
> > +		xlog(L_ERROR, "Error: %s", strerror(-ret));
> >  		ret = 1;
> >  	}
> >  out_cb:
> > @@ -994,7 +992,7 @@ static int update_listeners(const char *str)
> >  	 */
> >  	ret = getaddrinfo(addr, port, &hints, &res);
> >  	if (ret) {
> > -		fprintf(stderr, "getaddrinfo of \"%s\" failed: %s\n",
> > +		xlog(L_ERROR, "getaddrinfo of \"%s\" failed: %s",
> >  			addr, gai_strerror(ret));
> >  		return -EINVAL;
> >  	}
> > @@ -1046,7 +1044,7 @@ static int update_listeners(const char *str)
> >  	}
> >  	return 0;
> >  out_inval:
> > -	fprintf(stderr, "Invalid listener update string: %s", str);
> > +	xlog(L_ERROR, "Invalid listener update string: %s", str);
> >  	return -EINVAL;
> >  }
> >  
> > @@ -1076,7 +1074,7 @@ static int set_listeners(struct nl_sock *sock)
> >  
> >  		a = nla_nest_start(msg, NLA_F_NESTED | NFSD_A_SERVER_SOCK_ADDR);
> >  		if (!a) {
> > -			fprintf(stderr, "Unable to allocate listener nest!\n");
> > +			xlog(L_ERROR, "Unable to allocate listener nest!");
> >  			ret = 1;
> >  			goto out;
> >  		}
> > @@ -1091,14 +1089,14 @@ static int set_listeners(struct nl_sock *sock)
> >  
> >  	cb = nl_cb_alloc(NL_CB_CUSTOM);
> >  	if (!cb) {
> > -		fprintf(stderr, "Failed to allocate netlink callbacks\n");
> > +		xlog(L_ERROR, "Failed to allocate netlink callbacks");
> >  		ret = 1;
> >  		goto out;
> >  	}
> >  
> >  	ret = nl_send_auto(sock, msg);
> >  	if (ret < 0) {
> > -		fprintf(stderr, "Send failed: %d\n", ret);
> > +		xlog(L_ERROR, "Send failed: %d", ret);
> >  		goto out_cb;
> >  	}
> >  
> > @@ -1111,7 +1109,7 @@ static int set_listeners(struct nl_sock *sock)
> >  	while (ret > 0)
> >  		nl_recvmsgs(sock, cb);
> >  	if (ret < 0) {
> > -		fprintf(stderr, "Error: %s\n", strerror(-ret));
> > +		xlog(L_ERROR, "Error: %s", strerror(-ret));
> >  		ret = 1;
> >  	}
> >  out_cb:
> > @@ -1188,14 +1186,14 @@ static int pool_mode_doit(struct nl_sock *sock, int cmd, const char *pool_mode)
> >  
> >  	cb = nl_cb_alloc(NL_CB_CUSTOM);
> >  	if (!cb) {
> > -		fprintf(stderr, "failed to allocate netlink callbacks\n");
> > +		xlog(L_ERROR, "failed to allocate netlink callbacks");
> >  		ret = 1;
> >  		goto out;
> >  	}
> >  
> >  	ret = nl_send_auto(sock, msg);
> >  	if (ret < 0) {
> > -		fprintf(stderr, "send failed (%d)!\n", ret);
> > +		xlog(L_ERROR, "send failed (%d)!", ret);
> >  		goto out_cb;
> >  	}
> >  
> > @@ -1208,7 +1206,7 @@ static int pool_mode_doit(struct nl_sock *sock, int cmd, const char *pool_mode)
> >  	while (ret > 0)
> >  		nl_recvmsgs(sock, cb);
> >  	if (ret < 0) {
> > -		fprintf(stderr, "Error: %s\n", strerror(-ret));
> > +		xlog(L_ERROR, "Error: %s", strerror(-ret));
> >  		ret = 1;
> >  	}
> >  out_cb:
> > @@ -1245,7 +1243,7 @@ static int pool_mode_func(struct nl_sock *sock, int argc, char **argv)
> >  
> >  		/* empty string? */
> >  		if (*targv[0] == '\0') {
> > -			fprintf(stderr, "Invalid threads value %s.\n", targv[0]);
> > +			xlog(L_ERROR, "Invalid threads value %s.", targv[0]);
> >  			return 1;
> >  		}
> >  		pool_mode = targv[0];
> > @@ -1397,7 +1395,7 @@ static int autostart_func(struct nl_sock *sock, int argc, char ** argv)
> >  
> >  			threads[idx++] = strtol(n->field, &endptr, 0);
> >  			if (!endptr || *endptr != '\0') {
> > -				fprintf(stderr, "Invalid threads value %s.\n", n->field);
> > +				xlog(L_ERROR, "Invalid threads value %s.", n->field);
> >  				ret = -EINVAL;
> >  				goto out;
> >  			}
> > @@ -1470,7 +1468,8 @@ static void usage(void)
> 
> You missed some other changes in the usage() function (some boilerplate
> stuff in the printf's).
> 
> -Scott
> >  /* Options given before the command string */
> >  static const struct option pre_options[] = {
> >  	{ "help", no_argument, NULL, 'h' },
> > -	{ "debug", required_argument, NULL, 'd' },
> > +	{ "debug", no_argument, NULL, 'd' },
> > +	{ "syslog", no_argument, NULL, 's' },
> >  	{ "version", no_argument, NULL, 'V' },
> >  	{ },
> >  };
> > @@ -1524,7 +1523,7 @@ static int run_commandline(struct nl_sock *sock)
> >  		if (!ret)
> >  			ret = run_one_command(sock, argc, argv);
> >  		if (ret)
> > -			fprintf(stderr, "Error: %s\n", strerror(ret));
> > +			xlog(L_ERROR, "Error: %s", strerror(ret));
> >  		free(line);
> >  	}
> >  	return 0;
> > @@ -1533,23 +1532,25 @@ static int run_commandline(struct nl_sock *sock)
> >  int main(int argc, char **argv)
> >  {
> >  	int opt, ret;
> > -	struct nl_sock *sock = netlink_sock_alloc();
> > -
> > -	if (!sock) {
> > -		fprintf(stderr, "Unable to allocate netlink socket!");
> > -		return 1;
> > -	}
> > +	struct nl_sock *sock;
> >  
> >  	taskname = argv[0];
> >  
> > +	xlog_syslog(0);
> > +	xlog_stderr(1);
> > +
> >  	/* Parse the preliminary options */
> > -	while ((opt = getopt_long(argc, argv, "+hd:V", pre_options, NULL)) != -1) {
> > +	while ((opt = getopt_long(argc, argv, "+hdsV", pre_options, NULL)) != -1) {
> >  		switch (opt) {
> >  		case 'h':
> >  			usage();
> >  			return 0;
> >  		case 'd':
> > -			debug_level = atoi(optarg);
> > +			xlog_config(D_ALL, 1);
> > +			break;
> > +		case 's':
> > +			xlog_syslog(1);
> > +			xlog_stderr(0);
> >  			break;
> >  		case 'V':
> >  			// FIXME: print_version();
> > @@ -1557,6 +1558,14 @@ int main(int argc, char **argv)
> >  		}
> >  	}
> >  
> > +	xlog_open(basename(argv[0]));
> > +
> > +	sock = netlink_sock_alloc();
> > +	if (!sock) {
> > +		xlog(L_ERROR, "Unable to allocate netlink socket!");
> > +		return 1;
> > +	}
> > +
> >  	if (optind > argc) {
> >  		usage();
> >  		return 1;
> > 
> > -- 
> > 2.47.1
> > 
> 

-- 
Jeff Layton <jlayton@kernel.org>

[PATCH 2/3] nfsdctl: fix the --version option

[Jeff Layton]

Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
 utils/nfsdctl/nfsdctl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/nfsdctl/nfsdctl.c b/utils/nfsdctl/nfsdctl.c
index 11fa4363907a0897ddf79f21916f9e25b9e88dbb..2cd58fef079aec74000bb68a81a05eb7bd876d7f 100644
--- a/utils/nfsdctl/nfsdctl.c
+++ b/utils/nfsdctl/nfsdctl.c
@@ -1553,7 +1553,7 @@ int main(int argc, char **argv)
 			xlog_stderr(0);
 			break;
 		case 'V':
-			// FIXME: print_version();
+			fprintf(stdout, "nfsdctl: " VERSION "\n");
 			return 0;
 		}
 	}

-- 
2.47.1

[PATCH 3/3] nfsdctl: add necessary bits to configure lockd

[Jeff Layton]

The legacy rpc.nfsd program would configure the nlm_grace_period to
match the NFSv4 grace period when starting the server. This adds similar
functionality to the autostart subcommand using the new lockd netlink
configuration interfaces. In addition, if lockd's udp or tcp listener
ports are specified, also configure them before starting the server.

A "nlm" subcommand is also added that will display the current lockd
config settings in the current net ns. In the future, we could add the
ability to set these values using the "nlm" subcommand, but for now I
didn't see a real use-case for that, so I left it out.

Link: https://issues.redhat.com/browse/RHEL-71698
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
 configure.ac                  |   4 +
 utils/nfsdctl/lockd_netlink.h |  29 ++++++
 utils/nfsdctl/nfsdctl.adoc    |   5 +
 utils/nfsdctl/nfsdctl.c       | 220 +++++++++++++++++++++++++++++++++++++++---
 4 files changed, 242 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index 561e894dc46f48997df4ba6dc3e7691876589fdb..1d865fbc1c7f79e3ac6152bc59995e99fe10a38e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -268,6 +268,10 @@ AC_ARG_ENABLE(nfsdctl,
 				                   [[int foo = NFSD_CMD_POOL_MODE_GET;]])],
 				   [AC_DEFINE([USE_SYSTEM_NFSD_NETLINK_H], 1,
 					      ["Use system's linux/nfsd_netlink.h"])])
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <linux/lockd_netlink.h>]],
+				                   [[int foo = LOCKD_CMD_SERVER_GET;]])],
+				   [AC_DEFINE([USE_SYSTEM_LOCKD_NETLINK_H], 1,
+					      ["Use system's linux/lockd_netlink.h"])])
 	fi
 
 AC_ARG_ENABLE(nfsv4server,
diff --git a/utils/nfsdctl/lockd_netlink.h b/utils/nfsdctl/lockd_netlink.h
new file mode 100644
index 0000000000000000000000000000000000000000..21c65aec3bc6d1839961937081e6d16540332179
--- /dev/null
+++ b/utils/nfsdctl/lockd_netlink.h
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* Do not edit directly, auto-generated from: */
+/*	Documentation/netlink/specs/lockd.yaml */
+/* YNL-GEN uapi header */
+
+#ifndef _UAPI_LINUX_LOCKD_NETLINK_H
+#define _UAPI_LINUX_LOCKD_NETLINK_H
+
+#define LOCKD_FAMILY_NAME	"lockd"
+#define LOCKD_FAMILY_VERSION	1
+
+enum {
+	LOCKD_A_SERVER_GRACETIME = 1,
+	LOCKD_A_SERVER_TCP_PORT,
+	LOCKD_A_SERVER_UDP_PORT,
+
+	__LOCKD_A_SERVER_MAX,
+	LOCKD_A_SERVER_MAX = (__LOCKD_A_SERVER_MAX - 1)
+};
+
+enum {
+	LOCKD_CMD_SERVER_SET = 1,
+	LOCKD_CMD_SERVER_GET,
+
+	__LOCKD_CMD_MAX,
+	LOCKD_CMD_MAX = (__LOCKD_CMD_MAX - 1)
+};
+
+#endif /* _UAPI_LINUX_LOCKD_NETLINK_H */
diff --git a/utils/nfsdctl/nfsdctl.adoc b/utils/nfsdctl/nfsdctl.adoc
index 2114693042594297b7c5d8600ca16813a0f2356c..0207eff6118d2dcc5a794d2013c039d9beb11ddc 100644
--- a/utils/nfsdctl/nfsdctl.adoc
+++ b/utils/nfsdctl/nfsdctl.adoc
@@ -67,6 +67,11 @@ Each subcommand can also accept its own set of options and arguments. The
   addresses must be in dotted-quad form. IPv6 addresses should be in standard
   colon separated form, and must be enclosed in square brackets.
 
+*nlm*::
+
+  Get information about NLM (lockd) settings in the current net namespace. This
+  subcommand takes no arguments.
+
 *status*::
 
   Get information about RPCs currently executing in the server. This subcommand
diff --git a/utils/nfsdctl/nfsdctl.c b/utils/nfsdctl/nfsdctl.c
index 2cd58fef079aec74000bb68a81a05eb7bd876d7f..40a0f4e5936a87a38ef69487aec35c990b95b97c 100644
--- a/utils/nfsdctl/nfsdctl.c
+++ b/utils/nfsdctl/nfsdctl.c
@@ -35,7 +35,11 @@
 #include "nfsd_netlink.h"
 #endif
 
+#ifdef USE_SYSTEM_LOCKD_NETLINK_H
+#include <linux/lockd_netlink.h>
+#else
 #include "lockd_netlink.h"
+#endif
 
 #include "nfsdctl.h"
 #include "conffile.h"
@@ -350,6 +354,28 @@ static void parse_pool_mode_get(struct genlmsghdr *gnlh)
 	}
 }
 
+static void parse_lockd_get(struct genlmsghdr *gnlh)
+{
+	struct nlattr *attr;
+	int rem;
+
+	nla_for_each_attr(attr, genlmsg_attrdata(gnlh, 0),
+			  genlmsg_attrlen(gnlh, 0), rem) {
+		switch (nla_type(attr)) {
+		case LOCKD_A_SERVER_GRACETIME:
+			printf("gracetime: %u\n", nla_get_u32(attr));
+			break;
+		case LOCKD_A_SERVER_TCP_PORT:
+			printf("tcp_port: %hu\n", nla_get_u16(attr));
+			break;
+		case LOCKD_A_SERVER_UDP_PORT:
+			printf("udp_port: %hu\n", nla_get_u16(attr));
+			break;
+		default:
+			break;
+		}
+	}
+}
 static int recv_handler(struct nl_msg *msg, void *arg)
 {
 	struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
@@ -370,6 +396,9 @@ static int recv_handler(struct nl_msg *msg, void *arg)
 	case NFSD_CMD_POOL_MODE_GET:
 		parse_pool_mode_get(gnlh);
 		break;
+	case LOCKD_CMD_SERVER_GET:
+		parse_lockd_get(gnlh);
+		break;
 	default:
 		break;
 	}
@@ -400,12 +429,12 @@ static struct nl_sock *netlink_sock_alloc(void)
 	return sock;
 }
 
-static struct nl_msg *netlink_msg_alloc(struct nl_sock *sock)
+static struct nl_msg *netlink_msg_alloc(struct nl_sock *sock, const char *family)
 {
 	struct nl_msg *msg;
 	int id;
 
-	id = genl_ctrl_resolve(sock, NFSD_FAMILY_NAME);
+	id = genl_ctrl_resolve(sock, family);
 	if (id < 0) {
 		xlog(L_ERROR, "%s not found", NFSD_FAMILY_NAME);
 		return NULL;
@@ -449,7 +478,7 @@ static int status_func(struct nl_sock *sock, int argc, char ** argv)
 		}
 	}
 
-	msg = netlink_msg_alloc(sock);
+	msg = netlink_msg_alloc(sock, NFSD_FAMILY_NAME);
 	if (!msg)
 		return 1;
 
@@ -497,7 +526,7 @@ static int threads_doit(struct nl_sock *sock, int cmd, int grace, int lease,
 	struct nl_cb *cb;
 	int ret;
 
-	msg = netlink_msg_alloc(sock);
+	msg = netlink_msg_alloc(sock, NFSD_FAMILY_NAME);
 	if (!msg)
 		return 1;
 
@@ -609,7 +638,7 @@ static int fetch_nfsd_versions(struct nl_sock *sock)
 	struct nl_cb *cb;
 	int ret;
 
-	msg = netlink_msg_alloc(sock);
+	msg = netlink_msg_alloc(sock, NFSD_FAMILY_NAME);
 	if (!msg)
 		return 1;
 
@@ -674,7 +703,7 @@ static int set_nfsd_versions(struct nl_sock *sock)
 	struct nl_cb *cb;
 	int i, ret;
 
-	msg = netlink_msg_alloc(sock);
+	msg = netlink_msg_alloc(sock, NFSD_FAMILY_NAME);
 	if (!msg)
 		return 1;
 
@@ -827,7 +856,7 @@ static int fetch_current_listeners(struct nl_sock *sock)
 	struct nl_cb *cb;
 	int ret;
 
-	msg = netlink_msg_alloc(sock);
+	msg = netlink_msg_alloc(sock, NFSD_FAMILY_NAME);
 	if (!msg)
 		return 1;
 
@@ -1056,7 +1085,7 @@ static int set_listeners(struct nl_sock *sock)
 	struct nl_cb *cb;
 	int i, ret;
 
-	msg = netlink_msg_alloc(sock);
+	msg = netlink_msg_alloc(sock, NFSD_FAMILY_NAME);
 	if (!msg)
 		return 1;
 
@@ -1172,7 +1201,7 @@ static int pool_mode_doit(struct nl_sock *sock, int cmd, const char *pool_mode)
 	struct nl_cb *cb;
 	int ret;
 
-	msg = netlink_msg_alloc(sock);
+	msg = netlink_msg_alloc(sock, NFSD_FAMILY_NAME);
 	if (!msg)
 		return 1;
 
@@ -1251,6 +1280,131 @@ static int pool_mode_func(struct nl_sock *sock, int argc, char **argv)
 	return pool_mode_doit(sock, cmd, pool_mode);
 }
 
+static int lockd_config_doit(struct nl_sock *sock, int cmd, int grace, int tcpport, int udpport)
+{
+	struct genlmsghdr *ghdr;
+	struct nlmsghdr *nlh;
+	struct nl_msg *msg;
+	struct nl_cb *cb;
+	int ret;
+
+	if (cmd == LOCKD_CMD_SERVER_SET) {
+		/* Do nothing if there is nothing to set */
+		if (!grace && !tcpport && !udpport)
+			return 0;
+	}
+
+	msg = netlink_msg_alloc(sock, LOCKD_FAMILY_NAME);
+	if (!msg)
+		return 1;
+
+	nlh = nlmsg_hdr(msg);
+	if (cmd == LOCKD_CMD_SERVER_SET) {
+		if (grace)
+			nla_put_u32(msg, LOCKD_A_SERVER_GRACETIME, grace);
+		if (tcpport)
+			nla_put_u16(msg, LOCKD_A_SERVER_TCP_PORT, tcpport);
+		if (udpport)
+			nla_put_u16(msg, LOCKD_A_SERVER_UDP_PORT, udpport);
+	}
+
+	ghdr = nlmsg_data(nlh);
+	ghdr->cmd = cmd;
+
+	cb = nl_cb_alloc(NL_CB_CUSTOM);
+	if (!cb) {
+		xlog(L_ERROR, "failed to allocate netlink callbacks\n");
+		ret = 1;
+		goto out;
+	}
+
+	ret = nl_send_auto(sock, msg);
+	if (ret < 0) {
+		xlog(L_ERROR, "send failed (%d)!\n", ret);
+		goto out_cb;
+	}
+
+	ret = 1;
+	nl_cb_err(cb, NL_CB_CUSTOM, error_handler, &ret);
+	nl_cb_set(cb, NL_CB_FINISH, NL_CB_CUSTOM, finish_handler, &ret);
+	nl_cb_set(cb, NL_CB_ACK, NL_CB_CUSTOM, ack_handler, &ret);
+	nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, recv_handler, NULL);
+
+	while (ret > 0)
+		nl_recvmsgs(sock, cb);
+	if (ret < 0) {
+		xlog(L_ERROR, "Error: %s\n", strerror(-ret));
+		ret = 1;
+	}
+out_cb:
+	nl_cb_put(cb);
+out:
+	nlmsg_free(msg);
+	return ret;
+}
+
+static int get_service(const char *svc)
+{
+	struct addrinfo *res, hints = { .ai_flags = AI_PASSIVE };
+	int ret, port;
+
+	if (!svc)
+		return 0;
+
+	ret = getaddrinfo(NULL, svc, &hints, &res);
+	if (ret) {
+		xlog(L_ERROR, "getaddrinfo of \"%s\" failed: %s\n",
+			svc, gai_strerror(ret));
+		return -1;
+	}
+
+	switch (res->ai_family) {
+	case AF_INET:
+		{
+			struct sockaddr_in *sin = (struct sockaddr_in *)res->ai_addr;
+
+			port = ntohs(sin->sin_port);
+		}
+		break;
+	case AF_INET6:
+		{
+			struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)res->ai_addr;
+
+			port = ntohs(sin6->sin6_port);
+		}
+		break;
+	default:
+		xlog(L_ERROR, "Bad address family: %d\n", res->ai_family);
+		port = -1;
+	}
+	freeaddrinfo(res);
+	return port;
+}
+
+static int lockd_configure(struct nl_sock *sock, int grace)
+{
+	char *tcp_svc, *udp_svc;
+	int tcpport = 0, udpport = 0;
+	int ret;
+
+	tcp_svc = conf_get_str("lockd", "port");
+	if (tcp_svc) {
+		tcpport = get_service(tcp_svc);
+		if (tcpport < 0)
+			return 1;
+	}
+
+	udp_svc = conf_get_str("lockd", "udp-port");
+	if (udp_svc) {
+		udpport = get_service(udp_svc);
+		if (udpport < 0)
+			return 1;
+	}
+
+	return lockd_config_doit(sock, LOCKD_CMD_SERVER_SET, grace, tcpport, udpport);
+}
+
+
 #define MAX_LISTENER_LEN (64 * 2 + 16)
 
 static void
@@ -1357,6 +1511,13 @@ static int autostart_func(struct nl_sock *sock, int argc, char ** argv)
 
 	read_nfsd_conf();
 
+	grace = conf_get_num("nfsd", "grace-time", 0);
+	ret = lockd_configure(sock, grace);
+	if (ret) {
+		xlog(L_ERROR, "lockd configuration failure");
+		return ret;
+	}
+
 	pool_mode = conf_get_str("nfsd", "pool-mode");
 	if (pool_mode) {
 		ret = pool_mode_doit(sock, NFSD_CMD_POOL_MODE_SET, pool_mode);
@@ -1372,15 +1533,12 @@ static int autostart_func(struct nl_sock *sock, int argc, char ** argv)
 	if (ret)
 		return ret;
 
+	xlog(D_GENERAL, "configuring listeners");
 	configure_listeners();
 	ret = set_listeners(sock);
 	if (ret)
 		return ret;
 
-	grace = conf_get_num("nfsd", "grace-time", 0);
-	lease = conf_get_num("nfsd", "lease-time", 0);
-	scope = conf_get_str("nfsd", "scope");
-
 	thread_str = conf_get_list("nfsd", "threads");
 	pools = thread_str ? thread_str->cnt : 1;
 
@@ -1404,6 +1562,9 @@ static int autostart_func(struct nl_sock *sock, int argc, char ** argv)
 		threads[0] = DEFAULT_AUTOSTART_THREADS;
 	}
 
+	lease = conf_get_num("nfsd", "lease-time", 0);
+	scope = conf_get_str("nfsd", "scope");
+
 	ret = threads_doit(sock, NFSD_CMD_THREADS_SET, grace, lease, pools,
 			   threads, scope);
 out:
@@ -1411,6 +1572,30 @@ out:
 	return ret;
 }
 
+static void nlm_usage(void)
+{
+	printf("Usage: %s nlm\n", taskname);
+	printf("    Get the current settings for the NLM (lockd) server.\n");
+}
+
+static int nlm_func(struct nl_sock *sock, int argc, char ** argv)
+{
+	int *threads, grace, lease, idx, ret, opt, pools;
+	struct conf_list *thread_str;
+	struct conf_list_node *n;
+	char *scope, *pool_mode;
+
+	optind = 1;
+	while ((opt = getopt_long(argc, argv, "h", help_only_options, NULL)) != -1) {
+		switch (opt) {
+		case 'h':
+			nlm_usage();
+			return 0;
+		}
+	}
+	return lockd_config_doit(sock, LOCKD_CMD_SERVER_GET, 0, 0, 0);
+}
+
 enum nfsdctl_commands {
 	NFSDCTL_STATUS,
 	NFSDCTL_THREADS,
@@ -1418,6 +1603,7 @@ enum nfsdctl_commands {
 	NFSDCTL_LISTENER,
 	NFSDCTL_AUTOSTART,
 	NFSDCTL_POOL_MODE,
+	NFSDCTL_NLM,
 };
 
 static int parse_command(char *str)
@@ -1434,6 +1620,8 @@ static int parse_command(char *str)
 		return NFSDCTL_AUTOSTART;
 	if (!strcmp(str, "pool-mode"))
 		return NFSDCTL_POOL_MODE;
+	if (!strcmp(str, "nlm"))
+		return NFSDCTL_NLM;
 	return -1;
 }
 
@@ -1446,6 +1634,7 @@ static nfsdctl_func func[] = {
 	[NFSDCTL_LISTENER] = listener_func,
 	[NFSDCTL_AUTOSTART] = autostart_func,
 	[NFSDCTL_POOL_MODE] = pool_mode_func,
+	[NFSDCTL_NLM] = nlm_func,
 };
 
 static void usage(void)
@@ -1454,13 +1643,14 @@ static void usage(void)
 	printf("%s [-hv] [COMMAND] [ARGS]\n", taskname);
 	printf("  options:\n");
 	printf("    -h | --help          usage info\n");
-	printf("    -d | --debug=NUM     enable debugging\n");
+	printf("    -d | --debug         enable debugging\n");
 	printf("    -V | --version       print version info\n");
 	printf("  commands:\n");
 	printf("    pool-mode            get/set host pool mode setting\n");
 	printf("    listener             get/set listener info\n");
 	printf("    version              get/set supported NFS versions\n");
 	printf("    threads              get/set nfsd thread settings\n");
+	printf("    nlm                  get current nlm settings\n");
 	printf("    status               get current RPC processing info\n");
 	printf("    autostart            start server with settings from /etc/nfs.conf\n");
 }
@@ -1522,8 +1712,6 @@ static int run_commandline(struct nl_sock *sock)
 		ret = tokenize_string(line, &argc, argv);
 		if (!ret)
 			ret = run_one_command(sock, argc, argv);
-		if (ret)
-			xlog(L_ERROR, "Error: %s", strerror(ret));
 		free(line);
 	}
 	return 0;

-- 
2.47.1