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 36C25E69187 for ; Fri, 22 Nov 2024 18:05:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EC4BE6B009F; Fri, 22 Nov 2024 13:04:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E4B4C6B00A0; Fri, 22 Nov 2024 13:04:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C4D9E6B00A1; Fri, 22 Nov 2024 13:04:59 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 9BE876B009E for ; Fri, 22 Nov 2024 13:04:59 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id A5FFB1619BF for ; Fri, 22 Nov 2024 18:04:48 +0000 (UTC) X-FDA: 82814504598.06.0953043 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf20.hostedemail.com (Postfix) with ESMTP id 3EC171C0004 for ; Fri, 22 Nov 2024 18:03:38 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GqyXe4yZ; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf20.hostedemail.com: domain of llong@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=llong@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1732298548; a=rsa-sha256; cv=none; b=OhCajeAjrfrJWCnur9ve0s+KEYKg4hfBkb+7pptOmu90WRbpkkWLTzrvZJdT3xDpVQ+wu4 ss5iYg1DF/prsc0YeMBFwsrWuwL6zQDy6qkXVzyXqoGzWwq8b90Z/kMs1Wx0l2wUpU2YpT d9a8Lu6/OW3l1xZ6YDPGqySCUutyY0g= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=GqyXe4yZ; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf20.hostedemail.com: domain of llong@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=llong@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1732298548; 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=CgB4Xh16LltpIZ14PxsaottjJCcCZ0sRpmkNwhVZ7wk=; b=J72YzHFqwiYRAaEwdfu5BC2yYzAgD6SSxO7MDDsrbOrBHY7+CWDVYyrZkHFoMrSaZS6y7V O5kR58cJQY0Z/oe6Nrh50cOBPatUKojQrzEcoxAK5x7NDyWFatTzXsHeABaiggbbmNfnVO p894tHZu7tkP/tBgS/8RG+SgsdNuzeY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732298685; h=from:from: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; bh=CgB4Xh16LltpIZ14PxsaottjJCcCZ0sRpmkNwhVZ7wk=; b=GqyXe4yZBXX091KNMou/fDTkOocNQIeMmPOUEgGeYTj0LS62JvS92gMzYjemgZXcs7FxkK N0DfcrACi3hqvReC4yGaL49/atzKo1UAcweD6OaJ3BbdDXeevzVDiwm9weGaolfaLYHK95 EXDo/7o8IWAdrUvgUFOaje5ZJUJwQNY= Received: from mail-il1-f200.google.com (mail-il1-f200.google.com [209.85.166.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-529-qqgvflulMTOSHLcv5Mg0Wg-1; Fri, 22 Nov 2024 13:04:44 -0500 X-MC-Unique: qqgvflulMTOSHLcv5Mg0Wg-1 X-Mimecast-MFC-AGG-ID: qqgvflulMTOSHLcv5Mg0Wg Received: by mail-il1-f200.google.com with SMTP id e9e14a558f8ab-3a77a808c27so24692425ab.1 for ; Fri, 22 Nov 2024 10:04:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1732298683; x=1732903483; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:subject:user-agent:mime-version:date:message-id:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CgB4Xh16LltpIZ14PxsaottjJCcCZ0sRpmkNwhVZ7wk=; b=T+RVZamWauiCfVBw2vFlHYlHYxbeXAB/KqnUkF0ERK4v36NSqqCvZLT1gOOzyBoxC1 71JqV9Cv08u+kyzLwWTU13tiIOCODehG5h9ER6D8JVZ8zz//vEFEkdt2OgQTH6tSkFsK UiM76sP2SL03Jl22FxLDOBr+Le45oVjFLP3A+3hIIdWV+BhNEInGlX0oVmd73raBwVUT P6gZMozb/NKQbMKO/amEnhwUSVXUIAo1kJuSP9qcodreUzcUjVl2+6RSn2p/6+GjYzDg eTLOQYEZ2+38KCWNMosAv2ptJClL5XE79Aen8C54AQBr3yOQU8BBli84jQGapkKBoh4r WVYg== X-Forwarded-Encrypted: i=1; AJvYcCXSwjJmKWMC2iGiLfSRHZ7uGTdmJVm6PdtpZ9M75BSAeA8AnERd+PcPybCsH9PXOLF2FwxmbQMn9Q==@kvack.org X-Gm-Message-State: AOJu0YxnHrCkyj0BP+n+YCyx5o66xqCwiL0xFUpJ0FwA1TASUPsrzTse a0MCYPvHPmvqe5CXquSmaR/Zp/yiyBx05L+9NqrJwgZvdeZ2Dyw8d2z5Gr1CfG+2+qkJ8erLa3m KNtBl8ozbT7GJRh7vM3nR/Na75fUccu01UeuPH64/v2cL4VWL X-Gm-Gg: ASbGncvlsu2nI9Co9OShNgexwxKkYmiPYMntt0pMyxCoyRLsq8VtMSdmmYicqoqIUgw q6teOh56dcBB+QrXZWcbd2//Cy7kL1T+hWxeElaHx682IV20sY+EKhkYz7BbqyTUr6P6HYebLT2 gT3BUED6UGPVuy4rsBK21g3mttGRWBpFoS98kTx+e2PiDMUcRIipwiqd2pI4kFVqHjrNsN/Go8q UNzQ21qspMljR0Zk7xgGHP9UiChffMr+fJcTwv4jgsEJ+SHaUg2xof2dFPHk5gH3Ayrg2ugWJwv wo6PhU7BLd31a5Lt3Q== X-Received: by 2002:a05:6e02:3187:b0:3a7:a553:7dc with SMTP id e9e14a558f8ab-3a7a5530fafmr21839395ab.7.1732298683157; Fri, 22 Nov 2024 10:04:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IEycfqbiLDKzC9HEe7UneIN9L0zCzy5DBNTAPREtAcHYE3jCT/+nP1BaSQxpdcOYHj16em97A== X-Received: by 2002:a05:6e02:3187:b0:3a7:a553:7dc with SMTP id e9e14a558f8ab-3a7a5530fafmr21838975ab.7.1732298682781; Fri, 22 Nov 2024 10:04:42 -0800 (PST) Received: from ?IPV6:2601:188:ca00:a00:f844:fad5:7984:7bd7? ([2601:188:ca00:a00:f844:fad5:7984:7bd7]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3a79ac9735csm5893795ab.50.2024.11.22.10.04.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 22 Nov 2024 10:04:40 -0800 (PST) From: Waiman Long X-Google-Original-From: Waiman Long Message-ID: <514c8a18-0b12-481b-94c2-00cabd5a4a42@redhat.com> Date: Fri, 22 Nov 2024 13:04:34 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2] kasan: Make kasan_record_aux_stack_noalloc() the default behaviour To: Sebastian Andrzej Siewior , Andrey Konovalov Cc: Marco Elver , Peter Zijlstra , Vlastimil Babka , syzbot , Liam.Howlett@oracle.com, akpm@linux-foundation.org, jannh@google.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, lorenzo.stoakes@oracle.com, syzkaller-bugs@googlegroups.com, kasan-dev , Andrey Ryabinin , Alexander Potapenko , dvyukov@google.com, vincenzo.frascino@arm.com, paulmck@kernel.org, frederic@kernel.org, neeraj.upadhyay@kernel.org, joel@joelfernandes.org, josh@joshtriplett.org, boqun.feng@gmail.com, urezki@gmail.com, rostedt@goodmis.org, mathieu.desnoyers@efficios.com, jiangshanlai@gmail.com, qiang.zhang1211@gmail.com, mingo@redhat.com, juri.lelli@redhat.com, vincent.guittot@linaro.org, dietmar.eggemann@arm.com, bsegall@google.com, mgorman@suse.de, vschneid@redhat.com, tj@kernel.org, cl@linux.com, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, Thomas Gleixner , roman.gushchin@linux.dev, 42.hyeyoo@gmail.com, rcu@vger.kernel.org References: <67275485.050a0220.3c8d68.0a37.GAE@google.com> <20241104114506.GC24862@noisy.programming.kicks-ass.net> <20241119155701.GYennzPF@linutronix.de> <20241122155451.Mb2pmeyJ@linutronix.de> In-Reply-To: <20241122155451.Mb2pmeyJ@linutronix.de> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: IMfjFWfj0oYpgz3Sjpn27vhyBglcZn9RKmpN7cDr0YQ_1732298683 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3EC171C0004 X-Stat-Signature: f9m7nhhmfhiujz1fb63q6qu4azge9bus X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1732298618-525380 X-HE-Meta: U2FsdGVkX197HqTWb+Pk3eUNXj1SuSuorsyTmNejnqh2LmSPfveGto1oWFPkSVb2We+/sZ+vhHg7nzYhnbnG3ism4X+4Ny0sTnWbLZgs4IQHRnDqykpKs0MOqtfjyA2DxWNcPb7vE7fhbWrSKM45LZ0dDisqRlWs7ArC9/Uaj8IyqCVlz0EZgdvuil0gjip+/QydeR28aANv4lfnY666lyq7xj7rp1JhLsKOP5LAukR9atcs/kFu5JQ+q1g/UQFhfZQF6N8u7WgyMCP7ZD+26jdqcL/6sTImP5lcffpHO5eyfkfCblHrdc7c3FQ/P9C7m+EhmgES2cKn/+rgZ09235hdH9aG4rM53HZS4Pj9xI6nJfnUiU+rXJ8yOy/qT5hJqX/yVUQDT0o4sXRYvEPLUMQ3OYnY0SOaC95j5GHJSegmq2RxxJ/OxE9Cbu+f8VnRQtyd9OkI8/jfP2kF6Nmt/FKbnAknJOSjVKwROh0/dbwWsIS5yWtoVer99Tst3sgjw50SylCA1apzYcI75kPAKGyfNpDHbTkrsbuGLcq9ieS4C7EX82LtcKEve6A+WkuojMgQalQdHmrCvvCD96cZC1vF9vV72LcRbQeC6rYosPac/D/82fT5YjB6U94hIWonXKGFRWh6I2Ry5UtSKL/MegqhvSlwTD/HZ3lUjSFNE6Ky+TcIaSC0K4yjKDxhWJ4XFsBYg+t5me0O/5W11ZAZow7jPNPomClZkvzc8doE870nCYEttZQyvYehKHcFJ10JvRBPzfcWiw1rUZBsu16kBD3vL70/gHnONdpohAVtLoQQD/9sDXHvtgpf4D0EXtrVpggApa9yjXh83oCgE3cEOo80FlMdm7IU+TbDOm/WSsbx6IQb8mGuGoiuRVIZXze2AnyKWtvE3uY9hHcqp7ygpTOoKrCXqt3dbtlJmLIePOv0ZVvgZpFFlIUcr90vv/zE2EcrA7ozQ2aEPOu9xCa LUfJEySc /xFxn8LunYj8tmJgHYkfq268RGeC3NA3j+KIWa6cnvJvREk1dDXZuWFmZ7cdi8frnjPjDtMy5bVuV1nAP8EeFsCQ+A6yNJs7TFhZap2n99CZzCZq7IFYIz8Hsi016V0uXEReMbnqVVRrZklI/75001QYqIINk6xSq4Yy+ZBsCOhPuZLyhRJRNsVG9mN9udNDYDDnPfTuSzyhzwZMFsa8EawYmufHw/1morkBZXdJYA0ONjhpvN7FEyi3F1MLpHknhUCBvBkKMiGl6/e4DYblTYkSU3YSi/7V1yxjTcB7N6hIFbl8TTC2vWnw8STtES9LfUt93RwYU0upBKGDCu3zGwD/asr+a1B6qFrjGFkIYHTQqoUb/lrYzmSEr/+IOSVTeAKTFplY8TkIhU2iR7OUCIz60qX1rbUvftqncBa8ivVFculIqMKhedzhX2sDcARKcl0g/bL54DD/kHtM1L4QGxlMV908fTlamvEj2dvs3qMjP6l5bgFahuFwh8A1NwkuF8sNa8DUkDE10E4pZnJAU1rvWDvxksu6Y5kbuGD0htE7EPKlAJ18QRqXmV/dad7EqrJiihRM+0fvhZcPSFmZjpd6EuT6zp/9ob+a9Oxy0BpuTUF+p0KLXCZkj0i5rnSC1QCsBeFxr42PninyB5wB7cBL4qwTtDCltracNz2KeRCTVlekgr/8oWcyj8ABK+BXdv0hMOOp2/nd0XRzHYb7NtoJJU5yWWlt0tT3nGks9nojN2Ip4wwWJrGGXZ/AKDXz9jSce3VAW4RJnmPA= 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 11/22/24 10:54 AM, Sebastian Andrzej Siewior wrote: > From: Peter Zijlstra > > kasan_record_aux_stack_noalloc() was introduced to record a stack trace > without allocating memory in the process. It has been added to callers > which were invoked while a raw_spinlock_t was held. > More and more callers were identified and changed over time. Is it a > good thing to have this while functions try their best to do a > locklessly setup? The only downside of having kasan_record_aux_stack() > not allocate any memory is that we end up without a stacktrace if > stackdepot runs out of memory and at the same stacktrace was not > recorded before To quote Marco Elver from > https://lore.kernel.org/all/CANpmjNPmQYJ7pv1N3cuU8cP18u7PP_uoZD8YxwZd4jtbof9nVQ@mail.gmail.com/ > > | I'd be in favor, it simplifies things. And stack depot should be > | able to replenish its pool sufficiently in the "non-aux" cases > | i.e. regular allocations. Worst case we fail to record some > | aux stacks, but I think that's only really bad if there's a bug > | around one of these allocations. In general the probabilities > | of this being a regression are extremely small [...] > > Make the kasan_record_aux_stack_noalloc() behaviour default as > kasan_record_aux_stack(). > > [bigeasy: Dressed the diff as patch. ] > > Reported-by: syzbot+39f85d612b7c20d8db48@syzkaller.appspotmail.com > Closes: https://lore.kernel.org/all/67275485.050a0220.3c8d68.0a37.GAE@google.com > Acked-by: Waiman Long > Reviewed-by: Andrey Konovalov > Reviewed-by: Marco Elver > Fixes: 7cb3007ce2da2 ("kasan: generic: introduce kasan_record_aux_stack_noalloc()") > Signed-off-by: Peter Zijlstra (Intel) > Signed-off-by: Sebastian Andrzej Siewior > --- > v1…v2: > - Renamed the patch as per Marco. > - Added comment to kasan_record_aux_stack() as per Andrey. > - Added fixes tag since Waiman that it is the only user. > - Added Marco's quote from the mail to the commit description. > > include/linux/kasan.h | 2 -- > include/linux/task_work.h | 3 --- > kernel/irq_work.c | 2 +- > kernel/rcu/tiny.c | 2 +- > kernel/rcu/tree.c | 4 ++-- > kernel/sched/core.c | 2 +- > kernel/task_work.c | 14 +------------- > kernel/workqueue.c | 2 +- > mm/kasan/generic.c | 18 ++++++------------ > mm/slub.c | 2 +- > 10 files changed, 14 insertions(+), 37 deletions(-) > > diff --git a/include/linux/kasan.h b/include/linux/kasan.h > index 00a3bf7c0d8f0..1a623818e8b39 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -488,7 +488,6 @@ void kasan_cache_create(struct kmem_cache *cache, unsigned int *size, > void kasan_cache_shrink(struct kmem_cache *cache); > void kasan_cache_shutdown(struct kmem_cache *cache); > void kasan_record_aux_stack(void *ptr); > -void kasan_record_aux_stack_noalloc(void *ptr); > > #else /* CONFIG_KASAN_GENERIC */ > > @@ -506,7 +505,6 @@ static inline void kasan_cache_create(struct kmem_cache *cache, > static inline void kasan_cache_shrink(struct kmem_cache *cache) {} > static inline void kasan_cache_shutdown(struct kmem_cache *cache) {} > static inline void kasan_record_aux_stack(void *ptr) {} > -static inline void kasan_record_aux_stack_noalloc(void *ptr) {} > > #endif /* CONFIG_KASAN_GENERIC */ > > diff --git a/include/linux/task_work.h b/include/linux/task_work.h > index 2964171856e00..0646804860ff1 100644 > --- a/include/linux/task_work.h > +++ b/include/linux/task_work.h > @@ -19,9 +19,6 @@ enum task_work_notify_mode { > TWA_SIGNAL, > TWA_SIGNAL_NO_IPI, > TWA_NMI_CURRENT, > - > - TWA_FLAGS = 0xff00, > - TWAF_NO_ALLOC = 0x0100, > }; > > static inline bool task_work_pending(struct task_struct *task) > diff --git a/kernel/irq_work.c b/kernel/irq_work.c > index 2f4fb336dda17..73f7e1fd4ab4d 100644 > --- a/kernel/irq_work.c > +++ b/kernel/irq_work.c > @@ -147,7 +147,7 @@ bool irq_work_queue_on(struct irq_work *work, int cpu) > if (!irq_work_claim(work)) > return false; > > - kasan_record_aux_stack_noalloc(work); > + kasan_record_aux_stack(work); > > preempt_disable(); > if (cpu != smp_processor_id()) { > diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c > index b3b3ce34df631..4b3f319114650 100644 > --- a/kernel/rcu/tiny.c > +++ b/kernel/rcu/tiny.c > @@ -250,7 +250,7 @@ EXPORT_SYMBOL_GPL(poll_state_synchronize_rcu); > void kvfree_call_rcu(struct rcu_head *head, void *ptr) > { > if (head) > - kasan_record_aux_stack_noalloc(ptr); > + kasan_record_aux_stack(ptr); > > __kvfree_call_rcu(head, ptr); > } > diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c > index b1f883fcd9185..7eae9bd818a90 100644 > --- a/kernel/rcu/tree.c > +++ b/kernel/rcu/tree.c > @@ -3083,7 +3083,7 @@ __call_rcu_common(struct rcu_head *head, rcu_callback_t func, bool lazy_in) > } > head->func = func; > head->next = NULL; > - kasan_record_aux_stack_noalloc(head); > + kasan_record_aux_stack(head); > local_irq_save(flags); > rdp = this_cpu_ptr(&rcu_data); > lazy = lazy_in && !rcu_async_should_hurry(); > @@ -3807,7 +3807,7 @@ void kvfree_call_rcu(struct rcu_head *head, void *ptr) > return; > } > > - kasan_record_aux_stack_noalloc(ptr); > + kasan_record_aux_stack(ptr); > success = add_ptr_to_bulk_krc_lock(&krcp, &flags, ptr, !head); > if (!success) { > run_page_cache_worker(krcp); > diff --git a/kernel/sched/core.c b/kernel/sched/core.c > index a1c353a62c568..3717360a940d2 100644 > --- a/kernel/sched/core.c > +++ b/kernel/sched/core.c > @@ -10485,7 +10485,7 @@ void task_tick_mm_cid(struct rq *rq, struct task_struct *curr) > return; > > /* No page allocation under rq lock */ > - task_work_add(curr, work, TWA_RESUME | TWAF_NO_ALLOC); > + task_work_add(curr, work, TWA_RESUME); > } > > void sched_mm_cid_exit_signals(struct task_struct *t) > diff --git a/kernel/task_work.c b/kernel/task_work.c > index c969f1f26be58..d1efec571a4a4 100644 > --- a/kernel/task_work.c > +++ b/kernel/task_work.c > @@ -55,26 +55,14 @@ int task_work_add(struct task_struct *task, struct callback_head *work, > enum task_work_notify_mode notify) > { > struct callback_head *head; > - int flags = notify & TWA_FLAGS; > > - notify &= ~TWA_FLAGS; > if (notify == TWA_NMI_CURRENT) { > if (WARN_ON_ONCE(task != current)) > return -EINVAL; > if (!IS_ENABLED(CONFIG_IRQ_WORK)) > return -EINVAL; > } else { > - /* > - * Record the work call stack in order to print it in KASAN > - * reports. > - * > - * Note that stack allocation can fail if TWAF_NO_ALLOC flag > - * is set and new page is needed to expand the stack buffer. > - */ > - if (flags & TWAF_NO_ALLOC) > - kasan_record_aux_stack_noalloc(work); > - else > - kasan_record_aux_stack(work); > + kasan_record_aux_stack(work); > } > > head = READ_ONCE(task->task_works); > diff --git a/kernel/workqueue.c b/kernel/workqueue.c > index 9949ffad8df09..65b8314b2d538 100644 > --- a/kernel/workqueue.c > +++ b/kernel/workqueue.c > @@ -2180,7 +2180,7 @@ static void insert_work(struct pool_workqueue *pwq, struct work_struct *work, > debug_work_activate(work); > > /* record the work call stack in order to print it in KASAN reports */ > - kasan_record_aux_stack_noalloc(work); > + kasan_record_aux_stack(work); > > /* we own @work, set data and link */ > set_work_pwq(work, pwq, extra_flags); > diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c > index 6310a180278b6..2242249c2d50d 100644 > --- a/mm/kasan/generic.c > +++ b/mm/kasan/generic.c > @@ -521,7 +521,11 @@ size_t kasan_metadata_size(struct kmem_cache *cache, bool in_object) > sizeof(struct kasan_free_meta) : 0); > } > > -static void __kasan_record_aux_stack(void *addr, depot_flags_t depot_flags) > +/* > + * This function avoids dynamic memory allocations and thus can be called from > + * contexts that do not allow allocating memory. > + */ > +void kasan_record_aux_stack(void *addr) > { > struct slab *slab = kasan_addr_to_slab(addr); > struct kmem_cache *cache; > @@ -538,17 +542,7 @@ static void __kasan_record_aux_stack(void *addr, depot_flags_t depot_flags) > return; > > alloc_meta->aux_stack[1] = alloc_meta->aux_stack[0]; > - alloc_meta->aux_stack[0] = kasan_save_stack(0, depot_flags); > -} > - > -void kasan_record_aux_stack(void *addr) > -{ > - return __kasan_record_aux_stack(addr, STACK_DEPOT_FLAG_CAN_ALLOC); > -} > - > -void kasan_record_aux_stack_noalloc(void *addr) > -{ > - return __kasan_record_aux_stack(addr, 0); > + alloc_meta->aux_stack[0] = kasan_save_stack(0, 0); > } > > void kasan_save_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags) > diff --git a/mm/slub.c b/mm/slub.c > index 5b832512044e3..b8c4bf3fe0d07 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -2300,7 +2300,7 @@ bool slab_free_hook(struct kmem_cache *s, void *x, bool init, > * We have to do this manually because the rcu_head is > * not located inside the object. > */ > - kasan_record_aux_stack_noalloc(x); > + kasan_record_aux_stack(x); > > delayed_free->object = x; > call_rcu(&delayed_free->head, slab_free_after_rcu_debug); LGTM Reviewed-by: Waiman Long