From patchwork Sat Jun 12 04:51:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuan-Ying Lee X-Patchwork-Id: 12316863 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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,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 BF772C48BE5 for ; Sat, 12 Jun 2021 04:52:48 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 4924D6109E for ; Sat, 12 Jun 2021 04:52:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4924D6109E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id DEBB06B006E; Sat, 12 Jun 2021 00:52:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DC2436B0070; Sat, 12 Jun 2021 00:52:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C633F6B0071; Sat, 12 Jun 2021 00:52:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0084.hostedemail.com [216.40.44.84]) by kanga.kvack.org (Postfix) with ESMTP id 95CCC6B006E for ; Sat, 12 Jun 2021 00:52:47 -0400 (EDT) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 23C50BF1F for ; Sat, 12 Jun 2021 04:52:47 +0000 (UTC) X-FDA: 78243851574.26.FAEBE8C Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by imf02.hostedemail.com (Postfix) with ESMTP id 5806340002C1 for ; Sat, 12 Jun 2021 04:52:43 +0000 (UTC) Received: by mail-pg1-f179.google.com with SMTP id t9so4101126pgn.4 for ; Fri, 11 Jun 2021 21:52:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j92rbW58nMKVCYwSujbaWen32AsKLCNI08XRkv0EOjw=; b=Xfi5pFS5wr+Bh+YDz4R+vXBO2Ktv1C09hoV4O9TSqdbjrlelLG/e7uFI2bfZqsDDUc xHqKMGdzUYPO2/F/n5wk8ntDe/8RBE3Zp3OKN/6SGRjry9Gw483Q8CWGOAsPzsA5AAoF lfyoowB8gd0LvlOIdOwTt+VOggIOD2NSvP7i55KhxTLAYItI7VbkwSTDkYG19fX/0eV/ 6nLVD7arWh+OGQ8psryJ1WxUvsZws7v7ONSq5rH2dUKV8tBQW96SqF+V+FZSy6UISCVk ylwu/ZFwO91Sw2sAd7mpJY6CA43vcGT5s47i5LnzphJlK+DLoCWszfq7EUR+HmLOoic2 w/ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=j92rbW58nMKVCYwSujbaWen32AsKLCNI08XRkv0EOjw=; b=ufi/CWoG3u040Hftkv1EXG5TOlRGXMo2xZh2jTP0OUF/gwc1eBFKyeppJp5KiRSk3U jUUtNl2aiBRYApaM8zvTv4ubVEkVTrvcH6xaeX9mWxDkNj15zprsrlCbF1YxTKqq/MKj TUiSOfREnaLuxIWT45QuDfXpluva8DZQVPme6iP0M7twzHqctHxCPkp1kAXXJbJRZoNV Or8XNJHITDDbkQbKOjxYdG8LCyeEBXaZvhcAuwbY01BtZJVDzZP1R3uGki3iyITEG6yH lPM4URLd60wfMPmK9XX1BtE1AtP0kPtmB4YTgH4KmPUfUiKkAxQjA8Ri12y63GMl70I7 sQtQ== X-Gm-Message-State: AOAM533m3PEVi0J0De5LbPTd4sFlPaJ/BuWj8Enr8BvVgdTyUkZRUvX+ VxMjtIIKl+I9O3WwWx+tt6g= X-Google-Smtp-Source: ABdhPJxDo+WsgA3UnK6FWWqskp9r5kiLsOiH1I274oKbBgKPMG9WgfhorioBDDsRN1S9PsiObTQeFg== X-Received: by 2002:aa7:8892:0:b029:2f5:33fc:1073 with SMTP id z18-20020aa788920000b02902f533fc1073mr11510790pfe.79.1623473565850; Fri, 11 Jun 2021 21:52:45 -0700 (PDT) Received: from lee-virtual-machine.localdomain (61-230-42-225.dynamic-ip.hinet.net. [61.230.42.225]) by smtp.gmail.com with ESMTPSA id m1sm6076572pgd.78.2021.06.11.21.52.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 21:52:45 -0700 (PDT) From: Kuan-Ying Lee To: Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Andrew Morton Cc: kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Kuan-Ying Lee , Marco Elver Subject: [PATCH v2 1/3] kasan: rename CONFIG_KASAN_SW_TAGS_IDENTIFY to CONFIG_KASAN_TAGS_IDENTIFY Date: Sat, 12 Jun 2021 12:51:54 +0800 Message-Id: <20210612045156.44763-2-kylee0686026@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210612045156.44763-1-kylee0686026@gmail.com> References: <20210612045156.44763-1-kylee0686026@gmail.com> MIME-Version: 1.0 Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=Xfi5pFS5; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf02.hostedemail.com: domain of kylee0686026@gmail.com designates 209.85.215.179 as permitted sender) smtp.mailfrom=kylee0686026@gmail.com X-Rspamd-Server: rspam02 X-Stat-Signature: dshttzuwdkgscpuf73ujfqbcuctdt9a5 X-Rspamd-Queue-Id: 5806340002C1 X-HE-Tag: 1623473563-259497 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: This patch renames CONFIG_KASAN_SW_TAGS_IDENTIFY to CONFIG_KASAN_TAGS_IDENTIFY in order to be compatible with hardware tag-based mode. Signed-off-by: Kuan-Ying Lee Suggested-by: Marco Elver Cc: Andrey Ryabinin Cc: Alexander Potapenko Cc: Andrey Konovalov Cc: Dmitry Vyukov Cc: Andrew Morton --- lib/Kconfig.kasan | 2 +- mm/kasan/kasan.h | 4 ++-- mm/kasan/report_sw_tags.c | 2 +- mm/kasan/sw_tags.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/Kconfig.kasan b/lib/Kconfig.kasan index cffc2ebbf185..6f5d48832139 100644 --- a/lib/Kconfig.kasan +++ b/lib/Kconfig.kasan @@ -155,7 +155,7 @@ config KASAN_STACK CONFIG_COMPILE_TEST. On gcc it is assumed to always be safe to use and enabled by default. -config KASAN_SW_TAGS_IDENTIFY +config KASAN_TAGS_IDENTIFY bool "Enable memory corruption identification" depends on KASAN_SW_TAGS help diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index 8f450bc28045..b0fc9a1eb7e3 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -153,7 +153,7 @@ struct kasan_track { depot_stack_handle_t stack; }; -#ifdef CONFIG_KASAN_SW_TAGS_IDENTIFY +#ifdef CONFIG_KASAN_TAGS_IDENTIFY #define KASAN_NR_FREE_STACKS 5 #else #define KASAN_NR_FREE_STACKS 1 @@ -170,7 +170,7 @@ struct kasan_alloc_meta { #else struct kasan_track free_track[KASAN_NR_FREE_STACKS]; #endif -#ifdef CONFIG_KASAN_SW_TAGS_IDENTIFY +#ifdef CONFIG_KASAN_TAGS_IDENTIFY u8 free_pointer_tag[KASAN_NR_FREE_STACKS]; u8 free_track_idx; #endif diff --git a/mm/kasan/report_sw_tags.c b/mm/kasan/report_sw_tags.c index 3d20d3451d9e..821a14a19a92 100644 --- a/mm/kasan/report_sw_tags.c +++ b/mm/kasan/report_sw_tags.c @@ -31,7 +31,7 @@ const char *kasan_get_bug_type(struct kasan_access_info *info) { -#ifdef CONFIG_KASAN_SW_TAGS_IDENTIFY +#ifdef CONFIG_KASAN_TAGS_IDENTIFY struct kasan_alloc_meta *alloc_meta; struct kmem_cache *cache; struct page *page; diff --git a/mm/kasan/sw_tags.c b/mm/kasan/sw_tags.c index 9362938abbfa..dd05e6c801fa 100644 --- a/mm/kasan/sw_tags.c +++ b/mm/kasan/sw_tags.c @@ -177,7 +177,7 @@ void kasan_set_free_info(struct kmem_cache *cache, if (!alloc_meta) return; -#ifdef CONFIG_KASAN_SW_TAGS_IDENTIFY +#ifdef CONFIG_KASAN_TAGS_IDENTIFY idx = alloc_meta->free_track_idx; alloc_meta->free_pointer_tag[idx] = tag; alloc_meta->free_track_idx = (idx + 1) % KASAN_NR_FREE_STACKS; @@ -196,7 +196,7 @@ struct kasan_track *kasan_get_free_track(struct kmem_cache *cache, if (!alloc_meta) return NULL; -#ifdef CONFIG_KASAN_SW_TAGS_IDENTIFY +#ifdef CONFIG_KASAN_TAGS_IDENTIFY for (i = 0; i < KASAN_NR_FREE_STACKS; i++) { if (alloc_meta->free_pointer_tag[i] == tag) break;