From: Allison Henderson <allison.henderson@oracle.com>
To: "Darrick J. Wong" <djwong@kernel.org>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH v21 04/13] xfs: Handle krealloc errors in xlog_recover_add_to_cont_trans
Date: Fri, 9 Jul 2021 12:56:27 -0700 [thread overview]
Message-ID: <197d62be-66b2-d2fb-963b-504d8374b9f4@oracle.com> (raw)
In-Reply-To: <20210709040921.GM11588@locust>
On 7/8/21 9:09 PM, Darrick J. Wong wrote:
> On Wed, Jul 07, 2021 at 03:21:02PM -0700, Allison Henderson wrote:
>> Because xattrs can be over a page in size, we need to handle possible
>> krealloc errors to avoid warnings. If the allocation does fail, fall
>> back to kmem_alloc_large, with a memcpy.
>>
>> The warning:
>> WARNING: CPU: 1 PID: 20255 at mm/page_alloc.c:3446
>> get_page_from_freelist+0x100b/0x1690
>>
>> is caused when sizes larger that a page are allocated with the
>> __GFP_NOFAIL flag option. We encounter this error now because attr
>> values can be up to 64k in size. So we cannot use __GFP_NOFAIL, and
>> we need to handle the error code if the allocation fails.
>>
>> Signed-off-by: Allison Henderson <allison.henderson@oracle.com>
>
> I'm pretty sure that 'mm: Add kvrealloc' fixes this a little more
> elegantly, but either look fine to me. So while I'll probably take
> Dave's, here's a:
>
> Reviewed-by: Darrick J. Wong <djwong@kernel.org>
>
> in the meantime.
Alrighty, thank you! Either is fine.
Allison
>
> --D
>
>> ---
>> fs/xfs/xfs_log_recover.c | 10 +++++++++-
>> 1 file changed, 9 insertions(+), 1 deletion(-)
>>
>> diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
>> index ec4ccae..6ab467b 100644
>> --- a/fs/xfs/xfs_log_recover.c
>> +++ b/fs/xfs/xfs_log_recover.c
>> @@ -2062,7 +2062,15 @@ xlog_recover_add_to_cont_trans(
>> old_ptr = item->ri_buf[item->ri_cnt-1].i_addr;
>> old_len = item->ri_buf[item->ri_cnt-1].i_len;
>>
>> - ptr = krealloc(old_ptr, len + old_len, GFP_KERNEL | __GFP_NOFAIL);
>> + ptr = krealloc(old_ptr, len + old_len, GFP_KERNEL);
>> + if (ptr == NULL) {
>> + ptr = kmem_alloc_large(len + old_len, KM_ZERO);
>> + if (ptr == NULL)
>> + return -ENOMEM;
>> +
>> + memcpy(ptr, old_ptr, old_len);
>> + }
>> +
>> memcpy(&ptr[old_len], dp, len);
>> item->ri_buf[item->ri_cnt-1].i_len += len;
>> item->ri_buf[item->ri_cnt-1].i_addr = ptr;
>> --
>> 2.7.4
>>
next prev parent reply other threads:[~2021-07-09 19:56 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-07 22:20 [PATCH v21 00/13] Delayed Attributes Allison Henderson
2021-07-07 22:20 ` [PATCH v21 01/13] xfs: Return from xfs_attr_set_iter if there are no more rmtblks to process Allison Henderson
2021-07-09 4:05 ` Darrick J. Wong
2021-07-09 19:56 ` Allison Henderson
2021-07-07 22:21 ` [PATCH v21 02/13] xfs: Add state machine tracepoints Allison Henderson
2021-07-07 22:21 ` [PATCH v21 03/13] xfs: Rename __xfs_attr_rmtval_remove Allison Henderson
2021-07-07 22:21 ` [PATCH v21 04/13] xfs: Handle krealloc errors in xlog_recover_add_to_cont_trans Allison Henderson
2021-07-09 4:09 ` Darrick J. Wong
2021-07-09 19:56 ` Allison Henderson [this message]
2021-07-07 22:21 ` [PATCH v21 05/13] xfs: Set up infrastructure for deferred attribute operations Allison Henderson
2021-07-10 0:39 ` Darrick J. Wong
2021-07-13 18:52 ` Allison Henderson
2021-07-07 22:21 ` [PATCH v21 06/13] xfs: Implement attr logging and replay Allison Henderson
2021-07-10 1:08 ` Darrick J. Wong
2021-07-13 18:52 ` Allison Henderson
2021-07-07 22:21 ` [PATCH v21 07/13] RFC xfs: Skip flip flags for delayed attrs Allison Henderson
2021-07-07 22:21 ` [PATCH v21 08/13] xfs: Add xfs_attr_set_deferred and xfs_attr_remove_deferred Allison Henderson
2021-07-07 22:21 ` [PATCH v21 09/13] xfs: Remove unused xfs_attr_*_args Allison Henderson
2021-07-07 22:21 ` [PATCH v21 10/13] xfs: Add delayed attributes error tag Allison Henderson
2021-07-07 22:21 ` [PATCH v21 11/13] xfs: Add delattr mount option Allison Henderson
2021-07-09 4:14 ` Darrick J. Wong
2021-07-09 19:56 ` Allison Henderson
2021-07-07 22:21 ` [PATCH v21 12/13] xfs: Merge xfs_delattr_context into xfs_attr_item Allison Henderson
2021-07-07 22:21 ` [PATCH v21 13/13] xfs: Add helper function xfs_attr_leaf_addname Allison Henderson
2021-07-09 4:17 ` Darrick J. Wong
2021-07-09 19:56 ` Allison Henderson
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=197d62be-66b2-d2fb-963b-504d8374b9f4@oracle.com \
--to=allison.henderson@oracle.com \
--cc=djwong@kernel.org \
--cc=linux-xfs@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).