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 CEA8AC388F7 for ; Wed, 28 Oct 2020 17:03:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3F8DA2245A for ; Wed, 28 Oct 2020 17:03:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="beYPvEBL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3F8DA2245A 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 A98406B0070; Wed, 28 Oct 2020 13:03:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A48866B0071; Wed, 28 Oct 2020 13:03:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8E81B6B0072; Wed, 28 Oct 2020 13:03:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0179.hostedemail.com [216.40.44.179]) by kanga.kvack.org (Postfix) with ESMTP id 624026B0070 for ; Wed, 28 Oct 2020 13:03:41 -0400 (EDT) Received: from smtpin15.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 7753782499B9 for ; Wed, 28 Oct 2020 17:03:40 +0000 (UTC) X-FDA: 77421955800.15.flag51_4210efc27286 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin15.hostedemail.com (Postfix) with ESMTP id 2A3AF1814ACAD for ; Wed, 28 Oct 2020 17:03:34 +0000 (UTC) X-HE-Tag: flag51_4210efc27286 X-Filterd-Recvd-Size: 5755 Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by imf26.hostedemail.com (Postfix) with ESMTP for ; Wed, 28 Oct 2020 17:03:33 +0000 (UTC) Received: by mail-qk1-f195.google.com with SMTP id j129so5201565qke.5 for ; Wed, 28 Oct 2020 10:03:33 -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=Om/J11Dz/+K3ysCSaEysgFFu7qTF4HlL0YVwwzZ7OVM=; b=beYPvEBL3d903KFnr0mMKhvGfdVciFknBvx7Lfb6sqcWz8dPftwBhnYr5eg+ahwZJA oOhAdFdSRY96hBnGzZVJWy7EaHTQo/Kwy8iPsXr8YjQgWNJIKC1qU71L/MnijRv18FA7 75FOMWUN1xhvO75zewvnXNpRrIR20qqJefmmLBDuJ7uG04paHnynL4DKtMwEYBmo7GEf BpYC76B6QQc9TwjEr42pfgiRn8Mdia1SdAfgcaZyErgZyNrxRHkv6T3Fiw3prnGKopgy NVYfCAH1X2rvniOnkats98NrMarOiNz+8MYpbxILMkg6i5Aw80gQ79iFA+qNXkBPxFQ9 gDkA== 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=Om/J11Dz/+K3ysCSaEysgFFu7qTF4HlL0YVwwzZ7OVM=; b=KPQ9DCJbdoCgRa27e6oXnFIKnGm4/GSbd8mDMF3MaHDr6qNFKZ0ABAz59f3ysim1Rd H1RGIcGByzW7cETD3ECuv6KzXZj6sO8d4wSieBlWLiu8GNjAvaW1wSpASt/6+eRb2bVA ihGSVwcEyk1fXKhTErGK32j9krgtv2yCMdbvX9oOzOaU0dWCp7PeScr/rd8SlmCVYrZF wD1xAmlP1p/fSVNHAv7bQj+NleCAlsazjNc+Ag0vGLYRCLHcBB3a5CEU8bIStPa75iZr mM7jpoEEpYP7betjL3x2XLzB4IlmzvsnDpNamZmj2qz/8jZrDfR9CH2hBl7w6vK4lzCU 0ong== X-Gm-Message-State: AOAM532rqNYDCcP3EHDFiFfROzTSUoYQEG43GCQDW0F/CYhxAPQ2W+Jt Iz74gnM0yMafgOTsE+IwzPqjKCqammytM2mdpcBoTw== X-Google-Smtp-Source: ABdhPJwtu7WEEn2mx2PCyqU8hsiWoIohV5vy1l0kAQ9VrLA2Qae+Xn8jL9/lPq+J5T3HdoNVzM0aMM4ohQyIhDtzggw= X-Received: by 2002:a37:a00c:: with SMTP id j12mr2444824qke.231.1603904612589; Wed, 28 Oct 2020 10:03:32 -0700 (PDT) MIME-Version: 1.0 References: <6e866efaa7620162a9824914186ce54b29c17788.1603372719.git.andreyknvl@google.com> In-Reply-To: <6e866efaa7620162a9824914186ce54b29c17788.1603372719.git.andreyknvl@google.com> From: Dmitry Vyukov Date: Wed, 28 Oct 2020 18:03:21 +0100 Message-ID: Subject: Re: [PATCH RFC v2 20/21] kasan: simplify assign_tag and set_tag calls 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.000000, 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:20 PM Andrey Konovalov wrote: > > set_tag() already ignores the tag for the generic mode, so just call it > as is. Add a check for the generic mode to assign_tag(), and simplify its > call in ____kasan_kmalloc(). > > Signed-off-by: Andrey Konovalov > Link: https://linux-review.googlesource.com/id/I18905ca78fb4a3d60e1a34a4ca00247272480438 Reviewed-by: Dmitry Vyukov > --- > mm/kasan/common.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/mm/kasan/common.c b/mm/kasan/common.c > index 983383ebe32a..3cd56861eb11 100644 > --- a/mm/kasan/common.c > +++ b/mm/kasan/common.c > @@ -235,6 +235,9 @@ void __kasan_poison_object_data(struct kmem_cache *cache, void *object) > static u8 assign_tag(struct kmem_cache *cache, const void *object, > bool init, bool keep_tag) > { > + if (IS_ENABLED(CONFIG_KASAN_GENERIC)) > + return 0xff; > + > /* > * 1. When an object is kmalloc()'ed, two hooks are called: > * kasan_slab_alloc() and kasan_kmalloc(). We assign the > @@ -277,8 +280,8 @@ void * __must_check __kasan_init_slab_obj(struct kmem_cache *cache, > __memset(alloc_meta, 0, sizeof(*alloc_meta)); > } > > - if (IS_ENABLED(CONFIG_KASAN_SW_TAGS) || IS_ENABLED(CONFIG_KASAN_HW_TAGS)) > - object = set_tag(object, assign_tag(cache, object, true, false)); > + /* Tag is ignored in set_tag() without CONFIG_KASAN_SW/HW_TAGS */ > + object = set_tag(object, assign_tag(cache, object, true, false)); > > return (void *)object; > } > @@ -360,9 +363,7 @@ static void *____kasan_kmalloc(struct kmem_cache *cache, const void *object, > KASAN_GRANULE_SIZE); > redzone_end = round_up((unsigned long)object + cache->object_size, > KASAN_GRANULE_SIZE); > - > - if (IS_ENABLED(CONFIG_KASAN_SW_TAGS) || IS_ENABLED(CONFIG_KASAN_HW_TAGS)) > - tag = assign_tag(cache, object, false, keep_tag); > + tag = assign_tag(cache, object, false, keep_tag); > > /* > * Don't unpoison the object when keeping the tag. Tag is kept for: > -- > 2.29.0.rc1.297.gfa9743e501-goog >