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 X-Spam-Level: X-Spam-Status: No, score=-15.9 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1, USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17DD5C43464 for ; Fri, 18 Sep 2020 15:19:49 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 508D12388E for ; Fri, 18 Sep 2020 15:19:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="njwtxF5o" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 508D12388E Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id CDB5C6B0073; Fri, 18 Sep 2020 11:19:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C8A896B0074; Fri, 18 Sep 2020 11:19:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B52416B0075; Fri, 18 Sep 2020 11:19:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0144.hostedemail.com [216.40.44.144]) by kanga.kvack.org (Postfix) with ESMTP id A06E36B0073 for ; Fri, 18 Sep 2020 11:19:47 -0400 (EDT) Received: from smtpin29.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 645A1127B for ; Fri, 18 Sep 2020 15:19:47 +0000 (UTC) X-FDA: 77276542014.29.self85_01073e12712c Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin29.hostedemail.com (Postfix) with ESMTP id 2E995180868E0 for ; Fri, 18 Sep 2020 15:19:47 +0000 (UTC) X-HE-Tag: self85_01073e12712c X-Filterd-Recvd-Size: 6122 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by imf49.hostedemail.com (Postfix) with ESMTP for ; Fri, 18 Sep 2020 15:19:46 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id k18so5959219wmj.5 for ; Fri, 18 Sep 2020 08:19:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=LN66O5JSkYCxOmUnEcN+noTfKpC7LQl7RqBfE76tpKc=; b=njwtxF5oKOoIDCTtN7M94k1G+G0/E8GCFJd727PAZrNOP/hvMByvmLc043VdjseTxR WCNJRDar5juEL+QEPBtOF2DJQFYVX9B6QCwDwrnHVmzunwN68Q3ELK3pW+ijCPE3U0/x hmlVC2MSoNOzGlY1hkRqyj9y94hK0Whn6SUd4oy9FgQUeciQxPaUwGXmN9fUWhk5wGPm UJM2yEKaGKfWBQY830rCfu7i128RlgfcYZ59wQShEBO7XCX1APnK3mlhhf5aGO171hUO Y3oAlJKm/T/hNhIe/XOQFwy1nCNayYPk6XYUVt2pRbPAOKY61Gj5mwDwD9iZwXevqhgF JM8w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=LN66O5JSkYCxOmUnEcN+noTfKpC7LQl7RqBfE76tpKc=; b=XpUeMRJbKmepIo5NHsUeZajZv76SPAsZQt+4A5QSDvFq87fVLB/HwrnAtMyp9Zh6nT nauM5fIFvaoBDTdwZcMgXAU7nZRAi7eiLsVdh6a4Zoz8ns4elIfTlP92HPYaTG1lYIrO qLXDmR2SkGMyWLVYMRx4i/cG/ngCtsxmfIK/vlsKCJRDKf5nQ7POYI4jWGZxwZXAX5Gk jaoMRVexhwTallrDRmEIiPbK+SMfqQ3S2DHE0Dx6PIwhDCacM08A5twXfPlLHW4SLmP3 jczzEQaoHoiTN1H0Dh3H74KHH2xNY1WEmyt0Oef/Z6VzRakrc/K4TjMuxW3xS5P+OC2k G54A== X-Gm-Message-State: AOAM532BHQKwgJ0Cx4Ky6byN9GhJigaSWdY08vOZ5COm+rUGqmBfvAWQ YXOQ8Z3h3rBKSc2O6/m7ntCiwA== X-Google-Smtp-Source: ABdhPJyQq37a0beUlQ6BSXGA/W7iHrPH98l0i+hBHKR5luytBVxYilwdiT6p59tx580L9FUNOh+i4A== X-Received: by 2002:a7b:c085:: with SMTP id r5mr17054390wmh.52.1600442385292; Fri, 18 Sep 2020 08:19:45 -0700 (PDT) Received: from elver.google.com ([100.105.32.75]) by smtp.gmail.com with ESMTPSA id v128sm5556561wme.2.2020.09.18.08.19.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2020 08:19:44 -0700 (PDT) Date: Fri, 18 Sep 2020 17:19:39 +0200 From: Marco Elver To: Andrey Konovalov Cc: Dmitry Vyukov , Vincenzo Frascino , Catalin Marinas , kasan-dev@googlegroups.com, Andrey Ryabinin , Alexander Potapenko , Evgenii Stepanov , Elena Petrova , Branislav Rankov , Kevin Brodsky , Will Deacon , Andrew Morton , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 33/37] kasan, arm64: implement HW_TAGS runtime Message-ID: <20200918151939.GA2465533@elver.google.com> References: <74133d1a57c47cb8fec791dd5d1e6417b0579fc3.1600204505.git.andreyknvl@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <74133d1a57c47cb8fec791dd5d1e6417b0579fc3.1600204505.git.andreyknvl@google.com> User-Agent: Mutt/1.14.4 (2020-06-18) 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: On Tue, Sep 15, 2020 at 11:16PM +0200, Andrey Konovalov wrote: > diff --git a/include/linux/kasan.h b/include/linux/kasan.h > index 875bbcedd994..613c9d38eee5 100644 > --- a/include/linux/kasan.h > +++ b/include/linux/kasan.h > @@ -184,7 +184,7 @@ static inline void kasan_record_aux_stack(void *ptr) {} > > #endif /* CONFIG_KASAN_GENERIC */ > > -#ifdef CONFIG_KASAN_SW_TAGS > +#if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS) > > void kasan_init_tags(void); > > @@ -193,7 +193,7 @@ void *kasan_reset_tag(const void *addr); > bool kasan_report(unsigned long addr, size_t size, > bool is_write, unsigned long ip); > > -#else /* CONFIG_KASAN_SW_TAGS */ > +#else /* CONFIG_KASAN_SW_TAGS || CONFIG_KASAN_HW_TAGS */ > > static inline void kasan_init_tags(void) { } > > @@ -202,7 +202,7 @@ static inline void *kasan_reset_tag(const void *addr) > return (void *)addr; > } > > -#endif /* CONFIG_KASAN_SW_TAGS */ > +#endif /* CONFIG_KASAN_SW_TAGS || CONFIG_KASAN_HW_TAGS*/ > > #ifdef CONFIG_KASAN_VMALLOC It's not visible by looking at this diff, but there is some #ifdef-redundancy that I do not understand where it came from. This is what I have to fix it: diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 613c9d38eee5..80a0e5b11f2b 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -40,6 +40,12 @@ static inline void *kasan_mem_to_shadow(const void *addr) int kasan_add_zero_shadow(void *start, unsigned long size); void kasan_remove_zero_shadow(void *start, unsigned long size); +/* Enable reporting bugs after kasan_disable_current() */ +extern void kasan_enable_current(void); + +/* Disable reporting bugs for current task */ +extern void kasan_disable_current(void); + #else /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ static inline int kasan_add_zero_shadow(void *start, unsigned long size) @@ -50,18 +56,6 @@ static inline void kasan_remove_zero_shadow(void *start, unsigned long size) {} -#endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ - -#if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) - -/* Enable reporting bugs after kasan_disable_current() */ -extern void kasan_enable_current(void); - -/* Disable reporting bugs for current task */ -extern void kasan_disable_current(void); - -#else /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ - static inline void kasan_enable_current(void) {} static inline void kasan_disable_current(void) {}