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=-11.2 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_SANE_1 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 7F917C388F9 for ; Wed, 11 Nov 2020 16:08:58 +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 035B7206A1 for ; Wed, 11 Nov 2020 16:08:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="2HAAfBdg"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="QM4oYuC5" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 035B7206A1 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:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=4XoVmam/09uzdsZ7XuvJ8zZrNAgg+7aCdZU6/MfAN9w=; b=2HAAfBdgq2EH5EOguE38yir6t qFZEIdnUZTz6HW4tdSJ4KzpaLR39hdKvOsSRbYiQCE42qJyFkQMvMBPGbDD5qgXsIZy7M+TPA2IcS LbolaOWEpKOsSjq96khai6UmBA/1qDnZSPNHEIIiA3HXWmCg07G7qfLBuL1NepkDaXAOJszmx217u g+u7aI1h1kZjZd4KdukEKr2RtlZLAiH1RvZhOghp040Ke7R4KyfI4PK0ov4n6ad+bmnCiRvwCvHhC t4iv0lI8+3/SIuaXv6KZn2VJj7DgTayJSuQVSeGTB/6s2FGzcnQOpbbDhwX633rpYBJNzzwU0iDR0 6fb86WW1g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcsfe-0001Vq-QX; Wed, 11 Nov 2020 16:08:30 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kcsfc-0001VB-FD for linux-arm-kernel@lists.infradead.org; Wed, 11 Nov 2020 16:08:29 +0000 Received: by mail-wr1-x441.google.com with SMTP id k2so3068901wrx.2 for ; Wed, 11 Nov 2020 08:08:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=JOTPMrM9cXc3gHfHHUUOqsLEtBpDW5NPaRavY4aCrIo=; b=QM4oYuC5Dv5jC1hneMgwO9I5PEumNL2bgDxUI+JJdMVCTuBTGTxF1SCYZV/00TgpOU jyL6y9Z4jttTYmROYsPvh/wz16cfpFGnzGyFnhes84Lei6yYH0jCsSHpI5AR6kxkiqc7 ik18Y1bJ2FU5OQb8nz3f86wdDO3U+7w3dRViajfiHsrAzOjefbtM0uIJrPGin+syNTV+ 9tSmfDS7PNPRRnCPHUaQd0t15xRK+vJhg5Ny98KUKXbyEPq/pn7iRHU/oVOlJAUVLbmb eXZRZtTjweiRyy2RaB6eE3teAjLR2dyLJT+ssiPMaJ1aZ2oytbUGw9WTBmKFRSrGPD/h yhJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=JOTPMrM9cXc3gHfHHUUOqsLEtBpDW5NPaRavY4aCrIo=; b=BFqsfYNMHptUHHBVsJFQztozOAF/rwiY+vxuCVFtVKFzzMJ746G40Xfy9tBh6eYJX2 XCUKhbgdGlwuU9DPPOB/pWTIhFEJRcxcpDW90QpCGP87qfoSawlI31KDnMqJR+P1KWKW 1EALCz2QKVvM5dQVfcqpCPG+IBVAhxM5hPhfJUXo08S2JCSkYWnknACA0oLE4ExmsGVd +9uQLMB/bLbXws1stEE+cdapa95EtkIN12zTFevADnTITe95Gb4AiC7BwssgJAyTQSwD Cwsvpj8rFp9Mp3KsVHlW9dgSp0GT60Lu2WjafqVO5++v9s5LdoPKSrjBr3jBmQmLLdMc j/Uw== X-Gm-Message-State: AOAM533jj9XH+wRd90XZm8NtBV7HjvisBBJ1u97OFcPDHNvhAEdkqNx5 0Km5XorjBu7NAqXY/MRjKeT5HQ== X-Google-Smtp-Source: ABdhPJy1kKLqf6HaqcoO0w9pMiWiG9P2ZJ6j1NPhf0SJm9DRwyNAwOeaZQSjayP8e9C8Rp7vMSB0eg== X-Received: by 2002:adf:a549:: with SMTP id j9mr16145230wrb.199.1605110906715; Wed, 11 Nov 2020 08:08:26 -0800 (PST) Received: from elver.google.com ([2a00:79e0:15:13:f693:9fff:fef4:2449]) by smtp.gmail.com with ESMTPSA id y10sm3052674wru.94.2020.11.11.08.08.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 08:08:25 -0800 (PST) Date: Wed, 11 Nov 2020 17:08:20 +0100 From: Marco Elver To: Andrey Konovalov Subject: Re: [PATCH v2 01/20] kasan: simplify quarantine_put call site Message-ID: <20201111160819.GC517454@elver.google.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.14.6 (2020-07-11) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201111_110828_545725_81F148F3 X-CRM114-Status: GOOD ( 20.28 ) 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: linux-arm-kernel@lists.infradead.org, Branislav Rankov , Catalin Marinas , Kevin Brodsky , Will Deacon , linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linux-mm@kvack.org, Alexander Potapenko , Dmitry Vyukov , Andrey Ryabinin , Andrew Morton , Vincenzo Frascino , Evgenii Stepanov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Nov 10, 2020 at 11:20PM +0100, Andrey Konovalov wrote: > 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 > 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(-) Reviewed-by: Marco Elver > 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 21fe75c66f26..c2c40ec1544d 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.2.222.g5d2a92d10f8-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel