From patchwork Thu Dec 26 10:52:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Celeste Liu X-Patchwork-Id: 13921245 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 2CBF8E77191 for ; Thu, 26 Dec 2024 10:53:25 +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=0Cz1Abp7S8/Eva 6LRP9KnRZTHpvBSQS534H9PsOdsPsXRcfeGrKDniDjrYOTX9Cx3DP0wVRQ7Ax35U+cAMo1NzYGNsJ AlLmGvKNjNJLaNM1F23slcWvp0p+RFMgTqkAwmFoMijhQaubC4pD4USVDhkozljVbBQp4SCtx3PRp a0KYswebzHZOglgdIQb+F2i2iomvSfa56KGT4Eax0YYFdV2H70PD+BKDOOG9UXMHXLwd8wQg1tHxk u49AFD/s3ZKdXddhsZm/fyetp6Glx3HYoJ3ZhNh34Xy9o93tKNgSzwgL9tn/bM9IOzHXvw6mhIoaj UPO6NwKmdJr8ms/wqSTQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tQlUW-0000000Fe8r-3HM1; Thu, 26 Dec 2024 10:53:20 +0000 Received: from flow-a7-smtp.messagingengine.com ([103.168.172.142]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tQlUU-0000000Fe7I-22SD for linux-riscv@lists.infradead.org; Thu, 26 Dec 2024 10:53:19 +0000 Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailflow.phl.internal (Postfix) with ESMTP id DCC1E200298; Thu, 26 Dec 2024 05:53:17 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-12.internal (MEProxy); Thu, 26 Dec 2024 05:53:17 -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=1735210397; x=1735217597; bh=ePabROfKQd 3trOxWB+908jisGE3fNauyk5nCt4vyino=; b=rD9gXZzzeY/BFFLeDTK+M8eWDC sxyaDkib164PwEXBBPfk+NtQyvRx4odo2EuajbKzWJXW3MmrJZSeStflC/oFLoMp PH3smBzWjE7zfMCFB6A2TY8JB3rrSFw4UeoBOKj01wFHaAsnrWtKB1Nk5rT/Naf3 YfKzsxMDMTJCpnUkIIvyjaPyDL4zqhLJm2Ed3IPrkjZD58wF5dUQsqP25GHHgsMK HOmvA8wB+mOlIcyLmuwbBKB+cx4Nla3NHOBAhCsPfJX2IE+44E1RT60Lk/WZjSYB S7KwzVDBGORRfcjEp/Xz2B3SXnQdYSjqQn5SFrnh6SLoOD+wCvUlmi0qo/hA== 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=1735210397; x= 1735217597; bh=ePabROfKQd3trOxWB+908jisGE3fNauyk5nCt4vyino=; b=Z o3dw23ye754fPrOuH5/urcUT506FtweUOPMa3qv+1Rq+mIHv5NFasjks9rrlPn0Y Q6KmTlFFJ8M0GFgXKx6F6BEVYsx78KVooEnWWfv7GcQQGFMRSljMrSMP96ulLS6m 8qwpikvxZfF7HB856qmOiU2fTA9uruaNYC8YjhoTB2m4zmdiMfATj0EFTQbAQy1F uMKeZOoAVWN7hTztqkPPA8nHfAOTNI6VvAVPyyGPESx46B32d96++v3mubNX0S6z uVBKRjopgOuSil2TEXyBHxElogWq5Inu1Vau/IEjm9MDZpGM+KanOhMJ/DD5eh9h pOcwD34s19V5u+NwC9u6A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddruddukedgvdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtkeertdertdej necuhfhrohhmpeevvghlvghsthgvucfnihhuuceouhifuhestghovghlrggtrghnthhhuh hsrdhnrghmvgeqnecuggftrfgrthhtvghrnhepueeigfduffelffegiefffeeffeeileev jefghefhjeffueetvdffieduvedtleegnecuffhomhgrihhnpehkvghrnhgvlhdrohhrgh enucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehufihu segtohgvlhgrtggrnhhthhhushdrnhgrmhgvpdhnsggprhgtphhtthhopedvjedpmhhoug gvpehsmhhtphhouhhtpdhrtghpthhtohepshhhuhgrhheskhgvrhhnvghlrdhorhhgpdhr tghpthhtohepfhgvlhhigihonhhmrghrshesrghrtghhlhhinhhugidrohhrghdprhgtph htthhopehprghulhdrfigrlhhmshhlvgihsehsihhfihhvvgdrtghomhdprhgtphhtthho pegrohhusegvvggtshdrsggvrhhkvghlvgihrdgvughupdhrtghpthhtohepuhifuhestg hovghlrggtrghnthhhuhhsrdhnrghmvgdprhgtphhtthhopehguhhorhgvnheskhgvrhhn vghlrdhorhhgpdhrtghpthhtoheprhgvseifiehriidrnhgvthdprhgtphhtthhopegsjh horhhnsehkvghrnhgvlhdrohhrghdprhgtphhtthhopehtghhlgieslhhinhhuthhrohhn ihigrdguvg X-ME-Proxy: Feedback-ID: i95c648bc:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 26 Dec 2024 05:53:16 -0500 (EST) From: Celeste Liu Date: Thu, 26 Dec 2024 18:52:51 +0800 Subject: [PATCH v4 1/2] riscv/ptrace: add new regset to access original a0 register MIME-Version: 1.0 Message-Id: <20241226-riscv-new-regset-v4-1-4496a29d0436@coelacanthus.name> References: <20241226-riscv-new-regset-v4-0-4496a29d0436@coelacanthus.name> In-Reply-To: <20241226-riscv-new-regset-v4-0-4496a29d0436@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=owJ4nJvAy8zAJeafov85RWVtBeNptSSG9FzTSayCcadjtL1TfZwFL4VaWoskah41DHl4IebMZ 7FL5VfXM3aUsjCIcTHIiimy5JWw/OS8dLZ7b8f2Lpg5rEwgQxi4OAVgIg0pDP99Fx6OOnhNRGqf 2n/7hM8WTOH/rmf/4M5+eEHWKeOfVcAvhv8+R+w5D20PWXlNYpeEz8QVso8sr2+7ZvHljK3kl+5 +7idsAH7FSLQ= 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_025318_602894_B5DDA04C X-CRM114-Status: GOOD ( 12.03 ) 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:52:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Celeste Liu X-Patchwork-Id: 13921246 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 06785E77188 for ; Thu, 26 Dec 2024 10:53:29 +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=asmrqNCFfIWcNl+XGNVp/OZryHw/4GE6BgK+nOp/dag=; b=ABXZZ7Q9otiael SnhEn+Pn7XRFzdL3Yel5bPOXBKsh/CABnUNZpNB/hHt/j038UyEXUpXgAR14Fa4E6OKmFpmwIG8gQ gA/vgmoroZVbQraehA/UpuELAGAZRPKvNIDoJfx1aG2g9fhd49iilDGu/3qRX6tcTwvk+8SuenMTQ VuKnlkiAqziGH6UAICUlFu04rngsEQt9olB/7XfGQaJ5SKILE08of2Z2kHlHHUUEVit9jYkJmCC96 DHYtMAZQy+CvkNS6A8/rvnwaaocVRsUfX51YSh8x80FyCLxaiiBYsaH1w5AUmhVXqFD7l3dHJsbPH sDe/kQBqMCXK0XjqWCZg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tQlUa-0000000FeB1-26qV; Thu, 26 Dec 2024 10:53:24 +0000 Received: from flow-a7-smtp.messagingengine.com ([103.168.172.142]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tQlUX-0000000Fe9D-3A3n for linux-riscv@lists.infradead.org; Thu, 26 Dec 2024 10:53:23 +0000 Received: from phl-compute-06.internal (phl-compute-06.phl.internal [10.202.2.46]) by mailflow.phl.internal (Postfix) with ESMTP id 2B3CB2002B1; Thu, 26 Dec 2024 05:53:21 -0500 (EST) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-06.internal (MEProxy); Thu, 26 Dec 2024 05:53:21 -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=1735210401; x=1735217601; bh=sEK+xPK5km /mZ+DWNzMlZAIQ7OUPbQ+75uTCBsT7PHI=; b=FkDXc9dTKMbNiPGPtcE/ilPFDR 5Mt+58TSxkTJBm6FmtVBLqb5/8ieshlPMz+IJN9tKIKpZM1aDYhxUHELjpitZPQl MX7mMKURwrfetvjQxOqZxSIlnjvsk0LtHgRJtuWLlcWVRbZ2bRm7u0bnJcoY5v/2 vHme18QrViCPIKfv4XXibwnkbG953ls+/+sQD9vtridoeFTPKeODe6HYyP3Jrla8 ToZA5R6vFeqwxCPcohjASoWmzOpod/yaupVpbjkMdEI7Pv6fvVvwnDeNgynr8zZQ nciV1e3mJDIb2sof2pnbI5wrpSjSP+H4g7cLKroXWWwrFhQ/PDZPwWm/6a+Q== 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=1735210401; x= 1735217601; bh=sEK+xPK5km/mZ+DWNzMlZAIQ7OUPbQ+75uTCBsT7PHI=; b=b 7HF2BSueApbcES4dQH5QiNF7a5x+pf+3xNKRqOZNXmsYkp/be4+787Avhp2zwCf1 NKNS545zJjN43eqkLRZVdyNQbtCyM4MFNU6nFsvseruhzvwdPPPkZ71Xu3EsWR6x VQRPt/T97YSSTdj3bvBJulKqRNPX9GyexIjxVgwqQW6uYoYRBzRsopd59UFlOZE3 qId2wr/Z7tVF4QE6dtBEjJu65Gn8fHwecyDR8//eAAL1Bw43mf1gq01GpfJz7HUX sWnWwevkeB/DIbDT8Dn58Us4Q20OlcK7dhGM0KlQ3FziVZ1HipCcPzK9qPu4h/Ns gJIaq/8j2xrxvA1Dsh7xg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddruddukedgvdduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnh htshculddquddttddmnecujfgurhephfffufggtgfgkfhfjgfvvefosehtkeertdertdej necuhfhrohhmpeevvghlvghsthgvucfnihhuuceouhifuhestghovghlrggtrghnthhhuh hsrdhnrghmvgeqnecuggftrfgrthhtvghrnhepiedugeffhfdtueduudefhfefhfehjeej hfeukeehffefuefgueevteeiuedvtdefnecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomhepuhifuhestghovghlrggtrghnthhhuhhsrdhnrghmvgdp nhgspghrtghpthhtohepvdeipdhmohguvgepshhmthhpohhuthdprhgtphhtthhopehshh hurghhsehkvghrnhgvlhdrohhrghdprhgtphhtthhopehfvghlihigohhnmhgrrhhssegr rhgthhhlihhnuhigrdhorhhgpdhrtghpthhtohepphgruhhlrdifrghlmhhslhgvhiessh hifhhivhgvrdgtohhmpdhrtghpthhtoheprghouhesvggvtghsrdgsvghrkhgvlhgvhidr vgguuhdprhgtphhtthhopehufihusegtohgvlhgrtggrnhhthhhushdrnhgrmhgvpdhrtg hpthhtohepghhuohhrvghnsehkvghrnhgvlhdrohhrghdprhgtphhtthhopehrvgesfiei rhiirdhnvghtpdhrtghpthhtohepsghjohhrnheskhgvrhhnvghlrdhorhhgpdhrtghpth htohepthhglhigsehlihhnuhhtrhhonhhigidruggv X-ME-Proxy: Feedback-ID: i95c648bc:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 26 Dec 2024 05:53:20 -0500 (EST) From: Celeste Liu Date: Thu, 26 Dec 2024 18:52:52 +0800 Subject: [PATCH v4 2/2] riscv: selftests: Add a ptrace test to verify syscall parameter modification MIME-Version: 1.0 Message-Id: <20241226-riscv-new-regset-v4-2-4496a29d0436@coelacanthus.name> References: <20241226-riscv-new-regset-v4-0-4496a29d0436@coelacanthus.name> In-Reply-To: <20241226-riscv-new-regset-v4-0-4496a29d0436@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=6177; i=uwu@coelacanthus.name; h=from:subject:message-id; bh=LhYGmYOKKNxhqjWV6WITtgLh7rsJPNHBqIMMBzkdr3Q=; b=owJ4nJvAy8zAJeafov85RWVtBeNptSSG9FzTKVtfrfZccPvD9Kwok7otyxunG/mVFDnkZHbnS 984LRWvntlRysIgxsUgK6bIklfC8pPz0tnuvR3bu2DmsDKBDGHg4hSAiTieYfifE2ny7NnfT6ym Nf+fBuxmWMTY5yIq22InPtt8puDux7KLGRlmpDUH7qllvRitofLxnODVGZ9tHr7JM3R/up3rUfG F7GR2ALfhSNE= 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_025321_876926_EBE37B1C X-CRM114-Status: GOOD ( 18.65 ) 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..023695352215bb5de3f91c1a6f5ea3b4f9373ff9 --- /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, &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