From: greearb@candelatech.com
To: linux-nfs@vger.kernel.org
Cc: Ben Greear <greearb@candelatech.com>
Subject: [RFC 05/13] nfs: Pay attention to srcaddr in v4.1 callback logic.
Date: Mon, 21 Jan 2013 12:45:51 -0800 [thread overview]
Message-ID: <1358801159-18829-6-git-send-email-greearb@candelatech.com> (raw)
In-Reply-To: <1358801159-18829-1-git-send-email-greearb@candelatech.com>
From: Ben Greear <greearb@candelatech.com>
Signed-off-by: Ben Greear <greearb@candelatech.com>
---
fs/nfs/callback_proc.c | 3 ++-
fs/nfs/internal.h | 6 ++++--
fs/nfs/nfs4client.c | 24 +++++++++++++++++++++++-
3 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c
index 36b2e7a..24a3457 100644
--- a/fs/nfs/callback_proc.c
+++ b/fs/nfs/callback_proc.c
@@ -451,7 +451,8 @@ __be32 nfs4_callback_sequence(struct cb_sequenceargs *args,
int i;
__be32 status = htonl(NFS4ERR_BADSESSION);
- clp = nfs4_find_client_sessionid(cps->net, args->csa_addr, &args->csa_sessionid);
+ clp = nfs4_find_client_sessionid(cps->net, args->csa_daddr, args->csa_addr,
+ &args->csa_sessionid);
if (clp == NULL)
goto out;
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 80504e1..11c5ac7 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -190,8 +190,10 @@ extern void nfs_put_client(struct nfs_client *);
extern void nfs_free_client(struct nfs_client *);
extern struct nfs_client *nfs4_find_client_ident(struct net *, int);
extern struct nfs_client *
-nfs4_find_client_sessionid(struct net *, const struct sockaddr *,
- struct nfs4_sessionid *);
+nfs4_find_client_sessionid(struct net *,
+ const struct sockaddr *srcaddr,
+ const struct sockaddr *addr,
+ struct nfs4_sessionid *);
extern struct nfs_server *nfs_create_server(struct nfs_mount_info *,
struct nfs_subversion *);
extern struct nfs_server *nfs4_create_server(
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index 1f55131..7c4dc21 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -543,11 +543,13 @@ static bool nfs4_cb_match_client(const struct sockaddr *addr,
* Returns NULL if no such client
*/
struct nfs_client *
-nfs4_find_client_sessionid(struct net *net, const struct sockaddr *addr,
+nfs4_find_client_sessionid(struct net *net, const struct sockaddr *srcaddr,
+ const struct sockaddr *addr,
struct nfs4_sessionid *sid)
{
struct nfs_client *clp;
struct nfs_net *nn = net_generic(net, nfs_net_id);
+ struct nfs_client *ok_fit = NULL;
spin_lock(&nn->nfs_client_lock);
list_for_each_entry(clp, &nn->nfs_client_list, cl_share_link) {
@@ -562,10 +564,30 @@ nfs4_find_client_sessionid(struct net *net, const struct sockaddr *addr,
sid->data, NFS4_MAX_SESSIONID_LEN) != 0)
continue;
+ if (srcaddr) {
+ const struct sockaddr *sa;
+ sa = (const struct sockaddr *)&clp->cl_addr;
+ if (!nfs_sockaddr_match_ipaddr(srcaddr, sa)) {
+ /* If clp doesn't bind to srcaddr, then
+ * it is a potential match if we don't find
+ * a better one.
+ */
+ if (sa->sa_family == AF_UNSPEC && !ok_fit)
+ ok_fit = clp;
+ continue;
+ }
+ }
+found_one:
atomic_inc(&clp->cl_count);
spin_unlock(&nn->nfs_client_lock);
return clp;
}
+
+ if (ok_fit) {
+ clp = ok_fit;
+ goto found_one;
+ }
+
spin_unlock(&nn->nfs_client_lock);
return NULL;
}
--
1.7.3.4
next prev parent reply other threads:[~2013-01-21 20:47 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-21 20:45 [RFC 00/13] Allow NFS to bind to local IP address greearb
2013-01-21 20:45 ` [RFC 01/13] sunrpc: Don't attempt to bind to AF_UNSPEC address greearb
2013-01-21 20:45 ` [RFC 02/13] nfs: Two AF_UNSPEC addresses should always match each other greearb
2013-01-21 20:45 ` [RFC 03/13] nfs: Add srcaddr member to nfs_client greearb
2013-01-21 20:45 ` [RFC 04/13] nfs: Use request destination addr as callback source addr greearb
2013-01-21 20:45 ` greearb [this message]
2013-01-21 20:45 ` [RFC 06/13] nfs: Use srcaddr in nfs_match_client greearb
2013-01-21 20:45 ` [RFC 07/13] nfs: Pass srcaddr into mount request greearb
2013-01-21 20:45 ` [RFC 08/13] nfs: Propagate src-addr in client code greearb
2013-01-21 20:45 ` [RFC 09/13] nfs: Bind to srcaddr in rpcb_create greearb
2013-01-21 20:45 ` [RFC 10/13] nfs: Support srcaddr= to bind to specific IP address greearb
2013-01-21 20:45 ` [RFC 11/13] nfs: Add srcaddr to /proc/fs/nfsfs/servers greearb
2013-01-21 20:45 ` [RFC 12/13] lockd: Support binding nlm client to specific address greearb
2013-01-21 20:45 ` [RFC 13/13] nfs: Allow up to 5000 NFSv4 connections (instead of 1024) greearb
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1358801159-18829-6-git-send-email-greearb@candelatech.com \
--to=greearb@candelatech.com \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.