From patchwork Wed Oct 14 20:44:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 11838283 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 A34221580 for ; Wed, 14 Oct 2020 20:46:48 +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 6AA3D22248 for ; Wed, 14 Oct 2020 20:46:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="VUJ/QIS4"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="EBGrD6RN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6AA3D22248 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+patchwork-linux-arm=patchwork.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=eF8t0zaMjv03NGn5/XHOGF9Cavy74uq5KX1ZoaHkAHc=; b=VUJ/QIS4DObSTKhSD1Vas8z6q r+d+zjMwXN6xp1p9OwEQ7s1iAJ+xCOVR17Id3mq1RMP5gm8kk3C58MrVdYw5ZCwyjHnqNd7aaRHyu riSZHeOYN0H4w29/wDbE28tYRXBeHUQUmbGA/gXFbgwYFp3UzJ27xBTag9ZCML7EP5tcrqIsLFc7D A0EKti0a652XgCA+LNz5cgbCM9CNFOIEFtU6rbY3cmIiTe+4PEtjHJ9W6F43CpMFzSQqfiDqE+ad5 RfQRa24uvKJGMTtG9cnDwOHarDraxD7O/v6vESeUUxOi3Eadz8GaiSbp5pawkkV2x9PJYEV/+CgSI 9TZdK+M6Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSndw-0001f1-6p; Wed, 14 Oct 2020 20:45:04 +0000 Received: from mail-qv1-xf4a.google.com ([2607:f8b0:4864:20::f4a]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kSndl-0001Zj-8o for linux-arm-kernel@lists.infradead.org; Wed, 14 Oct 2020 20:44:54 +0000 Received: by mail-qv1-xf4a.google.com with SMTP id s8so290290qvv.18 for ; Wed, 14 Oct 2020 13:44:48 -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=CjGwVkjALHWoxnEpXUV5lg0pURyX1Lwjm/IxKYecvEk=; b=EBGrD6RN6xliNU79AWfmLo4aIDWh5aG3DjFXT7Waz6MK39WO/qU2QVR37uIkOel0tB cN48b+GW2inj2ip2t4+zE3AIkYKWxMgEHGr3qGt+grT8H8/Y2EWjYQxWAD2oXhQCFmNh PlYeiBPPS9e0yVQHBR9HqgahZtloF9KNLBICgjCL1pkgbhhwwmF+xwiZg27iJbeeEFYa yfq/yPLL003ZMrPNucEYvSiLFxctu0jqT7e9juN8tPhII9usBsXGfhzX/nvEp5dgmuf9 5DreMenxc/NfqbdxjxRzGYuXFlLPlKcp9EjLKimG4q8Y2miP/H4LaWSNJS1LM4kyEwqu 7ZHg== 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=CjGwVkjALHWoxnEpXUV5lg0pURyX1Lwjm/IxKYecvEk=; b=OY9yWFKUVYoNFfwpQKg9Ibrz+2rPlOaTVQB7q0crV46mDa0kKR1USz7q7ymZH/XP+u qy1iAZWu+YTqqN1NdXX48+fWojK5D2F23w0yTAeOIxsvOEsGxI1jo61CrGbV0Mu3cZvW OXu15F69iA6jyZOrSgodqqEZvLVblkViLWx2RBuuEhsuhP04mlOWrLHSdlTP97TzOT3U xd+dgUHhPM8epX2Ct1zkb+IgO1/CczpHgJVLEVhsdIUE4vUkfUPOCHZcQvgKIst0Fkeq p/JH9rbHt4wxBkqKvikQO3QR6DZsYntXx/QxaYyfo4yqdazWqL7g/wEHIEICjmgdqVqG Bilw== X-Gm-Message-State: AOAM53264uzaU8mGuACLn4rprvMcYpOF9+UoZT1QhcD4KTVlE74u93yH jhIQER1lUzmi+XtROifrkRT3tRwukwhIv8sM X-Google-Smtp-Source: ABdhPJyPS70k0bCBzAHZh7jQMEEFG1g2Nv/DzdUR14lOKVf0hYkMYkuYAvdtNuFtwtJnHpBjo+xyl45FSh1Jk4UO X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:ad4:5547:: with SMTP id v7mr1394100qvy.9.1602708286682; Wed, 14 Oct 2020 13:44:46 -0700 (PDT) Date: Wed, 14 Oct 2020 22:44:29 +0200 In-Reply-To: Message-Id: <42f809a3f36e9ca5b62e6a5b13c90e664d6e2933.1602708025.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.28.0.1011.ga647a8990f-goog Subject: [PATCH RFC 1/8] kasan: simplify quarantine_put call From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver , Evgenii Stepanov X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201014_164453_380850_314A0C43 X-CRM114-Status: GOOD ( 13.91 ) X-Spam-Score: -7.7 (-------) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-7.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:f4a listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -7.5 USER_IN_DEF_DKIM_WL From: address is in the default DKIM white-list -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 DKIMWL_WL_MED DKIMwl.org - Medium trust sender 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 , Andrey Konovalov , Kevin Brodsky , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, Andrey Ryabinin , Andrew Morton , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Move get_free_info() call into quarantine_put() to simplify the call site. No functional changes. Signed-off-by: Andrey Konovalov Link: https://linux-review.googlesource.com/id/Iab0f04e7ebf8d83247024b7190c67c3c34c7940f --- mm/kasan/common.c | 2 +- mm/kasan/kasan.h | 5 ++--- mm/kasan/quarantine.c | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 2bb0ef6da6bd..5712c66c11c1 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -308,7 +308,7 @@ static bool __kasan_slab_free(struct kmem_cache *cache, void *object, kasan_set_free_info(cache, object, tag); - quarantine_put(get_free_info(cache, object), cache); + quarantine_put(cache, object); return IS_ENABLED(CONFIG_KASAN_GENERIC); } diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 32ddb18541e3..a3bf60ceb5e1 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -214,12 +214,11 @@ struct kasan_track *kasan_get_free_track(struct kmem_cache *cache, #if defined(CONFIG_KASAN_GENERIC) && \ (defined(CONFIG_SLAB) || defined(CONFIG_SLUB)) -void quarantine_put(struct kasan_free_meta *info, struct kmem_cache *cache); +void quarantine_put(struct kmem_cache *cache, void *object); void quarantine_reduce(void); void quarantine_remove_cache(struct kmem_cache *cache); #else -static inline void quarantine_put(struct kasan_free_meta *info, - struct kmem_cache *cache) { } +static inline void quarantine_put(struct kmem_cache *cache, void *object) { } static inline void quarantine_reduce(void) { } static inline void quarantine_remove_cache(struct kmem_cache *cache) { } #endif diff --git a/mm/kasan/quarantine.c b/mm/kasan/quarantine.c index 580ff5610fc1..a0792f0d6d0f 100644 --- a/mm/kasan/quarantine.c +++ b/mm/kasan/quarantine.c @@ -161,11 +161,12 @@ static void qlist_free_all(struct qlist_head *q, struct kmem_cache *cache) qlist_init(q); } -void quarantine_put(struct kasan_free_meta *info, struct kmem_cache *cache) +void quarantine_put(struct kmem_cache *cache, void *object) { unsigned long flags; struct qlist_head *q; struct qlist_head temp = QLIST_INIT; + struct kasan_free_meta *info = get_free_info(cache, object); /* * Note: irq must be disabled until after we move the batch to the