From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6BC03CEB2CE for ; Tue, 1 Oct 2024 06:05:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E374F280052; Tue, 1 Oct 2024 02:05:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DE7CB280036; Tue, 1 Oct 2024 02:05:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CD632280052; Tue, 1 Oct 2024 02:05:54 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id B16F5280036 for ; Tue, 1 Oct 2024 02:05:54 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 5B9F08034C for ; Tue, 1 Oct 2024 06:05:54 +0000 (UTC) X-FDA: 82623997428.03.BEA48F2 Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by imf22.hostedemail.com (Postfix) with ESMTP id 82D36C0007 for ; Tue, 1 Oct 2024 06:05:52 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=MqAVXQqU; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf22.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.167.53 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1727762612; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=LDX300SfQ8XSrIseTiWT0bT/7uJ6lLhpLAjt+5qtDPM=; b=MRq1UaAqxb6ua7aODuKWiHCSfNg6GPwgkdpCoqPHx1p8L3Bfur0IIsxkGTYmFHLca55geh dolLT4ZNqG3Bc6hcGnoUJDxjAiV4DhvadeqIXJLG1eH9CNQxM7OpldnyermZGi/kTvGr6k mz3OmdVKoMQTVKevoGVAySB4qccvnFc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1727762612; a=rsa-sha256; cv=none; b=Wj+sjk3AcdJkHGFA781MT0Dl02oDBK5NR9f1xljXQzPDIIoj1p7HB8J4suYmVfp00JFVYB W2CYa3ihosBwZll3CjGGZ7g5bhcgbpiSQ1wWcVcUtwRxsRvWe5s11Y3W8+zwbOuSNxN5SR UkNBIjopjM/8KqwtWxfg7MOQycOqQnc= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=MqAVXQqU; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf22.hostedemail.com: domain of 42.hyeyoo@gmail.com designates 209.85.167.53 as permitted sender) smtp.mailfrom=42.hyeyoo@gmail.com Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-539908f238fso2413707e87.2 for ; Mon, 30 Sep 2024 23:05:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1727762750; x=1728367550; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=LDX300SfQ8XSrIseTiWT0bT/7uJ6lLhpLAjt+5qtDPM=; b=MqAVXQqURvoJzRdptJxPF1Z0PxdXNicYvvcdCxq1ZdF2JCD8Qs2zhqG+1YK3kJgRk8 IA0n6TCcas0yGoXxzc/I6FjHbuFqP9V4GuF5Nke/Nnc3LboxvGLl2N3qyrCgo4+jfJkY p89UZuZD+YvPatVcUbfJBWp5hqNqe+mVotff8O/lrnhqsiBBQ4Nzsf+9y8B7qOmTMd4g YAq1Auj+aQ057o7eAiDGKsPhVPdDTQAkusErbJAtzrU2zeTXa7a7cFwKzP9vhcMOctbf nqTLMZSNVFg44VY2EHy/MkT6Up1AyoLCgsQNT56JQ7sEygIkg9dVnQ1/gJjTFVCz+k2Z qsKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727762750; x=1728367550; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LDX300SfQ8XSrIseTiWT0bT/7uJ6lLhpLAjt+5qtDPM=; b=R50ruyWKhXpZlB1X+7sfo1AmRw7Sat0qpy5Cu04JqcwZJkO3vLKuEmLhPiXmEPkTWD ZEoEnyd8MaA2zlwcHul6QvqvNbGmjyM4eWBwvqsmyUXI0dil1sbV9YVg6PtqKNc89nbL wfuvHoC8NtdVCEdC4yZicVNDEktfUea3HLAfCybxgLDO/pME5XWuOKPC32ahpGl/N6B8 B4A+VLWcNKVdZerAbRRb/K2e2pEU9bWmjKZ1/eatb0XOcf1BdFnhf8TX9qf0tqUzTMlK oKTn1SxPS0NVgdwV28Uw8Kzhd1Y8HnX8LShpPq+8jaR79fbFnCgf2o9ANEiNvjmV+btw rhcA== X-Forwarded-Encrypted: i=1; AJvYcCVkcN6EuqwJSvOLxDs7pWoWpSxQ9++C+a+6kHdXmmHtxxo4HrCSsHfT8OIv8Rr8Bf33lLd1ZiuinQ==@kvack.org X-Gm-Message-State: AOJu0YzbaHtT+S7AFQBh7RUY271f+5Tb67Rs/vO5NcXjR3zn2c4EtEXM Bjv2bFQH+k2eTkE2obvn3m4de5XSRscIeymbCgO7otyqidV9xRrc7aCN/zF3px328GB9b25NPPx P7pruNwE4eJqWi1zBOw3lCjvEklc= X-Google-Smtp-Source: AGHT+IFbcvAwj92GwWG0q111tl4frudVTrCcrvbq6hNYm5bc5VJf4uoHjMb2dhPhlED70BX0sCtzSED5DSplo+sEXKs= X-Received: by 2002:a05:6512:3ba6:b0:538:9e1e:b068 with SMTP id 2adb3069b0e04-5389fc3bd6fmr7170466e87.15.1727762750129; Mon, 30 Sep 2024 23:05:50 -0700 (PDT) MIME-Version: 1.0 References: <20240930-b4-slub-kunit-fix-v1-0-32ca9dbbbc11@suse.cz> <20240930-b4-slub-kunit-fix-v1-1-32ca9dbbbc11@suse.cz> In-Reply-To: <20240930-b4-slub-kunit-fix-v1-1-32ca9dbbbc11@suse.cz> From: Hyeonggon Yoo <42.hyeyoo@gmail.com> Date: Tue, 1 Oct 2024 15:05:37 +0900 Message-ID: Subject: Re: [PATCH slab hotfixes 1/2] mm, slab: suppress warnings in test_leak_destroy kunit test To: Vlastimil Babka Cc: Andrew Morton , Christoph Lameter , David Rientjes , Roman Gushchin , linux-kernel@vger.kernel.org, linux-mm@kvack.org, kernel test robot , Guenter Roeck Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 82D36C0007 X-Stat-Signature: mm6z87q3y9kngwf851q7ddajdgkhicqu X-Rspam-User: X-HE-Tag: 1727762752-929093 X-HE-Meta: U2FsdGVkX1+llrC1lScTm213ArEyvSq1AL/Woj2wbu0vRjluDYxGhYjNwR7hYABLVgH5PBKsFGcv6AIoNGngdBpD0yTS6ekQs1IIDuNm3p4DEgZZVuiwU0BW0RAns98O/hdCscd6OT51C32TvUzlWEEK/RdW8/WTnMHvpOdLOr3mf1bagHmpU8C34ueOAMV2f8CfPk8QTxXK1sW8Jm2wlPxs7TMRg9bGaCFGxAGP//rP1MIE3yQT6XKyNSq5QGTC/yxgttIMMej0jDxDgVjvhYAcDJ6sgDnXQo/JXQMe2kkH8wk0at9R9VfC30jDXggpMwpmfA7eZ4PwRmBgbql+qMa3jIXBqFZlgGjCCjxwsSIcLBKmTZiFtoMgAlv0TkyYlUt6tDpFfc8tNYc9qS95BVYuw/jNjSTOGFOb7gVq0TaemBYdUzZ1acJVusTp4+jAW3maPP3n5D1Vesx7Aoo/OUbMl7vudy+etpWI+2r9uHE/qEp1yd5m5qzXtg3mXxEw08Lu2G/A8SF3KONkePE65Wc38Mhfh6ZHUinykOV5Dlc1Lepr/Kg7fq9bq4v8aZnl3KKI2YLK/bVPTNCmDcSpXayb0RJE+RBd8WZEycW3SMQ61hzbcyNep6uta2INYFJhDq3tR/MuXja3y+HEsAcfdT3s+6Vo7xfgOo5mzszSCkNi0rUVuFWQM/y9VRe49VXbtZOeAsYeJkMahYjN1+M03AQEcNWGRjEeq5WVwduoemkEnjJdxCh26RRUIxpONskV71ZCSao/YNsX5aFJPJN2mjWBpqVJ8t0pYB1WAGd4pFrOdrcSJ1IXBNa9L6c3DUNT+W/z+fjdHRAuiI9KaHHYTfZiq2zTgFA1D/F8UufxG/58pn7ouMe+f/fLJmx6146a+UHE32Ei0bHLVEnPI1UzH9pzt7o9zxInP7F6DoB8up+bgAwt2fjJEt9zvWRk9zI32XaA1Csdyeo3QYzcM4N Aaj+gWhE BE6/lrkR93AFPME0Q3dGJ5ydk2GFSN0xrJO1pd/EuNz1sJi1gYfa8GnDWDk6FjNbQ66GxiHt/rAojkd1PJrFiYVOc/Lcyu/t/Nn5k7bR6iLQuPZlCUyk9dbB3cuC8SksanjDOpNYRXDZCWKhbRCR3jd8syfnzAX3TFs+GncnYDRwcS0OFI73LK4xLoGnnBLC+MuMeCMlGzap4QHIqiLcMZaPPyX+oJ73VjDXigG4wV0MnBt7cBcnJK9YnhYPScxC7k04c0sSL5dcoHBU9JH54S1bZW0sPEqrCJzo4SMS23HDDO4HtgI6BDhtk4MoI4g74zK9uB/bsTCWnbTJ8V0/ibIsHI44ZBWI0X3/pKIr3N57YaEoCZGLL4PVDW6UkDZwGM8Y5gT7e5meN2SpxwouP0QGmkWYvxSv7fNefEMEYlrhjoCqQa9dArLasxcl6I8QoJwTfzVHVgbvVNOCQZGGvkNKLIFRJMZRGNiaQSOosZyDgUjo= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Mon, Sep 30, 2024 at 5:37=E2=80=AFPM Vlastimil Babka wr= ote: > > The test_leak_destroy kunit test intends to test the detection of stray > objects in kmem_cache_destroy(), which normally produces a warning. The > other slab kunit tests suppress the warnings in the kunit test context, > so suppress warnings and related printk output in this test as well. > Automated test running environments then don't need to learn to filter > the warnings. > > Also rename the test's kmem_cache, the name was wrongly copy-pasted from > test_kfree_rcu. > > Fixes: 4e1c44b3db79 ("kunit, slub: add test_kfree_rcu() and test_leak_des= troy()") > Reported-by: kernel test robot > Closes: https://lore.kernel.org/oe-lkp/202408251723.42f3d902-oliver.sang@= intel.com > Reported-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> > Closes: https://lore.kernel.org/all/CAB=3D+i9RHHbfSkmUuLshXGY_ifEZg9vCZi3= fqr99+kmmnpDus7Q@mail.gmail.com/ > Reported-by: Guenter Roeck > Closes: https://lore.kernel.org/all/6fcb1252-7990-4f0d-8027-5e83f0fb9409@= roeck-us.net/ > Signed-off-by: Vlastimil Babka > --- > lib/slub_kunit.c | 4 ++-- > mm/slab.h | 6 ++++++ > mm/slab_common.c | 5 +++-- > mm/slub.c | 5 +++-- > 4 files changed, 14 insertions(+), 6 deletions(-) Looks good to me, Reviewed-by: Hyeonggon Yoo <42.hyeyoo@gmail.com> > diff --git a/lib/slub_kunit.c b/lib/slub_kunit.c > index 6e3a1e5a7142f797fe20a28967657f50a466d4ee..85d51ec09846d4fa219db6bda= 336c6f0b89e98e4 100644 > --- a/lib/slub_kunit.c > +++ b/lib/slub_kunit.c > @@ -177,13 +177,13 @@ static void test_kfree_rcu(struct kunit *test) > > static void test_leak_destroy(struct kunit *test) > { > - struct kmem_cache *s =3D test_kmem_cache_create("TestSlub_kfree_r= cu", > + struct kmem_cache *s =3D test_kmem_cache_create("TestSlub_leak_de= stroy", > 64, SLAB_NO_MERGE= ); > kmem_cache_alloc(s, GFP_KERNEL); > > kmem_cache_destroy(s); > > - KUNIT_EXPECT_EQ(test, 1, slab_errors); > + KUNIT_EXPECT_EQ(test, 2, slab_errors); > } > > static int test_init(struct kunit *test) > diff --git a/mm/slab.h b/mm/slab.h > index f22fb760b2866124d9d873d28b5a7fa6867aeb90..5cf0fbab0b0554ee70f537177= 2bc37b290893b8a 100644 > --- a/mm/slab.h > +++ b/mm/slab.h > @@ -546,6 +546,12 @@ static inline bool kmem_cache_debug_flags(struct kme= m_cache *s, slab_flags_t fla > return false; > } > > +#if IS_ENABLED(CONFIG_SLUB_DEBUG) && IS_ENABLED(CONFIG_KUNIT) > +bool slab_in_kunit_test(void); > +#else > +static inline bool slab_in_kunit_test(void) { return false; } > +#endif > + > #ifdef CONFIG_SLAB_OBJ_EXT > > /* > diff --git a/mm/slab_common.c b/mm/slab_common.c > index 7443244656150325fb2a7d0158a71821e1418062..3d26c257ed8b57c336ec5c38d= 4bbd5f5e51d50ff 100644 > --- a/mm/slab_common.c > +++ b/mm/slab_common.c > @@ -508,8 +508,9 @@ void kmem_cache_destroy(struct kmem_cache *s) > kasan_cache_shutdown(s); > > err =3D __kmem_cache_shutdown(s); > - WARN(err, "%s %s: Slab cache still has objects when called from %= pS", > - __func__, s->name, (void *)_RET_IP_); > + if (!slab_in_kunit_test()) > + WARN(err, "%s %s: Slab cache still has objects when calle= d from %pS", > + __func__, s->name, (void *)_RET_IP_); > > list_del(&s->list); > > diff --git a/mm/slub.c b/mm/slub.c > index 21f71cb6cc06d951a657290421f41170bb3c76cf..5b832512044e3ead8ccde2c02= 308bd8954246db5 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -827,7 +827,7 @@ static bool slab_add_kunit_errors(void) > return true; > } > > -static bool slab_in_kunit_test(void) > +bool slab_in_kunit_test(void) > { > struct kunit_resource *resource; > > @@ -843,7 +843,6 @@ static bool slab_in_kunit_test(void) > } > #else > static inline bool slab_add_kunit_errors(void) { return false; } > -static inline bool slab_in_kunit_test(void) { return false; } > #endif > > static inline unsigned int size_from_object(struct kmem_cache *s) > @@ -5436,6 +5435,8 @@ static void list_slab_objects(struct kmem_cache *s,= struct slab *slab, > for_each_object(p, s, addr, slab->objects) { > > if (!test_bit(__obj_to_index(s, addr, p), object_map)) { > + if (slab_add_kunit_errors()) > + continue; > pr_err("Object 0x%p @offset=3D%tu\n", p, p - addr= ); > print_tracking(s, p); > } > > -- > 2.46.1 >