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.7 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,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT 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 762F5C388F2 for ; Thu, 22 Oct 2020 13:24:09 +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 0180220848 for ; Thu, 22 Oct 2020 13:24:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="VVspGbeR"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="g6JwnRNL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0180220848 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:To:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=O9CgRGIfMyrMVQ2qaMOHzdHZNgvPMuKg1LxyP2dvis4=; b=VVspGbeRiaOtt95/4qQ4kSU/h OxgnDFcubU7ij6uqNw5pimFHHdKV3FLJJBLmF5mJ1b2w8ZpkWQOGWrEjXzcMsj0vryFIyo/k8BTqz 54Adc0nbT5DqEW9pubOXvz6vmQy5QHDb/+4VnGddJUy2zKe805tYnW7MRRAqcgWr6YbpsDaAEFGY6 zfA35NAe5AwVkPBNE2B3ymd5OXrLES/A2xhhK5yG7eorab/0d6QAmiSg6Luc8NSiHuN5wQgQ7qw8a pFg4Z7t2e86YA/6t8cgQCZSweLbgk3QqdmQ+63EzN0mHheA261NIgcELzAuWabG+r7lYILeomyM6u OQBUhqHcQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kVaXk-0004Zx-Bz; Thu, 22 Oct 2020 13:22:12 +0000 Received: from mail-ed1-x54a.google.com ([2a00:1450:4864:20::54a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kVaVW-0003mF-6W for linux-arm-kernel@lists.infradead.org; Thu, 22 Oct 2020 13:20:13 +0000 Received: by mail-ed1-x54a.google.com with SMTP id dn20so663863edb.14 for ; Thu, 22 Oct 2020 06:19:51 -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=ZDpLws4WWjszeBZt7nTlIzp0p338D/8ILsPCgH/ymC0=; b=g6JwnRNLjkaRFkpFVHgLjZOQIQP4rh4rnIwcyms2N78ZDOmBQSYZP56ZAmgxHWUXcm IUxQSQ2WjpTQOfUa8ywDBIZo1cjnWs8RIdmAIYR9BmY3f8dJANNQmkqPsknBrdP0mTKd 7pCLzIjmPAiHrKFfW7/HdqypIdOXRxYiU0A/P2X0gH4z/L+QRN+nb/l+nlJ8Ry9HIATi yOztfvRbuWiGoiuYr/982JFzJxS8rVLWNALBOnthgIh/rCbjPQo4UQOn0uk+zjVYB9Qu tUcKGvDXUfdIG3nRrZ6DpILb3BTK4YSl1/12TJvrVWROGFqZHPvDO3fClAxHO5QiQ5ok hAYQ== 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=ZDpLws4WWjszeBZt7nTlIzp0p338D/8ILsPCgH/ymC0=; b=XK7E+VTbrzpNO1eFOcqH5kmEAGAA5ky/TlCdn6VzBUu76zdLxfhqCDwDrsm8cKwtiW kdOjiOSAsuU2HLZX44QGJah+fWIagsb5DWx0A9ugghlvn37USdICzS3t+/ulUPdv1Pxk 6EJhPHUpMb42/UxPD3o84GzJhTd68Tfv1YG4xFs+jN1tky5uIAH2cpG3J2JwCszTmSY0 T85W7uoOKFTx4U5JeD/N5h99me0XMb81p+43WJZFNPB2n1bFhIC5EK2+aq+vDyb/t6AJ wAkkN9d7ZLXo58QsAAmf7zRRknLT5Z2VazmLuYObfgxm9r9DKu3G6wRu3hPwg6kWijym sUZw== X-Gm-Message-State: AOAM531tv/GR/+xY6i9zk8tBLhjkd9Igpooo8/kQqxedccDOBKjQYm4h p61znPao+TF8Pb13oQRno1bcoykNbu3GxZ06 X-Google-Smtp-Source: ABdhPJxu3Fj1qguz52Emo3v2IYFJxBR6Ao7egY4U/BdH3m+sfImkhBYYfIlca1OIixc7Du21Hd+WcdpgheaEGhNu X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a50:fb06:: with SMTP id d6mr2197662edq.312.1603372790776; Thu, 22 Oct 2020 06:19:50 -0700 (PDT) Date: Thu, 22 Oct 2020 15:19:03 +0200 In-Reply-To: Message-Id: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 11/21] kasan: inline kasan_poison_memory and check_invalid_free From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201022_091954_299282_890FCF6D X-CRM114-Status: GOOD ( 14.08 ) 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: Branislav Rankov , Elena Petrova , linux-mm@kvack.org, Andrey Konovalov , Kevin Brodsky , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, Kostya Serebryany , linux-arm-kernel@lists.infradead.org, Serban Constantinescu , Andrey Ryabinin , Andrew Morton , Peter Collingbourne , Evgenii Stepanov 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 Using kasan_poison_memory() or check_invalid_free() currently results in function calls. Move their definitions to mm/kasan/kasan.h and turn them into static inline functions for hardware tag-based mode to avoid uneeded function calls. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/Ia9d8191024a12d1374675b3d27197f10193f50bb --- mm/kasan/hw_tags.c | 15 --------------- mm/kasan/kasan.h | 28 ++++++++++++++++++++++++---- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c index 4c24bfcfeff9..f03161f3da19 100644 --- a/mm/kasan/hw_tags.c +++ b/mm/kasan/hw_tags.c @@ -24,27 +24,12 @@ void __init kasan_init_tags(void) pr_info("KernelAddressSanitizer initialized\n"); } -void kasan_poison_memory(const void *address, size_t size, u8 value) -{ - set_mem_tag_range(reset_tag(address), - round_up(size, KASAN_GRANULE_SIZE), value); -} - void kasan_unpoison_memory(const void *address, size_t size) { set_mem_tag_range(reset_tag(address), round_up(size, KASAN_GRANULE_SIZE), get_tag(address)); } -bool check_invalid_free(void *addr) -{ - u8 ptr_tag = get_tag(addr); - u8 mem_tag = get_mem_tag(addr); - - return (mem_tag == KASAN_TAG_INVALID) || - (ptr_tag != KASAN_TAG_KERNEL && ptr_tag != mem_tag); -} - void kasan_set_free_info(struct kmem_cache *cache, void *object, u8 tag) { diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 94ba15c2f860..8d84ae6f58f1 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -153,8 +153,6 @@ struct kasan_alloc_meta *kasan_get_alloc_meta(struct kmem_cache *cache, struct kasan_free_meta *kasan_get_free_meta(struct kmem_cache *cache, const void *object); -void kasan_poison_memory(const void *address, size_t size, u8 value); - #if defined(CONFIG_KASAN_GENERIC) || defined(CONFIG_KASAN_SW_TAGS) static inline const void *kasan_shadow_to_mem(const void *shadow_addr) @@ -194,8 +192,6 @@ void print_tags(u8 addr_tag, const void *addr); 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); const char *get_bug_type(struct kasan_access_info *info); void metadata_fetch_row(char *buffer, void *row); @@ -276,6 +272,30 @@ static inline u8 random_tag(void) } #endif +#ifdef CONFIG_KASAN_HW_TAGS + +static inline void kasan_poison_memory(const void *address, size_t size, u8 value) +{ + set_mem_tag_range(reset_tag(address), + round_up(size, KASAN_GRANULE_SIZE), value); +} + +static inline bool check_invalid_free(void *addr) +{ + u8 ptr_tag = get_tag(addr); + u8 mem_tag = get_mem_tag(addr); + + return (mem_tag == KASAN_TAG_INVALID) || + (ptr_tag != KASAN_TAG_KERNEL && ptr_tag != mem_tag); +} + +#else /* CONFIG_KASAN_HW_TAGS */ + +void kasan_poison_memory(const void *address, size_t size, u8 value); +bool check_invalid_free(void *addr); + +#endif /* CONFIG_KASAN_HW_TAGS */ + /* * 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel