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=-9.8 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 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 03F11C55178 for ; Tue, 27 Oct 2020 12:41:34 +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 8EA1B21655 for ; Tue, 27 Oct 2020 12:41:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="L7CPdLP2"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="eXyC7a+k" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8EA1B21655 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:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=1ZJUPWGGYeUb35yyhDvzBYWNXSEzx3oTMnT+MTsaILU=; b=L7CPdLP2WBPwem1B5m48Z1RMR /vh/7UkVKC9Izg/Hiek7ALNY+uk9b/9xoj0hv0QgpAY80GKWGUNoyeGTKiF1r1LYArtqAvpt25WIB RIexbY+o/E5n1Ds2+/WuZIpeA8Cl3q2Vc3efVo99+9wdUXeP3xCXyLbBOnZV0LVCh75ibm7zAVLNp 6T507PgBjqZJjDg15GmKVd+Zwf77AXoLX4bLsavkh9kwgxx34xDJlCgfgGXG1cxjIZliVgUtS/0lA HM+g9mSx0yaBpEf4pr3lE0vapiQLwE++owxvQHpjxoiDu90t9AT3MYFGekQJ0mZ8Wfts4zJ7+/cDR ArBBUHP3w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXOHZ-0005Ap-Eq; Tue, 27 Oct 2020 12:40:57 +0000 Received: from mail-qk1-x741.google.com ([2607:f8b0:4864:20::741]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kXOHW-00058H-L1 for linux-arm-kernel@lists.infradead.org; Tue, 27 Oct 2020 12:40:55 +0000 Received: by mail-qk1-x741.google.com with SMTP id b18so922179qkc.9 for ; Tue, 27 Oct 2020 05:40:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=O2tDKAOxc+uu+1RBFzTdO3JlDCHYZwi+KFiWnGXj6D4=; b=eXyC7a+kdQWf7gyBaBcXcqJdLcqb09UxACwxIuXD0EqU4qICrjIWvKc50xhbwF49gG aztmsXfS+5KyaveUa40tBCZapl3tKRPCieATamVtAd42+OOqvwHCElaSq+HcMaswTgzh 3cylgtPcWDd7tceJOo3+mCf18FE3lIGioobzeNAKqBlO12Q8Be7eiFG2dT1pXvFNJH41 8eqG1NvlqFnQos9kH8RvCoM00r1+YEu/safsbcbJAhPNlFKejz0kWkfgDegDOuxgNGgW QkLDyavsG64K63C7R/T24DWcnfBtOCuvupnP8Vu9Eszd31UwDRDEjsaGCP2aKAKqEM3Z fXCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=O2tDKAOxc+uu+1RBFzTdO3JlDCHYZwi+KFiWnGXj6D4=; b=uLxWVx/TdjV43ab5oVdxe6ve1NfR82+5Zjm3XFPQQq3yiMNrhREcCjBtvZ6jls5k4c qL2LLyyd3Sp0/Gzri5oTnn351c5VOZj0u1fhkt2963Woondz8R9xGWZVRQvuKRsl4IWc pFvnsgqQ4tWcjS8MKxNGe2vNou3JCCT4sfZK/QJ2N+vNlp8uC7VIiYpPsuLuGnqfZYFL z1nBrlCC1Lz7FiQhysapH2WeSrGFZtKn8Bp8Kh5bIFvnht4oAgfPLTbf1O1cdDVfflxc dJhmZWUYlZRB8zjZWhZNc/y0nj6JJv0e8IrLfNt5dc9/czfAKoiruwPmWs2qXordS5Wu 92DQ== X-Gm-Message-State: AOAM530jtLAa2+bQ/jkxOu0K865pJsjSOKgmyyWpQ1/pxD0KW4bdS/mv LUap65Vk1M1z7c57cffC1aHQvoqKmRqVJKZMxlJbsw== X-Google-Smtp-Source: ABdhPJyI6ewWlHIMIUXPm4kj8NFrCdj78fZyHJilKPev5dxGCgG2Jqc987ffxHqOkzWCWcWzba12sZ8h6Ggqcr/9BLo= X-Received: by 2002:a05:620a:1188:: with SMTP id b8mr1912592qkk.265.1603802449178; Tue, 27 Oct 2020 05:40:49 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Dmitry Vyukov Date: Tue, 27 Oct 2020 13:40:37 +0100 Message-ID: Subject: Re: [PATCH RFC v2 01/21] kasan: simplify quarantine_put call site To: Andrey Konovalov X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201027_084054_757761_E53BBAC8 X-CRM114-Status: GOOD ( 19.41 ) 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: Marco Elver , Elena Petrova , Linux-MM , Catalin Marinas , Kevin Brodsky , Will Deacon , Branislav Rankov , kasan-dev , LKML , Kostya Serebryany , Alexander Potapenko , Linux ARM , Serban Constantinescu , Andrey Ryabinin , Andrew Morton , Vincenzo Frascino , Peter Collingbourne , 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 Thu, Oct 22, 2020 at 3:19 PM Andrey Konovalov wrote: > > 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 Reviewed-by: Dmitry Vyukov > --- > 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 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel