From nobody Fri Dec 19 20:05:32 2025 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 B152A1FB702; Sun, 24 Mar 2024 23:01:44 +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=1711321304; cv=none; b=b9WIjRl9HamYOL5w4hZTZw4XkvpMZjavxHeca+0Q6zz9cEY0oT8I//Mg7BtLkam7f5d5MyxPsJweUhFb8PtmAHtbNs0Xz234/12kLJj7ElHEWMV2t43BxlIxvsDDnfkBMVt9wSQNjzzxN92JviYHM/gjKZs0Y6yqBHCGiITsSLk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321304; c=relaxed/simple; bh=du2aFlm+xs0pTQLEJ971wtsOkmAlatVJgbY9t73ZhnI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eHKHeDg1Eboy5OnidBjM5DSgpdQQ5nKvpRoVk0aVmHWt+F3i+7F2KH16peA8jXfAFGQgOTPqWJy4Crf9UBFCcXBLgAk9mvdVK24A1ybvaxd3LG8oeu7ouivCF2abQc0JkR6xYXq1OvZtQMIT5wdMAzGl/oqkrT3r6pt91jGoiRk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=YyxUTwbu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="YyxUTwbu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9750CC43394; Sun, 24 Mar 2024 23:01:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711321304; bh=du2aFlm+xs0pTQLEJ971wtsOkmAlatVJgbY9t73ZhnI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YyxUTwbuP7iwAp23h5eM4niTH7BHK9lr5sz8YF8NDXC+aDvQ85V6Oqzkq2W2zEgkE /eLMEkFQRFQoHy+9Tjh/iK6sWITRlcPEnYUUYtlgvyPfNCUNjncGp0GkyWWfdbPwo1 K6wRC7ZKu5Lk25wlmElrkab8dR3z8RmVgGFoHfkWLo0aZ8csRHRWbKSDiuWaJGFk5E GLz8OqfATjP4aErkLgUHnUtLDR1Fr759NlbMfPul73qUe0zKi9a1DhRC0n3mjS4o+x W+5sFAf38UH8BhVu3BUhsqKpMwelBnu2/jTOeKXkOE0ziaROCb46UluYfeoTmyWUY1 ZirhaUbdW1dzw== 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.6 027/638] x86/mm: Move is_vsyscall_vaddr() into asm/vsyscall.h Date: Sun, 24 Mar 2024 18:51:04 -0400 Message-ID: <20240324230116.1348576-28-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324230116.1348576-1-sashal@kernel.org> References: <20240324230116.1348576-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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/vsyscal= l.h index ab60a71a8dcb9..472f0263dbc61 100644 --- a/arch/x86/include/asm/vsyscall.h +++ b/arch/x86/include/asm/vsyscall.h @@ -4,6 +4,7 @@ =20 #include #include +#include =20 #ifdef CONFIG_X86_VSYSCALL_EMULATION extern void map_vsyscall(void); @@ -24,4 +25,13 @@ static inline bool emulate_vsyscall(unsigned long error_= code, } #endif =20 +/* + * 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) =3D=3D VSYSCALL_ADDR); +} + #endif /* _ASM_X86_VSYSCALL_H */ diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index ab778eac19520..a9d69ec994b75 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 er= ror_code, show_opcodes(regs, loglvl); } =20 -/* - * 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) =3D=3D VSYSCALL_ADDR); -} - static void __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code, unsigned long address, u32 pkey, int si_code) --=20 2.43.0