From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Vlastimil Babka <vbabka@suse•cz>,
Andrew Morton <akpm@linux-foundation•org>
Cc: Andrey Konovalov <andreyknvl@gmail•com>,
Andrey Konovalov <andreyknvl@google•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 slab tree with the mm-stable, mm trees
Date: Tue, 2 Jan 2024 15:13:32 +1100 [thread overview]
Message-ID: <20240102151332.48a87d86@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2129 bytes --]
Hi all,
Today's linux-next merge of the slab tree got a conflict in:
mm/kasan/quarantine.c
between commits:
773688a6cb24 ("kasan: use stack_depot_put for Generic mode")
435736586ddc ("kasan: stop leaking stack trace handles")
from the mm-stable, mm trees and commit:
72786c0a3dc5 ("KASAN: remove code paths guarded by CONFIG_SLAB")
from the slab tree.
I fixed it up (see below) 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.
--
Cheers,
Stephen Rothwell
diff --cc mm/kasan/quarantine.c
index 8afa77bc5d3b,138c57b836f2..000000000000
--- a/mm/kasan/quarantine.c
+++ b/mm/kasan/quarantine.c
@@@ -143,10 -143,7 +143,9 @@@ static void *qlink_to_object(struct qli
static void qlink_free(struct qlist_node *qlink, struct kmem_cache *cache)
{
void *object = qlink_to_object(qlink, cache);
- struct kasan_free_meta *meta = kasan_get_free_meta(cache, object);
+ struct kasan_free_meta *free_meta = kasan_get_free_meta(cache, object);
- unsigned long flags;
+
+ kasan_release_object_meta(cache, object);
/*
* If init_on_free is enabled and KASAN's free metadata is stored in
@@@ -156,15 -153,15 +155,9 @@@
*/
if (slab_want_init_on_free(cache) &&
cache->kasan_info.free_meta_offset == 0)
- memzero_explicit(meta, sizeof(*meta));
-
- /*
- * As the object now gets freed from the quarantine, assume that its
- * free track is no longer valid.
- */
- *(u8 *)kasan_mem_to_shadow(object) = KASAN_SLAB_FREE;
+ memzero_explicit(free_meta, sizeof(*free_meta));
- if (IS_ENABLED(CONFIG_SLAB))
- local_irq_save(flags);
-
___cache_free(cache, object, _THIS_IP_);
-
- if (IS_ENABLED(CONFIG_SLAB))
- local_irq_restore(flags);
}
static void qlist_free_all(struct qlist_head *q, struct kmem_cache *cache)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-01-02 4:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-02 4:13 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-12-21 6:31 linux-next: manual merge of the slab tree with the mm-stable, mm trees 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=20240102151332.48a87d86@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=andreyknvl@gmail$(echo .)com \
--cc=andreyknvl@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