From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Vlastimil Babka <vbabka@suse•cz>
Cc: Alexander Potapenko <glider@google•com>,
Hyeonggon Yoo <42.hyeyoo@gmail•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the mm tree with the slab tree
Date: Tue, 6 Sep 2022 20:26:44 +1000 [thread overview]
Message-ID: <20220906202644.6552d26c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1904 bytes --]
Hi all,
Today's linux-next merge of the mm tree got a conflict in:
mm/slub.c
between commits:
a0c3b940023e ("mm/slub: move kmalloc_large_node() to slab_common.c")
d6a71648dbc0 ("mm/slab: kmalloc: pass requests larger than order-1 page to page allocator")
from the slab tree and commit:
47dd2b0d3e37 ("mm: kmsan: call KMSAN hooks from SLUB code")
from the mm tree.
I fixed it up (I used the former version of this file and applied the
following patch) and can carry the fix as necessary. This is now fixed
as far as linux-next is concerned, but any non trivial conflicts should
be mentioned to your upstream maintainer when your tree is submitted for
merging. You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Tue, 6 Sep 2022 19:42:49 +1000
Subject: [PATCH] mm/slab: fix up for "mm: kmsan: call KMSAN hooks from SLUB code"
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
mm/slab_common.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/mm/slab_common.c b/mm/slab_common.c
index 6a76c496e7e0..2e28a551b8d3 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -901,6 +901,7 @@ void free_large_kmalloc(struct folio *folio, void *object)
kmemleak_free(object);
kasan_kfree_large(object);
+ kmsan_kfree_large(object);
mod_lruvec_page_state(folio_page(folio, 0), NR_SLAB_UNRECLAIMABLE_B,
-(PAGE_SIZE << order));
@@ -1078,6 +1079,7 @@ static void *__kmalloc_large_node(size_t size, gfp_t flags, int node)
ptr = kasan_kmalloc_large(ptr, size, flags);
/* As ptr might get tagged, call kmemleak hook after KASAN. */
kmemleak_alloc(ptr, size, 1, flags);
+ kmsan_kmalloc_large(ptr, size, flags);
return ptr;
}
--
2.35.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2022-09-06 10:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-06 10:26 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-05-02 9:25 linux-next: manual merge of the mm tree with the slab tree Stephen Rothwell
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=20220906202644.6552d26c@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=42.hyeyoo@gmail$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=glider@google$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=vbabka@suse$(echo .)cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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