From patchwork Wed Mar 29 18:37:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: andrey.konovalov@linux.dev X-Patchwork-Id: 13193122 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47553C74A5B for ; Wed, 29 Mar 2023 18:38:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7D9AF6B0072; Wed, 29 Mar 2023 14:38:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 789356B0074; Wed, 29 Mar 2023 14:38:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6509F6B0075; Wed, 29 Mar 2023 14:38:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 5565D6B0072 for ; Wed, 29 Mar 2023 14:38:01 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 299F01A066B for ; Wed, 29 Mar 2023 18:38:01 +0000 (UTC) X-FDA: 80622795162.12.885AEFC Received: from out-22.mta1.migadu.com (out-22.mta1.migadu.com [95.215.58.22]) by imf17.hostedemail.com (Postfix) with ESMTP id 41E6F4000F for ; Wed, 29 Mar 2023 18:37:58 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=DbXVQvkG; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf17.hostedemail.com: domain of andrey.konovalov@linux.dev designates 95.215.58.22 as permitted sender) smtp.mailfrom=andrey.konovalov@linux.dev ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1680115079; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=FR0GMMMnNdReMCefH2++iHzkAdqxWWuGhtNaRaBked8=; b=qlgSyoorrFESfyoWduU9p7WJBbwKZa0+vTBkynXBEP8iMZOTMArOrCjE5FBi/uQGyo01Xo dlby9MuZrnn1cQ5jsRn+/sAEV1vOWX0uRYQKFishffSdqTV8sOnMMHCGLTWAtoUFpgPIfk tbxcqFWr6tUd0cbxTi524TJlnRkMlqw= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=linux.dev header.s=key1 header.b=DbXVQvkG; dmarc=pass (policy=none) header.from=linux.dev; spf=pass (imf17.hostedemail.com: domain of andrey.konovalov@linux.dev designates 95.215.58.22 as permitted sender) smtp.mailfrom=andrey.konovalov@linux.dev ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1680115079; a=rsa-sha256; cv=none; b=l5nyCNcFCKLLfdZtf50UkfQv5PGwjYe3Fxb2p03LlXHD4OEm1LVkPxJgRz1Fd96Heelax9 ds+ZeMS9kpX7RZVetg/AGlpnKG71+d25cYZ0vxvfJM87V1swquCkhefVJ1uYoQNXzHTyKG GzjP1oN8nAIyAK80XGhsCWh5tX0FHQY= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1680115077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FR0GMMMnNdReMCefH2++iHzkAdqxWWuGhtNaRaBked8=; b=DbXVQvkGTlCs/4ox1E5HOmnOas+o8dhrEXZjhbQ6W8WQVmI5zYiq4ygRCi6EHxe9W/CCRl SYi0JaVw5IP0cy6wxqsztEnf8kDC6a250hmtkSn2HqVpd/QOP3J/6rbmYShIcirFB1djxa c4RW3q5ScoCHI8t9U4gig00pOB+z2mU= From: andrey.konovalov@linux.dev To: Marco Elver , Catalin Marinas Cc: Andrey Konovalov , Alexander Potapenko , Dmitry Vyukov , Andrey Ryabinin , kasan-dev@googlegroups.com, Vincenzo Frascino , Will Deacon , linux-arm-kernel@lists.infradead.org, Peter Collingbourne , Evgenii Stepanov , Andrew Morton , linux-mm@kvack.org, Weizhao Ouyang , linux-kernel@vger.kernel.org, Andrey Konovalov Subject: [PATCH v2 2/5] kasan, arm64: rename tagging-related routines Date: Wed, 29 Mar 2023 20:37:45 +0200 Message-Id: <75c4000c862996060a20f1f66d6c9adcf9f23aca.1680114854.git.andreyknvl@google.com> In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Rspamd-Queue-Id: 41E6F4000F X-Rspamd-Server: rspam09 X-Rspam-User: X-Stat-Signature: gbjxtkxxzdawpfcf6fi55p18xx66opb1 X-HE-Tag: 1680115078-653894 X-HE-Meta: U2FsdGVkX19ZFd2j8Pg0wQ3LAeUahW/6dNlqZ4KgacQq+wMsZ7wN0a63Rpr4hacyUn9yU0n0a2oU9/VsS7oG5O5hyFHHj/8+5JLQjDI1cgw+wRdhd7EeCaE7nAPE+7T2Nnmj+Y+XMG1v4Vji/I1DnjRWAyzCm8/EdLUg58qYRifeQoQqHbNr04djUsN/VpPozF2BxQKEm9nscpya78gGOq9fY2nln6DZMkYgj5z33Z/O2WfLG0Z2nFSDn60XE33d3OHGXqqwsKvzOOwb2ABFqBscenXFt0Uc1S8xDPPLM5/jT/ezUFXO/feqczsDEufkeHpM2ZWQxa1kQCA4Bobo2LWaawV2yzzByyNZyEZkcU4zfR9L4QQARAvdyxB46Q2IidsdMulg1G6uY/QDzT65gYW/OJJWvhBrpBiWfEVz3EcEDMOhVt46MDUIvedj1Es6/E3q8uhD+tRHLUC80vrULEjSCA17n9Wl/GSizMbQclbis+N/nNb8xTAG8c0phz1yofQ7d73psXNGiXBbZCWnmUtwh7ZCcgczN/ogd2LwTzqDbvJa/MmZzwQSAW1y5KN8+drsoevNOmDy5H9MaoyeS761CD//JybHBunizsm0TQ8O4jdujp/GI6V9Po8QIrvCLuHjfFeShOjNpw+eEtZO1sbygAIvcQZCiQA0GPf85CUwxYYp2ddlzE1/8HJxVQm4daBBQj5+3z4Tfmm5JFzxUtVsjc3iikjAe9H5m9kq3hjrwMmDmmkQYxyc/QlfUgpxlBHKx5nvjpiRa1oLcuxIcpa8mpQX+c8XwqZbMDkAOyt8Lo1bYa+JH9BalDsJfhBaQdcMKQDhJWox3Pov1QMexKBimyUaVvLd01uUsd847cU/vp1fPoCcANq/1CafsqaG3H7ZI5DpwBzzdCZyXw4+y0h2eLILA+gIBoJlADwET+WoESPLi+oiyNcCHxV29RXZiWuqUGLTfPcoSL7Tdrx D8b0WxtY eXa2LCAs5NWpo3oK0Cq8BcchSKp+KxVgmh0BkdJ92Wyx1kxuYJockMgKq2QbAmD2OM/t04UJmvj+PlfkiuMkIzTyAYwaOwEtVzFPM76RIZLKHvd+tw1o+gMI1lOfj4Ch5S1GC58E8PbJZHzCYhzcZxgR+Qqtb+bOXsLVtPeGWhQ5S1OuNlKu5wt7m5nE5TnESqKV9 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: From: Andrey Konovalov Rename arch_enable_tagging_sync/async/asymm to arch_enable_tag_checks_sync/async/asymm, as the new name better reflects their function. Also rename kasan_enable_tagging to kasan_enable_hw_tags for the same reason. Signed-off-by: Andrey Konovalov --- arch/arm64/include/asm/memory.h | 6 +++--- mm/kasan/hw_tags.c | 12 ++++++------ mm/kasan/kasan.h | 10 +++++----- mm/kasan/kasan_test.c | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index 78e5163836a0..faf42bff9a60 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -261,9 +261,9 @@ static inline const void *__tag_set(const void *addr, u8 tag) } #ifdef CONFIG_KASAN_HW_TAGS -#define arch_enable_tagging_sync() mte_enable_kernel_sync() -#define arch_enable_tagging_async() mte_enable_kernel_async() -#define arch_enable_tagging_asymm() mte_enable_kernel_asymm() +#define arch_enable_tag_checks_sync() mte_enable_kernel_sync() +#define arch_enable_tag_checks_async() mte_enable_kernel_async() +#define arch_enable_tag_checks_asymm() mte_enable_kernel_asymm() #define arch_force_async_tag_fault() mte_check_tfsr_exit() #define arch_get_random_tag() mte_get_random_tag() #define arch_get_mem_tag(addr) mte_get_mem_tag(addr) diff --git a/mm/kasan/hw_tags.c b/mm/kasan/hw_tags.c index d1bcb0205327..b092e37b69a7 100644 --- a/mm/kasan/hw_tags.c +++ b/mm/kasan/hw_tags.c @@ -205,7 +205,7 @@ void kasan_init_hw_tags_cpu(void) * Enable async or asymm modes only when explicitly requested * through the command line. */ - kasan_enable_tagging(); + kasan_enable_hw_tags(); } /* kasan_init_hw_tags() is called once on boot CPU. */ @@ -373,19 +373,19 @@ void __kasan_poison_vmalloc(const void *start, unsigned long size) #endif -void kasan_enable_tagging(void) +void kasan_enable_hw_tags(void) { if (kasan_arg_mode == KASAN_ARG_MODE_ASYNC) - hw_enable_tagging_async(); + hw_enable_tag_checks_async(); else if (kasan_arg_mode == KASAN_ARG_MODE_ASYMM) - hw_enable_tagging_asymm(); + hw_enable_tag_checks_asymm(); else - hw_enable_tagging_sync(); + hw_enable_tag_checks_sync(); } #if IS_ENABLED(CONFIG_KASAN_KUNIT_TEST) -EXPORT_SYMBOL_GPL(kasan_enable_tagging); +EXPORT_SYMBOL_GPL(kasan_enable_hw_tags); void kasan_force_async_fault(void) { diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h index b1895526d02f..a1613f5d7608 100644 --- a/mm/kasan/kasan.h +++ b/mm/kasan/kasan.h @@ -395,20 +395,20 @@ static inline const void *arch_kasan_set_tag(const void *addr, u8 tag) #ifdef CONFIG_KASAN_HW_TAGS -#define hw_enable_tagging_sync() arch_enable_tagging_sync() -#define hw_enable_tagging_async() arch_enable_tagging_async() -#define hw_enable_tagging_asymm() arch_enable_tagging_asymm() +#define hw_enable_tag_checks_sync() arch_enable_tag_checks_sync() +#define hw_enable_tag_checks_async() arch_enable_tag_checks_async() +#define hw_enable_tag_checks_asymm() arch_enable_tag_checks_asymm() #define hw_force_async_tag_fault() arch_force_async_tag_fault() #define hw_get_random_tag() arch_get_random_tag() #define hw_get_mem_tag(addr) arch_get_mem_tag(addr) #define hw_set_mem_tag_range(addr, size, tag, init) \ arch_set_mem_tag_range((addr), (size), (tag), (init)) -void kasan_enable_tagging(void); +void kasan_enable_hw_tags(void); #else /* CONFIG_KASAN_HW_TAGS */ -static inline void kasan_enable_tagging(void) { } +static inline void kasan_enable_hw_tags(void) { } #endif /* CONFIG_KASAN_HW_TAGS */ diff --git a/mm/kasan/kasan_test.c b/mm/kasan/kasan_test.c index 627eaf1ee1db..a375776f9896 100644 --- a/mm/kasan/kasan_test.c +++ b/mm/kasan/kasan_test.c @@ -148,7 +148,7 @@ static void kasan_test_exit(struct kunit *test) kasan_sync_fault_possible()) { \ if (READ_ONCE(test_status.report_found) && \ !READ_ONCE(test_status.async_fault)) \ - kasan_enable_tagging(); \ + kasan_enable_hw_tags(); \ migrate_enable(); \ } \ WRITE_ONCE(test_status.report_found, false); \