From patchwork Fri Nov 13 22:19:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11904967 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 513751391 for ; Fri, 13 Nov 2020 22:20:40 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 1756B2223F for ; Fri, 13 Nov 2020 22:20:40 +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="F7pTXHrB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1756B2223F 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 F3AA86B0083; Fri, 13 Nov 2020 17:20:38 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E98CA6B0085; Fri, 13 Nov 2020 17:20:38 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CC2C76B0087; Fri, 13 Nov 2020 17:20:38 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0137.hostedemail.com [216.40.44.137]) by kanga.kvack.org (Postfix) with ESMTP id 8AD166B0083 for ; Fri, 13 Nov 2020 17:20:38 -0500 (EST) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 32EE4181AEF07 for ; Fri, 13 Nov 2020 22:20:38 +0000 (UTC) X-FDA: 77480815356.22.dress68_1806d9c27312 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin22.hostedemail.com (Postfix) with ESMTP id 07A8818038E67 for ; Fri, 13 Nov 2020 22:20:38 +0000 (UTC) X-Spam-Summary: 1,0,0,12f1b9973f95edf4,d41d8cd98f00b204,3taavxwokciefsiwj3ps0qlttlqj.htrqnsz2-rrp0fhp.twl@flex--andreyknvl.bounces.google.com,,RULES_HIT:41:152:355:379:541:800:960:966:967:973:988:989:1260:1277:1313:1314:1345:1359:1431:1437:1516:1518:1535:1541:1593:1594:1711:1730:1747:1777:1792:2196:2199:2393:2525:2559:2563:2682:2685:2693:2859:2902:2911:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3152:3352:3865:3868:3870:3871:3874:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4321:4385:4425:4605:5007:6261:6653:6742:7901:8660:9025:9969:10004:10400:11026:11658:11914:12043:12296:12297:12438:12555:12679:12895:12986:13069:13148:13161:13229:13230:13311:13357:14096:14097:14181:14394:14659:14721:21080:21365:21444:21451:21627:21939:21990:30054:30070,0,RBL:209.85.219.73:@flex--andreyknvl.bounces.google.com:.lbl8.mailshell.net-62.18.0.100 66.100.201.100;04ygictegnsr668a18dgphcnkao69oczwmpj3pdarxtao84pqjxqyfnds7mrewu.159eimm5xid1bcsimkco4gqf3u73eei71w593cf49z t3umkeyx X-HE-Tag: dress68_1806d9c27312 X-Filterd-Recvd-Size: 5259 Received: from mail-qv1-f73.google.com (mail-qv1-f73.google.com [209.85.219.73]) by imf16.hostedemail.com (Postfix) with ESMTP for ; Fri, 13 Nov 2020 22:20:37 +0000 (UTC) Received: by mail-qv1-f73.google.com with SMTP id v8so6993234qvq.12 for ; Fri, 13 Nov 2020 14:20:37 -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=DB+H7HqoS0BsRTXGNuAwKRf0LlfChpk6LpCcjRkDvbU=; b=F7pTXHrBRZyanjUreyw5h4KDyLv+NRf731NUD0LblbQHl85fHVhh2SMtDJdjbhJ9l1 V1a34qWAYst3ZvrnchN55jYNpbeKhVPN9nhWrO7QdljcZl/3+SnQrsTqVpQMZAEC/Ypl xY2vfRSeYdsyYSzD6VNprwV9REKHfVTvTd3/wEG3VBwT+e4mXCdawCl0lC/PR96ce9wE IOey4TzXaA0dCARaAJ0JINK44loqjAWJje7Uhc+dz8SCJxp53GVxit3+LRu/rRUZlAlD N9o3aBrKwkxkpj2OUzLEBtTHi8snIk9nPlbNFRaIy/mrBGYqTvTe8u4cUOu0cB7UJgdL 2iPQ== 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=DB+H7HqoS0BsRTXGNuAwKRf0LlfChpk6LpCcjRkDvbU=; b=kMABYk6fnD/nNx8PhTAhST8nvunhau7w4RJYrp1jKKNNfH79YkV5my44YDjpKa7D/N t8SKcUcrYHxzM0HxBh2wXq73aiNPcNk3bosa5uX56sjln+MUIwxnteOjqxfkgNk+mJVe 55d5HltnihsIkbYdbVB9CXwkhRSFixNX+8Cxnyq1HCJdELsiz9eHYxaAso+yW4OZmVTY 89J3wT3pD52f1PhcR0hTfg27XlvFCtLzlZWOe5in+ZrVpxIjY2XLtXAN5gJTnzt1vIj6 4DkPK4hLXZT97rj18JVoCJnyA9q2R9tiH6vbj6bkdaP0BdnfzORwRBsELFYNR8t13kCB rFng== X-Gm-Message-State: AOAM532BC5dty7GCBzBP5jcjBubV8EPsPJyfCbVeKX/HlmZUSm6MOYbB NAuO++eEWilPCvhSu+8jmyjKN7qwc5rGKBiY X-Google-Smtp-Source: ABdhPJzcA8hQOxnSs80NVqCkReYj+UcQZlyg4LV+//1yN70ab39PQ0at237VgPxvdUPLib1Hm1Mg2FxPUtFHEpt5 X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a05:6214:12ed:: with SMTP id w13mr4550130qvv.23.1605306036643; Fri, 13 Nov 2020 14:20:36 -0800 (PST) Date: Fri, 13 Nov 2020 23:19:59 +0100 In-Reply-To: Message-Id: <4d64025c647190a8b7101d0b1da3deb922535a0d.1605305978.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.299.gdc1121823c-goog Subject: [PATCH mm v3 09/19] kasan: open-code kasan_unpoison_slab 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 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: There's the external annotation kasan_unpoison_slab() that is currently defined as static inline and uses kasan_unpoison_range(). Open-code this function in mempool.c. Otherwise with an upcoming change this function will result in an unnecessary function call. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/Ia7c8b659f79209935cbaab3913bf7f082cc43a0e Reviewed-by: Marco Elver --- include/linux/kasan.h | 6 ------ mm/mempool.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 1594177f86bb..872bf145ddde 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -106,11 +106,6 @@ struct kasan_cache { int free_meta_offset; }; -size_t __ksize(const void *); -static inline void kasan_unpoison_slab(const void *ptr) -{ - kasan_unpoison_range(ptr, __ksize(ptr)); -} size_t kasan_metadata_size(struct kmem_cache *cache); bool kasan_save_enable_multi_shot(void); @@ -166,7 +161,6 @@ static inline bool kasan_slab_free(struct kmem_cache *s, void *object, return false; } -static inline void kasan_unpoison_slab(const void *ptr) { } static inline size_t kasan_metadata_size(struct kmem_cache *cache) { return 0; } #endif /* CONFIG_KASAN */ diff --git a/mm/mempool.c b/mm/mempool.c index f473cdddaff0..583a9865b181 100644 --- a/mm/mempool.c +++ b/mm/mempool.c @@ -112,7 +112,7 @@ static __always_inline void kasan_poison_element(mempool_t *pool, void *element) static void kasan_unpoison_element(mempool_t *pool, void *element) { if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc) - kasan_unpoison_slab(element); + kasan_unpoison_range(element, __ksize(element)); else if (pool->alloc == mempool_alloc_pages) kasan_alloc_pages(element, (unsigned long)pool->pool_data); }