From: NeilBrown <neilb@suse.de>
To: Andrew Morton <akpm@linux-foundation.org>,
Theodore Ts'o <tytso@mit.edu>,
Andreas Dilger <adilger.kernel@dilger.ca>,
"Darrick J. Wong" <djwong@kernel.org>,
Matthew Wilcox <willy@infradead.org>,
Mel Gorman <mgorman@suse.com>
Cc: linux-xfs@vger.kernel.org, linux-ext4@vger.kernel.org,
linux-fsdevel@vger.kernel.org, linux-nfs@vger.kernel.org,
linux-mm@kvack.org, linux-kernel@vger.kernel.org
Subject: [PATCH 5/6] XFS: remove congestion_wait() loop from kmem_alloc()
Date: Tue, 14 Sep 2021 10:13:04 +1000 [thread overview]
Message-ID: <163157838439.13293.5032214643474179966.stgit@noble.brown> (raw)
In-Reply-To: <163157808321.13293.486682642188075090.stgit@noble.brown>
Documentation commment in gfp.h discourages indefinite retry loops on
ENOMEM and says of __GFP_NOFAIL that it
is definitely preferable to use the flag rather than opencode
endless loop around allocator.
So remove the loop, instead specifying __GFP_NOFAIL if KM_MAYFAIL was
not given.
Signed-off-by: NeilBrown <neilb@suse.de>
---
fs/xfs/kmem.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/fs/xfs/kmem.c b/fs/xfs/kmem.c
index 6f49bf39183c..f545f3633f88 100644
--- a/fs/xfs/kmem.c
+++ b/fs/xfs/kmem.c
@@ -13,19 +13,11 @@ kmem_alloc(size_t size, xfs_km_flags_t flags)
{
int retries = 0;
gfp_t lflags = kmem_flags_convert(flags);
- void *ptr;
trace_kmem_alloc(size, flags, _RET_IP_);
- do {
- ptr = kmalloc(size, lflags);
- if (ptr || (flags & KM_MAYFAIL))
- return ptr;
- if (!(++retries % 100))
- xfs_err(NULL,
- "%s(%u) possible memory allocation deadlock size %u in %s (mode:0x%x)",
- current->comm, current->pid,
- (unsigned int)size, __func__, lflags);
- congestion_wait(BLK_RW_ASYNC, HZ/50);
- } while (1);
+ if (!(flags & KM_MAYFAIL))
+ lflags |= __GFP_NOFAIL;
+
+ return kmalloc(size, lflags);
}
next prev parent reply other threads:[~2021-09-14 0:28 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-14 0:13 [PATCH 0/6] congestion_wait() and GFP_NOFAIL NeilBrown
2021-09-14 0:13 ` [PATCH 2/6] MM: annotate congestion_wait() and wait_iff_congested() as ineffective NeilBrown
2021-09-15 11:56 ` Michal Hocko
2021-09-16 22:13 ` NeilBrown
2021-09-14 0:13 ` NeilBrown [this message]
2021-09-14 1:31 ` [PATCH 5/6] XFS: remove congestion_wait() loop from kmem_alloc() Dave Chinner
2021-09-14 3:27 ` NeilBrown
2021-09-14 6:05 ` Dave Chinner
2021-09-14 0:13 ` [PATCH 3/6] EXT4: Remove ENOMEM/congestion_wait() loops NeilBrown
2021-09-14 16:34 ` Mel Gorman
2021-09-14 21:48 ` NeilBrown
2021-09-15 12:06 ` Michal Hocko
2021-09-15 22:35 ` NeilBrown
2021-09-16 0:37 ` Dave Chinner
2021-09-16 6:52 ` Michal Hocko
2021-09-14 23:55 ` Dave Chinner
2021-09-15 8:59 ` Mel Gorman
2021-09-15 12:20 ` Michal Hocko
2021-09-15 14:35 ` Mel Gorman
2021-09-15 22:38 ` Dave Chinner
2021-09-16 9:00 ` Mel Gorman
2021-09-15 0:28 ` Theodore Ts'o
2021-09-15 5:25 ` NeilBrown
2021-09-15 17:02 ` Theodore Ts'o
2021-09-14 0:13 ` [PATCH 1/6] MM: improve documentation for __GFP_NOFAIL NeilBrown
2021-09-15 11:51 ` Michal Hocko
2021-09-14 0:13 ` [PATCH 6/6] XFS: remove congestion_wait() loop from xfs_buf_alloc_pages() NeilBrown
2021-09-14 2:08 ` Dave Chinner
2021-09-14 2:35 ` NeilBrown
2021-09-14 5:33 ` Dave Chinner
2021-09-14 16:45 ` Mel Gorman
2021-09-14 21:13 ` NeilBrown
2021-09-14 0:13 ` [PATCH 4/6] EXT4: remove congestion_wait from ext4_bio_write_page, and simplify NeilBrown
2021-09-17 2:56 [PATCH 0/6 v2] congestion_wait() and GFP_NOFAIL NeilBrown
2021-09-17 2:56 ` [PATCH 5/6] XFS: remove congestion_wait() loop from kmem_alloc() NeilBrown
2021-09-17 21:45 ` Dave Chinner
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=163157838439.13293.5032214643474179966.stgit@noble.brown \
--to=neilb@suse.de \
--cc=adilger.kernel@dilger.ca \
--cc=akpm@linux-foundation.org \
--cc=djwong@kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=mgorman@suse.com \
--cc=tytso@mit.edu \
--cc=willy@infradead.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).