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.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,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 16F3EC388F9 for ; Thu, 22 Oct 2020 13:19:30 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 85981222E9 for ; Thu, 22 Oct 2020 13:19:29 +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="OYz3Uex6" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 85981222E9 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 003BD6B0073; Thu, 22 Oct 2020 09:19:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F1DC56B0074; Thu, 22 Oct 2020 09:19:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D45876B0075; Thu, 22 Oct 2020 09:19:28 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0128.hostedemail.com [216.40.44.128]) by kanga.kvack.org (Postfix) with ESMTP id A00356B0073 for ; Thu, 22 Oct 2020 09:19:28 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 35A211EE6 for ; Thu, 22 Oct 2020 13:19:28 +0000 (UTC) X-FDA: 77399618016.17.egg91_3d0f5e227251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id 14D8F180D0180 for ; Thu, 22 Oct 2020 13:19:28 +0000 (UTC) X-HE-Tag: egg91_3d0f5e227251 X-Filterd-Recvd-Size: 5916 Received: from mail-qt1-f201.google.com (mail-qt1-f201.google.com [209.85.160.201]) by imf38.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:19:27 +0000 (UTC) Received: by mail-qt1-f201.google.com with SMTP id e19so1009744qtq.17 for ; Thu, 22 Oct 2020 06:19:27 -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=QY0XewM9lnHnRQ+vj0Qh7qias3TYU7mjlYARUV896zo=; b=OYz3Uex6U9uSOKmG8dnKe2ZRNBbSFCOO8PB9YiKoIPfAkmOkaw/6ymyo6N2z4rUFFK QA/R6DztoEC8wcxd06AE0Bius4X7c/Ftvt6G9p3wKYZS1veVqtDD5iASXy1APigHL3J+ iPYndXoTAgZ7G0g9rm5x9X9FjjfHxmypYlCQgRWErKC2QsF4LajQvOpb31KROOxQ41WK OYSFJLOpnhezmpsxyXoOE3KHS48ZEHk9c7FwIQOhHgIDWkyrWkB/S2CxHxacU7GXXy4H eD8PMg20cN4OPU93jp7Ur6QA+fOJK9FhytxSh8Jgir/r5sXgfQjHEY6bgN2JrU1G71to 2UhQ== 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=QY0XewM9lnHnRQ+vj0Qh7qias3TYU7mjlYARUV896zo=; b=bFG+qpmJdAUZBydAeb8ux4JmqI9fJxyFUxHfLp8f4NrilqHquvGeRVh+CUdMcBtStr VXjeZNklslXR2QPduVHtitkK1e+bwUXzNjaBgRgadp9rTlbcqYppeOX/+cCWKAEmXloX tL7u7S7O8clRzpw0EAqhat8NwqOycCYPwMpgJvWuZkXCS70TAPZpwmjahHVf9sFTMYGY dZ1U/sDi+2kEcl/TELpyyVVUZFw4dTN3rOhw5+MGa7pzOQJOuXPKKb+ivtxIAH+RhjAt 9HDT9RnecbM0x8AJeULGWni88HPcZHGESEiBHP0YuN8hwx9kw/teeRL6SbUS5xIWtOxM 4b3A== X-Gm-Message-State: AOAM531SFpu3l7GZ9KrP/zahwkDMTjGAq7+qCmj4mdkH+uZSuypZBB/U E8WCSwEw7u1tEvbecTEvTbq9YMI0Etr4WZLW X-Google-Smtp-Source: ABdhPJzQTsBQkJYG3rzMWRXjnKCNjmWERG4WSqKuEEUo0foPivBFc3WoUPPsrk/pqQdQ+K1+Kgc5n7k8hKkkenUW X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a05:6214:184c:: with SMTP id d12mr2385924qvy.11.1603372766736; Thu, 22 Oct 2020 06:19:26 -0700 (PDT) Date: Thu, 22 Oct 2020 15:18:53 +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 01/21] kasan: simplify quarantine_put call site From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , 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: 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 6850308c798a..5c0116c70579 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 -- 2.29.0.rc1.297.gfa9743e501-goog