On Tue, 11 Jan 2011 12:04:54 -0600
Rob Landley <rlandley@xxxxxxxxxxxxx> wrote:
> From: Rob Landley <rlandley@xxxxxxxxxxxxx>
>
> Teach cifs about network namespaces, so mounting uses adresses/routing
> visible from the container rather than from init context.
>
> Signed-off-by: Rob Landley <rlandley@xxxxxxxxxxxxx>
> ---
>
> Updated with Matt's feedback and to apply to current linus-git.
>
> fs/cifs/cifsglob.h | 37 +++++++++++++++++++++++++++++++++++++
> fs/cifs/connect.c | 14 ++++++++++++--
> 2 files changed, 49 insertions(+), 2 deletions(-)
>
> diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
> index 606ca8b..8175d31 100644
> --- a/fs/cifs/cifsglob.h
> +++ b/fs/cifs/cifsglob.h
> @@ -165,6 +165,9 @@ struct TCP_Server_Info {
> struct socket *ssocket;
> struct sockaddr_storage dstaddr;
> struct sockaddr_storage srcaddr; /* locally bind to this IP */
> +#ifdef CONFIG_NET_NS
> + struct net *net;
> +#endif
> wait_queue_head_t response_q;
> wait_queue_head_t request_q; /* if more than maxmpx to srvr must block*/
> struct list_head pending_mid_q;
> @@ -224,6 +227,40 @@ struct TCP_Server_Info {
> };
>
I've got a patch queued that rearranges some fields in TCP_Server_Info
according to pahole's recommendations. You may want to base this patch
on that.
It might also be good to run pahole on this after your patch to see if
it might be better placed...
> /*
> + * Macros to allow the TCP_Server_Info->net field and related code to drop out
> + * when CONFIG_NET_NS isn't set.
> + */
> +
> +#ifdef CONFIG_NET_NS
> +
> +#define HAVE_NET_NS 1
> +
> +static inline struct net *cifs_net_ns(struct TCP_Server_Info *srv)
> +{
> + return srv->net;
> +}
> +
> +static inline void cifs_set_net_ns(struct TCP_Server_Info *srv, struct net *net)
> +{
> + srv->net = net;
> +}
> +
> +#else
> +
> +#define HAVE_NET_NS 0
> +
> +static inline struct net *cifs_net_ns(struct TCP_Server_Info *srv)
> +{
> + return &init_net;
> +}
> +
> +static inline void cifs_set_net_ns(struct TCP_Server_Info *srv, struct net *net)
> +{
> +}
> +
> +#endif
> +
> +/*
> * Session structure. One of these for each uid session with a particular host
> */
> struct cifsSesInfo {
> diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
> index a65d311..7dab1d3 100644
> --- a/fs/cifs/connect.c
> +++ b/fs/cifs/connect.c
> @@ -1577,6 +1577,10 @@ cifs_find_tcp_session(struct sockaddr *addr, struct smb_vol *vol)
>
> spin_lock(&cifs_tcp_ses_lock);
> list_for_each_entry(server, &cifs_tcp_ses_list, tcp_ses_list) {
> + if (HAVE_NET_NS &&
> + cifs_net_ns(server) != current->nsproxy->net_ns)
> + continue;
> +
This HAVE_NET_NS thing is pretty ugly. This is not a high-performance
codepath. My vote would be to get rid of this and just have the useless
test when CONFIG_NET_NS isn't set.
Alternately, you could turn the comparison into a static inline or
macro, and simply have that compile down to nothing when CONFIG_NET_NS
isn't set.
> if (!match_address(server, addr,
> (struct sockaddr *)&vol->srcaddr))
> continue;
> @@ -1607,6 +1611,8 @@ cifs_put_tcp_session(struct TCP_Server_Info *server)
> return;
> }
>
> + put_net(cifs_net_ns(server));
> +
> list_del_init(&server->tcp_ses_list);
> spin_unlock(&cifs_tcp_ses_lock);
>
> @@ -1712,6 +1718,8 @@ cifs_get_tcp_session(struct smb_vol *volume_info)
> sizeof(tcp_ses->srcaddr));
> ++tcp_ses->srv_count;
>
> + cifs_set_net_ns(tcp_ses, get_net(current->nsproxy->net_ns));
> +
> if (addr.ss_family == AF_INET6) {
> cFYI(1, "attempting ipv6 connect");
> /* BB should we allow ipv6 on port 139? */
> @@ -1754,6 +1762,8 @@ cifs_get_tcp_session(struct smb_vol *volume_info)
> out_err_crypto_release:
> cifs_crypto_shash_release(tcp_ses);
>
> + put_net(cifs_net_ns(tcp_ses));
> +
^^^^
This looks like it will oops if you end up doing the "goto
out_err_crypto_release" after the extract_hostname call.
> out_err:
> if (tcp_ses) {
> if (!IS_ERR(tcp_ses->hostname))
> @@ -2265,8 +2275,8 @@ generic_ip_connect(struct TCP_Server_Info *server)
> }
>
> if (socket == NULL) {
> - rc = sock_create_kern(sfamily, SOCK_STREAM,
> - IPPROTO_TCP, &socket);
> + rc = __sock_create(cifs_net_ns(server), sfamily, SOCK_STREAM,
> + IPPROTO_TCP, &socket, 1);
> if (rc < 0) {
> cERROR(1, "Error %d creating socket", rc);
> server->ssocket = NULL;
> --
> To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Jeff Layton <jlayton@xxxxxxxxxx>
--
To unsubscribe from this list: send the line "unsubscribe linux-cifs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
