From: Mel Gorman <mgorman@suse.de>
To: Jeff Layton <jlayton@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Linux-MM <linux-mm@kvack.org>,
Linux-Netdev <netdev@vger.kernel.org>,
Linux-NFS <linux-nfs@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
David Miller <davem@davemloft.net>,
Trond Myklebust <Trond.Myklebust@netapp.com>,
Neil Brown <neilb@suse.de>, Christoph Hellwig <hch@infradead.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Mike Christie <michaelc@cs.wisc.edu>,
Eric B Munson <emunson@mgebm.net>
Subject: Re: [PATCH 10/12] nfs: enable swap on NFS
Date: Thu, 28 Jun 2012 13:37:34 +0100 [thread overview]
Message-ID: <20120628123734.GH8271@suse.de> (raw)
In-Reply-To: <20120628082725.33b71097@corrin.poochiereds.net>
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, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2012-06-28 12:37 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-22 14:30 [PATCH 00/12] Swap-over-NFS without deadlocking V7 Mel Gorman
2012-06-22 14:30 ` [PATCH 01/12] netvm: Prevent a stream-specific deadlock Mel Gorman
2012-06-22 14:30 ` [PATCH 02/12] selinux: tag avc cache alloc as non-critical Mel Gorman
2012-06-22 14:30 ` [PATCH 03/12] mm: Methods for teaching filesystems about PG_swapcache pages Mel Gorman
2012-06-22 14:31 ` [PATCH 04/12] mm: Add support for a filesystem to activate swap files and use direct_IO for writing swap pages Mel Gorman
2012-06-22 14:31 ` [PATCH 05/12] mm: swap: Implement generic handler for swap_activate Mel Gorman
2012-06-22 14:31 ` [PATCH 06/12] mm: Add get_kernel_page[s] for pinning of kernel addresses for I/O Mel Gorman
2012-06-22 14:31 ` [PATCH 07/12] mm: Add support for direct_IO to highmem pages Mel Gorman
2012-06-22 14:31 ` [PATCH 08/12] nfs: teach the NFS client how to treat PG_swapcache pages Mel Gorman
2012-06-22 14:31 ` [PATCH 09/12] nfs: disable data cache revalidation for swapfiles Mel Gorman
2012-06-22 14:31 ` [PATCH 10/12] nfs: enable swap on NFS Mel Gorman
2012-06-28 12:27 ` Jeff Layton
2012-06-28 12:37 ` Mel Gorman [this message]
2012-06-28 12:49 ` Jeff Layton
2012-06-22 14:31 ` [PATCH 11/12] nfs: Prevent page allocator recursions with swap over NFS Mel Gorman
2012-06-22 14:31 ` [PATCH 12/12] Avoid dereferencing bd_disk during swap_entry_free for network storage Mel Gorman
-- strict thread matches above, loose matches on Subject: below --
2012-07-12 6:40 [PATCH 00/12] Swap-over-NFS without deadlocking V9 Mel Gorman
2012-07-12 6:41 ` [PATCH 10/12] nfs: enable swap on NFS Mel Gorman
2012-06-29 13:33 [PATCH 00/12] Swap-over-NFS without deadlocking V8 Mel Gorman
2012-06-29 13:33 ` [PATCH 10/12] nfs: enable swap on NFS Mel Gorman
2012-06-20 9:37 [PATCH 00/12] Swap-over-NFS without deadlocking V6 Mel Gorman
2012-06-20 9:37 ` [PATCH 10/12] nfs: enable swap on NFS Mel Gorman
2012-06-20 17:38 ` Rik van Riel
2012-05-17 14:51 [PATCH 00/12] Swap-over-NFS without deadlocking V5 Mel Gorman
2012-05-17 14:51 ` [PATCH 10/12] nfs: enable swap on NFS Mel Gorman
2012-05-10 13:54 [PATCH 00/12] Swap-over-NFS without deadlocking V4 Mel Gorman
2012-05-10 13:54 ` [PATCH 10/12] nfs: enable swap on NFS Mel Gorman
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=20120628123734.GH8271@suse.de \
--to=mgorman@suse.de \
--cc=Trond.Myklebust@netapp.com \
--cc=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=emunson@mgebm.net \
--cc=hch@infradead.org \
--cc=jlayton@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nfs@vger.kernel.org \
--cc=michaelc@cs.wisc.edu \
--cc=neilb@suse.de \
--cc=netdev@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).