Received-SPF: pass (google.com: domain of linux-kernel+bounces-14014-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Tue, 2 Jan 2024 15:13:32 +1100
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
Message-ID: <20240102151332.48a87d86@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/wfB=MU5Q0Sr7Y2VG9iIw_Sa";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/wfB=MU5Q0Sr7Y2VG9iIw_Sa
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.

--=20
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 =3D qlink_to_object(qlink, cache);
 -	struct kasan_free_meta *meta =3D kasan_get_free_meta(cache, object);
 +	struct kasan_free_meta *free_meta =3D kasan_get_free_meta(cache, object);
- 	unsigned long flags;
 +
 +	kasan_release_object_meta(cache, object);
 =20
  	/*
  	 * 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 =3D=3D 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) =3D KASAN_SLAB_FREE;
 +		memzero_explicit(free_meta, sizeof(*free_meta));
 =20
- 	if (IS_ENABLED(CONFIG_SLAB))
- 		local_irq_save(flags);
-=20
  	___cache_free(cache, object, _THIS_IP_);
-=20
- 	if (IS_ENABLED(CONFIG_SLAB))
- 		local_irq_restore(flags);
  }
 =20
  static void qlist_free_all(struct qlist_head *q, struct kmem_cache *cache)

--Sig_/wfB=MU5Q0Sr7Y2VG9iIw_Sa
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWTjWwACgkQAVBC80lX
0Gy4/Af/cL43FDP9ZkJ03TvRNhUmSZ6igR6ZwynFZcTGx0PzE/F+8zWZNL02iGWy
LrQ6npksmc6H6xGkUfzh4YUIh3rsgjXp7EVEeDQz+nWQu8mc6i5mUsUfa5nxmafX
DO/9c5UjfAEvCqlV4hpP5lyaB6PrubPY9xWs7uNn992kCcpQXVHZhrPpT5kkIjKb
n0SW4HWapBha/ojZuTudzjQxP4AJeR+ofxg/788AYY2D83OnEheYVNbGS+9OEyOy
RMtDQeFrKWI+nJF8GmNB5KfEc1lMHQklfShGiYsHwbLtEhZHcKyoHLHAJRQHH3yg
FsbdXGYTJqEPCIIi3lIBXcRGGNZkqg==
=7QH2
-----END PGP SIGNATURE-----

--Sig_/wfB=MU5Q0Sr7Y2VG9iIw_Sa--