From patchwork Fri Feb 2 12:30:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiaxun Yang X-Patchwork-Id: 13542888 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 D780EC47DB3 for ; Fri, 2 Feb 2024 12:30:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 13C8C6B0075; Fri, 2 Feb 2024 07:30:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 0D69B6B007E; Fri, 2 Feb 2024 07:30:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D1A3B6B0078; Fri, 2 Feb 2024 07:30:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id B4C226B0074 for ; Fri, 2 Feb 2024 07:30:40 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 6F74CC0F4E for ; Fri, 2 Feb 2024 12:30:40 +0000 (UTC) X-FDA: 81746797440.20.B3DFF5F Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by imf18.hostedemail.com (Postfix) with ESMTP id 42E751C0024 for ; Fri, 2 Feb 2024 12:30:37 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=flygoat.com header.s=fm1 header.b="fEI1zv/+"; dkim=pass header.d=messagingengine.com header.s=fm3 header.b="G M6TVMH"; dmarc=pass (policy=none) header.from=flygoat.com; spf=pass (imf18.hostedemail.com: domain of jiaxun.yang@flygoat.com designates 66.111.4.28 as permitted sender) smtp.mailfrom=jiaxun.yang@flygoat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706877037; a=rsa-sha256; cv=none; b=XDT4NnAevGWHzPMWlRNqDYXXiuRXF54Bbkk0CHVQ2q1su/E/wpeK7IHasRGpjMLPuELMkb 4FRgjmRjseOJz3DY1lFVmMLOVdvSqkdtAvcBhM4ErRvlfYJEfBo2VwKuLmUzo0AmiTaaID RXYIoRuVrmoQp67DI1JoL1kxVK8H35A= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=flygoat.com header.s=fm1 header.b="fEI1zv/+"; dkim=pass header.d=messagingengine.com header.s=fm3 header.b="G M6TVMH"; dmarc=pass (policy=none) header.from=flygoat.com; spf=pass (imf18.hostedemail.com: domain of jiaxun.yang@flygoat.com designates 66.111.4.28 as permitted sender) smtp.mailfrom=jiaxun.yang@flygoat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706877037; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=3C5bFwJv9LWEX7uXH9OhbPn6aVzr7qyWAUolJmL7emQ=; b=d+Cj+AOZ5bU1cGFbMifOEIqq8mJbMFnmJmujunl4lJiUHhPJzCJMF++k+BlRciwxwNqLAz urLA+teqC9SFUpZNAAFPHSwExpyuhQsQAGlraifIts+a80OS3wHBNAaTi8Utjr1fR7q50Y RyPQRNTlTmhbg8l6FWpyigtKUcmHPhQ= Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 8CDF65C0160; Fri, 2 Feb 2024 07:30:36 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Fri, 02 Feb 2024 07:30:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flygoat.com; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1706877036; x=1706963436; bh=3C5bFwJv9LWEX7uXH9OhbPn6aVzr7qyWAUolJmL7emQ=; b= fEI1zv/+ZvFpkfpFRiLTSbFcBisWuJ2q1jjScOxUaTFUrgkBaxR7Dx3eZf25cfK3 CCgcfDN0Mp+DmtIBGMvaBhPgFah6cUtlcaagGHlj97CLyV1V3p/5jw7OtwdFh64a HMQa5y/m/fAdJjMEvV/Q0eZ89mcIVI1Riga2COWISSsrwMoXl1biAun7d9Iem3JM EJsIIbsWbJqGq5yN4S1pDLjjeDsbBOGGag/1fMXqkCs/ScLMbRqeJdXOG6T/rZGC s00KA5riqpXZZ/sqaaNNV9dRJ0lagWb/DXUyBPlGEwCHFFKUDNZtGujoWsr2NybD eYv4M7t3bTg1agwJRceaIQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1706877036; x= 1706963436; bh=3C5bFwJv9LWEX7uXH9OhbPn6aVzr7qyWAUolJmL7emQ=; b=G M6TVMHqdzw6Ad4JtN7ng9dTBDFr/eJ0ih2VN0pFcxFRMqVse9IA4ZgGzwjEuvCz8 ZYuIoiL2km7nIa+V2fNKiCBS3hXbwKYKgfKJABkZ3O58hAPcwy3AmQvvJx5xoy6/ w6Yew322XWxbcGUF9VqlbmHmtI/kQqZFxP/WHKzEIwgIg1+Luc8NEAHeVxPuGU+E ztCrKwLNLAlHT2j+alLLJ/jtu4feGjNtgYQTtunDXjuJxRD/O1ZNDNPRq2r4o1Jh AZ1h8rdIffPFFY6kjHi7iGxfFTjq2U4DpsBRuyMgjprKJ6be/BB/h/kEbM00rSgp jgGUDqGGjalnzB+Cei1Nw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrfedugedgfeelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertdertdejnecuhfhrohhmpeflihgr gihunhcujggrnhhguceojhhirgiguhhnrdihrghnghesfhhlhihgohgrthdrtghomheqne cuggftrfgrthhtvghrnhepvedujefhfffhveekhfffkeetvefgteejkeeutdduieehieeg feejtdelveejtedunecuffhomhgrihhnpehkvghrnhgvlhdrohhrghenucevlhhushhtvg hrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehjihgrgihunhdrhigrnhhg sehflhihghhorghtrdgtohhm X-ME-Proxy: Feedback-ID: ifd894703:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 2 Feb 2024 07:30:34 -0500 (EST) From: Jiaxun Yang Date: Fri, 02 Feb 2024 12:30:26 +0000 Subject: [PATCH v2 1/3] ptrace: Introduce exception_ip arch hook MIME-Version: 1.0 Message-Id: <20240202-exception_ip-v2-1-e6894d5ce705@flygoat.com> References: <20240202-exception_ip-v2-0-e6894d5ce705@flygoat.com> In-Reply-To: <20240202-exception_ip-v2-0-e6894d5ce705@flygoat.com> To: Oleg Nesterov , Thomas Bogendoerfer , Andrew Morton , Ben Hutchings Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, Jiaxun Yang X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=2422; i=jiaxun.yang@flygoat.com; h=from:subject:message-id; bh=jqYI8HbcM9CNa56K9MGaAYkP5szfqvwINyuXO+HntBI=; b=owGbwMvMwCXmXMhTe71c8zDjabUkhtQ9D9L/qG88d2+OlHtP+o78T0s3chUbPZ8Uvzbu8jpWN g75zrbzHaUsDGJcDLJiiiwhAkp9GxovLrj+IOsPzBxWJpAhDFycAjCRVzMYGR6pPn00Z3LOVYMf +pd5H13RYA/4m6B+6ezjTK8Z5rkHPioy/FMONNv9ubG3cWFPxtH1qnK6706VPv38t/CF1H4RHyU PKx4A X-Developer-Key: i=jiaxun.yang@flygoat.com; a=openpgp; fpr=980379BEFEBFBF477EA04EF9C111949073FC0F67 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 42E751C0024 X-Stat-Signature: rtsxmpmgqfhd4j9theyo6za73mw7shtf X-HE-Tag: 1706877037-817679 X-HE-Meta: U2FsdGVkX1/KcY8C2SPpPbauKHzx0CUnb57Ts80liJU27ssJrNmTbnYNRt7MGBAm2JbBXmRISSzFgg5nirbkvqRGy2eRAGfJ0A7PdPwBhxcFpES8TWYMoC8hGmlgoLxLZzrJaqcYWYKoiIE+hqbUJ4njungl3P8jZb2/R1uL5LUZFHM7IZ9X7dAafWObDGYwRY+lVliqPXF/Vm72+jzQr24qVijrYx2EnzBRVGG9Ds4vA/OBKUHUzkDgbuOKuLnjRq4oYAp7NAkkEXt4RJ8Dr/YO1iMzFXE+tDIq6Q5Oxq6wCpMGDAWuL5+BGEzLMU7M3cFgYLFZxvUGdYkqpcG8adjpUJOSeEJYiCM1fThZKnu/IguM5Qqi/PCiQygZji+k6Kf6g2kB0UvecSBUw7FeamWvTHbE9+nWbybJjkCMPBTtM3/h54Ifr/kCFdQlHUlvAbUWUDsBuf4JSbcat1X9Kc+gOilRwJZ8RfOvcA3FwGNnFD9ARXTC8EJXmQzUnjlA2l+Aq8twLB/HKE7JiSKODuqSvfkYCyBv/ep3d5VBe0u0Sx6CyuBHkPwmWl7LvVSf5ZAKooP65HdoPwYbIKm/3WsMgn0WI5Te9eVPsFjZrq+G/4F9/ckcWGgV1VzPXeq0f5HA3ozJk2RB4XN9ojwkITQYu/AG2RQ/4DHULnNPnMDVuMWtMwbFi0OHbu3iILSRa+09Tinpq6tqQ5QY7xoGI3ICru9JQbGC1izL6RTQ5/U/3RDWgGNG/OwRmuWO7ufxylqNgklX5KUKb2FgY88vwIniko/E66AKPSLwDGY/I8oXMp0NwoQ3SE3X20t6bOHE2+r1Hy4MRBB8ZaE/rfvdlRD87JXbx6ZuU4AnamylcIr27mJniJzZDGAqlD4BwMVo+eNje3Cat8f8GZeXaZMBx4ljrHZP98ssMuGaoBTvolGnC5RcFePp8s+64xZ+liOTviOJBfNvqoS4+8hAWzp wwtpAKSR 8vi6mE8abiEGLFD6ZJTsh0HPsi0jVjl7U6Sl/jKO+t4JG5Y79pgJbxCb9QZ88s4c8jJjZNejdI/GEGco8qNP74RvjNpt4YZajyoRnurDMiIGAiyLHyye5Ku71VX5Mqdh5q6ryB3fFtpAYLtsLnJ4Hk6yA3ZbpKNCXCprgu1GTXs6fWar80WtxnMoY1GRQMroWJvzIZ2pZqbSASlERq+Qsvg2TCX8cSL8nQvOrkMphzsXIT9U01z0qE0fp3920v5sLcRw/8Rhd9gfjtlb7pQfs1QeiebRv3S6dN4/Rfud04UgkC7MOKiqePfdZEsilJxtQUFgYOc2caViN98N777myQvk+q+B1jqTSCAmzhUCaIRCXZqxX2Izkx5KWu0+gQuwRFonoiaZ73SeH8SDhvEL8GyB5XzZF820tkFDcMT3nTiGuDZZmhhSVpC5Uoq/kXriXgr8N76oCcnLSw2p8+gB3XiTvPpxK0L+igy1hGlPuLaI27uzDxtvIHNbBZg== 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: List-Subscribe: List-Unsubscribe: On architectures with delay slot, architecture level instruction pointer (or program counter) in pt_regs may differ from where exception was triggered. Introduce exception_ip hook to invoke architecture code and determine actual instruction pointer to the exception. Link: https://lore.kernel.org/lkml/00d1b813-c55f-4365-8d81-d70258e10b16@app.fastmail.com/ Signed-off-by: Jiaxun Yang --- arch/mips/include/asm/ptrace.h | 2 ++ arch/mips/kernel/ptrace.c | 7 +++++++ include/linux/ptrace.h | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/arch/mips/include/asm/ptrace.h b/arch/mips/include/asm/ptrace.h index daf3cf244ea9..701a233583c2 100644 --- a/arch/mips/include/asm/ptrace.h +++ b/arch/mips/include/asm/ptrace.h @@ -154,6 +154,8 @@ static inline long regs_return_value(struct pt_regs *regs) } #define instruction_pointer(regs) ((regs)->cp0_epc) +extern unsigned long exception_ip(struct pt_regs *regs); +#define exception_ip(regs) exception_ip(regs) #define profile_pc(regs) instruction_pointer(regs) extern asmlinkage long syscall_trace_enter(struct pt_regs *regs, long syscall); diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c index d9df543f7e2c..59288c13b581 100644 --- a/arch/mips/kernel/ptrace.c +++ b/arch/mips/kernel/ptrace.c @@ -31,6 +31,7 @@ #include #include +#include #include #include #include @@ -48,6 +49,12 @@ #define CREATE_TRACE_POINTS #include +unsigned long exception_ip(struct pt_regs *regs) +{ + return exception_epc(regs); +} +EXPORT_SYMBOL(exception_ip); + /* * Called by kernel/ptrace.c when detaching.. * diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h index eaaef3ffec22..90507d4afcd6 100644 --- a/include/linux/ptrace.h +++ b/include/linux/ptrace.h @@ -393,6 +393,10 @@ static inline void user_single_step_report(struct pt_regs *regs) #define current_user_stack_pointer() user_stack_pointer(current_pt_regs()) #endif +#ifndef exception_ip +#define exception_ip(x) instruction_pointer(x) +#endif + extern int task_current_syscall(struct task_struct *target, struct syscall_info *info); extern void sigaction_compat_abi(struct k_sigaction *act, struct k_sigaction *oact); From patchwork Fri Feb 2 12:30:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiaxun Yang X-Patchwork-Id: 13542889 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 CF3F5C4828E for ; Fri, 2 Feb 2024 12:30:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 48FE36B0078; Fri, 2 Feb 2024 07:30:41 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 422046B007D; Fri, 2 Feb 2024 07:30:41 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2789A6B007B; Fri, 2 Feb 2024 07:30:41 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 017B66B007D for ; Fri, 2 Feb 2024 07:30:40 -0500 (EST) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id CB0051C0E08 for ; Fri, 2 Feb 2024 12:30:40 +0000 (UTC) X-FDA: 81746797440.09.7A351E1 Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by imf13.hostedemail.com (Postfix) with ESMTP id B87862001F for ; Fri, 2 Feb 2024 12:30:38 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=flygoat.com header.s=fm1 header.b=KPCaY3+u; dkim=pass header.d=messagingengine.com header.s=fm3 header.b="y PVF2ep"; dmarc=pass (policy=none) header.from=flygoat.com; spf=pass (imf13.hostedemail.com: domain of jiaxun.yang@flygoat.com designates 66.111.4.28 as permitted sender) smtp.mailfrom=jiaxun.yang@flygoat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706877038; a=rsa-sha256; cv=none; b=WNGo4vpaY+ceT4KWb+0Hk3dsI/0tSV/5SOJFnPYeAnN6wxiqDVxN+dRjwxjnOJKz/3mKkn gdhK5o4r8iNXmWLe2hNTJDSXBTn9a4qBfuhqU4fFbTXq+X1u78lebSAgRl8flL+8rAVLIu AtJpeXfkg1riGQhIN4mZy+u5gZM9cjU= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=flygoat.com header.s=fm1 header.b=KPCaY3+u; dkim=pass header.d=messagingengine.com header.s=fm3 header.b="y PVF2ep"; dmarc=pass (policy=none) header.from=flygoat.com; spf=pass (imf13.hostedemail.com: domain of jiaxun.yang@flygoat.com designates 66.111.4.28 as permitted sender) smtp.mailfrom=jiaxun.yang@flygoat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706877038; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=w2r17fGseyKoUkYg1Q+CG1Kwf5xRgoFxjWp3QiPCMOY=; b=tcxzLBYb4pZm1AIbb99SKpWe5NTvLvrAlQDz/xtPOMpSRlcH+XlNnvY6DOcjvyL1hFoxOL IE36hz9Pv8PK9r6WCt18FqX/3S6PGluVZfJKvkgM7uW+gnhSBw0PWrC9TrGcqqXQor993g fuC+DjHFWR1CCc3Gxj6/Vvu7vt4Rmuk= Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 00D0A5C00C0; Fri, 2 Feb 2024 07:30:38 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Fri, 02 Feb 2024 07:30:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flygoat.com; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1706877037; x=1706963437; bh=w2r17fGseyKoUkYg1Q+CG1Kwf5xRgoFxjWp3QiPCMOY=; b= KPCaY3+uIJ73xN9kmYWwqgB93DBfywxqEdTVF6jc120MMGM0qem41ii6ITXekWMz VBrSyQbOQFobNNMOYtJbqvUhxmtWSVWUogeU9JxxLmq05JvxZetbuaVM8hFwtZc7 B+dlZAVTfVuWDfXAy6QGqW6YSij16X4jDd73BiueETOXlSy2csX5Su4y+mBe6Zue FDZIj8Mk8xs4vvI5W7S86b8zCJauqXvPqpGTya19/yJvq6dKYZb1UvcYAbflthp9 2Su/6ZEeuTXPGiTorKVckNAGL24Jk3/kE/y84EUkHooM9TkQQjIHzagTBvRaad5M m2bsiZJgHM3sTlhiUx3AYg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1706877037; x= 1706963437; bh=w2r17fGseyKoUkYg1Q+CG1Kwf5xRgoFxjWp3QiPCMOY=; b=y PVF2ep61M5MoWsoGtC6vryilWqWoSPCuYHTkRIUxkp2m+XgU2WglQGeTgqMRkWen z3n/xeXDSYWxohz/3+6PfCnngrXxukbjVlgRq/M3TbTRhIytfk3C52Q8reQIwY8Y LhlxM1J1GBRMp/5yY34id+Y/jJyXHDFlIlQBTxxvsK3b/y3sZ1oWp3d4a0ZCGQBd mhawXZ3huHsn/FEiDGAcrMNf/6j2mYVmMK5GbdhWDvMmIja2QU72CFCs32FpS54m c4y9+s/rCgzw3TAy1OwJ8QsuYM1UPwOcZ8zjmbL3cQNTtwI77TfFYR1dyB59Btly nIU18gB2KMbJuwqTFfCsg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrfedugedggedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertdertdejnecuhfhrohhmpeflihgr gihunhcujggrnhhguceojhhirgiguhhnrdihrghnghesfhhlhihgohgrthdrtghomheqne cuggftrfgrthhtvghrnhepvdekiefhfeevkeeuveetfeelffekgedugefhtdduudeghfeu veegffegudekjeelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomhepjhhirgiguhhnrdihrghnghesfhhlhihgohgrthdrtghomh X-ME-Proxy: Feedback-ID: ifd894703:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 2 Feb 2024 07:30:36 -0500 (EST) From: Jiaxun Yang Date: Fri, 02 Feb 2024 12:30:27 +0000 Subject: [PATCH v2 2/3] MIPS: Clear Cause.BD in instruction_pointer_set MIME-Version: 1.0 Message-Id: <20240202-exception_ip-v2-2-e6894d5ce705@flygoat.com> References: <20240202-exception_ip-v2-0-e6894d5ce705@flygoat.com> In-Reply-To: <20240202-exception_ip-v2-0-e6894d5ce705@flygoat.com> To: Oleg Nesterov , Thomas Bogendoerfer , Andrew Morton , Ben Hutchings Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, Jiaxun Yang X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=860; i=jiaxun.yang@flygoat.com; h=from:subject:message-id; bh=eEckd5oJQ3BVb3TI50bExWCbMqs/5XPSjzMz9OXoNmg=; b=owGbwMvMwCXmXMhTe71c8zDjabUkhtQ9D9KbxBb5s2avMMxZk/Fa1OTF/ICgHV78MjaFTJtvf f35OXBNRykLgxgXg6yYIkuIgFLfhsaLC64/yPoDM4eVCWQIAxenAEzE9Dsjwz6v/vdH3Fze1/99 FOW6+OMuxxvHUq8msNTf6zrBPE9PsIThr3h4jgr7uXVaRkt3sXl2P3nPWfRUcFd+muzkppu3Vhz /zQAA X-Developer-Key: i=jiaxun.yang@flygoat.com; a=openpgp; fpr=980379BEFEBFBF477EA04EF9C111949073FC0F67 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: B87862001F X-Stat-Signature: rx4kurkpx36h9rkejjyrt3q9yhfomyin X-HE-Tag: 1706877038-441564 X-HE-Meta: U2FsdGVkX1/kwyhRFmOafTXzukk1Rm/osso+GJproPwPRpfYANoUbqU/ZkbEtI3v9/FoU6RcDJZLL30PiGMCKgDkxF9O6NvtSkIu48Xxy6/Suf5rzoMyy5dVAPv51laczqpCiqBtaJvaE4TV2Yw7l69J4J+BV6va7F7ndE5osL5f+slBb1hSQIYE1nZ30srcoH5+8KfqS6y3HVqVJ0dhkDFMCd/3BWYbLz5Ryd6rCgVzrfjSD7mgSajmB1YaCKwqnXVWfx0GLw8f3//n8ETAp8LHQVAayNSXKlxsBzrvlEg6w6EfgqzZddlu63nV2gWsKYNVnKaXmJlgYEMKlMu4I0A/cprWq97inDpiCtyu/KY1+dAvIWxYtd+mdHqBM/6lMla/FdwGuOeqeaZyhE5M5RmXVE4iQ/8VVM8Rwz9DbfMukY5n4hFLha9iyYWv2C8gnkqfikeOzzG+V3qFDB5uhlx6QzeYOmWP8UgkmQZhPZgo4HQfiquEqMEeqRKZGyFc2MqKF3v2U3arMyQutoxiDVScXzAluGUNYnYrImKHkhU72AXTpjtQPlLHtl+6jepmsTZ9a/x9+KRAARyVA5kjEvK6/64Ri7yfeWdBwSsVXYvUvZGgi5RT27ykDPHaXekb1AJ3/lX8aZMvwHbioHmwqUwePHMFneZb257Apk1IgO+sAHJnAUs6BFEC52z/tjSg3RNujOrbKiMckvwP0Xw6/5XEjuLdgVIpqyTyPCUPLNH8KJMduIDfWw/RTvLetUlwL6lQqd6472BxsVMOAAFLxg1aux38Z/UYanDdmJSw3CpWz3hYZKZh1KKXIwe2GsWL4RogKdLHu6mwt8n+CfUNtN1cUvv2cipO0Rj6QuRVEGIDPEInacHsV2zwJlpRIsSruAbSCHJxv3kg2Bxp1TqKS+SsWZG8+Anr0smyqXDrvZRogxYMDRr5qmDTsDEbUmltPjSTQxGFr7CB9uTtdK9 L960Ky25 2t4Jf0o3AGsvlxpgYug1KmgGWAPJl8ZJf7yofPhVAGiycpRIsR7/To3TLgYW1ouvPwXOWP2VvpIIGr78O5LcfFxYMDio3fQiXx6nmglHBt5PzBpjSFd/ptzMhgSTT/B+XANa/3+nFKMx8IVPhWSAxDEl87drctpPPkx99onzlHoQeW7I2Bmf5P04lMUacKAWglg8zVrmfLe/j0FSnovYVfXm2MbXCjvnFDmko9scSERmNpSe9rlX3Cd2jI9DmoHkBzqyeBzHw+CYa53sM2j2RuFQI5jGII/yJNmZp/uDarCgPh0AsZ3Am9ohLJe/AWTiCgqjJdD/bShNAXHW2oMHAjnEdcPhyfaViwBNJ8jwH1UQ4KDigAh3pE8p+lA== 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: List-Subscribe: List-Unsubscribe: Clear Cause.BD after we use instruction_pointer_set to override EPC. This can prevent exception_epc check against instruction code at new return address. It won't be considered as "in delay slot" after epc being overridden anyway. Signed-off-by: Jiaxun Yang --- arch/mips/include/asm/ptrace.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/mips/include/asm/ptrace.h b/arch/mips/include/asm/ptrace.h index 701a233583c2..d14d0e37ad02 100644 --- a/arch/mips/include/asm/ptrace.h +++ b/arch/mips/include/asm/ptrace.h @@ -60,6 +60,7 @@ static inline void instruction_pointer_set(struct pt_regs *regs, unsigned long val) { regs->cp0_epc = val; + regs->cp0_cause &= ~CAUSEF_BD; } /* Query offset/name of register from its name/offset */ From patchwork Fri Feb 2 12:30:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiaxun Yang X-Patchwork-Id: 13542890 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 88CC4C47DB3 for ; Fri, 2 Feb 2024 12:30:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 666546B007D; Fri, 2 Feb 2024 07:30:44 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5EF0C6B007E; Fri, 2 Feb 2024 07:30:44 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4906F6B0080; Fri, 2 Feb 2024 07:30:44 -0500 (EST) 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 296406B007D for ; Fri, 2 Feb 2024 07:30:44 -0500 (EST) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id BAB74160F89 for ; Fri, 2 Feb 2024 12:30:43 +0000 (UTC) X-FDA: 81746797566.03.35B78CA Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by imf30.hostedemail.com (Postfix) with ESMTP id 93A928001E for ; Fri, 2 Feb 2024 12:30:40 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=flygoat.com header.s=fm1 header.b=mNL2+pa4; dkim=pass header.d=messagingengine.com header.s=fm3 header.b="C q4Hswe"; spf=pass (imf30.hostedemail.com: domain of jiaxun.yang@flygoat.com designates 66.111.4.28 as permitted sender) smtp.mailfrom=jiaxun.yang@flygoat.com; dmarc=pass (policy=none) header.from=flygoat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706877040; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=PkffIQ/TwdfU+2w1YXK1H3DJt1XQppKKQHpkyIAY8Jw=; b=IAUf9Ki12+lQIgNX18S+ZN8zQg1NUaXBZdDYkmxjXhUNG9K7mEyrj8TFaCXKRLtAlSa10h EH49sA9yUtblXRc+9LX59t+/2YRExOleXF8oRSRdLF2D5QPKsPkXbVIGi3BzjFR6HiblmM NFnXRdhInMoCC/8SGoZAPo5GMb8k1LM= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706877040; a=rsa-sha256; cv=none; b=p0Saa3Fs5AzvsO1PS/gRq7C0mu902A1wrtfXvSitowhYXx/hanXiESCaic0eC6m8394uZg NXhi7y535v67mzjeOTCXqMk4mTJxQ6OMYA66WoLohQty19HEJr1CGfYeV1zn+wKHHYOU8W wrrDTLIJA4q93aVP5nBeQJvbDETQX24= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=flygoat.com header.s=fm1 header.b=mNL2+pa4; dkim=pass header.d=messagingengine.com header.s=fm3 header.b="C q4Hswe"; spf=pass (imf30.hostedemail.com: domain of jiaxun.yang@flygoat.com designates 66.111.4.28 as permitted sender) smtp.mailfrom=jiaxun.yang@flygoat.com; dmarc=pass (policy=none) header.from=flygoat.com Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id E94335C0180; Fri, 2 Feb 2024 07:30:39 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Fri, 02 Feb 2024 07:30:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=flygoat.com; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1706877039; x=1706963439; bh=PkffIQ/TwdfU+2w1YXK1H3DJt1XQppKKQHpkyIAY8Jw=; b= mNL2+pa4mBLckcf1YJNeLqeEfEkNIjSaMXoe0/FrLp02SzGJ1t3KLW7TQO9OrUXc gptTiPkf6xEJzcFsrJmmaP3fCsUyMqC7xRA+KTwybjnLjZRd0HzgwV0Hpw2bMevY DQ+bVp6Wcbe2sKmiK7UhkyRCrq1BPPCVpVdSbfPG+667OCbV20W7ydPsxLBgVJMH PVwxt+msm8xw2LScDcgmsw9zYJAtlnk2NZIT8KBu45qMK6XCj9Zu+luAq6INNCTz MKRctK4ygm6lXXS8eruWRjzvu8IRq6ynqU9WCHZjFBVUj/OjDLAgRPoGsOVl8MQv ymUfDDIqKWIrUCROGYDowQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1706877039; x= 1706963439; bh=PkffIQ/TwdfU+2w1YXK1H3DJt1XQppKKQHpkyIAY8Jw=; b=C q4Hswe3VCvFGloX8BaUea0BX+Tdp6jIWtdo/NcLMOZ56e2czWHNGBPkiuQbNdzBb HBcnE/O0bfvlN2FqY6HlgqPif8XK2+JNKeADBQsfNLfGp3S7Sp88DXOuv7KROL1M qxYc/MyR+MFHX78qRaPRY1BTHlQgtAwnrxD4cVxCo6jpNlPMqWNmYWKx0HxbUh3V wtwSxtMqXbBHWYzIW6RDV58pXcBTsqQEVKXe3gt3wkwFWhOl69ipCtLw8ErunLPu rjLwCcAM/gYCPYwRX1+qpa/wHGqP1JVs4qH6fUfdd60GVpbNtxrx+5sCKB6OCqeW pPmUmusVQfxGge/Nohhaw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrfedugedggedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephfffufggtgfgkfhfjgfvvefosehtjeertdertdejnecuhfhrohhmpeflihgr gihunhcujggrnhhguceojhhirgiguhhnrdihrghnghesfhhlhihgohgrthdrtghomheqne cuggftrfgrthhtvghrnhepvedujefhfffhveekhfffkeetvefgteejkeeutdduieehieeg feejtdelveejtedunecuffhomhgrihhnpehkvghrnhgvlhdrohhrghenucevlhhushhtvg hrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehjihgrgihunhdrhigrnhhg sehflhihghhorghtrdgtohhm X-ME-Proxy: Feedback-ID: ifd894703:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 2 Feb 2024 07:30:38 -0500 (EST) From: Jiaxun Yang Date: Fri, 02 Feb 2024 12:30:28 +0000 Subject: [PATCH v2 3/3] mm/memory: Use exception ip to search exception tables MIME-Version: 1.0 Message-Id: <20240202-exception_ip-v2-3-e6894d5ce705@flygoat.com> References: <20240202-exception_ip-v2-0-e6894d5ce705@flygoat.com> In-Reply-To: <20240202-exception_ip-v2-0-e6894d5ce705@flygoat.com> To: Oleg Nesterov , Thomas Bogendoerfer , Andrew Morton , Ben Hutchings Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, Jiaxun Yang , Xi Ruoyao , Linus Torvalds X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=1379; i=jiaxun.yang@flygoat.com; h=from:subject:message-id; bh=uKuLCoMYm7TN/5FDEmNqhpyC6JKJvRlQkX2qQKN8ZTg=; b=owGbwMvMwCXmXMhTe71c8zDjabUkhtQ9D9I5oxxuhtd5FaqYPUoS1m9SED32vzE+yratNz1t6 f17PZwdpSwMYlwMsmKKLCECSn0bGi8uuP4g6w/MHFYmkCEMXJwCMJGpQQx/xT/dPrVBSu154PLX /HJvTZJnd/7847ilbPm6i5kqQk9unmX4yVh5i+20gXjQviW/jx/ZZs6cUhVptrg1LabUvf/G1MP JLAA= X-Developer-Key: i=jiaxun.yang@flygoat.com; a=openpgp; fpr=980379BEFEBFBF477EA04EF9C111949073FC0F67 X-Rspamd-Queue-Id: 93A928001E X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: qrm66w9qga38sopjmp5qi9e44hwnpinr X-HE-Tag: 1706877040-182947 X-HE-Meta: U2FsdGVkX1/3IdOH0u19/W8EWJWjfglRmHn0XrmX4vQ/QzCBgff4m64DpUKKfwMxaqmGKvkJGmjF+kJaMCJxgYk0PpW+0ttRlTqYJxZW8CI95wXNWE44Q3A7Gw1ZJTtBaF26Iz68xfFZ8flW5Fup4qPexsBOeyMHYNS2E/m7DGWQrq9z6eOUOuwr1QlxgL/mnGR5udF/KqWfYgDuXKii/pnZmikHV0LlzVSaU+7xUMyST9XY5YVrP8kpZBVW/5liJp10GxvZ2VP+oXmExYOg/58Pbjee0+i7Uuj6PUpHUlOt6rffX3rrwUJNWTrA/+ZdDrH1zXstnsa9URnmJxxtEN+P35d27P9aFmoap2kBh+P/XmLvYjAjajDr6AX3rFRfs2rjiu3dVieQ8sDsasdN8wqu5yXIkVHWxwdeSJtqKlo3W4uQbb5ybuTAdunrjmIH7zkktj7d4jRchfUvNa309y+OeV2jv/JR9BQY+q1ySAJcKWxrwq5rSWhG3hLCVwTPEqM0dj9VezlHvAtAE/QRkwavn3yZP5okdK93P81v9MD3Mh7Nmbn0FVJ0YsAAGgKLlvqCS1cG4ykybJQXHCHqJ6v4NF6Ypq9xua6iAd5mXTNfogi5Q/uUwfLTUkrwVb4btwUjYtYY+CaQXcDn+AU7Wc+QX2/l82IRwVt4Wz+Hx/nBON7jVN3elchQNUvmxT4atldyBush3/ZvucX3Lj2kXcVQCtwxRm29pHlJtdl7lKfJz5ep3t3Qly6+hPf2lhvp3fOqBC0ExzFJRQbYLTG5ASA+ux1TG9ppAAbZpRq3G5vb5N3xpRGq2qu849WUzAfz0Sf13ThrpCyuuBy6PEmnOVViiUBJC/gFEaJH1xyEv410PW3Buz53X6OfbeOw6dzJONZ/ztqp7dgb0I7sW09FkJC6a80iNQ6ZM85venIs9xKtZASNGWDvo9VpGsPWRiI5qaAB7h+ngL0nUfiGEOp Im5kYsei xUPUW30wZk5wM8RA1v4Ar0XYoImXtKFbn4dqMRd+I5UtxG0h4On7eS2lCTY3zjiB2xPMuaWelY3KkgKB+n+H2gqTHvS9Wr3jq8u0BHZLb7Cq8+W41s5QasTesY1vEJzKw1utnxtTiNIopcoeqiuzoAvws1slmRrQL/MuMd/MwsdVqw2m91qY8hbYnLb8WwR7cyhTffRharYzn2fH/CHbsHX2gCNGIBKCBGcYCOwku1kiyfXJUYDUiaSwHpuScWxZ26ftdh8iIzFHrBFsTC2S8O2U3+DxyKVI+WQXzWHgNmuzy8e2BsVbzQKkHP5LBWPRMmDLFf1S8dq5kR8dMR3acsZMWo3BctBrkftJuKJgQdtwmk22hUBV+70MNV7rfGK40I0sW7KB3s/R2fS0OhC9mzbkFWpVMFg2EH5w7IS6Y5GFKHstIXdgIFi5TFrEItobjDA43 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: List-Subscribe: List-Unsubscribe: On architectures with delay slot, instruction_pointer() may differ from where exception was triggered. Use exception_ip we just introduced to search exception tables to get rid of the problem. Fixes: 4bce37a68ff8 ("mips/mm: Convert to using lock_mm_and_find_vma()") Reported-by: Xi Ruoyao Link: https://lore.kernel.org/r/75e9fd7b08562ad9b456a5bdaacb7cc220311cc9.camel@xry111.site/ Suggested-by: Linus Torvalds Signed-off-by: Jiaxun Yang --- mm/memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 8d14ba440929..49433612444a 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -5481,7 +5481,7 @@ static inline bool get_mmap_lock_carefully(struct mm_struct *mm, struct pt_regs return true; if (regs && !user_mode(regs)) { - unsigned long ip = instruction_pointer(regs); + unsigned long ip = exception_ip(regs); if (!search_exception_tables(ip)) return false; } @@ -5506,7 +5506,7 @@ static inline bool upgrade_mmap_lock_carefully(struct mm_struct *mm, struct pt_r { mmap_read_unlock(mm); if (regs && !user_mode(regs)) { - unsigned long ip = instruction_pointer(regs); + unsigned long ip = exception_ip(regs); if (!search_exception_tables(ip)) return false; }