Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2515533lqp; Mon, 25 Mar 2024 00:39:21 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCU39uAvk55+6xRWB/oyPVWQTAM9MI44GmJ6aEXMI6sXq6s8E/yGq2Y9utMunObSYJNds9ANkcTpPf0NWlefJBT6cIa5gCWUA6wdCzEU9Q== X-Google-Smtp-Source: AGHT+IGt8hc6zY3UvvmbQkT7xT8PPC9spflM3FUNBC3+fouxWtNCE/2vFzPgNIxXUX0yEqmywQ7y X-Received: by 2002:a05:6512:312c:b0:513:cfbc:970a with SMTP id p12-20020a056512312c00b00513cfbc970amr3330463lfd.2.1711352361488; Mon, 25 Mar 2024 00:39:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711352361; cv=pass; d=google.com; s=arc-20160816; b=Q2qi9NYemNVjC48+5eiNYiIAiYJzwh4LFYnrfRieZoxPRFKt+HVPwvjKSCgRlnzBj/ 3CtUULuM81ChbK6BlDbr4udZ7sM7XxIma645VoJ6CQABZO7CHr/9re4xeNYKONilkfJU 3nYLbIdpMhneO1uP3zAl6vm+xujhWM30IckNzMhHIefznGUpewD9svcQ66JzMLUpyh37 SJhxyMssG+2nYCCIpil3Rb1us7RvWHraptwMPNauTT9DOBglLuG6du97Knl5rYFRbzPt xEA64j7E9uwmlPiDFOIMqXq3LfZfC9rFufgU1X5nSTV53qRNYo/FyPiJYcLZMXetv2s6 rHNA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=OfO1VWdFjWnUkzbRFv07qICU4dFNyNOCMFgStZxh8HE=; fh=YNsMpTj6GFuCFxCU4B36SHOcGahCVQTlNhXSeS+/Q9I=; b=AuaojCPYq8iAshBhdkDWpFyZSF7PD42VUsyJJRkFpWNKkFXGXrpg0nfjhihDEqWgW2 orSIvOksUaPP2LxqPcn3Y65eALSpgIIYnX1J2TIZeYSMF9iZEGSI7Id/3d1A4D6b8bzg UM02cvu7nwTEKyf/p+NcG35bb4QttVjMv6eQy8yRMA4FGQeR1s3juyLsvn/H/M9eE9oW So7WgQyYLKq3LEkTkfldJgayBQFHIM3lgFQY54XbyFsw84v29RttGTpBUNbm69P5uATl 7A14EML6ky0r1B9gvX8rEpUHmfmRG+X91L2COhaG9dpeSwZHUyOOLwssgGSenVkxRt6p +9XQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FpVtOU+g; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115280-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115280-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id s4-20020a508d04000000b0056b9026f2d2si2302785eds.431.2024.03.25.00.39.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 00:39:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-115280-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=FpVtOU+g; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-115280-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-115280-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 23A361F343AD for ; Mon, 25 Mar 2024 07:30:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5E38F15E7E3; Mon, 25 Mar 2024 02:31:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FpVtOU+g" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 345A97F498; Sun, 24 Mar 2024 22:47:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320473; cv=none; b=lwW2QVVsz/p7vJ3kS3yD4uN+FgMfQjnFpJFRUO3oNMxSspJSXl9cd5WHxLGBlHqqnJp4WY1hOHQLMHvfVk7lrElnaLil/VcUPss+hasOaYrylMKLkOoPswMUDXsIxzfCxhzYnzVrMQE07x/KBcA31NJNAURerpxOvSaLSY3jDj8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320473; c=relaxed/simple; bh=w5BdxNjIE7bfEOwDCFFB2lHGJCSTEMlYfCM9CWgPQaA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QW2UL45a0gLb/TgoaV4fMi7TZAqZDbc649uYDcQm//PHhEWs8T2JVQ2D+grxu5JpbyoYHh9bUY+Qr0cUBHTATyCf6fctWWejwsh2NzmWG45goerapGWt2f4zefHN5foT4GoTChQVz82EhgkHiPozMyviy+iCaWTkAQ4tfdQgoxo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FpVtOU+g; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B3F8C433F1; Sun, 24 Mar 2024 22:47:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320473; bh=w5BdxNjIE7bfEOwDCFFB2lHGJCSTEMlYfCM9CWgPQaA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FpVtOU+g4mLtAPayMG2qyFLvsM6Bk2VtvjrjrblAWTvuI0BcfcY8CVc3AhUDsZbPb PEi+9Q3HwdFj25ssH5xFHuoh+W7P2gBAZA34MIgOOmVXhSgLnp9pj5pe/vQnNjEATf 78nXTMsgdjkoIpIHkDgiU1Achmj3jX55TJSsXA17ls1bLT4CC0ntBgJsYZaRDm0pbh dxLC6TnEHpx4oU7tWvpcD/uavC1d/xXWqngNIlv44dQybT/4lkrrP57p1QsEUQJ01A ajVYdCTn1Vcf57vyywXrAFdLi9OvnHvcXz/0sAFJQnMLW1XU0LZ0fZ3njFamCYKdh1 zWhqsYDkYZL2A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hou Tao , Sohil Mehta , Alexei Starovoitov , Sasha Levin Subject: [PATCH 6.7 032/713] x86/mm: Move is_vsyscall_vaddr() into asm/vsyscall.h Date: Sun, 24 Mar 2024 18:35:58 -0400 Message-ID: <20240324224720.1345309-33-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324224720.1345309-1-sashal@kernel.org> References: <20240324224720.1345309-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Hou Tao [ Upstream commit ee0e39a63b78849f8abbef268b13e4838569f646 ] Move is_vsyscall_vaddr() into asm/vsyscall.h to make it available for copy_from_kernel_nofault_allowed() in arch/x86/mm/maccess.c. Reviewed-by: Sohil Mehta Signed-off-by: Hou Tao Link: https://lore.kernel.org/r/20240202103935.3154011-2-houtao@huaweicloud.com Signed-off-by: Alexei Starovoitov Signed-off-by: Sasha Levin --- arch/x86/include/asm/vsyscall.h | 10 ++++++++++ arch/x86/mm/fault.c | 9 --------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/arch/x86/include/asm/vsyscall.h b/arch/x86/include/asm/vsyscall.h index ab60a71a8dcb9..472f0263dbc61 100644 --- a/arch/x86/include/asm/vsyscall.h +++ b/arch/x86/include/asm/vsyscall.h @@ -4,6 +4,7 @@ #include #include +#include #ifdef CONFIG_X86_VSYSCALL_EMULATION extern void map_vsyscall(void); @@ -24,4 +25,13 @@ static inline bool emulate_vsyscall(unsigned long error_code, } #endif +/* + * The (legacy) vsyscall page is the long page in the kernel portion + * of the address space that has user-accessible permissions. + */ +static inline bool is_vsyscall_vaddr(unsigned long vaddr) +{ + return unlikely((vaddr & PAGE_MASK) == VSYSCALL_ADDR); +} + #endif /* _ASM_X86_VSYSCALL_H */ diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 679b09cfe241c..d6375b3c633bc 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -798,15 +798,6 @@ show_signal_msg(struct pt_regs *regs, unsigned long error_code, show_opcodes(regs, loglvl); } -/* - * The (legacy) vsyscall page is the long page in the kernel portion - * of the address space that has user-accessible permissions. - */ -static bool is_vsyscall_vaddr(unsigned long vaddr) -{ - return unlikely((vaddr & PAGE_MASK) == VSYSCALL_ADDR); -} - static void __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code, unsigned long address, u32 pkey, int si_code) -- 2.43.0