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=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 576CCC388F2 for ; Thu, 22 Oct 2020 13:19:55 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id C8808222E9 for ; Thu, 22 Oct 2020 13:19:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="DNq7BoOI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C8808222E9 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 83E816B0092; Thu, 22 Oct 2020 09:19:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7C7286B0093; Thu, 22 Oct 2020 09:19:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 691866B0095; Thu, 22 Oct 2020 09:19:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0112.hostedemail.com [216.40.44.112]) by kanga.kvack.org (Postfix) with ESMTP id 31F556B0092 for ; Thu, 22 Oct 2020 09:19:50 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id CDEE1181AEF07 for ; Thu, 22 Oct 2020 13:19:49 +0000 (UTC) X-FDA: 77399618898.13.bomb24_131436627251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin13.hostedemail.com (Postfix) with ESMTP id ABEA118140B67 for ; Thu, 22 Oct 2020 13:19:49 +0000 (UTC) X-HE-Tag: bomb24_131436627251 X-Filterd-Recvd-Size: 6259 Received: from mail-qv1-f74.google.com (mail-qv1-f74.google.com [209.85.219.74]) by imf42.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:19:49 +0000 (UTC) Received: by mail-qv1-f74.google.com with SMTP id ec4so982495qvb.21 for ; Thu, 22 Oct 2020 06:19:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=ttDbGg8ckV2PZque6BU+M0wdmEgRXMhDQET60HhqsRw=; b=DNq7BoOIMFRWZI331hPIuN8vmCPTnZnXF+XeIjG3w9Hk2atPyCaUpdrcWQFtLMEsK6 LNS+gBQZSNMj+AQNcPlzCyjpQD+9cvI78lR3QVEDsT5li5S1WII6cVWu5VIIQkUnwM4e +bQIJ4VljeoRS67xneeuZbD+h9ZhKdXuyYyYcBr8991D5MhajraRH9cLTqIYWls1s/Kv 1rWH3LASWY26b9h93KZAno8D5Spvwl5ggv8QS0bjaP3ThZhgnUW9192aLQdwG4/DjTjJ w0gzTW48I1nyPkSPnDsSs55Y8p2ekSNdOpn+V1L+KMK2eeF1JEdYr18irubGQFKoUNLs p0oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=ttDbGg8ckV2PZque6BU+M0wdmEgRXMhDQET60HhqsRw=; b=luZ4sxvcdaBR3Z6aVPKKd2JlFnmTb4a/Cw6KvufIWQcJCIy3ZMF2St4/JOfoANbXhj KbxVzE+DcuRGPP2Ip3Yd4yPTWwIjZZVkn5YwWSKLFjT2jjQjbDaXRE9agPMYDlgOeK1S R8+GAmSBydqDjwxu2adESX4M5UYrs9k7zCjvQiRS0ZHbfeLukAaE6J+FEvzTlfgj2k7G k/QW99FcVaIQL5r9Vrk0RY4PAT4mjpTu3CjKICbbHsnOPaD74S8SCPIVLbGKHZCFxzWK 5EIvtJTinYC1a4xAbaB3xVJpxh+cbXexsznFDfq8s/GyaK3qkSv7ULm2kQQoEZ+AVCtB bYIQ== X-Gm-Message-State: AOAM531bCaqcv1T/oyWX7MnjYFiACSaslPf33/GcGafh2PQmShB00Qmc oDgWQrjcpMFmFk9HmolTDUU9xXfroAsrNdjV X-Google-Smtp-Source: ABdhPJwJNOlcCNokD229g2j6kSc2H2jEf2rPOcfKu2ebxDvvoQ75tqz88rP7WbdvohZY0+9l7Lmu+TJ0jcXmoqbT X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:4d46:: with SMTP id m6mr2314403qvm.60.1603372788362; Thu, 22 Oct 2020 06:19:48 -0700 (PDT) Date: Thu, 22 Oct 2020 15:19:02 +0200 In-Reply-To: Message-Id: <56b19be34ee958103481bdfc501978556a168b42.1603372719.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 10/21] kasan: inline random_tag for HW_TAGS From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev@googlegroups.com, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Andrey Konovalov Content-Type: text/plain; charset="UTF-8" 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: Using random_tag() currently results in a function call. Move its definition to mm/kasan/kasan.h and turn it into a static inline function for hardware tag-based mode to avoid uneeded function call. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/Iac5b2faf9a912900e16cca6834d621f5d4abf427 --- mm/kasan/hw_tags.c | 5 ----- mm/kasan/kasan.h | 37 ++++++++++++++++++++----------------- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c index c3a0e83b5e7a..4c24bfcfeff9 100644 --- a/mm/kasan/hw_tags.c +++ b/mm/kasan/hw_tags.c @@ -36,11 +36,6 @@ void kasan_unpoison_memory(const void *address, size_t size) round_up(size, KASAN_GRANULE_SIZE), get_tag(address)); } -u8 random_tag(void) -{ - return get_random_tag(); -} - bool check_invalid_free(void *addr) { u8 ptr_tag = get_tag(addr); diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 0ccbb3c4c519..94ba15c2f860 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -188,6 +188,12 @@ static inline bool addr_has_metadata(const void *addr) #endif /* CONFIG_KASAN_GENERIC || CONFIG_KASAN_SW_TAGS */ +#if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS) +void print_tags(u8 addr_tag, const void *addr); +#else +static inline void print_tags(u8 addr_tag, const void *addr) { } +#endif + bool check_invalid_free(void *addr); void *find_first_bad_addr(void *addr, size_t size); @@ -223,23 +229,6 @@ static inline void quarantine_reduce(void) { } static inline void quarantine_remove_cache(struct kmem_cache *cache) { } #endif -#if defined(CONFIG_KASAN_SW_TAGS) || defined(CONFIG_KASAN_HW_TAGS) - -void print_tags(u8 addr_tag, const void *addr); - -u8 random_tag(void); - -#else - -static inline void print_tags(u8 addr_tag, const void *addr) { } - -static inline u8 random_tag(void) -{ - return 0; -} - -#endif - #ifndef arch_kasan_set_tag static inline const void *arch_kasan_set_tag(const void *addr, u8 tag) { @@ -273,6 +262,20 @@ static inline const void *arch_kasan_set_tag(const void *addr, u8 tag) #define get_mem_tag(addr) arch_get_mem_tag(addr) #define set_mem_tag_range(addr, size, tag) arch_set_mem_tag_range((addr), (size), (tag)) +#ifdef CONFIG_KASAN_SW_TAGS +u8 random_tag(void); +#elif defined(CONFIG_KASAN_HW_TAGS) +static inline u8 random_tag(void) +{ + return get_random_tag(); +} +#else +static inline u8 random_tag(void) +{ + return 0; +} +#endif + /* * Exported functions for interfaces called from assembly or from generated * code. Declarations here to avoid warning about missing declarations. -- 2.29.0.rc1.297.gfa9743e501-goog