Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Sun, 25 Sep 2022 19:26:41 +0800
From:   Feng Tang <feng.tang@intel.com>
To:     Andrey Konovalov <andreyknvl@gmail.com>
CC:     Andrew Morton <akpm@linux-foundation.org>,
        Vlastimil Babka <vbabka@suse.cz>,
        Christoph Lameter <cl@linux.com>,
        Pekka Enberg <penberg@kernel.org>,
        David Rientjes <rientjes@google.com>,
        Joonsoo Kim <iamjoonsoo.kim@lge.com>,
        Roman Gushchin <roman.gushchin@linux.dev>,
        Hyeonggon Yoo <42.hyeyoo@gmail.com>,
        Dmitry Vyukov <dvyukov@google.com>,
        Jonathan Corbet <corbet@lwn.net>,
        "Hansen, Dave" <dave.hansen@intel.com>,
        Linux Memory Management List <linux-mm@kvack.org>,
        LKML <linux-kernel@vger.kernel.org>,
        kasan-dev <kasan-dev@googlegroups.com>,
        "Sang, Oliver" <oliver.sang@intel.com>
Subject: Re: [PATCH v6 3/4] mm: kasan: Add free_meta size info in struct
 kasan_cache
Message-ID: <YzA68cSh5Uuh5pjZ@feng-clx>
References: <20220913065423.520159-1-feng.tang@intel.com>
 <20220913065423.520159-4-feng.tang@intel.com>
 <CA+fCnZdFi471MxQG9RduQcBZWR10GCqxyNkuaDXzX6y4zCaYAQ@mail.gmail.com>
 <Yyr9ZZnVPgr4GHYQ@feng-clx>
 <CA+fCnZdUF3YiNpy10=xOJmPVbftaJr76wB5E58v0W_946Uketw@mail.gmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <CA+fCnZdUF3YiNpy10=xOJmPVbftaJr76wB5E58v0W_946Uketw@mail.gmail.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?0M2Hf7pl7fOdo2yuu8MVpOE1Z0MGfRf/vZ7+P2V0Ko0EmLljMMV9RLfFPM6Z?=
 =?us-ascii?Q?UPFJSPi1IfVzOeSCmD32PCuit+rxBIw+snIDoNiLXPvLIYc2Z7zq1qLNzxwK?=
 =?us-ascii?Q?Z03FQqXdp76MdmRViAf8XXDr/pmVVHOHouG3Ni9nQzQTYKo13wiJH1tMddRk?=
 =?us-ascii?Q?enioQ6/jOLNb2J8C4Y6ANqfuw2Q4W4EdLDHsp8bP8pgWsKxDNBhwdjWbI1o7?=
 =?us-ascii?Q?MVcbPkeEIY+NaQZLoPbYadsMw6odINxpn7fe5eievP5zYDtgbhkiHLveMgMW?=
 =?us-ascii?Q?uNgI2wuVUemkA+34bTkfOyccBxcCsus5XNN6seIJSDjyLhVjJK05WUTuYQjQ?=
 =?us-ascii?Q?cSX6JAsPTY2q7TlGmhUdj2YGBfquu5056LKEm43gETOZDMnKR7yoG2R13hk/?=
 =?us-ascii?Q?RyoWAWH0C+jMt2UYdr09bQGpqv2Z8ofxousD4c3Hu+w3cyA8FxeRrmgQ/ZXZ?=
 =?us-ascii?Q?JJ1vXgmYTuQ29GZtDtHA4KRrlkzYfnsjL3+/GsALjksmbYyYIcy9NVrAdqvB?=
 =?us-ascii?Q?SQBPJy0UJXu2IWw87W3gPAWLZ30cYWQTIZaa+YZKPSUrPZi1zthkQOg4mrTS?=
 =?us-ascii?Q?pJfBKU1cblRMIKFeJdai33GODMS6VTx9rJRP/2HlUTdvDSdg96fcYmLxnQGz?=
 =?us-ascii?Q?Ww7jH4WOY/oWUkPbZWGYw86ea09npmLg1okK2g8XL5mNzObv4pXOT0RyBSJ8?=
 =?us-ascii?Q?N7Ed0+X+Dtkf3LNYleFuUO1KqD2/DD9IR13znx6yHKURTJ1ub+ebugRs7+VL?=
 =?us-ascii?Q?fkKS3C0QU9aDidJT4zqT6z80isqqNqXe33pzf1r1NKaOIb9cNctiX+m93NXD?=
 =?us-ascii?Q?6yP9cO4BpN3EpoWC+vsZBw75xlonInLLxmGTE5RPJaTOtkTkS47p6xUOGwWa?=
 =?us-ascii?Q?h4bSr6rTAkHVsJ/mag6cS/iCCZ2C260zp3kibE6IH5RGNw1OiWdT14A9wB5b?=
 =?us-ascii?Q?5L5xyGlMqecL+/mofU5B1jZJ+JDEAACtoVp3iP/l0YooXmVkvFh/LDZJga4U?=
 =?us-ascii?Q?43r3eWsMTdcV057j54bwEJfsXmKFpRR7ShzjfGpHvyXynugf+6TKV8Hv3b15?=
 =?us-ascii?Q?YXTzQcCL/4RNVxXw8XR+CLYpAg/BorbaDznTVvWn8dcJb+sqLTCshiCU8ayE?=
 =?us-ascii?Q?vTu+MU5SqMjZk2HXyJ6purM3WY77tiHDZKtGhEWSCWkZU0hPao/msTx96ZyH?=
 =?us-ascii?Q?qhc46tt12ENtucvfvUp9g+w5SS72HmPMnpf/vYQbdbWABGRZ7o1Vsl3/mcTw?=
 =?us-ascii?Q?6cg246TbLzBKbdZgNdHsa/yL1DKIi7E2IS3tPyYuQxTDSL6RfWNx6od7IqBs?=
 =?us-ascii?Q?YOImeJY4VXv252mKCRqJ0OgoH5kltTjG7WZ9pVy19S8bAsYmnX3z0NZ2DSXV?=
 =?us-ascii?Q?jYUYKHNa9rSxzjN3xJ8k241/orDTO2kktX0pqyeV0gaHWy4lRpopC/rbGuc+?=
 =?us-ascii?Q?fZCM3PDRGZuWs9w+nPJf0ouHJXn7JovDFzhAgf7VfpOVlvNglpkat5DcAIuf?=
 =?us-ascii?Q?QugHuCsT5l/JZmgB92NJkCBoh9HRI+YezqhE7EoLNHUlPueb+QD/VYMG67U2?=
 =?us-ascii?Q?otoOIQmbUAxRCdqMyE11p+QJwVfbeamZIf2muNWS?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 5ad801b9-2f77-4585-3c2d-08da9ee8e4bc
X-MS-Exchange-CrossTenant-AuthSource: MN0PR11MB6304.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Sep 2022 11:27:13.5051
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: CLIKRH95o8fgA39v9Ppsx2Ga0kFCPUrJdBZpHpzr59BB1KFh3kJVfS16m4bCP3cSZp/W7jNhS3y7fD8rOk6+nA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB7144
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Sun, Sep 25, 2022 at 02:05:04AM +0800, Andrey Konovalov wrote:
> On Wed, Sep 21, 2022 at 2:03 PM Feng Tang <feng.tang@intel.com> wrote:
> >
> > Agree, it's better not touch the internal fields in slub code.
> >
> > How about the following patch, it merge the 2 functions with one flag
> > indicating in meta data or object. (I'm fine with 2 separate functions)
> 
> The overall approach sounds good. See some comments below.
> 
> > diff --git a/include/linux/kasan.h b/include/linux/kasan.h
> > index b092277bf48d..0ad05a34e708 100644
> > --- a/include/linux/kasan.h
> > +++ b/include/linux/kasan.h
> > @@ -150,11 +150,12 @@ static __always_inline void kasan_cache_create_kmalloc(struct kmem_cache *cache)
> >                 __kasan_cache_create_kmalloc(cache);
> >  }
> >
> > -size_t __kasan_metadata_size(struct kmem_cache *cache);
> > -static __always_inline size_t kasan_metadata_size(struct kmem_cache *cache)
> > +size_t __kasan_meta_size(struct kmem_cache *cache, bool in_slab_object);
> > +static __always_inline size_t kasan_meta_size(struct kmem_cache *cache,
> > +                                                       bool in_slab_object)
> 
> I would keep the name as kasan_metadata_size as it's more clear to
> external users but rename in_slab_object to in_object to make the
> declaration shorter.

Make sense to me, will do.

[...]

> > +       if (in_slab_object)
> > +               return (cache->kasan_info.alloc_meta_offset == 0 ?
> > +                       sizeof(struct kasan_alloc_meta) : 0) +
> > +                       (cache->kasan_info.free_meta_offset ?
> > +                       sizeof(struct kasan_free_meta) : 0);
> > +       else
> > +               return (cache->kasan_info.alloc_meta_offset == 0 ?
> > +                       sizeof(struct kasan_alloc_meta) : 0) +
> > +                       (cache->kasan_info.free_meta_offset ?
> > +                       sizeof(struct kasan_free_meta) : 0);
> 
> Something weird here: both if and else cases are the same.
 
Yes, will fix it. 

> The change also needs to be rebased onto [1].
> 
> Thanks!
> 
> [1] https://lore.kernel.org/linux-mm/c7b316d30d90e5947eb8280f4dc78856a49298cf.1662411799.git.andreyknvl@google.com/

I noticed this has been merged to -mm tree's 'mm-everything' branch,
so following is the patch againt that. Thanks! 

One thing I'm not very sure is, to check 'in-object' kasan's meta
size, I didn't check 'alloc_meta_offset', as from the code reading
the alloc_meta is never put inside slab object data area.


Thanks,
Feng

---8<---

diff --git a/include/linux/kasan.h b/include/linux/kasan.h
index d811b3d7d2a1..96c9d56e5510 100644
--- a/include/linux/kasan.h
+++ b/include/linux/kasan.h
@@ -302,7 +302,7 @@ static inline void kasan_unpoison_task_stack(struct task_struct *task) {}
 
 #ifdef CONFIG_KASAN_GENERIC
 
-size_t kasan_metadata_size(struct kmem_cache *cache);
+size_t kasan_metadata_size(struct kmem_cache *cache, bool in_object);
 slab_flags_t kasan_never_merge(void);
 void kasan_cache_create(struct kmem_cache *cache, unsigned int *size,
 			slab_flags_t *flags);
@@ -315,7 +315,8 @@ void kasan_record_aux_stack_noalloc(void *ptr);
 #else /* CONFIG_KASAN_GENERIC */
 
 /* Tag-based KASAN modes do not use per-object metadata. */
-static inline size_t kasan_metadata_size(struct kmem_cache *cache)
+static inline size_t kasan_metadata_size(struct kmem_cache *cache,
+						bool in_object)
 {
 	return 0;
 }
diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c
index d8b5590f9484..5a806f9b9466 100644
--- a/mm/kasan/generic.c
+++ b/mm/kasan/generic.c
@@ -450,15 +450,22 @@ void kasan_init_object_meta(struct kmem_cache *cache, const void *object)
 		__memset(alloc_meta, 0, sizeof(*alloc_meta));
 }
 
-size_t kasan_metadata_size(struct kmem_cache *cache)
+size_t kasan_metadata_size(struct kmem_cache *cache, bool in_object)
 {
+	struct kasan_cache *info = &cache->kasan_info ;
+
 	if (!kasan_requires_meta())
 		return 0;
-	return (cache->kasan_info.alloc_meta_offset ?
-		sizeof(struct kasan_alloc_meta) : 0) +
-		((cache->kasan_info.free_meta_offset &&
-		  cache->kasan_info.free_meta_offset != KASAN_NO_FREE_META) ?
-		 sizeof(struct kasan_free_meta) : 0);
+
+	if (in_object)
+		return (info->free_meta_offset ?
+			0 : sizeof(struct kasan_free_meta));
+	else
+		return (info->alloc_meta_offset ?
+			sizeof(struct kasan_alloc_meta) : 0) +
+			((info->free_meta_offset &&
+			info->free_meta_offset != KASAN_NO_FREE_META) ?
+			sizeof(struct kasan_free_meta) : 0);
 }
 
 static void __kasan_record_aux_stack(void *addr, bool can_alloc)
diff --git a/mm/slub.c b/mm/slub.c
index ce8310e131b3..a75c21a0da8b 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -887,7 +887,7 @@ static void print_trailer(struct kmem_cache *s, struct slab *slab, u8 *p)
 	if (s->flags & SLAB_STORE_USER)
 		off += 2 * sizeof(struct track);
 
-	off += kasan_metadata_size(s);
+	off += kasan_metadata_size(s, false);
 
 	if (off != size_from_object(s))
 		/* Beginning of the filler is the free pointer */
@@ -1042,7 +1042,7 @@ static int check_pad_bytes(struct kmem_cache *s, struct slab *slab, u8 *p)
 		/* We also have user information there */
 		off += 2 * sizeof(struct track);
 
-	off += kasan_metadata_size(s);
+	off += kasan_metadata_size(s, false);
 
 	if (size_from_object(s) == off)
 		return 1;