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=-16.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,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 8F63CC2D0E4 for ; Mon, 23 Nov 2020 20:15:15 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id F24DF20657 for ; Mon, 23 Nov 2020 20:15:14 +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="nMsy4P1z" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F24DF20657 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 51FE36B0085; Mon, 23 Nov 2020 15:15:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4FD0A6B0087; Mon, 23 Nov 2020 15:15:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 371F46B0088; Mon, 23 Nov 2020 15:15:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0079.hostedemail.com [216.40.44.79]) by kanga.kvack.org (Postfix) with ESMTP id 06F616B0085 for ; Mon, 23 Nov 2020 15:15:13 -0500 (EST) Received: from smtpin10.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id A4F121EE6 for ; Mon, 23 Nov 2020 20:15:13 +0000 (UTC) X-FDA: 77516787306.10.brick83_60094f327368 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin10.hostedemail.com (Postfix) with ESMTP id 87A5F16A4A9 for ; Mon, 23 Nov 2020 20:15:13 +0000 (UTC) X-HE-Tag: brick83_60094f327368 X-Filterd-Recvd-Size: 6070 Received: from mail-qt1-f201.google.com (mail-qt1-f201.google.com [209.85.160.201]) by imf34.hostedemail.com (Postfix) with ESMTP for ; Mon, 23 Nov 2020 20:15:12 +0000 (UTC) Received: by mail-qt1-f201.google.com with SMTP id y5so14465254qtb.13 for ; Mon, 23 Nov 2020 12:15:12 -0800 (PST) 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=+ebVro8WhZiLU99JJsnZ41QIjsbf3l1QeUgTEZT5fwM=; b=nMsy4P1zBhnUlJ7LXW5vgMe9VAoz/CbtlFUKrJKF1+LyFx3nO8IGDWAzkq6sCI3cyX 37cZ0AyhoIpiVPMTMdyIP8+n8+BQA57PTXiQxaqv1coMlGKSDmL5G0Bzu1IswwgHYRIF WL3uJIRxFuTlY8/s2i4hCvE/6Vy8uBi6lCrsVkIn8eAz6q3j1YzY9iX/JW8uCtCQyoOv 2fgfUu3tA1ooA7GWCT/E5nVFskmr0ABKzjIcPB/jQauVJM9VZ8rbHjYRd8eAchmaVMRZ kRtz9MnoLJ+37V9QrBxh8/aA/B7kZ8Cwx1WSfgMSxOgxMX4E7RLZx4vULPLNgYjMi0p6 nheA== 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=+ebVro8WhZiLU99JJsnZ41QIjsbf3l1QeUgTEZT5fwM=; b=kWPpIgsEMz9YGOHdwa3eJuCSGIM4gbbtMsh3FxMJoIfftmK8jsX/RIpSTrkrjV9a0/ 8HSTDM8OD9PxhHc2VnmREsIIZI0QEpr8I0HgxSc7uoUlSsHH4LMcpkmdTZAHdknmPq57 L1HKEAJl41OiNSYV/1tP7UvidxNWUCIu9xiPheGcVl9KK5cf/hVfRJ57uTX0xaKUJI5z CNytD+d/1z0SKGYk4jlzBmi7lLjOoO3i3abW5bUY/qvBq+5Yvi4Pvk5GgMvQogjvIvGu c5BwpsQ1dnRX3do6wS7sBUdeDlMLzO+x0Pk2S5vC9kuwC71R/eiw8lk0GqfogEbRVZ8n Fv7A== X-Gm-Message-State: AOAM53232MDVq0YUZ7jD7WTtzMrZDKNlM02saRzEpAjPwfiBHlC8iNDe OE3CoiMXsQHcfDk+utsEebjRXMUEPshrxw2j X-Google-Smtp-Source: ABdhPJz/EIT+p1GLjg2l1/jdNIDDxtLmLPSNqnUlEbXUIzj7/CSWJSG0+2TpsAC2+guYEI2P9bEmzgTPMtEAhQTQ X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a05:6214:aab:: with SMTP id ew11mr1176833qvb.4.1606162512301; Mon, 23 Nov 2020 12:15:12 -0800 (PST) Date: Mon, 23 Nov 2020 21:14:38 +0100 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog Subject: [PATCH mm v4 08/19] kasan: inline random_tag for HW_TAGS From: Andrey Konovalov To: Andrew Morton Cc: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , 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 calls. Signed-off-by: Andrey Konovalov Reviewed-by: Marco Elver Reviewed-by: Dmitry Vyukov Link: https://linux-review.googlesource.com/id/Iac5b2faf9a912900e16cca6834d621f5d4abf427 --- mm/kasan/hw_tags.c | 5 ----- mm/kasan/kasan.h | 31 ++++++++++++++----------------- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c index a34476764f1d..3cdd87d189f6 100644 --- a/mm/kasan/hw_tags.c +++ b/mm/kasan/hw_tags.c @@ -51,11 +51,6 @@ void unpoison_range(const void *address, size_t size) round_up(size, KASAN_GRANULE_SIZE), get_tag(address)); } -u8 random_tag(void) -{ - return hw_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 5e8cd2080369..7876a2547b7d 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -190,6 +190,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); @@ -225,23 +231,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) { @@ -281,6 +270,14 @@ static inline const void *arch_kasan_set_tag(const void *addr, u8 tag) #endif /* CONFIG_KASAN_HW_TAGS */ +#ifdef CONFIG_KASAN_SW_TAGS +u8 random_tag(void); +#elif defined(CONFIG_KASAN_HW_TAGS) +static inline u8 random_tag(void) { return hw_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.2.454.gaff20da3a2-goog