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=-12.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 AB179C388F2 for ; Thu, 22 Oct 2020 13:20:25 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 30BDC222E9 for ; Thu, 22 Oct 2020 13:20:25 +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="HfX7ercL" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 30BDC222E9 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 B97EE6B00A6; Thu, 22 Oct 2020 09:20:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B48056B00A7; Thu, 22 Oct 2020 09:20:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 99A0E6B00A8; Thu, 22 Oct 2020 09:20:14 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0190.hostedemail.com [216.40.44.190]) by kanga.kvack.org (Postfix) with ESMTP id 690B06B00A6 for ; Thu, 22 Oct 2020 09:20:14 -0400 (EDT) Received: from smtpin17.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 01E988996995 for ; Thu, 22 Oct 2020 13:20:14 +0000 (UTC) X-FDA: 77399619948.17.brass90_4306a7227251 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin17.hostedemail.com (Postfix) with ESMTP id D91FE180D0180 for ; Thu, 22 Oct 2020 13:20:13 +0000 (UTC) X-HE-Tag: brass90_4306a7227251 X-Filterd-Recvd-Size: 5449 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) by imf10.hostedemail.com (Postfix) with ESMTP for ; Thu, 22 Oct 2020 13:20:13 +0000 (UTC) Received: by mail-wr1-f74.google.com with SMTP id n14so624496wrp.1 for ; Thu, 22 Oct 2020 06:20:13 -0700 (PDT) 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=xOXxdsX9wfgVlPASo24fEeH7IiHQsViadxCdQzhZ1/Y=; b=HfX7ercL+cFW/KClhFoz+6kZbu2i+/58U1zQot0xkcWJUF4lNlzTPutId70SOfd2su jTfaHHJ/k1+6vcydfwijYQY45vVXk4hQxn0bovGm+FuCTzRWCzYeHfO5c+0PaBsWEAs9 SkSvJy/yjNmODf8+50lkI136iZ6TU/E+cKDQ2rkS5Evb8rPm80APJnXIvGMRkPuFRDXJ MxmPdEPchFR3620tU25OHllWIx19ppDbTTIYyRq9ZyvHnxi3SPOuQLihNQInuBF5+BW9 Lhm+va8L6VezXpICA36BvVmlZaQeLJCdYjNnF5WhHdYgVS3mujiiSLiBvdM8+39/CCs1 s+gA== 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=xOXxdsX9wfgVlPASo24fEeH7IiHQsViadxCdQzhZ1/Y=; b=GWPEmz8al4rgk9kT0yTeeJpZLefj7e+InEoghjaVnHnejP1le9ZalPdCE54Gni6HGH n110SdUcPxBrvg8LGD7jBs/9Zx++gIYbOcj/cp23s2FRngadDcLtSlRDetXnLzDsGQ44 50smBPvZoDflS58av7b85FM59f5Kl47pUdBu/u2LptjWBmzr0XXJhIiXBIl9l6DU9YjM uzF5rUdstd9RTLIwR6cJ6OiEaksRDQeulzBWblmpw/N7CrCeDNtA/no606mryXXXdtTQ fvNpiP50CjLlfPe/62KBUvUo1wv1T5CIGlUZAPnACeuIoUlqXjEB0wg7Y+SUbxJrSEJK IgGQ== X-Gm-Message-State: AOAM530cURpooAx59In/NfaSWbIAt5q24CBmomz2WKyxpFYTiLaJS7ed /pWbzdxuxN/kM2HRayit8Ij4NcffMNQhPJJO X-Google-Smtp-Source: ABdhPJxmmX9viwK28cT2Ay5EHxingwtZYKgXsdkjeLwZhFRedSASX0UK4zU6EaIwvfeoe8I2Gxb7B7c+TXE5SqrB X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a1c:3503:: with SMTP id c3mr2468528wma.43.1603372812346; Thu, 22 Oct 2020 06:20:12 -0700 (PDT) Date: Thu, 22 Oct 2020 15:19:12 +0200 In-Reply-To: Message-Id: <6e866efaa7620162a9824914186ce54b29c17788.1603372719.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.0.rc1.297.gfa9743e501-goog Subject: [PATCH RFC v2 20/21] kasan: simplify assign_tag and set_tag calls From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Alexander Potapenko , Marco Elver Cc: Evgenii Stepanov , Kostya Serebryany , Peter Collingbourne , Serban Constantinescu , Andrey Ryabinin , Elena Petrova , Branislav Rankov , Kevin Brodsky , Andrew Morton , 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: 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 --- 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