netdev - Re: [PATCH 10/12] nfs: enable swap on NFS

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Thu, 28 Jun 2012 13:37:34 +0100
From:	Mel Gorman <mgorman@...e.de>
To:	Jeff Layton <jlayton@...hat.com>
Cc:	Andrew Morton <akpm@...ux-foundation.org>,
	Linux-MM <linux-mm@...ck.org>,
	Linux-Netdev <netdev@...r.kernel.org>,
	Linux-NFS <linux-nfs@...r.kernel.org>,
	LKML <linux-kernel@...r.kernel.org>,
	David Miller <davem@...emloft.net>,
	Trond Myklebust <Trond.Myklebust@...app.com>,
	Neil Brown <neilb@...e.de>,
	Christoph Hellwig <hch@...radead.org>,
	Peter Zijlstra <a.p.zijlstra@...llo.nl>,
	Mike Christie <michaelc@...wisc.edu>,
	Eric B Munson <emunson@...bm.net>
Subject: Re: [PATCH 10/12] nfs: enable swap on NFS

On Thu, Jun 28, 2012 at 08:27:25AM -0400, Jeff Layton wrote:
> > <SNIP>
> > @@ -2108,11 +2156,15 @@ static void xs_tcp_setup_socket(struct work_struct *work)
> >  		container_of(work, struct sock_xprt, connect_worker.work);
> >  	struct socket *sock = transport->sock;
> >  	struct rpc_xprt *xprt = &transport->xprt;
> > +	unsigned long pflags = current->flags;
> >  	int status = -EIO;
> >  
> >  	if (xprt->shutdown)
> >  		goto out;
> >  
> > +	if (xprt->swapper)
> > +		current->flags |= PF_MEMALLOC;
> > +
> >  	if (!sock) {
> >  		clear_bit(XPRT_CONNECTION_ABORT, &xprt->state);
> >  		sock = xs_create_sock(xprt, transport,
> > @@ -2174,6 +2226,7 @@ out_eagain:
> >  out:
> >  	xprt_clear_connecting(xprt);
> >  	xprt_wake_pending_tasks(xprt, status);
> > +	tsk_restore_flags(current, pflags, PF_MEMALLOC);
> >  }
> >  
> >  /**
> 
> Apologies if this is fixed in another patch and I didn't see it...
> 

No apologies necessary. Even if it was fixed in another patch, it would
still be wrong for bisection reasons and for being rude to reviewers.

> There's a place in the above function that returns without going
> through "out:". I think you also want to tsk_restore_flags() in that
> spot too.
> 

You're right. The case that it would trigger would be some corner case
but very nicely spotted.

diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index b84df34..3d58b92 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -2214,6 +2214,7 @@ static void xs_tcp_setup_socket(struct work_struct *work)
 	case -EINPROGRESS:
 	case -EALREADY:
 		xprt_clear_connecting(xprt);
+		tsk_restore_flags(current, pflags, PF_MEMALLOC);
 		return;
 	case -EINVAL:
 		/* Happens, for instance, if the user specified a link
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html