Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp4140414iog; Tue, 21 Jun 2022 12:56:27 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tfXKBbqXiJfcxxqr8+hDVgdGeNsjtW/uhh0kEmnVgbBo6+U2segD7uZcxGQytl8AgPCBVK X-Received: by 2002:a17:906:149:b0:712:c9:7981 with SMTP id 9-20020a170906014900b0071200c97981mr27409272ejh.218.1655841387052; Tue, 21 Jun 2022 12:56:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655841387; cv=none; d=google.com; s=arc-20160816; b=UqRjWByLyBLaUCIJ2SIV6SVp1zOV3+yc/rPrKnq5n/2Q4ZkwieeMcAWEVjxFIm2+xK AHNiB2UI6S/VhbHuHicRRfa9Xi0HXvqFrAcqAqf8reEfpFhD4Wor+4MkSxIKMDlvuc9o 5IPt5aniejY6e+P47jOTeRrTkfxheSCVtzGnRxxdLeKtLDe7Vuo9wUnrVbZaRwT/uwAG gJMvUu18IWSntEia4cwTajf+51jxr4785JDnp1300f0sIbY2nJqsxmWljvRrEvm1dM8u ZkgJBVn7uFcuvdgtpJHrgVJ7+pn/0jBUnXPTYTb0YMpWbfkIBsX4G6DYF75shToNOruR 7Bsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:reply-to:message-id:subject:cc:to:from:date :dkim-signature; bh=c8Tauunknfv3rb01brVIt0ui5WaHR7yt1ZVu5IubLoQ=; b=QHDScc1rcR0bWK9ONCHrSVCasBxbUXRXu2pZq6VkTUNeGxApkm0LYHX8OcXcEFOSAD +HdU3lOk0Dj7GXBX7UuOMFk5/L7M3xZjOCpyaLkyJ7L5fF++Bsk6f7ZFRYQNMAVIXE6f acoJdZcQGDs24ezp/iIoiWVc0gcbL7ORcbtim9AxtkfaOxhxoPCpV3ai9O8l1uyxgkJX b1NBAsc3ETo5wsteKjUnaeMDYjyM6tYYkKGGrrLk12buqMbDxewHJOCWDDlWqkg2d19J nyzrAA/2yYs1zxXv931W4hWLmWZQiQvZOhe2UnDrAL29tWgyAssdyqYobCsbZYbeM4yH Ew+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GKjTthMH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jg25-20020a170907971900b007048e19020esi4489315ejc.30.2022.06.21.12.56.01; Tue, 21 Jun 2022 12:56:27 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=GKjTthMH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352707AbiFUTbl (ORCPT + 99 others); Tue, 21 Jun 2022 15:31:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233517AbiFUTbj (ORCPT ); Tue, 21 Jun 2022 15:31:39 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F412025C52; Tue, 21 Jun 2022 12:31:38 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 821EEB81B08; Tue, 21 Jun 2022 19:31:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3A5DBC341C4; Tue, 21 Jun 2022 19:31:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1655839896; bh=XOK/ai0FHGuQIlrk56DODIykPUAQiocU9ghRFS6qaB8=; h=Date:From:To:Cc:Subject:Reply-To:References:In-Reply-To:From; b=GKjTthMHeEabqxU4T764aK2hDWxLM9BTCWG6ObuHO1ujXQwxJ0Z+bnZtLgD3tZs// yP4ChJ1fuLz9nyNfSz9nELB8AfotVBVkxzeasLsP9GKUs7L4OK0B2RHT7o1aMtdANu y70ViNEkOYksfIfdnK6GhCInolTYpZ1AUR5ddniurrw0BGr7Lz7RxXgiufvmphvhOB aEOXNsPmQHuYkzsI4W/1onqefUzYhUYEuWbr4ZsB1/HKw/+BtFDSIZPJSckwj+jfqr AITjKQc2EyBrbKn1T/R4AD4SxRMifEhRTHpJncLJkGF1Fh148cca8Dj0iq8dYvjOqf pF4hHchlqB/Vw== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id C63F05C09AF; Tue, 21 Jun 2022 12:31:35 -0700 (PDT) Date: Tue, 21 Jun 2022 12:31:35 -0700 From: "Paul E. McKenney" To: Neeraj Upadhyay Cc: rcu@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@fb.com, rostedt@goodmis.org, Johannes Berg , Dmitry Vyukov , elver@google.com Subject: Re: [PATCH rcu 07/12] rcu: tiny: Record kvfree_call_rcu() call stack for KASAN Message-ID: <20220621193135.GM1790663@paulmck-ThinkPad-P17-Gen-1> Reply-To: paulmck@kernel.org References: <20220620222022.GA3839466@paulmck-ThinkPad-P17-Gen-1> <20220620222032.3839547-7-paulmck@kernel.org> <00f3eb47-2529-a493-ee67-c0c0219937a3@quicinc.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <00f3eb47-2529-a493-ee67-c0c0219937a3@quicinc.com> X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jun 21, 2022 at 12:01:29PM +0530, Neeraj Upadhyay wrote: > > > On 6/21/2022 3:50 AM, Paul E. McKenney wrote: > > From: Johannes Berg > > > > When running KASAN with Tiny RCU (e.g. under ARCH=um, where > > a working KASAN patch is now available), we don't get any > > information on the original kfree_rcu() (or similar) caller > > when a problem is reported, as Tiny RCU doesn't record this. > > > > Add the recording, which required pulling kvfree_call_rcu() > > out of line for the KASAN case since the recording function > > (kasan_record_aux_stack_noalloc) is neither exported, nor > > can we include kasan.h into rcutiny.h. > > > > without KASAN, the patch has no size impact (ARCH=um kernel): > > text data bss dec hex filename > > 6151515 4423154 33148520 43723189 29b29b5 linux > > 6151515 4423154 33148520 43723189 29b29b5 linux + patch > > > > with KASAN, the impact on my build was minimal: > > text data bss dec hex filename > > 13915539 7388050 33282304 54585893 340ea25 linux > > 13911266 7392114 33282304 54585684 340e954 linux + patch > > -4273 +4064 +-0 -209 > > > > Acked-by: Dmitry Vyukov > > Signed-off-by: Johannes Berg > > Signed-off-by: Paul E. McKenney > > --- > > include/linux/rcutiny.h | 11 ++++++++++- > > kernel/rcu/tiny.c | 14 ++++++++++++++ > > 2 files changed, 24 insertions(+), 1 deletion(-) > > > > diff --git a/include/linux/rcutiny.h b/include/linux/rcutiny.h > > index 5fed476f977f6..d84e13f2c3848 100644 > > --- a/include/linux/rcutiny.h > > +++ b/include/linux/rcutiny.h > > @@ -38,7 +38,7 @@ static inline void synchronize_rcu_expedited(void) > > */ > > extern void kvfree(const void *addr); > > -static inline void kvfree_call_rcu(struct rcu_head *head, rcu_callback_t func) > > +static inline void __kvfree_call_rcu(struct rcu_head *head, rcu_callback_t func) > > { > > if (head) { > > call_rcu(head, func); > > @@ -51,6 +51,15 @@ static inline void kvfree_call_rcu(struct rcu_head *head, rcu_callback_t func) > > kvfree((void *) func); > > } > > +#ifdef CONFIG_KASAN_GENERIC > > +void kvfree_call_rcu(struct rcu_head *head, rcu_callback_t func); > > +#else > > +static inline void kvfree_call_rcu(struct rcu_head *head, rcu_callback_t func) > > +{ > > + __kvfree_call_rcu(head, func); > > +} > > +#endif > > + > > void rcu_qs(void); > > static inline void rcu_softirq_qs(void) > > diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c > > index 340b3f8b090d4..58ff3721d975c 100644 > > --- a/kernel/rcu/tiny.c > > +++ b/kernel/rcu/tiny.c > > @@ -217,6 +217,20 @@ bool poll_state_synchronize_rcu(unsigned long oldstate) > > } > > EXPORT_SYMBOL_GPL(poll_state_synchronize_rcu); > > +#ifdef CONFIG_KASAN_GENERIC > > +void kvfree_call_rcu(struct rcu_head *head, rcu_callback_t func) > > +{ > > + if (head) { > > + void *ptr = (void *) head - (unsigned long) func; > > + > > + kasan_record_aux_stack_noalloc(ptr); > > + } > > For the !head case; similar to Tree RCU's kvfree_call_rcu() implementation, > we do not need to record 'ptr' (which will be 'func')? My understanding is that we do not need to record in that case because __kvfree_call_rcu() will simply invoke the almost-zero-cost synchronize_rcu() and then invoke kfree(). Johannes, Dmitry, Marco, anything that I am missing? Thanx, Paul > Thanks > Neeraj > > > + > > + __kvfree_call_rcu(head, func); > > +} > > +EXPORT_SYMBOL_GPL(kvfree_call_rcu); > > +#endif > > + > > void __init rcu_init(void) > > { > > open_softirq(RCU_SOFTIRQ, rcu_process_callbacks);