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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0066DC4332F for ; Sat, 17 Dec 2022 00:11:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=VQ+XsJ8WRn4qF8hGF8uVN+5CLQnsgm3By/y3ut8Ua7g=; b=I7ztjc1g+4MIun 4p3EhhSwkYFktseI6LObWhYh8l4DSyX3wiHBQjWK1FqrRAJSLXGHQ9HERO6d6oIvj9F6RxfvwoxA4 SRqu8X1n6wu975ghf6/83zwjZjyGiAk5EvVjlMkeHCof2eb1jUEfUygIzuk/N7oouFjotLw8eoF04 3cVGmFXlIuxeTXAnodwsr4e6mtubotl/e2qpsbigedDGpWdKWP8u+Ayqva2Pbjkn1uPhGEhDX1A8X SIrGIUtcudG3Zwqzsohr6ePS5W8y2YiieZKUaYtvPz9aYGo04K5zpllfAsdwXepEoaZ1R0fwRNP+E l2b2ZKQx+Dr3jGR00QYg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p6Km9-0030iq-NK; Sat, 17 Dec 2022 00:10:01 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1p6Km5-0030ga-Dn for linux-arm-kernel@lists.infradead.org; Sat, 17 Dec 2022 00:09:59 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 31B2FB81E2C; Sat, 17 Dec 2022 00:09:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D5AF7C433EF; Sat, 17 Dec 2022 00:09:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1671235794; bh=n+UO3JEjJNtE6E7bl5JwaGCjw+WpyVJcpCgHb+zK70g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XYdkp4uOHEe1zDTjKmZY70ueOCkT7KFVCEsuL7DKp2C6aYFTpgBx6SXNoHoQ2k4GC zgWUqb8wCM2prt1Ob4JXl9yztWNkCqS5IIxZDQLysHB4MJ+L1qRr+Arw/xPBfMmV5v kGrefqiASlNZ1JP+UR4IaaDKumBcCQKwYGodzL/Nq2LymUoW8BxCDs9N2bXoaZKcf/ 0lyc0OsCUsYGme4ws69H+CEGt6oRBTLv0uqXpA5Gy+1OcKtjeQUKUs2J9jgX51j6Ap 5epxzDhfLpl1BTBrbr1brsrkDfqUNWSeUw/6oiFaEL4zMaAIhTzymZgGv9k6IIlxWW p29dwsMOSxgsw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mark Rutland , Catalin Marinas , Will Deacon , Sasha Levin , broonie@kernel.org, keescook@chromium.org, christophe.leroy@csgroup.eu, flaniel@linux.microsoft.com, wangkefeng.wang@huawei.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 6.1 2/9] arm64: make is_ttbrX_addr() noinstr-safe Date: Fri, 16 Dec 2022 19:09:29 -0500 Message-Id: <20221217000937.41115-2-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221217000937.41115-1-sashal@kernel.org> References: <20221217000937.41115-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221216_160957_659117_8F3B1F98 X-CRM114-Status: GOOD ( 12.38 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Mark Rutland [ Upstream commit d8c1d798a2e5091128c391c6dadcc9be334af3f5 ] We use is_ttbr0_addr() in noinstr code, but as it's only marked as inline, it's theoretically possible for the compiler to place it out-of-line and instrument it, which would be problematic. Mark is_ttbr0_addr() as __always_inline such that that can safely be used from noinstr code. For consistency, do the same to is_ttbr1_addr(). Note that while is_ttbr1_addr() calls arch_kasan_reset_tag(), this is a macro (and its callees are either macros or __always_inline), so there is not a risk of transient instrumentation. Signed-off-by: Mark Rutland Cc: Catalin Marinas Cc: Will Deacon Link: https://lore.kernel.org/r/20221114144042.3001140-1-mark.rutland@arm.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- arch/arm64/include/asm/processor.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index 445aa3af3b76..400f8956328b 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -308,13 +308,13 @@ static inline void compat_start_thread(struct pt_regs *regs, unsigned long pc, } #endif -static inline bool is_ttbr0_addr(unsigned long addr) +static __always_inline bool is_ttbr0_addr(unsigned long addr) { /* entry assembly clears tags for TTBR0 addrs */ return addr < TASK_SIZE; } -static inline bool is_ttbr1_addr(unsigned long addr) +static __always_inline bool is_ttbr1_addr(unsigned long addr) { /* TTBR1 addresses may have a tag if KASAN_SW_TAGS is in use */ return arch_kasan_reset_tag(addr) >= PAGE_OFFSET; -- 2.35.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel