From: Michal Hocko <mhocko@kernel.org>
To: <linux-mm@kvack.org>, <linux-fsdevel@vger.kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Dave Chinner <david@fromorbit.com>,
"Theodore Ts'o" <tytso@mit.edu>, Chris Mason <clm@fb.com>,
David Sterba <dsterba@suse.cz>, Jan Kara <jack@suse.cz>,
ceph-devel@vger.kernel.org, cluster-devel@redhat.com,
linux-nfs@vger.kernel.org, logfs@logfs.org,
linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org,
linux-btrfs@vger.kernel.org, linux-mtd@lists.infradead.org,
reiserfs-devel@vger.kernel.org,
linux-ntfs-dev@lists.sourceforge.net,
linux-f2fs-devel@lists.sourceforge.net,
linux-afs@lists.infradead.org,
LKML <linux-kernel@vger.kernel.org>,
Michal Hocko <mhocko@suse.com>
Subject: [PATCH 5/9] xfs: use memalloc_nofs_{save,restore} instead of memalloc_noio*
Date: Thu, 15 Dec 2016 15:07:11 +0100 [thread overview]
Message-ID: <20161215140715.12732-6-mhocko@kernel.org> (raw)
In-Reply-To: <20161215140715.12732-1-mhocko@kernel.org>
From: Michal Hocko <mhocko@suse.com>
kmem_zalloc_large and _xfs_buf_map_pages use memalloc_noio_{save,restore}
API to prevent from reclaim recursion into the fs because vmalloc can
invoke unconditional GFP_KERNEL allocations and these functions might be
called from the NOFS contexts. The memalloc_noio_save will enforce
GFP_NOIO context which is even weaker than GFP_NOFS and that seems to be
unnecessary. Let's use memalloc_nofs_{save,restore} instead as it should
provide exactly what we need here - implicit GFP_NOFS context.
Signed-off-by: Michal Hocko <mhocko@suse.com>
---
fs/xfs/kmem.c | 10 +++++-----
fs/xfs/xfs_buf.c | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/fs/xfs/kmem.c b/fs/xfs/kmem.c
index a76a05dae96b..d69ed5e76621 100644
--- a/fs/xfs/kmem.c
+++ b/fs/xfs/kmem.c
@@ -65,7 +65,7 @@ kmem_alloc(size_t size, xfs_km_flags_t flags)
void *
kmem_zalloc_large(size_t size, xfs_km_flags_t flags)
{
- unsigned noio_flag = 0;
+ unsigned nofs_flag = 0;
void *ptr;
gfp_t lflags;
@@ -80,14 +80,14 @@ kmem_zalloc_large(size_t size, xfs_km_flags_t flags)
* context via PF_MEMALLOC_NOIO to prevent memory reclaim re-entering
* the filesystem here and potentially deadlocking.
*/
- if ((current->flags & PF_MEMALLOC_NOFS) || (flags & KM_NOFS))
- noio_flag = memalloc_noio_save();
+ if (flags & KM_NOFS)
+ nofs_flag = memalloc_nofs_save();
lflags = kmem_flags_convert(flags);
ptr = __vmalloc(size, lflags | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL);
- if ((current->flags & PF_MEMALLOC_NOFS) || (flags & KM_NOFS))
- memalloc_noio_restore(noio_flag);
+ if (flags & KM_NOFS)
+ memalloc_nofs_restore(nofs_flag);
return ptr;
}
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index f31ae592dcae..5c6f9bd4d8be 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -441,17 +441,17 @@ _xfs_buf_map_pages(
bp->b_addr = NULL;
} else {
int retried = 0;
- unsigned noio_flag;
+ unsigned nofs_flag;
/*
* vm_map_ram() will allocate auxillary structures (e.g.
* pagetables) with GFP_KERNEL, yet we are likely to be under
* GFP_NOFS context here. Hence we need to tell memory reclaim
- * that we are in such a context via PF_MEMALLOC_NOIO to prevent
+ * that we are in such a context via PF_MEMALLOC_NOFS to prevent
* memory reclaim re-entering the filesystem here and
* potentially deadlocking.
*/
- noio_flag = memalloc_noio_save();
+ nofs_flag = memalloc_nofs_save();
do {
bp->b_addr = vm_map_ram(bp->b_pages, bp->b_page_count,
-1, PAGE_KERNEL);
@@ -459,7 +459,7 @@ _xfs_buf_map_pages(
break;
vm_unmap_aliases();
} while (retried++ <= 1);
- memalloc_noio_restore(noio_flag);
+ memalloc_noio_restore(nofs_flag);
if (!bp->b_addr)
return -ENOMEM;
--
2.10.2
WARNING: multiple messages have this Message-ID (diff)
From: Michal Hocko <mhocko@kernel.org>
To: <linux-mm@kvack.org>, <linux-fsdevel@vger.kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Dave Chinner <david@fromorbit.com>,
"Theodore Ts'o" <tytso@mit.edu>, Chris Mason <clm@fb.com>,
David Sterba <dsterba@suse.cz>, Jan Kara <jack@suse.cz>,
ceph-devel@vger.kernel.org, cluster-devel@redhat.com,
linux-nfs@vger.kernel.org, logfs@logfs.org,
linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org,
linux-btrfs@vger.kernel.org, linux-mtd@lists.infradead.org,
reiserfs-devel@vger.kernel.org,
linux-ntfs-dev@lists.sourceforge.net,
linux-f2fs-devel@lists.sourceforge.net,
linux-afs@lists.infradead.org,
LKML <linux-kernel@vger.kernel.org>,
Michal Hocko <mhocko@suse.com>
Subject: [PATCH 5/9] xfs: use memalloc_nofs_{save,restore} instead of memalloc_noio*
Date: Thu, 15 Dec 2016 15:07:11 +0100 [thread overview]
Message-ID: <20161215140715.12732-6-mhocko@kernel.org> (raw)
In-Reply-To: <20161215140715.12732-1-mhocko@kernel.org>
From: Michal Hocko <mhocko@suse.com>
kmem_zalloc_large and _xfs_buf_map_pages use memalloc_noio_{save,restore}
API to prevent from reclaim recursion into the fs because vmalloc can
invoke unconditional GFP_KERNEL allocations and these functions might be
called from the NOFS contexts. The memalloc_noio_save will enforce
GFP_NOIO context which is even weaker than GFP_NOFS and that seems to be
unnecessary. Let's use memalloc_nofs_{save,restore} instead as it should
provide exactly what we need here - implicit GFP_NOFS context.
Signed-off-by: Michal Hocko <mhocko@suse.com>
---
fs/xfs/kmem.c | 10 +++++-----
fs/xfs/xfs_buf.c | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/fs/xfs/kmem.c b/fs/xfs/kmem.c
index a76a05dae96b..d69ed5e76621 100644
--- a/fs/xfs/kmem.c
+++ b/fs/xfs/kmem.c
@@ -65,7 +65,7 @@ kmem_alloc(size_t size, xfs_km_flags_t flags)
void *
kmem_zalloc_large(size_t size, xfs_km_flags_t flags)
{
- unsigned noio_flag = 0;
+ unsigned nofs_flag = 0;
void *ptr;
gfp_t lflags;
@@ -80,14 +80,14 @@ kmem_zalloc_large(size_t size, xfs_km_flags_t flags)
* context via PF_MEMALLOC_NOIO to prevent memory reclaim re-entering
* the filesystem here and potentially deadlocking.
*/
- if ((current->flags & PF_MEMALLOC_NOFS) || (flags & KM_NOFS))
- noio_flag = memalloc_noio_save();
+ if (flags & KM_NOFS)
+ nofs_flag = memalloc_nofs_save();
lflags = kmem_flags_convert(flags);
ptr = __vmalloc(size, lflags | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL);
- if ((current->flags & PF_MEMALLOC_NOFS) || (flags & KM_NOFS))
- memalloc_noio_restore(noio_flag);
+ if (flags & KM_NOFS)
+ memalloc_nofs_restore(nofs_flag);
return ptr;
}
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index f31ae592dcae..5c6f9bd4d8be 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -441,17 +441,17 @@ _xfs_buf_map_pages(
bp->b_addr = NULL;
} else {
int retried = 0;
- unsigned noio_flag;
+ unsigned nofs_flag;
/*
* vm_map_ram() will allocate auxillary structures (e.g.
* pagetables) with GFP_KERNEL, yet we are likely to be under
* GFP_NOFS context here. Hence we need to tell memory reclaim
- * that we are in such a context via PF_MEMALLOC_NOIO to prevent
+ * that we are in such a context via PF_MEMALLOC_NOFS to prevent
* memory reclaim re-entering the filesystem here and
* potentially deadlocking.
*/
- noio_flag = memalloc_noio_save();
+ nofs_flag = memalloc_nofs_save();
do {
bp->b_addr = vm_map_ram(bp->b_pages, bp->b_page_count,
-1, PAGE_KERNEL);
@@ -459,7 +459,7 @@ _xfs_buf_map_pages(
break;
vm_unmap_aliases();
} while (retried++ <= 1);
- memalloc_noio_restore(noio_flag);
+ memalloc_noio_restore(nofs_flag);
if (!bp->b_addr)
return -ENOMEM;
--
2.10.2
--
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>
WARNING: multiple messages have this Message-ID (diff)
From: Michal Hocko <mhocko@kernel.org>
To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
Dave Chinner <david@fromorbit.com>, Theodore Ts'o <tytso@mit.edu>,
Chris Mason <clm@fb.com>, David Sterba <dsterba@suse.cz>,
Jan Kara <jack@suse.cz>,
ceph-devel@vger.kernel.org, cluster-devel@redhat.com,
linux-nfs@vger.kernel.org, logfs@logfs.org,
linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org,
linux-btrfs@vger.kernel.org, linux-mtd@lists.infradead.org,
reiserfs-devel@vger.kernel.org,
linux-ntfs-dev@lists.sourceforge.net,
linux-f2fs-devel@lists.sourceforge.net,
linux-afs@lists.infradead.org,
LKML <linux-kernel@vger.kernel.org>,
Michal Hocko <mhocko@suse.com>
Subject: [PATCH 5/9] xfs: use memalloc_nofs_{save,restore} instead of memalloc_noio*
Date: Thu, 15 Dec 2016 15:07:11 +0100 [thread overview]
Message-ID: <20161215140715.12732-6-mhocko@kernel.org> (raw)
In-Reply-To: <20161215140715.12732-1-mhocko@kernel.org>
From: Michal Hocko <mhocko@suse.com>
kmem_zalloc_large and _xfs_buf_map_pages use memalloc_noio_{save,restore}
API to prevent from reclaim recursion into the fs because vmalloc can
invoke unconditional GFP_KERNEL allocations and these functions might be
called from the NOFS contexts. The memalloc_noio_save will enforce
GFP_NOIO context which is even weaker than GFP_NOFS and that seems to be
unnecessary. Let's use memalloc_nofs_{save,restore} instead as it should
provide exactly what we need here - implicit GFP_NOFS context.
Signed-off-by: Michal Hocko <mhocko@suse.com>
---
fs/xfs/kmem.c | 10 +++++-----
fs/xfs/xfs_buf.c | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/fs/xfs/kmem.c b/fs/xfs/kmem.c
index a76a05dae96b..d69ed5e76621 100644
--- a/fs/xfs/kmem.c
+++ b/fs/xfs/kmem.c
@@ -65,7 +65,7 @@ kmem_alloc(size_t size, xfs_km_flags_t flags)
void *
kmem_zalloc_large(size_t size, xfs_km_flags_t flags)
{
- unsigned noio_flag = 0;
+ unsigned nofs_flag = 0;
void *ptr;
gfp_t lflags;
@@ -80,14 +80,14 @@ kmem_zalloc_large(size_t size, xfs_km_flags_t flags)
* context via PF_MEMALLOC_NOIO to prevent memory reclaim re-entering
* the filesystem here and potentially deadlocking.
*/
- if ((current->flags & PF_MEMALLOC_NOFS) || (flags & KM_NOFS))
- noio_flag = memalloc_noio_save();
+ if (flags & KM_NOFS)
+ nofs_flag = memalloc_nofs_save();
lflags = kmem_flags_convert(flags);
ptr = __vmalloc(size, lflags | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL);
- if ((current->flags & PF_MEMALLOC_NOFS) || (flags & KM_NOFS))
- memalloc_noio_restore(noio_flag);
+ if (flags & KM_NOFS)
+ memalloc_nofs_restore(nofs_flag);
return ptr;
}
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index f31ae592dcae..5c6f9bd4d8be 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -441,17 +441,17 @@ _xfs_buf_map_pages(
bp->b_addr = NULL;
} else {
int retried = 0;
- unsigned noio_flag;
+ unsigned nofs_flag;
/*
* vm_map_ram() will allocate auxillary structures (e.g.
* pagetables) with GFP_KERNEL, yet we are likely to be under
* GFP_NOFS context here. Hence we need to tell memory reclaim
- * that we are in such a context via PF_MEMALLOC_NOIO to prevent
+ * that we are in such a context via PF_MEMALLOC_NOFS to prevent
* memory reclaim re-entering the filesystem here and
* potentially deadlocking.
*/
- noio_flag = memalloc_noio_save();
+ nofs_flag = memalloc_nofs_save();
do {
bp->b_addr = vm_map_ram(bp->b_pages, bp->b_page_count,
-1, PAGE_KERNEL);
@@ -459,7 +459,7 @@ _xfs_buf_map_pages(
break;
vm_unmap_aliases();
} while (retried++ <= 1);
- memalloc_noio_restore(noio_flag);
+ memalloc_noio_restore(nofs_flag);
if (!bp->b_addr)
return -ENOMEM;
--
2.10.2
WARNING: multiple messages have this Message-ID (diff)
From: Michal Hocko <mhocko@kernel.org>
To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
Dave Chinner <david@fromorbit.com>, Theodore Ts'o <tytso@mit.edu>,
Chris Mason <clm@fb.com>, David Sterba <dsterba@suse.cz>,
Jan Kara <jack@suse.cz>,
ceph-devel@vger.kernel.org, cluster-devel@redhat.com,
linux-nfs@vger.kernel.org, logfs@logfs.org,
linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org,
linux-btrfs@vger.kernel.org, linux-mtd@lists.infradead.org,
reiserfs-devel@vger.kernel.org,
linux-ntfs-dev@lists.sourceforge.net,
linux-f2fs-devel@lists.sourceforge.net,
linux-afs@lists.infradead.org,
LKML <linux-kernel@vger.kernel.org>,
Michal Hocko <mhocko@suse.com>
Subject: [PATCH 5/9] xfs: use memalloc_nofs_{save,restore} instead of memalloc_noio*
Date: Thu, 15 Dec 2016 15:07:11 +0100 [thread overview]
Message-ID: <20161215140715.12732-6-mhocko@kernel.org> (raw)
In-Reply-To: <20161215140715.12732-1-mhocko@kernel.org>
From: Michal Hocko <mhocko@suse.com>
kmem_zalloc_large and _xfs_buf_map_pages use memalloc_noio_{save,restore}
API to prevent from reclaim recursion into the fs because vmalloc can
invoke unconditional GFP_KERNEL allocations and these functions might be
called from the NOFS contexts. The memalloc_noio_save will enforce
GFP_NOIO context which is even weaker than GFP_NOFS and that seems to be
unnecessary. Let's use memalloc_nofs_{save,restore} instead as it should
provide exactly what we need here - implicit GFP_NOFS context.
Signed-off-by: Michal Hocko <mhocko@suse.com>
---
fs/xfs/kmem.c | 10 +++++-----
fs/xfs/xfs_buf.c | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/fs/xfs/kmem.c b/fs/xfs/kmem.c
index a76a05dae96b..d69ed5e76621 100644
--- a/fs/xfs/kmem.c
+++ b/fs/xfs/kmem.c
@@ -65,7 +65,7 @@ kmem_alloc(size_t size, xfs_km_flags_t flags)
void *
kmem_zalloc_large(size_t size, xfs_km_flags_t flags)
{
- unsigned noio_flag = 0;
+ unsigned nofs_flag = 0;
void *ptr;
gfp_t lflags;
@@ -80,14 +80,14 @@ kmem_zalloc_large(size_t size, xfs_km_flags_t flags)
* context via PF_MEMALLOC_NOIO to prevent memory reclaim re-entering
* the filesystem here and potentially deadlocking.
*/
- if ((current->flags & PF_MEMALLOC_NOFS) || (flags & KM_NOFS))
- noio_flag = memalloc_noio_save();
+ if (flags & KM_NOFS)
+ nofs_flag = memalloc_nofs_save();
lflags = kmem_flags_convert(flags);
ptr = __vmalloc(size, lflags | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL);
- if ((current->flags & PF_MEMALLOC_NOFS) || (flags & KM_NOFS))
- memalloc_noio_restore(noio_flag);
+ if (flags & KM_NOFS)
+ memalloc_nofs_restore(nofs_flag);
return ptr;
}
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index f31ae592dcae..5c6f9bd4d8be 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -441,17 +441,17 @@ _xfs_buf_map_pages(
bp->b_addr = NULL;
} else {
int retried = 0;
- unsigned noio_flag;
+ unsigned nofs_flag;
/*
* vm_map_ram() will allocate auxillary structures (e.g.
* pagetables) with GFP_KERNEL, yet we are likely to be under
* GFP_NOFS context here. Hence we need to tell memory reclaim
- * that we are in such a context via PF_MEMALLOC_NOIO to prevent
+ * that we are in such a context via PF_MEMALLOC_NOFS to prevent
* memory reclaim re-entering the filesystem here and
* potentially deadlocking.
*/
- noio_flag = memalloc_noio_save();
+ nofs_flag = memalloc_nofs_save();
do {
bp->b_addr = vm_map_ram(bp->b_pages, bp->b_page_count,
-1, PAGE_KERNEL);
@@ -459,7 +459,7 @@ _xfs_buf_map_pages(
break;
vm_unmap_aliases();
} while (retried++ <= 1);
- memalloc_noio_restore(noio_flag);
+ memalloc_noio_restore(nofs_flag);
if (!bp->b_addr)
return -ENOMEM;
--
2.10.2
--
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>
WARNING: multiple messages have this Message-ID (diff)
From: Michal Hocko <mhocko@kernel.org>
To: <linux-mm@kvack.org>, <linux-fsdevel@vger.kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Dave Chinner <david@fromorbit.com>,
"Theodore Ts'o" <tytso@mit.edu>, Chris Mason <clm@fb.com>,
David Sterba <dsterba@suse.cz>, Jan Kara <jack@suse.cz>,
ceph-devel@vger.kernel.org, cluster-devel@redhat.com,
linux-nfs@vger.kernel.org, logfs@logfs.org,
linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org,
linux-btrfs@vger.kernel.org, linux-mtd@lists.infradead.org,
reiserfs-devel@vger.kernel.org,
linux-ntfs-dev@lists.sourceforge.net,
linux-f2fs-devel@lists.sourceforge.net,
linux-afs@lists.infradead.org,
LKML <linux-kernel@vger.kernel.org>,
Michal Hocko <mhocko@suse.com>
Subject: [PATCH 5/9] xfs: use memalloc_nofs_{save, restore} instead of memalloc_noio*
Date: Thu, 15 Dec 2016 15:07:11 +0100 [thread overview]
Message-ID: <20161215140715.12732-6-mhocko@kernel.org> (raw)
In-Reply-To: <20161215140715.12732-1-mhocko@kernel.org>
From: Michal Hocko <mhocko@suse.com>
kmem_zalloc_large and _xfs_buf_map_pages use memalloc_noio_{save,restore}
API to prevent from reclaim recursion into the fs because vmalloc can
invoke unconditional GFP_KERNEL allocations and these functions might be
called from the NOFS contexts. The memalloc_noio_save will enforce
GFP_NOIO context which is even weaker than GFP_NOFS and that seems to be
unnecessary. Let's use memalloc_nofs_{save,restore} instead as it should
provide exactly what we need here - implicit GFP_NOFS context.
Signed-off-by: Michal Hocko <mhocko@suse.com>
---
fs/xfs/kmem.c | 10 +++++-----
fs/xfs/xfs_buf.c | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/fs/xfs/kmem.c b/fs/xfs/kmem.c
index a76a05dae96b..d69ed5e76621 100644
--- a/fs/xfs/kmem.c
+++ b/fs/xfs/kmem.c
@@ -65,7 +65,7 @@ kmem_alloc(size_t size, xfs_km_flags_t flags)
void *
kmem_zalloc_large(size_t size, xfs_km_flags_t flags)
{
- unsigned noio_flag = 0;
+ unsigned nofs_flag = 0;
void *ptr;
gfp_t lflags;
@@ -80,14 +80,14 @@ kmem_zalloc_large(size_t size, xfs_km_flags_t flags)
* context via PF_MEMALLOC_NOIO to prevent memory reclaim re-entering
* the filesystem here and potentially deadlocking.
*/
- if ((current->flags & PF_MEMALLOC_NOFS) || (flags & KM_NOFS))
- noio_flag = memalloc_noio_save();
+ if (flags & KM_NOFS)
+ nofs_flag = memalloc_nofs_save();
lflags = kmem_flags_convert(flags);
ptr = __vmalloc(size, lflags | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL);
- if ((current->flags & PF_MEMALLOC_NOFS) || (flags & KM_NOFS))
- memalloc_noio_restore(noio_flag);
+ if (flags & KM_NOFS)
+ memalloc_nofs_restore(nofs_flag);
return ptr;
}
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index f31ae592dcae..5c6f9bd4d8be 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -441,17 +441,17 @@ _xfs_buf_map_pages(
bp->b_addr = NULL;
} else {
int retried = 0;
- unsigned noio_flag;
+ unsigned nofs_flag;
/*
* vm_map_ram() will allocate auxillary structures (e.g.
* pagetables) with GFP_KERNEL, yet we are likely to be under
* GFP_NOFS context here. Hence we need to tell memory reclaim
- * that we are in such a context via PF_MEMALLOC_NOIO to prevent
+ * that we are in such a context via PF_MEMALLOC_NOFS to prevent
* memory reclaim re-entering the filesystem here and
* potentially deadlocking.
*/
- noio_flag = memalloc_noio_save();
+ nofs_flag = memalloc_nofs_save();
do {
bp->b_addr = vm_map_ram(bp->b_pages, bp->b_page_count,
-1, PAGE_KERNEL);
@@ -459,7 +459,7 @@ _xfs_buf_map_pages(
break;
vm_unmap_aliases();
} while (retried++ <= 1);
- memalloc_noio_restore(noio_flag);
+ memalloc_noio_restore(nofs_flag);
if (!bp->b_addr)
return -ENOMEM;
--
2.10.2
WARNING: multiple messages have this Message-ID (diff)
From: Michal Hocko <mhocko@kernel.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH 5/9] xfs: use memalloc_nofs_{save, restore} instead of memalloc_noio*
Date: Thu, 15 Dec 2016 15:07:11 +0100 [thread overview]
Message-ID: <20161215140715.12732-6-mhocko@kernel.org> (raw)
In-Reply-To: <20161215140715.12732-1-mhocko@kernel.org>
From: Michal Hocko <mhocko@suse.com>
kmem_zalloc_large and _xfs_buf_map_pages use memalloc_noio_{save,restore}
API to prevent from reclaim recursion into the fs because vmalloc can
invoke unconditional GFP_KERNEL allocations and these functions might be
called from the NOFS contexts. The memalloc_noio_save will enforce
GFP_NOIO context which is even weaker than GFP_NOFS and that seems to be
unnecessary. Let's use memalloc_nofs_{save,restore} instead as it should
provide exactly what we need here - implicit GFP_NOFS context.
Signed-off-by: Michal Hocko <mhocko@suse.com>
---
fs/xfs/kmem.c | 10 +++++-----
fs/xfs/xfs_buf.c | 8 ++++----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/fs/xfs/kmem.c b/fs/xfs/kmem.c
index a76a05dae96b..d69ed5e76621 100644
--- a/fs/xfs/kmem.c
+++ b/fs/xfs/kmem.c
@@ -65,7 +65,7 @@ kmem_alloc(size_t size, xfs_km_flags_t flags)
void *
kmem_zalloc_large(size_t size, xfs_km_flags_t flags)
{
- unsigned noio_flag = 0;
+ unsigned nofs_flag = 0;
void *ptr;
gfp_t lflags;
@@ -80,14 +80,14 @@ kmem_zalloc_large(size_t size, xfs_km_flags_t flags)
* context via PF_MEMALLOC_NOIO to prevent memory reclaim re-entering
* the filesystem here and potentially deadlocking.
*/
- if ((current->flags & PF_MEMALLOC_NOFS) || (flags & KM_NOFS))
- noio_flag = memalloc_noio_save();
+ if (flags & KM_NOFS)
+ nofs_flag = memalloc_nofs_save();
lflags = kmem_flags_convert(flags);
ptr = __vmalloc(size, lflags | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL);
- if ((current->flags & PF_MEMALLOC_NOFS) || (flags & KM_NOFS))
- memalloc_noio_restore(noio_flag);
+ if (flags & KM_NOFS)
+ memalloc_nofs_restore(nofs_flag);
return ptr;
}
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index f31ae592dcae..5c6f9bd4d8be 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -441,17 +441,17 @@ _xfs_buf_map_pages(
bp->b_addr = NULL;
} else {
int retried = 0;
- unsigned noio_flag;
+ unsigned nofs_flag;
/*
* vm_map_ram() will allocate auxillary structures (e.g.
* pagetables) with GFP_KERNEL, yet we are likely to be under
* GFP_NOFS context here. Hence we need to tell memory reclaim
- * that we are in such a context via PF_MEMALLOC_NOIO to prevent
+ * that we are in such a context via PF_MEMALLOC_NOFS to prevent
* memory reclaim re-entering the filesystem here and
* potentially deadlocking.
*/
- noio_flag = memalloc_noio_save();
+ nofs_flag = memalloc_nofs_save();
do {
bp->b_addr = vm_map_ram(bp->b_pages, bp->b_page_count,
-1, PAGE_KERNEL);
@@ -459,7 +459,7 @@ _xfs_buf_map_pages(
break;
vm_unmap_aliases();
} while (retried++ <= 1);
- memalloc_noio_restore(noio_flag);
+ memalloc_noio_restore(nofs_flag);
if (!bp->b_addr)
return -ENOMEM;
--
2.10.2
next prev parent reply other threads:[~2016-12-15 14:07 UTC|newest]
Thread overview: 138+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-15 14:07 [PATCH 0/9 v2] scope GFP_NOFS api Michal Hocko
2016-12-15 14:07 ` [Cluster-devel] " Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-15 14:07 ` [PATCH 1/9] lockdep: allow to disable reclaim lockup detection Michal Hocko
2016-12-15 14:07 ` [Cluster-devel] " Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-15 14:07 ` [PATCH 2/9] xfs: introduce and use KM_NOLOCKDEP to silence reclaim lockdep false positives Michal Hocko
2016-12-15 14:07 ` [Cluster-devel] " Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-16 15:40 ` [PATCH 2/9 v2] " Michal Hocko
2016-12-16 15:40 ` [Cluster-devel] " Michal Hocko
2016-12-16 15:40 ` Michal Hocko
2016-12-16 15:40 ` Michal Hocko
2016-12-16 15:40 ` Michal Hocko
2016-12-16 16:37 ` Brian Foster
2016-12-16 16:37 ` [Cluster-devel] " Brian Foster
2016-12-16 16:37 ` Brian Foster
2016-12-16 22:01 ` Michal Hocko
2016-12-16 22:01 ` [Cluster-devel] " Michal Hocko
2016-12-16 22:01 ` Michal Hocko
2016-12-19 21:24 ` [PATCH 2/9] " Dave Chinner
2016-12-19 21:24 ` [Cluster-devel] " Dave Chinner
2016-12-19 21:24 ` Dave Chinner
2016-12-19 22:06 ` Darrick J. Wong
2016-12-19 22:07 ` [Cluster-devel] " Darrick J. Wong
2016-12-19 22:06 ` Darrick J. Wong
2016-12-20 21:39 ` Dave Chinner
2016-12-20 21:39 ` [Cluster-devel] " Dave Chinner
2016-12-20 21:39 ` Dave Chinner
2016-12-20 8:38 ` Michal Hocko
2016-12-20 8:38 ` [Cluster-devel] " Michal Hocko
2016-12-20 8:38 ` Michal Hocko
2016-12-15 14:07 ` [PATCH 3/9] xfs: abstract PF_FSTRANS to PF_MEMALLOC_NOFS Michal Hocko
2016-12-15 14:07 ` [Cluster-devel] " Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-16 16:38 ` Brian Foster
2016-12-16 16:38 ` [Cluster-devel] " Brian Foster
2016-12-16 16:38 ` Brian Foster
2016-12-15 14:07 ` [PATCH 4/9] mm: introduce memalloc_nofs_{save,restore} API Michal Hocko
2016-12-15 14:07 ` [Cluster-devel] [PATCH 4/9] mm: introduce memalloc_nofs_{save, restore} API Michal Hocko
2016-12-15 14:07 ` [PATCH 4/9] mm: introduce memalloc_nofs_{save,restore} API Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-17 10:44 ` Tetsuo Handa
2016-12-18 16:21 ` Michal Hocko
2016-12-15 14:07 ` Michal Hocko [this message]
2016-12-15 14:07 ` [Cluster-devel] [PATCH 5/9] xfs: use memalloc_nofs_{save, restore} instead of memalloc_noio* Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-15 14:07 ` [PATCH 5/9] xfs: use memalloc_nofs_{save,restore} " Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-16 16:38 ` Brian Foster
2016-12-16 16:38 ` [Cluster-devel] [PATCH 5/9] xfs: use memalloc_nofs_{save, restore} " Brian Foster
2016-12-16 16:38 ` [PATCH 5/9] xfs: use memalloc_nofs_{save,restore} " Brian Foster
2016-12-16 22:00 ` [PATCH 5/9 v2] " Michal Hocko
2016-12-16 22:00 ` [Cluster-devel] [PATCH 5/9 v2] xfs: use memalloc_nofs_{save, restore} " Michal Hocko
2016-12-16 22:00 ` [PATCH 5/9 v2] xfs: use memalloc_nofs_{save,restore} " Michal Hocko
2016-12-16 22:00 ` Michal Hocko
2016-12-16 22:00 ` Michal Hocko
2016-12-15 14:07 ` [PATCH 6/9] jbd2: mark the transaction context with the scope GFP_NOFS context Michal Hocko
2016-12-15 14:07 ` [Cluster-devel] " Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-16 8:39 ` Jan Kara
2016-12-16 8:39 ` [Cluster-devel] " Jan Kara
2016-12-16 8:39 ` Jan Kara
2016-12-15 14:07 ` [PATCH 7/9] jbd2: make the whole kjournald2 kthread NOFS safe Michal Hocko
2016-12-15 14:07 ` [Cluster-devel] " Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-16 8:40 ` Jan Kara
2016-12-16 8:40 ` [Cluster-devel] " Jan Kara
2016-12-16 8:40 ` Jan Kara
2016-12-15 14:07 ` [PATCH 8/9] Revert "ext4: avoid deadlocks in the writeback path by using sb_getblk_gfp" Michal Hocko
2016-12-15 14:07 ` [Cluster-devel] " Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-16 8:41 ` Jan Kara
2016-12-16 8:41 ` [Cluster-devel] " Jan Kara
2016-12-16 8:41 ` Jan Kara
2016-12-15 14:07 ` [PATCH 9/9] Revert "ext4: fix wrong gfp type under transaction" Michal Hocko
2016-12-15 14:07 ` [Cluster-devel] " Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-15 14:07 ` Michal Hocko
2016-12-16 8:43 ` Jan Kara
2016-12-16 8:43 ` [Cluster-devel] " Jan Kara
2016-12-16 8:43 ` Jan Kara
2016-12-16 12:46 ` [DEBUG PATCH 0/2] debug explicit GFP_NO{FS,IO} usage from the scope context Michal Hocko
2016-12-16 12:46 ` [Cluster-devel] [DEBUG PATCH 0/2] debug explicit GFP_NO{FS, IO} " Michal Hocko
2016-12-16 12:46 ` Michal Hocko
2016-12-16 12:46 ` [DEBUG PATCH 0/2] debug explicit GFP_NO{FS,IO} " Michal Hocko
2016-12-16 12:46 ` Michal Hocko
2016-12-16 12:46 ` Michal Hocko
2016-12-16 12:46 ` [DEBUG PATCH 1/2] mm, debug: report when GFP_NO{FS,IO} is used explicitly from memalloc_no{fs,io}_{save,restore} context Michal Hocko
2016-12-16 12:46 ` [Cluster-devel] [DEBUG PATCH 1/2] mm, debug: report when GFP_NO{FS, IO} is used explicitly from memalloc_no{fs, io}_{save, restore} context Michal Hocko
2016-12-16 12:46 ` Michal Hocko
2016-12-16 12:46 ` [DEBUG PATCH 1/2] mm, debug: report when GFP_NO{FS,IO} is used explicitly from memalloc_no{fs,io}_{save,restore} context Michal Hocko
2016-12-16 12:46 ` Michal Hocko
2016-12-16 12:46 ` Michal Hocko
2016-12-16 12:46 ` [DEBUG PATCH 2/2] silent warnings which we cannot do anything about Michal Hocko
2016-12-16 12:46 ` [Cluster-devel] " Michal Hocko
2016-12-16 12:46 ` Michal Hocko
2016-12-16 12:46 ` Michal Hocko
2016-12-16 12:46 ` Michal Hocko
2016-12-16 15:05 ` [PATCH 0/9 v2] scope GFP_NOFS api Mike Galbraith
2016-12-16 15:06 ` [Cluster-devel] " Mike Galbraith
2016-12-16 15:05 ` Mike Galbraith
2016-12-16 15:05 ` Mike Galbraith
2016-12-16 15:05 ` Mike Galbraith
2016-12-16 15:05 ` Mike Galbraith
2016-12-16 15:05 ` Mike Galbraith
2016-12-16 15:35 ` Michal Hocko
2016-12-16 15:35 ` [Cluster-devel] " Michal Hocko
2016-12-16 15:35 ` Michal Hocko
2016-12-16 16:27 ` Mike Galbraith
2016-12-16 16:27 ` [Cluster-devel] " Mike Galbraith
2016-12-16 16:27 ` Mike Galbraith
2016-12-16 16:27 ` Mike Galbraith
2016-12-16 16:27 ` Mike Galbraith
2016-12-19 9:25 ` Jan Kara
2016-12-19 9:25 ` [Cluster-devel] " Jan Kara
2016-12-19 9:25 ` Jan Kara
2016-12-22 9:38 ` Michal Hocko
2016-12-22 9:38 ` [Cluster-devel] " Michal Hocko
2016-12-22 9:38 ` Michal Hocko
2016-12-22 9:38 ` Michal Hocko
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=20161215140715.12732-6-mhocko@kernel.org \
--to=mhocko@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=ceph-devel@vger.kernel.org \
--cc=clm@fb.com \
--cc=cluster-devel@redhat.com \
--cc=david@fromorbit.com \
--cc=dsterba@suse.cz \
--cc=jack@suse.cz \
--cc=linux-afs@lists.infradead.org \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-ntfs-dev@lists.sourceforge.net \
--cc=linux-xfs@vger.kernel.org \
--cc=logfs@logfs.org \
--cc=mhocko@suse.com \
--cc=reiserfs-devel@vger.kernel.org \
--cc=tytso@mit.edu \
/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.