Re: [NFS] [PATCH 019 of 19] knfsd: Register all RPC programs with portmapper by default

Peter Staubach
2006-09-01T13:29:24Z

NeilBrown wrote:
> From: Olaf Kirch <okir@suse.de>
>
> The NFSACL patches introduced support for multiple RPC services
> listening on the same transport. However, only the first of these
> services was registered with portmapper. This was perfectly fine
> for nfsacl, as you traditionally do not want these to show up in a
> portmapper listing.
>
> The patch below changes the default behavior to always register
> all services listening on a given transport, but retains the
> old behavior for nfsacl services.
>
> Signed-off-by: Olaf Kirch <okir@suse.de>
> Signed-off-by: Neil Brown <neilb@suse.de>
>
> ### Diffstat output
> ./fs/nfsd/nfs2acl.c | 1 +
> ./fs/nfsd/nfs3acl.c | 1 +
> ./include/linux/sunrpc/svc.h | 3 +++
> ./net/sunrpc/svc.c | 37 +++++++++++++++++++++++--------------
> 4 files changed, 28 insertions(+), 14 deletions(-)
>
> diff .prev/fs/nfsd/nfs2acl.c ./fs/nfsd/nfs2acl.c
> --- .prev/fs/nfsd/nfs2acl.c 2006-09-01 12:22:10.000000000 +1000
> +++ ./fs/nfsd/nfs2acl.c 2006-09-01 12:22:11.000000000 +1000
> @@ -333,4 +333,5 @@ struct svc_version nfsd_acl_version2 = {
> .vs_proc = nfsd_acl_procedures2,
> .vs_dispatch = nfsd_dispatch,
> .vs_xdrsize = NFS3_SVC_XDRSIZE,
> + .vs_hidden = 1,
> };
>
> diff .prev/fs/nfsd/nfs3acl.c ./fs/nfsd/nfs3acl.c
> --- .prev/fs/nfsd/nfs3acl.c 2006-09-01 12:22:10.000000000 +1000
> +++ ./fs/nfsd/nfs3acl.c 2006-09-01 12:22:11.000000000 +1000
> @@ -263,5 +263,6 @@ struct svc_version nfsd_acl_version3 = {
> .vs_proc = nfsd_acl_procedures3,
> .vs_dispatch = nfsd_dispatch,
> .vs_xdrsize = NFS3_SVC_XDRSIZE,
> + .vs_hidden = 1,
> };
>
>
> diff .prev/include/linux/sunrpc/svc.h ./include/linux/sunrpc/svc.h
> --- .prev/include/linux/sunrpc/svc.h 2006-09-01 12:22:10.000000000 +1000
> +++ ./include/linux/sunrpc/svc.h 2006-09-01 12:22:11.000000000 +1000
> @@ -304,6 +304,9 @@ struct svc_version {
> struct svc_procedure * vs_proc; /* per-procedure info */
> u32 vs_xdrsize; /* xdrsize needed for this version */
>
> + unsigned int vs_hidden : 1; /* Don't register with portmapper.
> + * Only used for nfsacl so far. */
> +
> /* Override dispatch function (e.g. when caching replies).
> * A return value of 0 means drop the request.
> * vs_dispatch == NULL means use default dispatcher.
>
> diff .prev/net/sunrpc/svc.c ./net/sunrpc/svc.c
> --- .prev/net/sunrpc/svc.c 2006-09-01 12:22:11.000000000 +1000
> +++ ./net/sunrpc/svc.c 2006-09-01 12:22:11.000000000 +1000
> @@ -644,23 +644,32 @@ svc_register(struct svc_serv *serv, int
> unsigned long flags;
> int i, error = 0, dummy;
>
> - progp = serv->sv_program;
> -
> - dprintk("RPC: svc_register(%s, %s, %d)\n",
> - progp->pg_name, proto == IPPROTO_UDP? "udp" : "tcp", port);
> -
> if (!port)
> clear_thread_flag(TIF_SIGPENDING);
>
> - for (i = 0; i < progp->pg_nvers; i++) {
> - if (progp->pg_vers[i] == NULL)
> - continue;
> - error = rpc_register(progp->pg_prog, i, proto, port, &dummy);
> - if (error < 0)
> - break;
> - if (port && !dummy) {
> - error = -EACCES;
> - break;
> + for (progp = serv->sv_program; progp; progp = progp->pg_next) {
> + for (i = 0; i < progp->pg_nvers; i++) {
> + if (progp->pg_vers[i] == NULL)
> + continue;
> +
> + dprintk("RPC: svc_register(%s, %s, %d, %d)%s\n",
> + progp->pg_name,
> + proto == IPPROTO_UDP? "udp" : "tcp",
> + port,
> + i,
> + progp->pg_vers[i]->vs_hidden?
> + " (but not telling portmap)" : "");
> +
> + if (progp->pg_vers[i]->vs_hidden)
> + continue;
> +
> + error = rpc_register(progp->pg_prog, i, proto, port, &dummy);
> + if (error < 0)
> + break;
> + if (port && !dummy) {
> + error = -EACCES;
> + break;
> + }
> }
> }

While I'm thinking about it a little more, why not register NFS_ACL with
portmap/rpcbind? That would make it pingable via rpcinfo.

Thanx...

ps