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=-16.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 11D69C63697 for ; Mon, 23 Nov 2020 20:14:59 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A684A20715 for ; Mon, 23 Nov 2020 20:14:58 +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="vE2RlTTz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A684A20715 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 2D6E86B0070; Mon, 23 Nov 2020 15:14:58 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 286306B0071; Mon, 23 Nov 2020 15:14:58 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 19B936B0072; Mon, 23 Nov 2020 15:14:58 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0098.hostedemail.com [216.40.44.98]) by kanga.kvack.org (Postfix) with ESMTP id E15516B0070 for ; Mon, 23 Nov 2020 15:14:57 -0500 (EST) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 85B5D181AEF1D for ; Mon, 23 Nov 2020 20:14:57 +0000 (UTC) X-FDA: 77516786634.21.hands54_390e7a627368 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin21.hostedemail.com (Postfix) with ESMTP id 58EE8180442CB for ; Mon, 23 Nov 2020 20:14:57 +0000 (UTC) X-HE-Tag: hands54_390e7a627368 X-Filterd-Recvd-Size: 5838 Received: from mail-qk1-f202.google.com (mail-qk1-f202.google.com [209.85.222.202]) by imf24.hostedemail.com (Postfix) with ESMTP for ; Mon, 23 Nov 2020 20:14:56 +0000 (UTC) Received: by mail-qk1-f202.google.com with SMTP id d132so8631803qke.5 for ; Mon, 23 Nov 2020 12:14:56 -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=X8He+i5DTpgfYKqVr7f46nksdkLo8KZ5P0WRCUmFYW8=; b=vE2RlTTzBzO5Gu2A4Wlttso8aG+Md8VyWf3JRDOc1Rk1bLUV819+D3mRFk8KL3kdCG eXUGqYHjERGJSQYpOySgTRgSxDqdgGaOMismdtSjBIQFp7VMipUQnz3fsflxJBsTgjmH NTkvIqSK2uP2oEw57s2L/OQz6kWSVTj1zYVffNLK8eHvX8vuv0hOk/6SCps9Wj1XwINP adkHqjEHjQsc17VN0LO03Evgdty940In8beiJqeKz0sawcA/v6PNFAx/exm7EBcnbW+R oqSoQUga4Kh5eizfSuq5arMaMeewWgBhiYoyf2DJQl0xvTuFK0f+3u+3d79cZRKSlWGJ CCnA== 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=X8He+i5DTpgfYKqVr7f46nksdkLo8KZ5P0WRCUmFYW8=; b=Td+/2weeoipwFs2oqJmQPIVtCi8wqKqQ9dRn6Zg29GMRmlAQHBHhM8fCLqPdtgRH8E OMnj8rdcAkFNfsUmIAOLp6sFDIF6X7T2nCzFKpxvmrXvoKAd/bNEJ4+IRBcXkfGuVN10 72sOSqtR8Bx2J8sRdaBjQTJyXqaTLhD5xy+6wS69k6sq+wgPyW1Is581ZKYrU/llkx4q BESKLWU9Dha3BHtrBTR8QWz4IA9oItSydHXPhSCidfmzZuxgnK08MZ0oI1E4gxUktk7L Jsq37jF5zLm/HggI34c0F635M0ccdDnbhc8WcDftfPHpnpKj0Uv2jm98nlP6S/ji21OU CxYw== X-Gm-Message-State: AOAM532cGIrHNaSQzHrOhx3xgHYlV2P/Xk44ZwUXTsAH129WLfGlvUSx upSv5fW84AzzchGMAWetpUWhy0djcSFV5DmN X-Google-Smtp-Source: ABdhPJwdwL1lWnof+uE3ypolP2P0M2AIXFB3wOTJiySzgHkkoCi1sbMWbkPHW5t6+b/xqQEPSNiAl3jFR3LB4TT+ X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a0c:eac4:: with SMTP id y4mr1134178qvp.19.1606162496039; Mon, 23 Nov 2020 12:14:56 -0800 (PST) Date: Mon, 23 Nov 2020 21:14:31 +0100 In-Reply-To: Message-Id: <312d0a3ef92cc6dc4fa5452cbc1714f9393ca239.1606162397.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog Subject: [PATCH mm v4 01/19] kasan: simplify quarantine_put call site 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 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 Reviewed-by: Dmitry Vyukov Reviewed-by: Marco Elver 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 998aede4d172..e11fac2ee30c 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -317,7 +317,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 64560cc71191..13c511e85d5f 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -216,12 +216,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.2.454.gaff20da3a2-goog