From patchwork Thu Oct 22 13:19:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11851443 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 4A2BAC388F2 for ; Thu, 22 Oct 2020 13:39:21 +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 BC49620790 for ; Thu, 22 Oct 2020 13:39:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="NW6srkqj"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="CJZz2QbC"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="WMfS9dRt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BC49620790 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=g9C8tX7CFuNL2FQMEd1V+kDydeHzfjKUANZOQm6y7mk=; b=NW6srkqj9nGEvO5i/r870L4Cc PrwiFK5jwizXJ4fCRzg/btujiGtg6PRM2G3JU3kE7JTac3+OiHgKjMbgq0z4ZCDZ0AXkzP7Gs6AyF vQRFf/az6wdaoJTARe++0+TgzXGBPnu76lDzTpbzvh/bAJygweLaNdnObxhS+dddML0+EoJ2mLV5i VkqM0DCX6f3MknG/nCezbonBM9D4TKi0DWEjfA+0MBTJeC0Vyd6Yf3JvLaQceMG05n2L7NFe5xpQj ZmlKuxWlJtOa2STUTNMbuyebujyn0w8RB6FIUmQaLGLTimBN5195Dcma8xj87YGxF0Qf/dFL4Nopm G+rij8yoQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kVamV-0001o8-PL; Thu, 22 Oct 2020 13:37:27 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kVamL-0001j7-2o for linux-arm-kernel@merlin.infradead.org; Thu, 22 Oct 2020 13:37:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:Cc:To:From:Subject: References:Mime-Version:Message-Id:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=mi7vvSs1Xj6QP3ZrLQqzK4ZcKPoucW49C95TbzYwJvE=; b=CJZz2QbCyU/7rnRw7uFdn22Rj4 b7/tOL7dZMzjls7sVWltbj6hjZJrmmuBq+sMvsLsnDSieh5/PNVOFfloyObCyoBaj2Z+S/pdp9lfO pQpDJinxVwp7Efb8ksi2LnzPrYJIhSZsLCjpCeodxHX10Jhb7PSEl6uh7CwWU7U9/aLehijYmZXXn iSlZuc8NodsRu5nKexF1oQDD3I99LINPJqob72l40eEWCgPHz7wIHyZ0zokLYqk5jZ4QEKTl0z0Ud Pyv9DoYAlwS30OJJFvuUEYBSPFo5QGXrRKojEVPyMmf3txP8FQkntQDOl5M2d4DNJRxCnpjYpmCH9 HvnV+ZOA==; Received: from mail-wr1-x449.google.com ([2a00:1450:4864:20::449]) by casper.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kVaVl-0006LX-6e for linux-arm-kernel@lists.infradead.org; Thu, 22 Oct 2020 13:20:12 +0000 Received: by mail-wr1-x449.google.com with SMTP id v5so628534wrr.0 for ; Thu, 22 Oct 2020 06:20:08 -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=mi7vvSs1Xj6QP3ZrLQqzK4ZcKPoucW49C95TbzYwJvE=; b=WMfS9dRtWZDX51w4plP16bp5piaEqQBpE3ornSYeL4364aMXjgpHqTbWKaOtT8lIOT v5zOz0YSe6e0XtaHoql8967nc/Ii8Xyg3lq0RkSpi0aEH27mCDY9+Sm1vddt2AcHGw+3 M+4LeBiz3q9p/G41hOvs2+O6TYRJRlz5Z4/lK4kPB4PV1Uwo2emgWq4qSbkzvrBrPkMz CZRZd+EFA54+4QVaXcXhxB+1cxfOvt4wyBzRVaJBz/D+2wnhEul+MQwlP5Fgl2Sljjxs UVriHaxB0mWYuChQ5nj6umtVt+86dyH3deGoVsEldYIV3EuTpba9LgakwKDulbRSW3yy WYPQ== 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=mi7vvSs1Xj6QP3ZrLQqzK4ZcKPoucW49C95TbzYwJvE=; b=rG9vKqbzDj4loDXnxKn2KXswAWADG6IkoJw07tmSiZZsV49bFKZ4mo7UBbMokpNtiO 4EYpBoEjCp0EZFXhFsUUEKbj9cPKlDifv2HuMuruyxjejcuE/WnSFImhcs4HeD9QaxPs DJm1XMOeLozfjtwChNTVvhXtEFdqXVpRN0yGfHQne6icIVSlA07Z7zxL538wXHh/sE+h D1e8jQv4RDl3sMn4cO/JAXUnhhvNC2CsYiHMJkEU4wpC1uoVy+3/nK5oNA/PY6OQPEHa ZI6ujnO50JeCcLW5v3LrqUXw1RldYS+jS4Xj2NVDY43RdhjL+uHTuZ9zzCFlbPk+XI8j ibtg== X-Gm-Message-State: AOAM532IdDrqS1IamcQxJ50DF+rJgLKTyYP29prtyL4m8je57yzU+TF1 xPoikENJPtP1Mj9tQKZNW75ykLAsgSBL11Y1 X-Google-Smtp-Source: ABdhPJyeu67ARBka23poZcAOoLY0EqwcOXOj2FFCFiEBl9x3OWHicQB9Jdn9dGK4WtpJc3PPmsLntPwXfNYvLXyq X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a1c:4b09:: with SMTP id y9mr2666404wma.90.1603372807440; Thu, 22 Oct 2020 06:20:07 -0700 (PDT) Date: Thu, 22 Oct 2020 15:19:10 +0200 In-Reply-To: Message-Id: <5a6f32308101c49da5eef652437bd3da9234c0da.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 18/21] kasan: rename kasan_poison_kfree 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_142009_451595_A7930718 X-CRM114-Status: GOOD ( 13.20 ) 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 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Rename kasan_poison_kfree() into kasan_slab_free_mempool() as it better reflects what this annotation does. No functional changes. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/I5026f87364e556b506ef1baee725144bb04b8810 Reviewed-by: Dmitry Vyukov --- include/linux/kasan.h | 16 ++++++++-------- mm/kasan/common.c | 16 ++++++++-------- mm/mempool.c | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/include/linux/kasan.h b/include/linux/kasan.h index 8654275aa62e..2ae92f295f76 100644 --- a/include/linux/kasan.h +++ b/include/linux/kasan.h @@ -162,6 +162,13 @@ static inline bool kasan_slab_free(struct kmem_cache *s, void *object, unsigned return false; } +void __kasan_slab_free_mempool(void *ptr, unsigned long ip); +static inline void kasan_slab_free_mempool(void *ptr, unsigned long ip) +{ + if (static_branch_likely(&kasan_enabled)) + __kasan_slab_free_mempool(ptr, ip); +} + void * __must_check __kasan_slab_alloc(struct kmem_cache *s, void *object, gfp_t flags); static inline void * __must_check kasan_slab_alloc(struct kmem_cache *s, @@ -202,13 +209,6 @@ static inline void * __must_check kasan_krealloc(const void *object, return (void *)object; } -void __kasan_poison_kfree(void *ptr, unsigned long ip); -static inline void kasan_poison_kfree(void *ptr, unsigned long ip) -{ - if (static_branch_likely(&kasan_enabled)) - __kasan_poison_kfree(ptr, ip); -} - void __kasan_kfree_large(void *ptr, unsigned long ip); static inline void kasan_kfree_large(void *ptr, unsigned long ip) { @@ -244,6 +244,7 @@ static inline bool kasan_slab_free(struct kmem_cache *s, void *object, { return false; } +static inline void kasan_slab_free_mempool(void *ptr, unsigned long ip) {} static inline void *kasan_slab_alloc(struct kmem_cache *s, void *object, gfp_t flags) { @@ -264,7 +265,6 @@ static inline void *kasan_krealloc(const void *object, size_t new_size, { return (void *)object; } -static inline void kasan_poison_kfree(void *ptr, unsigned long ip) {} static inline void kasan_kfree_large(void *ptr, unsigned long ip) {} #endif /* CONFIG_KASAN */ diff --git a/mm/kasan/common.c b/mm/kasan/common.c index b82dbae0c5d6..5622b0ec0907 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -334,6 +334,14 @@ bool __kasan_slab_free(struct kmem_cache *cache, void *object, unsigned long ip) return ____kasan_slab_free(cache, object, ip, true); } +void __kasan_slab_free_mempool(void *ptr, unsigned long ip) +{ + struct page *page; + + page = virt_to_head_page(ptr); + ____kasan_slab_free(page->slab_cache, ptr, ip, false); +} + static void set_alloc_info(struct kmem_cache *cache, void *object, gfp_t flags) { kasan_set_track(&kasan_get_alloc_meta(cache, object)->alloc_track, flags); @@ -436,14 +444,6 @@ void * __must_check __kasan_krealloc(const void *object, size_t size, gfp_t flag flags, true); } -void __kasan_poison_kfree(void *ptr, unsigned long ip) -{ - struct page *page; - - page = virt_to_head_page(ptr); - ____kasan_slab_free(page->slab_cache, ptr, ip, false); -} - void __kasan_kfree_large(void *ptr, unsigned long ip) { if (ptr != page_address(virt_to_head_page(ptr))) diff --git a/mm/mempool.c b/mm/mempool.c index 79bff63ecf27..0e8d877fbbc6 100644 --- a/mm/mempool.c +++ b/mm/mempool.c @@ -106,7 +106,7 @@ static inline void poison_element(mempool_t *pool, void *element) static __always_inline void kasan_poison_element(mempool_t *pool, void *element) { if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc) - kasan_poison_kfree(element, _RET_IP_); + kasan_slab_free_mempool(element, _RET_IP_); if (pool->alloc == mempool_alloc_pages) kasan_free_pages(element, (unsigned long)pool->pool_data); }