Commit abfdbd53 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Faster detection if gssd is actually running 



Recent changes to the NFS security flavour negotiation mean that
we have a stronger dependency on rpc.gssd. If the latter is not
running, because the user failed to start it, then we time out
and mark the container as not having an instance. We then
use that information to time out faster the next time.

If, on the other hand, the rpc.gssd successfully binds to an rpc_pipe,
then we mark the container as having an rpc.gssd instance.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent d36ccb9c

net/sunrpc/auth_gss/auth_gss.c

+12 −1
Original line number Original line Diff line number Diff line
@@ -52,6 +52,8 @@ 
#include <linux/sunrpc/gss_api.h>

#include <linux/sunrpc/gss_api.h>

#include <asm/uaccess.h>

#include <asm/uaccess.h>





#include "../netns.h"



static const struct rpc_authops authgss_ops;

static const struct rpc_authops authgss_ops;





static const struct rpc_credops gss_credops;

static const struct rpc_credops gss_credops;
@@ -559,9 +561,12 @@ gss_refresh_upcall(struct rpc_task *task) 
static inline int

static inline int

gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred)

gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred)

{

{

	struct net *net = rpc_net_ns(gss_auth->client);

	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);

	struct rpc_pipe *pipe;

	struct rpc_pipe *pipe;

	struct rpc_cred *cred = &gss_cred->gc_base;

	struct rpc_cred *cred = &gss_cred->gc_base;

	struct gss_upcall_msg *gss_msg;

	struct gss_upcall_msg *gss_msg;

	unsigned long timeout;

	DEFINE_WAIT(wait);

	DEFINE_WAIT(wait);

	int err;

	int err;
@@ -569,11 +574,17 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred) 
		__func__, from_kuid(&init_user_ns, cred->cr_uid));

		__func__, from_kuid(&init_user_ns, cred->cr_uid));

retry:

retry:

	err = 0;

	err = 0;

	/* Default timeout is 15s unless we know that gssd is not running */

	timeout = 15 * HZ;

	if (!sn->gssd_running)

		timeout = HZ >> 2;

	gss_msg = gss_setup_upcall(gss_auth->client, gss_auth, cred);

	gss_msg = gss_setup_upcall(gss_auth->client, gss_auth, cred);

	if (PTR_ERR(gss_msg) == -EAGAIN) {

	if (PTR_ERR(gss_msg) == -EAGAIN) {

		err = wait_event_interruptible_timeout(pipe_version_waitqueue,

		err = wait_event_interruptible_timeout(pipe_version_waitqueue,

				pipe_version >= 0, 15*HZ);

				pipe_version >= 0, timeout);

		if (pipe_version < 0) {

		if (pipe_version < 0) {

			if (err == 0)

				sn->gssd_running = 0;

			warn_gssd();

			warn_gssd();

			err = -EACCES;

			err = -EACCES;

		}

		}

net/sunrpc/netns.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,8 @@ struct sunrpc_net { 
	struct rpc_clnt *gssp_clnt;

	struct rpc_clnt *gssp_clnt;

	int use_gss_proxy;

	int use_gss_proxy;

	struct proc_dir_entry *use_gssp_proc;

	struct proc_dir_entry *use_gssp_proc;



	unsigned int gssd_running;

};

};





extern int sunrpc_net_id;

extern int sunrpc_net_id;

net/sunrpc/rpc_pipe.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -216,11 +216,14 @@ rpc_destroy_inode(struct inode *inode) 
static int

static int

rpc_pipe_open(struct inode *inode, struct file *filp)

rpc_pipe_open(struct inode *inode, struct file *filp)

{

{

	struct net *net = inode->i_sb->s_fs_info;

	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);

	struct rpc_pipe *pipe;

	struct rpc_pipe *pipe;

	int first_open;

	int first_open;

	int res = -ENXIO;

	int res = -ENXIO;





	mutex_lock(&inode->i_mutex);

	mutex_lock(&inode->i_mutex);

	sn->gssd_running = 1;

	pipe = RPC_I(inode)->pipe;

	pipe = RPC_I(inode)->pipe;

	if (pipe == NULL)

	if (pipe == NULL)

		goto out;

		goto out;
@@ -1069,6 +1072,7 @@ void rpc_pipefs_init_net(struct net *net) 
	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);

	struct sunrpc_net *sn = net_generic(net, sunrpc_net_id);





	mutex_init(&sn->pipefs_sb_lock);

	mutex_init(&sn->pipefs_sb_lock);

	sn->gssd_running = 1;

}

}





/*

/*