* [Ocfs2-devel] [PATCH] ocfs2: Use memalloc_nofs_save instead of memalloc_noio_save
@ 2020-03-26 20:02 Matthew Wilcox
2020-03-27 1:28 ` Joseph Qi
0 siblings, 1 reply; 2+ messages in thread
From: Matthew Wilcox @ 2020-03-26 20:02 UTC (permalink / raw)
To: ocfs2-devel
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
OCFS2 doesn't mind if memory reclaim makes I/Os happen; it just cares
that it won't be reentered, so it can use memalloc_nofs_save() instead
of memalloc_noio_save().
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
---
fs/ocfs2/cluster/tcp.c | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
index 9261c1f06a9f..2c512b40a940 100644
--- a/fs/ocfs2/cluster/tcp.c
+++ b/fs/ocfs2/cluster/tcp.c
@@ -1570,15 +1570,13 @@ static void o2net_start_connect(struct work_struct *work)
struct sockaddr_in myaddr = {0, }, remoteaddr = {0, };
int ret = 0, stop;
unsigned int timeout;
- unsigned int noio_flag;
+ unsigned int nofs_flag;
/*
- * sock_create allocates the sock with GFP_KERNEL. We must set
- * per-process flag PF_MEMALLOC_NOIO so that all allocations done
- * by this process are done as if GFP_NOIO was specified. So we
- * are not reentering filesystem while doing memory reclaim.
+ * sock_create allocates the sock with GFP_KERNEL. We must
+ * prevent the filesystem from being reentered by memory reclaim.
*/
- noio_flag = memalloc_noio_save();
+ nofs_flag = memalloc_nofs_save();
/* if we're greater we initiate tx, otherwise we accept */
if (o2nm_this_node() <= o2net_num_from_nn(nn))
goto out;
@@ -1683,7 +1681,7 @@ static void o2net_start_connect(struct work_struct *work)
if (mynode)
o2nm_node_put(mynode);
- memalloc_noio_restore(noio_flag);
+ memalloc_nofs_restore(nofs_flag);
return;
}
@@ -1810,15 +1808,13 @@ static int o2net_accept_one(struct socket *sock, int *more)
struct o2nm_node *local_node = NULL;
struct o2net_sock_container *sc = NULL;
struct o2net_node *nn;
- unsigned int noio_flag;
+ unsigned int nofs_flag;
/*
- * sock_create_lite allocates the sock with GFP_KERNEL. We must set
- * per-process flag PF_MEMALLOC_NOIO so that all allocations done
- * by this process are done as if GFP_NOIO was specified. So we
- * are not reentering filesystem while doing memory reclaim.
+ * sock_create_lite allocates the sock with GFP_KERNEL. We must
+ * prevent the filesystem from being reentered by memory reclaim.
*/
- noio_flag = memalloc_noio_save();
+ nofs_flag = memalloc_nofs_save();
BUG_ON(sock == NULL);
*more = 0;
@@ -1934,7 +1930,7 @@ static int o2net_accept_one(struct socket *sock, int *more)
if (sc)
sc_put(sc);
- memalloc_noio_restore(noio_flag);
+ memalloc_nofs_restore(nofs_flag);
return ret;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Ocfs2-devel] [PATCH] ocfs2: Use memalloc_nofs_save instead of memalloc_noio_save
2020-03-26 20:02 [Ocfs2-devel] [PATCH] ocfs2: Use memalloc_nofs_save instead of memalloc_noio_save Matthew Wilcox
@ 2020-03-27 1:28 ` Joseph Qi
0 siblings, 0 replies; 2+ messages in thread
From: Joseph Qi @ 2020-03-27 1:28 UTC (permalink / raw)
To: ocfs2-devel
On 2020/3/27 04:02, Matthew Wilcox wrote:
> From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
>
> OCFS2 doesn't mind if memory reclaim makes I/Os happen; it just cares
> that it won't be reentered, so it can use memalloc_nofs_save() instead
> of memalloc_noio_save().
>
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
> ---
> fs/ocfs2/cluster/tcp.c | 24 ++++++++++--------------
> 1 file changed, 10 insertions(+), 14 deletions(-)
>
> diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c
> index 9261c1f06a9f..2c512b40a940 100644
> --- a/fs/ocfs2/cluster/tcp.c
> +++ b/fs/ocfs2/cluster/tcp.c
> @@ -1570,15 +1570,13 @@ static void o2net_start_connect(struct work_struct *work)
> struct sockaddr_in myaddr = {0, }, remoteaddr = {0, };
> int ret = 0, stop;
> unsigned int timeout;
> - unsigned int noio_flag;
> + unsigned int nofs_flag;
>
> /*
> - * sock_create allocates the sock with GFP_KERNEL. We must set
> - * per-process flag PF_MEMALLOC_NOIO so that all allocations done
> - * by this process are done as if GFP_NOIO was specified. So we
> - * are not reentering filesystem while doing memory reclaim.
> + * sock_create allocates the sock with GFP_KERNEL. We must
> + * prevent the filesystem from being reentered by memory reclaim.
> */
> - noio_flag = memalloc_noio_save();
> + nofs_flag = memalloc_nofs_save();
> /* if we're greater we initiate tx, otherwise we accept */
> if (o2nm_this_node() <= o2net_num_from_nn(nn))
> goto out;
> @@ -1683,7 +1681,7 @@ static void o2net_start_connect(struct work_struct *work)
> if (mynode)
> o2nm_node_put(mynode);
>
> - memalloc_noio_restore(noio_flag);
> + memalloc_nofs_restore(nofs_flag);
> return;
> }
>
> @@ -1810,15 +1808,13 @@ static int o2net_accept_one(struct socket *sock, int *more)
> struct o2nm_node *local_node = NULL;
> struct o2net_sock_container *sc = NULL;
> struct o2net_node *nn;
> - unsigned int noio_flag;
> + unsigned int nofs_flag;
>
> /*
> - * sock_create_lite allocates the sock with GFP_KERNEL. We must set
> - * per-process flag PF_MEMALLOC_NOIO so that all allocations done
> - * by this process are done as if GFP_NOIO was specified. So we
> - * are not reentering filesystem while doing memory reclaim.
> + * sock_create_lite allocates the sock with GFP_KERNEL. We must
> + * prevent the filesystem from being reentered by memory reclaim.
> */
> - noio_flag = memalloc_noio_save();
> + nofs_flag = memalloc_nofs_save();
>
> BUG_ON(sock == NULL);
> *more = 0;
> @@ -1934,7 +1930,7 @@ static int o2net_accept_one(struct socket *sock, int *more)
> if (sc)
> sc_put(sc);
>
> - memalloc_noio_restore(noio_flag);
> + memalloc_nofs_restore(nofs_flag);
> return ret;
> }
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-27 1:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-26 20:02 [Ocfs2-devel] [PATCH] ocfs2: Use memalloc_nofs_save instead of memalloc_noio_save Matthew Wilcox
2020-03-27 1:28 ` Joseph Qi
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.