From patchwork Thu Dec 26 10:45:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Celeste Liu X-Patchwork-Id: 13921237 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 7A61BE7718E for ; Thu, 26 Dec 2024 10:45:56 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vNoWlUcyoba4OeD0myDPDMIJKczca5JZKNKrjI4wKDk=; b=dXeWk+Aa7dx6uV SVi6hY0yrJo9lmFlBNkpqr1iIhD6ijjhGV66tHA8DtTG7QsI0qD7bks2WdvbR0rQMLE5lOON+1RRT y8uhJqufRH99opJSpruq1+01bJx5zdm5zCP/K9zU+uHUrQpJQaL09gi9xlyGNK/qf5AxAXmGb6iCH DgYuBm73/yCf8OOUM8B3q4nLs9lcNvMvGowElHZ+Uufbb51uDOyjATgTt5e31qDil0k8fWkO38ZmN wL6YBvIC4AfwkQPdHJouraRuaXHwS+t5xdA7BMLZjce+5aMP/slpRBRWq66uokfaFwWqNrLfIvelA y3nmA7wXpbsEqELaRS5Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tQlN7-0000000Fd2p-1mdc; Thu, 26 Dec 2024 10:45:41 +0000 Received: from flow-a3-smtp.messagingengine.com ([103.168.172.138]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tQlN3-0000000Fd15-1WVG for linux-riscv@lists.infradead.org; Thu, 26 Dec 2024 10:45:39 +0000 Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailflow.phl.internal (Postfix) with ESMTP id BCC252005BC; Thu, 26 Dec 2024 05:45:36 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-12.internal (MEProxy); Thu, 26 Dec 2024 05:45:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= coelacanthus.name; 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=fm3; t=1735209936; x=1735217136; bh=ePabROfKQd 3trOxWB+908jisGE3fNauyk5nCt4vyino=; b=WJCKp/yHbthI8T+qhG/lyB8sVl YkBdNRi92T7EjmfAbW05WfVUqDu6jMu/pV3O3UDDFi3bwVIIA5zyZO5UtSzIlteK OjuZ8aMVHFdrFILJ+CDVV3Q6uZzvcZOBDQfjedKCJwlS5ckYzekFayuJxhWPCIAF SjkG5pgUr63vrT0O18uKxwyeWkCVFU57zuA49U3lZ4FBrOdE9O11FoEUjTcCISmK lNnxGP7k4CrA/l+5PlRQdktO30wi2umtCXxTp9NQAZa4bR8PIXO9a4L4pgao7Q2q NOvn9Z5T+S5p5QFxpuXUmKX8Bk+nCrK0/R5c1Rd463frn54ZqIb3i5AcFN9w== 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-sender:x-me-sender:x-sasl-enc; s=fm2; t=1735209936; x= 1735217136; bh=ePabROfKQd3trOxWB+908jisGE3fNauyk5nCt4vyino=; b=e CDGpgifKLN6SqZU5GgHiZkzD9f3gSYBbWmMcaEC1BB+hlYeLabPw3gNh52pejqb/ 8WbiSTOTHWdFIdTFXZhW1QegDkIbCpMocpWKco/JtlFIDfM1ypfn+v3h3j7+40yB +ox5zGQJGuP+1B2I3NtCfXxRiMpUrXg6q/nsP5RkvQxyxqe/be9ZBE0wFxnZeMJt zi5vSene5LV0etexLECP0WxSuNVIVrr02y5FcVPgKGUZvTlFaGJ8vyC0tlv3lb5b ZpZmLpAN3fQgW7eKhzDGqI5rUe3X0X1m1scff8dL7jy8PjT1KcIZ0J0qbqlwGQdi TFjzDhawAn5/zFoLqm4HA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddruddukedgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtkeertdertdej necuhfhrohhmpeevvghlvghsthgvucfnihhuuceouhifuhestghovghlrggtrghnthhhuh hsrdhnrghmvgeqnecuggftrfgrthhtvghrnhepueeigfduffelffegiefffeeffeeileev jefghefhjeffueetvdffieduvedtleegnecuffhomhgrihhnpehkvghrnhgvlhdrohhrgh enucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehufihu segtohgvlhgrtggrnhhthhhushdrnhgrmhgvpdhnsggprhgtphhtthhopedvjedpmhhoug gvpehsmhhtphhouhhtpdhrtghpthhtohepfhgvlhhigihonhhmrghrshesrghrtghhlhhi nhhugidrohhrghdprhgtphhtthhopegrsgholhhoghhnrgesrhgvughhrghtrdgtohhmpd hrtghpthhtohepuhifuhestghovghlrggtrghnthhhuhhsrdhnrghmvgdprhgtphhtthho pehlihhnuhigqdhrihhstghvsehlihhsthhsrdhinhhfrhgruggvrggurdhorhhgpdhrtg hpthhtoheplhhinhhugidqmhhmsehkvhgrtghkrdhorhhgpdhrtghpthhtoheplhhinhhu gidqkhhsvghlfhhtvghsthesvhhgvghrrdhkvghrnhgvlhdrohhrghdprhgtphhtthhope hkvggvsheskhgvrhhnvghlrdhorhhgpdhrtghpthhtoheprghjohhnvghssehvvghnthgr nhgrmhhitghrohdrtghomhdprhgtphhtthhopehshhhurghhsehkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i95c648bc:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 26 Dec 2024 05:45:35 -0500 (EST) From: Celeste Liu Date: Thu, 26 Dec 2024 18:45:09 +0800 Subject: [PATCH v3 1/2] riscv/ptrace: add new regset to access original a0 register MIME-Version: 1.0 Message-Id: <20241226-riscv-new-regset-v3-1-f5b96465826b@coelacanthus.name> References: <20241226-riscv-new-regset-v3-0-f5b96465826b@coelacanthus.name> In-Reply-To: <20241226-riscv-new-regset-v3-0-f5b96465826b@coelacanthus.name> To: Oleg Nesterov , Paul Walmsley , Palmer Dabbelt , Eric Biederman , Kees Cook , Shuah Khan , Albert Ou Cc: Alexandre Ghiti , "Dmitry V. Levin" , Andrea Bolognani , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , Thomas Gleixner , Ron Economos , Charlie Jenkins , Andrew Jones , Quan Zhou , Felix Yan , Ruizhe Pan , Guo Ren , Yao Zi , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, Celeste Liu , stable@vger.kernel.org, =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=3197; i=uwu@coelacanthus.name; h=from:subject:message-id; bh=ltD8Q1yJuFcwflR+5zmJHqfB8aeFKvQGlw/4hXFU+gg=; b=owJ4nJvAy8zAJeafov85RWVtBeNptSSG9FzjfcFzW5JSdpl75XUxC/ltnaLIqDsn6mp9ALeE/ /UNjTpGnztKWRjEuBhkxRRZ8kpYfnJeOtu9t2N7F8wcViaQIQxcnAIwkbY4hr+CYlO/Xjrb7vv1 +Z2EKf+Uc45vtstX3O5heYTPZ/69PkYfhv+pU2QfOJ+VmqvmXlw/Sez2geWKDfKuot+ldE1LVY8 xbeEGAGoyRRQ= X-Developer-Key: i=uwu@coelacanthus.name; a=openpgp; fpr=892EBC7DC392DFF9C9C03F1D15F4180E73787863 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241226_024537_573217_BB2104B3 X-CRM114-Status: GOOD ( 12.13 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org The orig_a0 is missing in struct user_regs_struct of riscv, and there is no way to add it without breaking UAPI. (See Link tag below) Like NT_ARM_SYSTEM_CALL do, we add a new regset name NT_RISCV_ORIG_A0 to access original a0 register from userspace via ptrace API. Fixes: e2c0cdfba7f6 ("RISC-V: User-facing API") Link: https://lore.kernel.org/all/59505464-c84a-403d-972f-d4b2055eeaac@gmail.com/ Cc: stable@vger.kernel.org Reviewed-by: Björn Töpel Signed-off-by: Celeste Liu --- arch/riscv/kernel/ptrace.c | 32 ++++++++++++++++++++++++++++++++ include/uapi/linux/elf.h | 1 + 2 files changed, 33 insertions(+) diff --git a/arch/riscv/kernel/ptrace.c b/arch/riscv/kernel/ptrace.c index ea67e9fb7a583683b922fe2c017ea61f3bc848db..ef9ab74c8575a5c440155973b1c625c06a867c97 100644 --- a/arch/riscv/kernel/ptrace.c +++ b/arch/riscv/kernel/ptrace.c @@ -31,6 +31,7 @@ enum riscv_regset { #ifdef CONFIG_RISCV_ISA_SUPM REGSET_TAGGED_ADDR_CTRL, #endif + REGSET_ORIG_A0, }; static int riscv_gpr_get(struct task_struct *target, @@ -184,6 +185,29 @@ static int tagged_addr_ctrl_set(struct task_struct *target, } #endif +static int riscv_orig_a0_get(struct task_struct *target, + const struct user_regset *regset, + struct membuf to) +{ + return membuf_store(&to, task_pt_regs(target)->orig_a0); +} + +static int riscv_orig_a0_set(struct task_struct *target, + const struct user_regset *regset, + unsigned int pos, unsigned int count, + const void *kbuf, const void __user *ubuf) +{ + unsigned long orig_a0 = task_pt_regs(target)->orig_a0; + int ret; + + ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &orig_a0, 0, -1); + if (ret) + return ret; + + task_pt_regs(target)->orig_a0 = orig_a0; + return 0; +} + static const struct user_regset riscv_user_regset[] = { [REGSET_X] = { .core_note_type = NT_PRSTATUS, @@ -224,6 +248,14 @@ static const struct user_regset riscv_user_regset[] = { .set = tagged_addr_ctrl_set, }, #endif + [REGSET_ORIG_A0] = { + .core_note_type = NT_RISCV_ORIG_A0, + .n = 1, + .size = sizeof(elf_greg_t), + .align = sizeof(elf_greg_t), + .regset_get = riscv_orig_a0_get, + .set = riscv_orig_a0_set, + }, }; static const struct user_regset_view riscv_user_native_view = { diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h index b44069d29cecc0f9de90ee66bfffd2137f4275a8..390060229601631da2fb27030d9fa2142e676c14 100644 --- a/include/uapi/linux/elf.h +++ b/include/uapi/linux/elf.h @@ -452,6 +452,7 @@ typedef struct elf64_shdr { #define NT_RISCV_CSR 0x900 /* RISC-V Control and Status Registers */ #define NT_RISCV_VECTOR 0x901 /* RISC-V vector registers */ #define NT_RISCV_TAGGED_ADDR_CTRL 0x902 /* RISC-V tagged address control (prctl()) */ +#define NT_RISCV_ORIG_A0 0x903 /* RISC-V original a0 register */ #define NT_LOONGARCH_CPUCFG 0xa00 /* LoongArch CPU config registers */ #define NT_LOONGARCH_CSR 0xa01 /* LoongArch control and status registers */ #define NT_LOONGARCH_LSX 0xa02 /* LoongArch Loongson SIMD Extension registers */ From patchwork Thu Dec 26 10:45:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Celeste Liu X-Patchwork-Id: 13921236 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 94749E7718E for ; Thu, 26 Dec 2024 10:45:51 +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:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=u/35elawEO2pochbuTaMBgy8ro+gQxV6BXPPlZBXBcc=; b=v0WTk8fDocMOz4 pfptWzCD/H24hjx/RYZneMkt6iwk5OTQFFAzHSa6ifLV/gqkfIvN++SHE4AvduRwCfAl7cV2H8t7i mB/aYvGibscHi4fIU3RgmY7lVQ7LD7XbT9I20jwUTDk8LzXz9XV3CAilxUcwyB4qumYRR5R+dFBSO NlyIp3hhD7MTMn6czeSskkxTXHNUMJMjS2hY0LdS2fC65iIcjbJbbouYAPGcTijMSSaGC8cDy9PIa UWg2Ur3GM5gxJ7j4sC3D+U7i9omOJhxKosDHpvdnZ9N9FUsm6obI7zNgdbdlZoojMkm4+rl1Pa/mq WNZAAUBRB8LBGUEhl0yg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tQlNB-0000000Fd4X-0a85; Thu, 26 Dec 2024 10:45:45 +0000 Received: from flow-a3-smtp.messagingengine.com ([103.168.172.138]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tQlN8-0000000Fd3J-3fU0 for linux-riscv@lists.infradead.org; Thu, 26 Dec 2024 10:45:44 +0000 Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailflow.phl.internal (Postfix) with ESMTP id 46FB82005BD; Thu, 26 Dec 2024 05:45:42 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-04.internal (MEProxy); Thu, 26 Dec 2024 05:45:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= coelacanthus.name; 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=fm3; t=1735209942; x=1735217142; bh=4Yi1afU0Pc Tb7IjinI272SW/UZ4NmwHY4mwQ9VbR8Ac=; b=dCBf+Vxt0Q646hDRolC6zJ6C88 +ZhD1IpfUsijZnoiA5aZ2XUwsmgasaOb7N05rwVyBRTK6geX6Z+h+k1MbEBL6/Vo aWM38NW6r/XbiZc1Rg818AGwpQyTVQ9wNgYxSvFAVHXKwOFdlX5ovssgi134aUm3 A73KNStxjD3oDx2uE0OW2PWZzUoFjxi4p27e65BzAPy3R7oX1doGhAhEbeq8to6A 27yv0FP1FXTlbiNuG60/4Ug0sns+j/YLuevhQt2M/g04uDMCsjFheprLg3LtALne iK/qjCip+ZHZrNmPfjryDiyzh/aNQeTQ3f9rqjlG5NWtwI6LBxpFGXrEGu2A== 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-sender:x-me-sender:x-sasl-enc; s=fm2; t=1735209942; x= 1735217142; bh=4Yi1afU0PcTb7IjinI272SW/UZ4NmwHY4mwQ9VbR8Ac=; b=E sdqqA/7GxYT3zyblIBwCs4vDbPencIe5YPgwgvZuHxmCk+LBK0hByllqgP5/ELId HdCSWoKCtalCxcDEXB1cZWNIz4ppUTnT61O1DNtOhHJfQx4umI6GvK3R9zifGr9q DcXXDGdGGloSdLj+L8/m6RmbxTjYs6HeKzhdc8VrVz6gOsy6MsnuB/5yImh559WN ALPS6HPcsP/6aA3ANJiYrhfHbnDgpwSEhx8L6B+R8GNeDC/AjEBw1iJbX0XhYwPF Nia/qmnO+sRPkC/lvHpBsKL7ivaggC+GqKOJAEoP/gAfpjOQ3MV5ylDPy7vpwbCD BSu4OJKtcbAhPNk1ZSMbQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddruddukedgvddtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtkeertdertdej necuhfhrohhmpeevvghlvghsthgvucfnihhuuceouhifuhestghovghlrggtrghnthhhuh hsrdhnrghmvgeqnecuggftrfgrthhtvghrnhepiedugeffhfdtueduudefhfefhfehjeej hfeukeehffefuefgueevteeiuedvtdefnecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomhepuhifuhestghovghlrggtrghnthhhuhhsrdhnrghmvgdp nhgspghrtghpthhtohepvdeipdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehfvg hlihigohhnmhgrrhhssegrrhgthhhlihhnuhigrdhorhhgpdhrtghpthhtoheprggsohhl ohhgnhgrsehrvgguhhgrthdrtghomhdprhgtphhtthhopehufihusegtohgvlhgrtggrnh hthhhushdrnhgrmhgvpdhrtghpthhtoheplhhinhhugidqrhhishgtvheslhhishhtshdr ihhnfhhrrgguvggrugdrohhrghdprhgtphhtthhopehlihhnuhigqdhmmheskhhvrggtkh drohhrghdprhgtphhtthhopehlihhnuhigqdhkshgvlhhfthgvshhtsehvghgvrhdrkhgv rhhnvghlrdhorhhgpdhrtghpthhtohepkhgvvghssehkvghrnhgvlhdrohhrghdprhgtph htthhopegrjhhonhgvshesvhgvnhhtrghnrghmihgtrhhordgtohhmpdhrtghpthhtohep shhhuhgrhheskhgvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: i95c648bc:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 26 Dec 2024 05:45:40 -0500 (EST) From: Celeste Liu Date: Thu, 26 Dec 2024 18:45:10 +0800 Subject: [PATCH v3 2/2] riscv: selftests: Add a ptrace test to verify syscall parameter modification MIME-Version: 1.0 Message-Id: <20241226-riscv-new-regset-v3-2-f5b96465826b@coelacanthus.name> References: <20241226-riscv-new-regset-v3-0-f5b96465826b@coelacanthus.name> In-Reply-To: <20241226-riscv-new-regset-v3-0-f5b96465826b@coelacanthus.name> To: Oleg Nesterov , Paul Walmsley , Palmer Dabbelt , Eric Biederman , Kees Cook , Shuah Khan , Albert Ou Cc: Alexandre Ghiti , "Dmitry V. Levin" , Andrea Bolognani , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , Thomas Gleixner , Ron Economos , Charlie Jenkins , Andrew Jones , Quan Zhou , Felix Yan , Ruizhe Pan , Guo Ren , Yao Zi , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, Celeste Liu , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= X-Mailer: b4 0.15-dev X-Developer-Signature: v=1; a=openpgp-sha256; l=6180; i=uwu@coelacanthus.name; h=from:subject:message-id; bh=RwziARy9LYogiNaY+tRNajVYbC8xlhPLfEfHo/RnxWo=; b=kA0DAAoWT2Qv82QkrXgByyZiAGdtM8KgQ1i1ZpH3yT+h91v9V4Ml592+z4QJ6bXiI5L5+PGi1 Yh1BAAWCgAdFiEEbnQE+QnSzYu9iLeKT2Qv82QkrXgFAmdtM8IACgkQT2Qv82QkrXj/uwEAiD+r uHX0W2AEe+ETcnP3pFvrPjh7a8vn/lXycVs5DDMBALCLKLmjd2KucK8JkpLyekJvdojEp7TzDND XeXMJ8pkG X-Developer-Key: i=uwu@coelacanthus.name; a=openpgp; fpr=892EBC7DC392DFF9C9C03F1D15F4180E73787863 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241226_024543_073354_C1C8F411 X-CRM114-Status: GOOD ( 18.76 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org This test checks that orig_a0 allows a syscall argument to be modified, and that changing a0 does not change the syscall argument. Co-developed-by: Quan Zhou Signed-off-by: Quan Zhou Co-developed-by: Charlie Jenkins Signed-off-by: Charlie Jenkins Reviewed-by: Björn Töpel Signed-off-by: Celeste Liu --- tools/testing/selftests/riscv/abi/.gitignore | 1 + tools/testing/selftests/riscv/abi/Makefile | 5 +- tools/testing/selftests/riscv/abi/ptrace.c | 151 +++++++++++++++++++++++++++ 3 files changed, 156 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/riscv/abi/.gitignore b/tools/testing/selftests/riscv/abi/.gitignore index b38358f91c4d2240ae64892871d9ca98bda1ae58..378c605919a3b3d58eec2701eb7af430cfe315d6 100644 --- a/tools/testing/selftests/riscv/abi/.gitignore +++ b/tools/testing/selftests/riscv/abi/.gitignore @@ -1 +1,2 @@ pointer_masking +ptrace diff --git a/tools/testing/selftests/riscv/abi/Makefile b/tools/testing/selftests/riscv/abi/Makefile index ed82ff9c664e7eb3f760cbab81fb957ff72579c5..3f74d059dfdcbce4d45d8ff618781ccea1419061 100644 --- a/tools/testing/selftests/riscv/abi/Makefile +++ b/tools/testing/selftests/riscv/abi/Makefile @@ -2,9 +2,12 @@ CFLAGS += -I$(top_srcdir)/tools/include -TEST_GEN_PROGS := pointer_masking +TEST_GEN_PROGS := pointer_masking ptrace include ../../lib.mk $(OUTPUT)/pointer_masking: pointer_masking.c $(CC) -static -o$@ $(CFLAGS) $(LDFLAGS) $^ + +$(OUTPUT)/ptrace: ptrace.c + $(CC) -static -o$@ $(CFLAGS) $(LDFLAGS) $^ diff --git a/tools/testing/selftests/riscv/abi/ptrace.c b/tools/testing/selftests/riscv/abi/ptrace.c new file mode 100644 index 0000000000000000000000000000000000000000..c89343cb4abc7da57f83879ecce619f503c438bb --- /dev/null +++ b/tools/testing/selftests/riscv/abi/ptrace.c @@ -0,0 +1,151 @@ +// SPDX-License-Identifier: GPL-2.0-only +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../../kselftest_harness.h" + +#define ORIG_A0_MODIFY 0x01 +#define A0_MODIFY 0x02 +#define A0_OLD 0x03 +#define A0_NEW 0x04 + +struct a0_regs { + __s64 orig_a0; + __u64 a0; +}; + +#define perr_and_exit(fmt, ...) \ + ({ \ + char buf[256]; \ + snprintf(buf, sizeof(buf), "%s:%d:" fmt ": %m\n", \ + __func__, __LINE__, ##__VA_ARGS__); \ + ksft_exit_fail_perror(buf); \ + }) + +static inline void resume_and_wait_tracee(pid_t pid, int flag) +{ + int status; + + if (ptrace(flag, pid, 0, 0)) + perr_and_exit("failed to resume the tracee %d\n", pid); + + if (waitpid(pid, &status, 0) != pid) + perr_and_exit("failed to wait for the tracee %d\n", pid); +} + +static void ptrace_test(int opt, struct a0_regs *result) +{ + int status; + pid_t pid; + struct user_regs_struct regs; + struct iovec iov = { + .iov_base = ®s, + .iov_len = sizeof(regs), + }; + + unsigned long orig_a0; + struct iovec a0_iov = { + .iov_base = &orig_a0, + .iov_len = sizeof(orig_a0), + }; + struct ptrace_syscall_info syscall_info_entry, syscall_info_exit; + + pid = fork(); + if (pid == 0) { + /* Mark oneself being traced */ + long val = ptrace(PTRACE_TRACEME, 0, 0, 0); + + if (val) + perr_and_exit("failed to request for tracer to trace me: %ld\n", val); + + kill(getpid(), SIGSTOP); + + /* Perform exit syscall that will be intercepted */ + exit(A0_OLD); + } + + if (pid < 0) + ksft_exit_fail_perror("failed to fork"); + + if (waitpid(pid, &status, 0) != pid) + perr_and_exit("failed to wait for the tracee %d\n", pid); + + /* Stop at the entry point of the syscall */ + resume_and_wait_tracee(pid, PTRACE_SYSCALL); + + /* Check tracee regs before the syscall */ + if (ptrace(PTRACE_GETREGSET, pid, NT_PRSTATUS, &iov)) + perr_and_exit("failed to get tracee registers\n"); + if (ptrace(PTRACE_GETREGSET, pid, NT_RISCV_ORIG_A0, &a0_iov)) + perr_and_exit("failed to get tracee registers\n"); + if (orig_a0 != A0_OLD) + perr_and_exit("unexpected orig_a0: 0x%lx\n", orig_a0); + + /* Modify a0/orig_a0 for the syscall */ + switch (opt) { + case A0_MODIFY: + regs.a0 = A0_NEW; + break; + case ORIG_A0_MODIFY: + orig_a0 = A0_NEW; + break; + } + + if (ptrace(PTRACE_SETREGSET, pid, NT_PRSTATUS, &a0_iov)) + perr_and_exit("failed to set tracee registers\n"); + if (ptrace(PTRACE_SETREGSET, pid, NT_RISCV_ORIG_A0, &a0_iov)) + perr_and_exit("failed to set tracee registers\n"); + + if (ptrace(PTRACE_GET_SYSCALL_INFO, pid, PTRACE_SYSCALL_INFO_ENTRY, &syscall_info_entry)) + perr_and_exit("failed to get syscall info of entry\n"); + result->orig_a0 = syscall_info_entry->entry.args[0]; + if (ptrace(PTRACE_GET_SYSCALL_INFO, pid, PTRACE_SYSCALL_INFO_EXIT, &syscall_info_exit)) + perr_and_exit("failed to get syscall info of exit\n"); + result->a0 = syscall_info_exit->exit.rval; + + /* Resume the tracee */ + ptrace(PTRACE_CONT, pid, 0, 0); + if (waitpid(pid, &status, 0) != pid) + perr_and_exit("failed to wait for the tracee\n"); + +} + +TEST(ptrace_modify_a0) +{ + struct a0_regs result; + + ptrace_test(A0_MODIFY, &result); + + /* The modification of a0 cannot affect the first argument of the syscall */ + EXPECT_EQ(A0_OLD, result.orig_a0); + EXPECT_EQ(A0_NEW, result.a0); +} + +TEST(ptrace_modify_orig_a0) +{ + struct a0_regs result; + + ptrace_test(ORIG_A0_MODIFY, &result); + + /* Only modify orig_a0 to change the first argument of the syscall */ + EXPECT_EQ(A0_NEW, result.orig_a0); + /* a0 will keep default value, orig_a0 or -ENOSYS, depends on internal. */ + EXPECT_NE(A0_NEW, result.a0); +} + +TEST_HARNESS_MAIN