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=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_IN_DEF_DKIM_WL 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 155BDC388F9 for ; Tue, 27 Oct 2020 12:40:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 6A44421D24 for ; Tue, 27 Oct 2020 12:40:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (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 6A44421D24 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 9BB726B005D; Tue, 27 Oct 2020 08:40:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 992586B006C; Tue, 27 Oct 2020 08:40:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8CE3D6B006E; Tue, 27 Oct 2020 08:40:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0143.hostedemail.com [216.40.44.143]) by kanga.kvack.org (Postfix) with ESMTP id 5E7B36B005D for ; Tue, 27 Oct 2020 08:40:51 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id DAA373624 for ; Tue, 27 Oct 2020 12:40:50 +0000 (UTC) X-FDA: 77417664660.25.title37_04142ff2727c Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id B7DFD1804E3A0 for ; Tue, 27 Oct 2020 12:40:50 +0000 (UTC) X-HE-Tag: title37_04142ff2727c X-Filterd-Recvd-Size: 6126 Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by imf37.hostedemail.com (Postfix) with ESMTP for ; Tue, 27 Oct 2020 12:40:50 +0000 (UTC) Received: by mail-qk1-f193.google.com with SMTP id 140so942309qko.2 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=UiJCp0n0Coxrjob3k9+Qr+VeCRsny1zRddiO799mGzPWm1+K5xmn2KCVrKt37FFRh9 UwBo/MCzL8nPQQfmTdghcAbUbHWaeJDFnZKrXf7j2qdB1e+K7ek7yTJE4JjMX2CA8Fgq aIuSWBVVekAmwThwmXZGjFzZAlomFq5vx0cqdkol8OL0xPNtcZJDVxBNjc0wFAW+Z6sl kxMz/+XYo4z7iFQLFvS/Znf26hwP+Hg8lsJOcUlYnt/boN7iFD4SeGRriAw+2M9sraVV ZJPiGhMGRu/Jz3KMcVqmEnRQ5Ymp7ez+2kMLi7Rd2d4wTwFrSCOUiYiNVoUs6fROvA/m ++Vg== X-Gm-Message-State: AOAM53114zIioGfEGKOGdn4JsLDh/Fy4d8jSW6d42nkrNGfg6kYHUQEI HHB3+6kIuLHEKZCh7aUOG/dfDWcHmaiU6NzI7hSexQ== 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 Cc: Catalin Marinas , Will Deacon , Vincenzo Frascino , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , kasan-dev , Linux ARM , Linux-MM , LKML Content-Type: text/plain; charset="UTF-8" X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: 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 >