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=-16.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,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 AD83EC2D0E4 for ; Mon, 23 Nov 2020 20:15:33 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3359520657 for ; Mon, 23 Nov 2020 20:15:33 +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="vHo5ItmT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3359520657 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 E224F6B009C; Mon, 23 Nov 2020 15:15:31 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DF7CD6B009D; Mon, 23 Nov 2020 15:15:31 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CC24A6B009E; Mon, 23 Nov 2020 15:15:31 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0150.hostedemail.com [216.40.44.150]) by kanga.kvack.org (Postfix) with ESMTP id 9E8C76B009C for ; Mon, 23 Nov 2020 15:15:31 -0500 (EST) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 41AE71EE6 for ; Mon, 23 Nov 2020 20:15:31 +0000 (UTC) X-FDA: 77516788062.06.linen90_2e0754327368 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin06.hostedemail.com (Postfix) with ESMTP id 1F9761003CD07 for ; Mon, 23 Nov 2020 20:15:31 +0000 (UTC) X-HE-Tag: linen90_2e0754327368 X-Filterd-Recvd-Size: 5676 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) by imf23.hostedemail.com (Postfix) with ESMTP for ; Mon, 23 Nov 2020 20:15:30 +0000 (UTC) Received: by mail-wr1-f74.google.com with SMTP id n1so397933wro.22 for ; Mon, 23 Nov 2020 12:15:30 -0800 (PST) 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=wBmPP01T6X6nVOaGKZckDZFO93MqGK09sbRfPDSt1eI=; b=vHo5ItmTL3kbBhJu4MbDo8AfqRmB73n2TJFE0EqgqSt8qZmzJAeQdQC3sKEnalkGXn ktkjkHf9SVCy/+8sUzxYEdo0V1Yxbry2LrkenRFFOepM6GqptfBvA4C8IpThBl75KpHt WmRnIy0r+5UovGNDlKo4z+gvVIVR67Jp4iFay2QP1lhbg/zzFlL1xN2Ts1992NPJccMO yPvLvTrrP9WRIgX3u5V106kkWnv9b5I21z82z2a8Odxi1fZjp6KzOWRTuiHa4PYjNJv+ Qx8DTqkNyJ8snArdIUqRdgkNEsIT5BmKTanM6v/2K7vU+vIIBXO28XYu1M994wDmikAX UWlw== 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=wBmPP01T6X6nVOaGKZckDZFO93MqGK09sbRfPDSt1eI=; b=ZegyWcGrZ/cUeiSgWIFV7maq2dqFnci+vQNF7/mgkJj+Le4wZ/zdMqstLnn/DXR0cY ySU9TqjWoWeKmLiknnlcHncZseZRJGNyoZ7Q60hUwIwdVPPP06cERcuKf2jv4ay4841P hiBfJ26jjSQWnjOt6pqPWNnsa1ZLjF6Y6CkLz5luL4ehqYSP08HFHj5CO6B2Oaiz/3Vv LnSVmO3T2B4BRDBUSM/noavh9WZuWDj2xaCYOqmE2Fi4Gk0C8BL24wM9WzgWJxctsuwb FvbM88CmcM3yg5xNUzmbeQKES0I6B/QxGoeIVFBi0rlmD3EqYbWlG6HOgTsKs9DJbm0N 1YBw== X-Gm-Message-State: AOAM533+MoVDI4wHJ/W+RlOEE6r+k6VfcHrYkNSilys8/wDsJeF7h+YV ScVmUF8aMiIFhrkQlHgYJ0ErphwRUVOMMHnY X-Google-Smtp-Source: ABdhPJyHaYhL2h/mGk2m6LiBmTS7pItR3APYX+HCQrNLLJYOQY2bd3/ofHLz5IVsdCsxUJXf29WoeTZZqqWHQsZj X-Received: from andreyknvl3.muc.corp.google.com ([2a00:79e0:15:13:7220:84ff:fe09:7e9d]) (user=andreyknvl job=sendgmr) by 2002:a1c:810c:: with SMTP id c12mr609306wmd.96.1606162529119; Mon, 23 Nov 2020 12:15:29 -0800 (PST) Date: Mon, 23 Nov 2020 21:14:45 +0100 In-Reply-To: Message-Id: <121eeab245f98555862b289d2ba9269c868fbbcf.1606162397.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.29.2.454.gaff20da3a2-goog Subject: [PATCH mm v4 15/19] kasan: simplify assign_tag and set_tag calls From: Andrey Konovalov To: Andrew Morton Cc: Catalin Marinas , Will Deacon , Vincenzo Frascino , Dmitry Vyukov , Andrey Ryabinin , Alexander Potapenko , Marco Elver , Evgenii Stepanov , Branislav Rankov , Kevin Brodsky , 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 Reviewed-by: Dmitry Vyukov Reviewed-by: Marco Elver Link: https://linux-review.googlesource.com/id/I18905ca78fb4a3d60e1a34a4ca00247272480438 --- mm/kasan/common.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/mm/kasan/common.c b/mm/kasan/common.c index 1a88e4005181..821678a58ac6 100644 --- a/mm/kasan/common.c +++ b/mm/kasan/common.c @@ -234,6 +234,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 @@ -276,8 +279,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; } @@ -364,7 +367,7 @@ static void *____kasan_kmalloc(struct kmem_cache *cache, const void *object, { unsigned long redzone_start; unsigned long redzone_end; - u8 tag = 0xff; + u8 tag; if (gfpflags_allow_blocking(flags)) quarantine_reduce(); @@ -379,9 +382,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); /* Tag is ignored in set_tag without CONFIG_KASAN_SW/HW_TAGS */ unpoison_range(set_tag(object, tag), size); -- 2.29.2.454.gaff20da3a2-goog