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 1C3C6C7EE2C for ; Mon, 29 May 2023 01:08:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 94DDB900003; Sun, 28 May 2023 21:08:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8FC56900002; Sun, 28 May 2023 21:08:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7C3FA900003; Sun, 28 May 2023 21:08:33 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 6EA5C900002 for ; Sun, 28 May 2023 21:08:33 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3B44C160378 for ; Mon, 29 May 2023 01:08:33 +0000 (UTC) X-FDA: 80841507306.03.B90D8EF Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by imf11.hostedemail.com (Postfix) with ESMTP id 208BA4000C for ; Mon, 29 May 2023 01:08:29 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=YCqXjc8b; spf=pass (imf11.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1685322511; a=rsa-sha256; cv=none; b=Xxp8sMNuuFK5s8KcequyL5NXNss/3yJGJpEmXi7sj5O1NGm4BK9bfqgWfZW/Eo5uNDShcL fS1XiEGG9VjDrgrJl7tsdE4d4EskVCIfF0f9vBleg6nimfDGszH/4RAqQEq0NsaxDTJYMH ZGTQ501FZSNUS/m/T42rlMrhASvlMRk= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=intel.com header.s=Intel header.b=YCqXjc8b; spf=pass (imf11.hostedemail.com: domain of ying.huang@intel.com designates 134.134.136.24 as permitted sender) smtp.mailfrom=ying.huang@intel.com; dmarc=pass (policy=none) header.from=intel.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1685322511; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=6IE6kmaNP+13cdk3lZRKBoXCBljbT9SD9hfWoGRN4PE=; b=SVOV+Mh40QjtB6nFz9FR32RrTOz7oXay2qZEBjWYUY2igiaBEbEdsbymHaz2BpILnsriAz vde7XD4KbTpuaZ4ZAryE2yj81ncrl53rOqpM6acUBG4LYh6aU+U26pvl8nUIaml99QqlkZ C5da16BH1WhgymigU4+rh4VfGsqmJ6A= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685322510; x=1716858510; h=from:to:cc:subject:references:date:in-reply-to: message-id:mime-version; bh=MBlb0bajZpGFTqzZBpoji1xgmasu75yZ+cGvDG5K8Wk=; b=YCqXjc8bd75QUqDR5fsby3Xf1hfVf9h8fLjcKj5+tSxu/IQoFqIECu36 yCZmvLoFDVGsNNkkDe5DTI10U3unrN4dFkRYUkAJi+Tff2Ai1f4LIuX5j jzdx2XpgItzD8K0w270uX9laPXty6m0BEZjjj+JtkIxwmN0iJ99NRF2Nm JsOcCNEhkfzhwO4mtVoWfR/HeNjcuhWyPWbI6StIciNFu98KruMuh9yuA ik9u3otEmqLPh8hh8Vls/dBSISnnyQ71EmIdmkAJ21VthpD6LgeinsDy0 k7HIg5HIb4Xbpg1ehFgJyYu3YfpouHgMaRl8R/SsMxNTvwvCMh6mQnQBE w==; X-IronPort-AV: E=McAfee;i="6600,9927,10724"; a="356963799" X-IronPort-AV: E=Sophos;i="6.00,200,1681196400"; d="scan'208";a="356963799" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 May 2023 18:08:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10724"; a="952532962" X-IronPort-AV: E=Sophos;i="6.00,200,1681196400"; d="scan'208";a="952532962" Received: from yhuang6-desk2.sh.intel.com (HELO yhuang6-desk2.ccr.corp.intel.com) ([10.238.208.55]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 May 2023 18:08:22 -0700 From: "Huang, Ying" To: Tetsuo Handa Cc: syzbot , , Mel Gorman , Vlastimil Babka , Andrew Morton , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Andrey Ryabinin , "Vincenzo Frascino" , Marco Elver , kasan-dev , linux-mm Subject: Re: [PATCH] kasan,kmsan: remove __GFP_KSWAPD_RECLAIM usage from kasan/kmsan References: <000000000000cef3a005fc1bcc80@google.com> <656cb4f5-998b-c8d7-3c61-c2d37aa90f9a@I-love.SAKURA.ne.jp> Date: Mon, 29 May 2023 09:07:14 +0800 In-Reply-To: <656cb4f5-998b-c8d7-3c61-c2d37aa90f9a@I-love.SAKURA.ne.jp> (Tetsuo Handa's message of "Sun, 28 May 2023 00:25:31 +0900") Message-ID: <87353gx7wd.fsf@yhuang6-desk2.ccr.corp.intel.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=ascii X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 208BA4000C X-Stat-Signature: xuu16sfnk65dcn8joedgwjmjcm4fukdi X-Rspam-User: X-HE-Tag: 1685322509-84233 X-HE-Meta: U2FsdGVkX1/B79qJ5al+Isv+8qG8F6pGc6+QE5KrlPhTuHhVrHsCmztEAqA74D1QpJ0HGK0T7dMO9Lm3jPhANf0tAC26XukwRj6ypEhAtXfjGQG657RvY908e3WX2xPUYLSSy0ZuIuY8bQMcrJSZixocfGbDeXesgs6qoiBtENQsGosTATH+gX1Mql8B0/MdO9LhTHcmPwH2HXkGl+xvBq/6d0AS0R/RIqCijvwk6mEe6w/xTTj3Xu2HEFDQgn32OzWnPnBxxaLaW/4CpIXiU8dq0C3hkmkyowRotGtrFvK6rgodi0BqSOgPZCqPZtM+gB1tGxOOmvKzSvIu0EcPXcPLE7/xAy6t7JszaaWdbmzOR14aNVyzcC4tt1jhNDhYwb30hJW3b3TnHdASmuEe7qrJQrNJ/GjWdVjk2X3p3x+O/UieRG0VnU5WCKenVcf4ZvtfCo0uZ0gVJ6B/WV8d1GVHgz+B1NkXoIgSIs8ssEW9Gy3l0uPYFL80Mrdl3BU6EuYgszKymWXLavCGZM4Tm8avTj5PM64iXDYA+P768igXPusx1uXPwAxAzyfSuZ6Ww5EGcbC8TiQGaEL2LWsqzWoQiBEU42yDMA7XY5QO7Q7Ea5swqS0KHR/q9PKh8/VQO2ziCGoczr+0BVtu++4WDjwI3gQmvUJgzPtUmEBMtZNpaB1LK3JSy5FiYGWHjXTH14pJit2kGpnAW7eeQ8zA2yOJlwcwWOoLddfbBRcuFzM+8NeQOrxypSeYQtWIbGxOwKCQs5JIzEhBLMpRPyZnwqpRsN2icTTfCDtqbWgCMOelymodICuCiZuY1IAp6TBsm6hyiPEvNv64IhonvxqXbfF3lvoKM4khT0ZWB9vSE7hTiqowVPirSke3Hkt08BumjVZubcm7St2wTh0JTz7z2TBzuh0oMw4C2+ro7k5T6s4cDMJJgCwqY3ZT7sOUqIu6R7SX+P8QVcDp9oR6Mlx h8Ix10QH Q1vDNbuverMce4FJuF6OUHQNVbYUbNd1ZSFWu027i1UKvTUJnrllRCNmStoQhXWouW1HVn3Se0utyYLOgPdKtUYLXnSy58D15vFaKuY2pNDAZIRfc8sxKBxqLFrdA4iwo4YUHtdbkE8UACNJBRgI1T5eV4GmK6Kdr433GFLnRO3VTybebekQr9ZyxszQMeD1vxatQpqYaI9Es+1f+oOjvC70twvWVc8KfIKuEA7A7MQ7QqYRh4CekdrkmSoGsayJsUqUA2d94+byV99WIBY93wBuxwuwXVQkDiiNtePdvmFQMePEO001cP1dkOMzXnNrn4y1m/GVHKQPZVEuThISy2pwC75VNPYInYzBGadvhm6YagQT8WRIEjYpVrH10pecxDOisbXyXz7OgDzIT/cjypv9TQco1LRDbgi77bHrTKxRyIUfPufZwJQvjOg== 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: Tetsuo Handa writes: > syzbot is reporting lockdep warning in __stack_depot_save(), for > the caller of __stack_depot_save() (i.e. __kasan_record_aux_stack() in > this report) is responsible for masking __GFP_KSWAPD_RECLAIM flag in > order not to wake kswapd which in turn wakes kcompactd. > > Since kasan/kmsan functions might be called with arbitrary locks held, > mask __GFP_KSWAPD_RECLAIM flag from all GFP_NOWAIT/GFP_ATOMIC allocations > in kasan/kmsan. > > Note that kmsan_save_stack_with_flags() is changed to mask both > __GFP_DIRECT_RECLAIM flag and __GFP_KSWAPD_RECLAIM flag, for > wakeup_kswapd() from wake_all_kswapds() from __alloc_pages_slowpath() > calls wakeup_kcompactd() if __GFP_KSWAPD_RECLAIM flag is set and > __GFP_DIRECT_RECLAIM flag is not set. > > Reported-by: syzbot > Closes: https://syzkaller.appspot.com/bug?extid=ece2915262061d6e0ac1 > Signed-off-by: Tetsuo Handa This looks good to me. Thanks! Reviewed-by: "Huang, Ying" > --- > mm/kasan/generic.c | 4 ++-- > mm/kasan/tags.c | 2 +- > mm/kmsan/core.c | 6 +++--- > mm/kmsan/instrumentation.c | 2 +- > 4 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c > index e5eef670735e..2c94f4943240 100644 > --- a/mm/kasan/generic.c > +++ b/mm/kasan/generic.c > @@ -488,7 +488,7 @@ static void __kasan_record_aux_stack(void *addr, bool can_alloc) > return; > > alloc_meta->aux_stack[1] = alloc_meta->aux_stack[0]; > - alloc_meta->aux_stack[0] = kasan_save_stack(GFP_NOWAIT, can_alloc); > + alloc_meta->aux_stack[0] = kasan_save_stack(0, can_alloc); > } > > void kasan_record_aux_stack(void *addr) > @@ -518,7 +518,7 @@ void kasan_save_free_info(struct kmem_cache *cache, void *object) > if (!free_meta) > return; > > - kasan_set_track(&free_meta->free_track, GFP_NOWAIT); > + kasan_set_track(&free_meta->free_track, 0); > /* The object was freed and has free track set. */ > *(u8 *)kasan_mem_to_shadow(object) = KASAN_SLAB_FREETRACK; > } > diff --git a/mm/kasan/tags.c b/mm/kasan/tags.c > index 67a222586846..7dcfe341d48e 100644 > --- a/mm/kasan/tags.c > +++ b/mm/kasan/tags.c > @@ -140,5 +140,5 @@ void kasan_save_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags) > > void kasan_save_free_info(struct kmem_cache *cache, void *object) > { > - save_stack_info(cache, object, GFP_NOWAIT, true); > + save_stack_info(cache, object, 0, true); > } > diff --git a/mm/kmsan/core.c b/mm/kmsan/core.c > index 7d1e4aa30bae..3adb4c1d3b19 100644 > --- a/mm/kmsan/core.c > +++ b/mm/kmsan/core.c > @@ -74,7 +74,7 @@ depot_stack_handle_t kmsan_save_stack_with_flags(gfp_t flags, > nr_entries = stack_trace_save(entries, KMSAN_STACK_DEPTH, 0); > > /* Don't sleep. */ > - flags &= ~__GFP_DIRECT_RECLAIM; > + flags &= ~(__GFP_DIRECT_RECLAIM | __GFP_KSWAPD_RECLAIM); > > handle = __stack_depot_save(entries, nr_entries, flags, true); > return stack_depot_set_extra_bits(handle, extra); > @@ -245,7 +245,7 @@ depot_stack_handle_t kmsan_internal_chain_origin(depot_stack_handle_t id) > extra_bits = kmsan_extra_bits(depth, uaf); > > entries[0] = KMSAN_CHAIN_MAGIC_ORIGIN; > - entries[1] = kmsan_save_stack_with_flags(GFP_ATOMIC, 0); > + entries[1] = kmsan_save_stack_with_flags(__GFP_HIGH, 0); > entries[2] = id; > /* > * @entries is a local var in non-instrumented code, so KMSAN does not > @@ -253,7 +253,7 @@ depot_stack_handle_t kmsan_internal_chain_origin(depot_stack_handle_t id) > * positives when __stack_depot_save() passes it to instrumented code. > */ > kmsan_internal_unpoison_memory(entries, sizeof(entries), false); > - handle = __stack_depot_save(entries, ARRAY_SIZE(entries), GFP_ATOMIC, > + handle = __stack_depot_save(entries, ARRAY_SIZE(entries), __GFP_HIGH, > true); > return stack_depot_set_extra_bits(handle, extra_bits); > } > diff --git a/mm/kmsan/instrumentation.c b/mm/kmsan/instrumentation.c > index cf12e9616b24..cc3907a9c33a 100644 > --- a/mm/kmsan/instrumentation.c > +++ b/mm/kmsan/instrumentation.c > @@ -282,7 +282,7 @@ void __msan_poison_alloca(void *address, uintptr_t size, char *descr) > > /* stack_depot_save() may allocate memory. */ > kmsan_enter_runtime(); > - handle = stack_depot_save(entries, ARRAY_SIZE(entries), GFP_ATOMIC); > + handle = stack_depot_save(entries, ARRAY_SIZE(entries), __GFP_HIGH); > kmsan_leave_runtime(); > > kmsan_internal_set_shadow_origin(address, size, -1, handle,