From: Christoph Hellwig Subject: Re: [PATCH 1/2] NLM failover unlock commands Date: Thu, 10 Jan 2008 07:59:59 +0000 Message-ID: <20080110075959.GA9623@infradead.org> References: <4781BB0D.90706@redhat.com> <20080108170220.GA21401@infradead.org> <20080108174958.GA25025@infradead.org> <4783E3C9.3040803@redhat.com> <20080109180214.GA31071@infradead.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Christoph Hellwig , NFS list , cluster-devel@redhat.com To: Wendy Cheng Return-path: Received: from pentafluge.infradead.org ([213.146.154.40]:36514 "EHLO pentafluge.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754325AbYAJIAD (ORCPT ); Thu, 10 Jan 2008 03:00:03 -0500 In-Reply-To: <20080109180214.GA31071@infradead.org> Sender: linux-nfs-owner@vger.kernel.org List-ID: On Wed, Jan 09, 2008 at 06:02:15PM +0000, Christoph Hellwig wrote: > On Tue, Jan 08, 2008 at 03:57:45PM -0500, Wendy Cheng wrote: > > Christoph Hellwig wrote: > >> Ok, I played around with this and cleaned up the ip/path codepathes to > >> be entirely setup which helped the code quite a bit. Also a few other > >> > > Thanks for doing this :) . In the middle of running it with our cluster > > test - if passed, will repost it. Get your "signed-off" line ready ? > > Not quite yet. I'm not happy with what's going on in svcsubs.c in the > current form. > > I've added another (untested) idea patch below which adds a second > match function to nlm_traverse_files to remove the current hardcoded > hack. If that works out we'll just need to incorporate Neil's feedback > to the second patch somehow. This patch introduce a new bug by a reversed check for the file_ok function that would hit all non-failover lockd functionality. There's also been a bug left-over from my previous patch where the file_ok callback expects the wrong type passed to it and would crash. Fixed version below: Index: linux-2.6/fs/nfsd/nfsctl.c =================================================================== --- linux-2.6.orig/fs/nfsd/nfsctl.c 2008-01-08 18:36:37.000000000 +0100 +++ linux-2.6/fs/nfsd/nfsctl.c 2008-01-10 08:56:55.000000000 +0100 @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -35,6 +36,7 @@ #include #include #include +#include #include @@ -52,6 +54,8 @@ enum { NFSD_Getfs, NFSD_List, NFSD_Fh, + NFSD_FO_UnlockIP, + NFSD_FO_UnlockFS, NFSD_Threads, NFSD_Pool_Threads, NFSD_Versions, @@ -88,6 +92,9 @@ static ssize_t write_leasetime(struct fi static ssize_t write_recoverydir(struct file *file, char *buf, size_t size); #endif +static ssize_t failover_unlock_ip(struct file *file, char *buf, size_t size); +static ssize_t failover_unlock_fs(struct file *file, char *buf, size_t size); + static ssize_t (*write_op[])(struct file *, char *, size_t) = { [NFSD_Svc] = write_svc, [NFSD_Add] = write_add, @@ -97,6 +104,8 @@ static ssize_t (*write_op[])(struct file [NFSD_Getfd] = write_getfd, [NFSD_Getfs] = write_getfs, [NFSD_Fh] = write_filehandle, + [NFSD_FO_UnlockIP] = failover_unlock_ip, + [NFSD_FO_UnlockFS] = failover_unlock_fs, [NFSD_Threads] = write_threads, [NFSD_Pool_Threads] = write_pool_threads, [NFSD_Versions] = write_versions, @@ -288,6 +297,55 @@ static ssize_t write_getfd(struct file * return err; } +static ssize_t failover_unlock_ip(struct file *file, char *buf, size_t size) +{ + __be32 server_ip; + char *fo_path; + char *mesg; + + /* sanity check */ + if (size <= 0) + return -EINVAL; + + if (buf[size-1] == '\n') + buf[size-1] = 0; + + fo_path = mesg = buf; + if (qword_get(&mesg, fo_path, size) < 0) + return -EINVAL; + + server_ip = in_aton(fo_path); + return nlmsvc_failover_ip(server_ip); +} + +static ssize_t failover_unlock_fs(struct file *file, char *buf, size_t size) +{ + struct nameidata nd; + char *fo_path; + char *mesg; + int error; + + /* sanity check */ + if (size <= 0) + return -EINVAL; + + if (buf[size-1] == '\n') + buf[size-1] = 0; + + fo_path = mesg = buf; + if (qword_get(&mesg, fo_path, size) < 0) + return -EINVAL; + + error = path_lookup(fo_path, 0, &nd); + if (error) + return error; + + error = nlmsvc_failover_path(&nd); + + path_release(&nd); + return error; +} + static ssize_t write_filehandle(struct file *file, char *buf, size_t size) { /* request is: @@ -646,6 +704,8 @@ static int nfsd_fill_super(struct super_ [NFSD_Getfd] = {".getfd", &transaction_ops, S_IWUSR|S_IRUSR}, [NFSD_Getfs] = {".getfs", &transaction_ops, S_IWUSR|S_IRUSR}, [NFSD_List] = {"exports", &exports_operations, S_IRUGO}, + [NFSD_FO_UnlockIP] = {"unlock_ip", &transaction_ops, S_IWUSR|S_IRUSR}, + [NFSD_FO_UnlockFS] = {"unlock_filesystem", &transaction_ops, S_IWUSR|S_IRUSR}, [NFSD_Fh] = {"filehandle", &transaction_ops, S_IWUSR|S_IRUSR}, [NFSD_Threads] = {"threads", &transaction_ops, S_IWUSR|S_IRUSR}, [NFSD_Pool_Threads] = {"pool_threads", &transaction_ops, S_IWUSR|S_IRUSR}, Index: linux-2.6/fs/lockd/svcsubs.c =================================================================== --- linux-2.6.orig/fs/lockd/svcsubs.c 2008-01-08 18:36:37.000000000 +0100 +++ linux-2.6/fs/lockd/svcsubs.c 2008-01-10 08:56:18.000000000 +0100 @@ -18,6 +18,8 @@ #include #include #include +#include +#include #define NLMDBG_FACILITY NLMDBG_SVCSUBS @@ -87,7 +89,7 @@ nlm_lookup_file(struct svc_rqst *rqstp, unsigned int hash; __be32 nfserr; - nlm_debug_print_fh("nlm_file_lookup", f); + nlm_debug_print_fh("nlm_lookup_file", f); hash = file_hash(f); @@ -123,6 +125,9 @@ nlm_lookup_file(struct svc_rqst *rqstp, hlist_add_head(&file->f_list, &nlm_files[hash]); + /* fill in f_iaddr for nlm lock failover */ + file->f_iaddr = rqstp->rq_daddr; + found: dprintk("lockd: found file %p (count %d)\n", file, file->f_count); *result = file; @@ -194,6 +199,12 @@ again: return 0; } +static int +nlmsvc_always_match(struct nlm_host *dummy1, struct nlm_host *dummy2) +{ + return 1; +} + /* * Inspect a single file */ @@ -230,7 +241,8 @@ nlm_file_inuse(struct nlm_file *file) * Loop over all files in the file table. */ static int -nlm_traverse_files(struct nlm_host *host, nlm_host_match_fn_t match) +nlm_traverse_files(void *data, nlm_host_match_fn_t match, + int (*file_ok)(void *data, struct nlm_file *file)) { struct hlist_node *pos, *next; struct nlm_file *file; @@ -244,8 +256,10 @@ nlm_traverse_files(struct nlm_host *host /* Traverse locks, blocks and shares of this file * and update file->f_locks count */ - if (nlm_inspect_file(host, file, match)) - ret = 1; + if (!file_ok || file_ok(data, file)) { + if (nlm_inspect_file(data, file, match)) + ret = 1; + } mutex_lock(&nlm_file_mutex); file->f_count--; @@ -337,7 +351,7 @@ void nlmsvc_mark_resources(void) { dprintk("lockd: nlmsvc_mark_resources\n"); - nlm_traverse_files(NULL, nlmsvc_mark_host); + nlm_traverse_files(NULL, nlmsvc_mark_host, NULL); } /* @@ -348,7 +362,7 @@ nlmsvc_free_host_resources(struct nlm_ho { dprintk("lockd: nlmsvc_free_host_resources\n"); - if (nlm_traverse_files(host, nlmsvc_same_host)) { + if (nlm_traverse_files(host, nlmsvc_same_host, NULL)) { printk(KERN_WARNING "lockd: couldn't remove all locks held by %s\n", host->h_name); @@ -368,5 +382,36 @@ nlmsvc_invalidate_all(void) * turn, which is about as inefficient as it gets. * Now we just do it once in nlm_traverse_files. */ - nlm_traverse_files(NULL, nlmsvc_is_client); + nlm_traverse_files(NULL, nlmsvc_is_client, NULL); +} + +static int +nlmsvc_failover_file_ok_path(void *datap, struct nlm_file *file) +{ + struct nameidata *nd = datap; + return nd->mnt == file->f_file->f_path.mnt; +} + +int +nlmsvc_failover_path(struct nameidata *nd) +{ + return nlm_traverse_files(nd, nlmsvc_always_match, + nlmsvc_failover_file_ok_path); +} +EXPORT_SYMBOL_GPL(nlmsvc_failover_path); + +static int +nlmsvc_failover_file_ok_ip(void *datap, struct nlm_file *file) +{ + __be32 *server_addr = datap; + + return file->f_iaddr.addr.s_addr == *server_addr; +} + +int +nlmsvc_failover_ip(__be32 server_addr) +{ + return nlm_traverse_files(&server_addr, nlmsvc_always_match, + nlmsvc_failover_file_ok_ip); } +EXPORT_SYMBOL_GPL(nlmsvc_failover_ip); Index: linux-2.6/include/linux/lockd/lockd.h =================================================================== --- linux-2.6.orig/include/linux/lockd/lockd.h 2008-01-08 18:36:37.000000000 +0100 +++ linux-2.6/include/linux/lockd/lockd.h 2008-01-08 18:44:44.000000000 +0100 @@ -113,6 +113,7 @@ struct nlm_file { unsigned int f_locks; /* guesstimate # of locks */ unsigned int f_count; /* reference count */ struct mutex f_mutex; /* avoid concurrent access */ + union svc_addr_u f_iaddr; /* server ip for failover */ }; /* @@ -214,6 +215,12 @@ void nlmsvc_mark_resources(void); void nlmsvc_free_host_resources(struct nlm_host *); void nlmsvc_invalidate_all(void); +/* + * Cluster failover support + */ +int nlmsvc_failover_path(struct nameidata *nd); +int nlmsvc_failover_ip(__be32 server_addr); + static __inline__ struct inode * nlmsvc_file_inode(struct nlm_file *file) {