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=-11.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 53A0BC43463 for ; Fri, 18 Sep 2020 15:21:16 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F03C02067C for ; Fri, 18 Sep 2020 15:21:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="eDmFK69J"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="njwtxF5o" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F03C02067C Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=DIhRqI6hrSQ682Nk1pEHc1rBAtZ8w0lvjweXz1ofGrM=; b=eDmFK69JIPRQOKvBv6qygGt2C RyKamGN2LzLD9iJgmDUHGKtf5i1KX+PPOmQ9sO84hzlBPmWOLQks0UEJmxKaAAefFK0vd683mlr/e zAD+jCpXJ0R1PM9fKb3s6ZecvxmiIlmi2eaNp+Tsh+acmEV7RlVBUv5CKygA9UyvE+P3IT3U45EVE Tp9o5X7yvbfLV7Wu4Ba1mejOw4iFvSbis7dFSELATgjIqYSZeQrbEvrvlaFReshBIhxU0bP4DPCoL beCJuTzOLOtKpH0R9Ob4+xlsQzQtCRUydkAAD4lu6EHEZx42BQuVhxhLr43mh9T3c72XagYfZ+WDa NP/Domi4A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kJIAw-0003aG-1d; Fri, 18 Sep 2020 15:19:50 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kJIAs-0003ZM-Ic for linux-arm-kernel@lists.infradead.org; Fri, 18 Sep 2020 15:19:47 +0000 Received: by mail-wm1-x344.google.com with SMTP id k18so5959218wmj.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=WOygh+lhDEOxaGW0aGHsxda9eYrzLjwK7sSSJawuS0jbwtDkKu0Zv1lEpfmdfbDIsc oeRQ0+EUbBVl8zvb6q0TABbp2tJoq6To/u1dnCejPJS2bBGy/jVDdjsFSX7lXiJq2CU8 m0NplnRJS8u+6KiqadY5g5J4eVmySzR4waZXr/5Xv3sFecCS8Hfy8wkchZJ08BgIBZTz oD5PBAs2e3IEDD6LSqWNOIS1q76ATc/57R9iGWUZJ+zh3r+vCuC2OFl3g8B53D1oDeKu MvlVch6cA/JlNxfmWEVz3yuI11W8+RhHTsBpvJudea9Jhm692Fb744kZKcWBWqdUAdd1 J6kA== X-Gm-Message-State: AOAM531V4z85emEDfHobw5jk/TMeOVoMiQcbn0fXHXq9l1OrRfB1oJ76 47zid8atX3eFrRc5YKw7qspHuQ== 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 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-Disposition: inline In-Reply-To: <74133d1a57c47cb8fec791dd5d1e6417b0579fc3.1600204505.git.andreyknvl@google.com> User-Agent: Mutt/1.14.4 (2020-06-18) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200918_111946_640901_74A52981 X-CRM114-Status: GOOD ( 18.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Branislav Rankov , Elena Petrova , Catalin Marinas , Kevin Brodsky , Will Deacon , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, Alexander Potapenko , Evgenii Stepanov , Andrey Ryabinin , Andrew Morton , Vincenzo Frascino , Dmitry Vyukov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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) {} _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel