From patchwork Mon Jun 5 11:07:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Chiu X-Patchwork-Id: 13267662 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 EF42BC7EE24 for ; Mon, 5 Jun 2023 15:41:05 +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:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=U4HfzD4Uhfob2hIsU8YI0rhIFpEeAGzGFQFwlQIVCrU=; b=NBNo+0yeHI11MK puNDSIpbmB0NcbvFP457J5y/dTmv1sU+I9749qtF0so9FFBTrIevOUwJh6CdPeUalWyZVHVDfEvbq +PKz0swBOdBsb9CSan8jh9M+UiIPHzetaymdwZ0Ik2g0gpXs3bkU7XGkdcvbvEC766LcHan9QxSA5 3oOOX6amOjp6Edj+MuE2yfDWbN7WiLtvNzRwoV7jIM2Dnp3u9h1wNpOGMJyelVxGdKOIGpSonSQNY rGVnNVlFv/bhZFc+Xr4bjoH5NJArVDxvBimVHQcmSaNLi5DfeaBIIQAo5V7vXB6RCY45JxxIW/YUT QqpWUyDTpnUrQgxYxlzQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q6CKM-00FzK6-0l; Mon, 05 Jun 2023 15:41:02 +0000 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q6CKJ-00FzIW-2G for linux-riscv@lists.infradead.org; Mon, 05 Jun 2023 15:41:01 +0000 Received: by mail-pl1-x62b.google.com with SMTP id d9443c01a7336-1b0478487c3so21033575ad.1 for ; Mon, 05 Jun 2023 08:40:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; t=1685979659; x=1688571659; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=TK601nUo3JGOQ5o2y+/f0WKC5t8HaAAxa1cHt24xSbI=; b=R5BxkKCWIghCYwLXPtnwRI07Z3hc7iGIi/1HXhM2k8fOuhBhB8tEbXKkK9gHOj/VAN 0czr+1rxNjN+afGR1VUqprS8iWfgvLm5G0kf1Vnvyk52sbTkiiYWMinvnQidwTydJKsY gZkLFC7TmOwzpMurHMAZeyCNGaNERqoyr8aROMHd6eJqlT0zZoCabwGHcXdm7ATwgeRl vr02oRmwAnthb/7iVofuUxzVf/5sFsulL+Mnh2tlJhSsMHjgUzatwaoDF+iYDFGK18+l Tr9aclC+uDh9J7RB0VKwhu1C5w1j8d0bSm0/GUz6BmWKT+4iqRkgTSDsuqXdcfjMPJEg rotA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685979659; x=1688571659; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=TK601nUo3JGOQ5o2y+/f0WKC5t8HaAAxa1cHt24xSbI=; b=LA38qqpIdxibyS5Eg0JfjRXEMY7+VfxRcvzyvCki92scAbA0YwBjr0UlqhOxolqj6V wKQANjHrb1JQHh2u022Lms29AzSYEdAJC2JU6PWvyQ1Ku70SLGBUVXKF4dBXNz4+AHfa agIe9a4gDpIeQYIB9u4Efw8Zezii7NIXm1atAww1FkwxNdC6nWorDGhpxVMPh5NcYo1n VXwiKwKL4m/7oq5RNdHYa56xmYnM2rO21orEJ0R8T3w9tDsAR6H+ytR5dgbioNbgRaA5 8rOSETx98JUBIi8oLFOIiDk0Yo51phYUIa3Z/f1gTNlioGbmlIIYQSuMT9RB3lC17oKk 5KBw== X-Gm-Message-State: AC+VfDzLRxgPUyfK4bGxIFNTzB3YpkjxMcFervf2vxV7UcHuj3VpjfUf 51Q3tXX5535JQkwsTqhXidrDJ9w6oZ6SOSwHplgWhePEK01Wyi1TCtsd1O8wJthGb40XOsIjA/e OKHanZCt6nXq+MbECI9HpLzHe9LaDdmiX9+pa8oGuiBeMAIfw9W3NGdm7WNeLbxydcFbLxydK1b cjoV7SaNbiGXHDhDg= X-Google-Smtp-Source: ACHHUZ7hfG1thEtCG4vbbjy6UDKU1EfM3Ezzqk9rQTWatF9ikbEydRLDwivfsoWuJM2PMIaiFjRg8Q== X-Received: by 2002:a17:902:6a88:b0:1b0:113e:1047 with SMTP id n8-20020a1709026a8800b001b0113e1047mr2933210plk.62.1685979658667; Mon, 05 Jun 2023 08:40:58 -0700 (PDT) Received: from hsinchu26.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id jk19-20020a170903331300b001b0aec3ed59sm6725962plb.256.2023.06.05.08.40.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Jun 2023 08:40:58 -0700 (PDT) From: Andy Chiu To: linux-riscv@lists.infradead.org, palmer@dabbelt.com, anup@brainfault.org, atishp@atishpatra.org, kvm-riscv@lists.infradead.org, kvm@vger.kernel.org Cc: vineetg@rivosinc.com, greentime.hu@sifive.com, guoren@linux.alibaba.com, Vincent Chen , Andy Chiu , Paul Walmsley , Albert Ou , Oleg Nesterov , Eric Biederman , Kees Cook , Heiko Stuebner , Conor Dooley , "Christian Brauner (Microsoft)" , Mark Brown , Rolf Eike Beer , Janosch Frank , Qing Zhang Subject: [PATCH -next v21 12/27] riscv: Add ptrace vector support Date: Mon, 5 Jun 2023 11:07:09 +0000 Message-Id: <20230605110724.21391-13-andy.chiu@sifive.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230605110724.21391-1-andy.chiu@sifive.com> References: <20230605110724.21391-1-andy.chiu@sifive.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230605_084059_738996_E6855BCA X-CRM114-Status: GOOD ( 21.42 ) 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: , MIME-Version: 1.0 Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Greentime Hu This patch adds ptrace support for riscv vector. The vector registers will be saved in datap pointer of __riscv_v_ext_state. This pointer will be set right after the __riscv_v_ext_state data structure then it will be put in ubuf for ptrace system call to get or set. It will check if the datap got from ubuf is set to the correct address or not when the ptrace system call is trying to set the vector registers. Co-developed-by: Vincent Chen Signed-off-by: Vincent Chen Signed-off-by: Greentime Hu Signed-off-by: Andy Chiu Reviewed-by: Conor Dooley Reviewed-by: Palmer Dabbelt --- Changelog V18: - Use sizeof(vstate->datap) instead of sizeof(void*) (Eike) --- arch/riscv/include/uapi/asm/ptrace.h | 7 +++ arch/riscv/kernel/ptrace.c | 70 ++++++++++++++++++++++++++++ include/uapi/linux/elf.h | 1 + 3 files changed, 78 insertions(+) diff --git a/arch/riscv/include/uapi/asm/ptrace.h b/arch/riscv/include/uapi/asm/ptrace.h index 586786d023c4..e8d127ec5cf7 100644 --- a/arch/riscv/include/uapi/asm/ptrace.h +++ b/arch/riscv/include/uapi/asm/ptrace.h @@ -94,6 +94,13 @@ struct __riscv_v_ext_state { */ }; +/* + * According to spec: The number of bits in a single vector register, + * VLEN >= ELEN, which must be a power of 2, and must be no greater than + * 2^16 = 65536bits = 8192bytes + */ +#define RISCV_MAX_VLENB (8192) + #endif /* __ASSEMBLY__ */ #endif /* _UAPI_ASM_RISCV_PTRACE_H */ diff --git a/arch/riscv/kernel/ptrace.c b/arch/riscv/kernel/ptrace.c index 23c48b14a0e7..1d572cf3140f 100644 --- a/arch/riscv/kernel/ptrace.c +++ b/arch/riscv/kernel/ptrace.c @@ -7,6 +7,7 @@ * Copied from arch/tile/kernel/ptrace.c */ +#include #include #include #include @@ -24,6 +25,9 @@ enum riscv_regset { #ifdef CONFIG_FPU REGSET_F, #endif +#ifdef CONFIG_RISCV_ISA_V + REGSET_V, +#endif }; static int riscv_gpr_get(struct task_struct *target, @@ -80,6 +84,61 @@ static int riscv_fpr_set(struct task_struct *target, } #endif +#ifdef CONFIG_RISCV_ISA_V +static int riscv_vr_get(struct task_struct *target, + const struct user_regset *regset, + struct membuf to) +{ + struct __riscv_v_ext_state *vstate = &target->thread.vstate; + + if (!riscv_v_vstate_query(task_pt_regs(target))) + return -EINVAL; + + /* + * Ensure the vector registers have been saved to the memory before + * copying them to membuf. + */ + if (target == current) + riscv_v_vstate_save(current, task_pt_regs(current)); + + /* Copy vector header from vstate. */ + membuf_write(&to, vstate, offsetof(struct __riscv_v_ext_state, datap)); + membuf_zero(&to, sizeof(vstate->datap)); + + /* Copy all the vector registers from vstate. */ + return membuf_write(&to, vstate->datap, riscv_v_vsize); +} + +static int riscv_vr_set(struct task_struct *target, + const struct user_regset *regset, + unsigned int pos, unsigned int count, + const void *kbuf, const void __user *ubuf) +{ + int ret, size; + struct __riscv_v_ext_state *vstate = &target->thread.vstate; + + if (!riscv_v_vstate_query(task_pt_regs(target))) + return -EINVAL; + + /* Copy rest of the vstate except datap */ + ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, vstate, 0, + offsetof(struct __riscv_v_ext_state, datap)); + if (unlikely(ret)) + return ret; + + /* Skip copy datap. */ + size = sizeof(vstate->datap); + count -= size; + ubuf += size; + + /* Copy all the vector registers. */ + pos = 0; + ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, vstate->datap, + 0, riscv_v_vsize); + return ret; +} +#endif + static const struct user_regset riscv_user_regset[] = { [REGSET_X] = { .core_note_type = NT_PRSTATUS, @@ -99,6 +158,17 @@ static const struct user_regset riscv_user_regset[] = { .set = riscv_fpr_set, }, #endif +#ifdef CONFIG_RISCV_ISA_V + [REGSET_V] = { + .core_note_type = NT_RISCV_VECTOR, + .align = 16, + .n = ((32 * RISCV_MAX_VLENB) + + sizeof(struct __riscv_v_ext_state)) / sizeof(__u32), + .size = sizeof(__u32), + .regset_get = riscv_vr_get, + .set = riscv_vr_set, + }, +#endif }; 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 ac3da855fb19..7d8d9ae36615 100644 --- a/include/uapi/linux/elf.h +++ b/include/uapi/linux/elf.h @@ -440,6 +440,7 @@ typedef struct elf64_shdr { #define NT_MIPS_DSP 0x800 /* MIPS DSP ASE registers */ #define NT_MIPS_FP_MODE 0x801 /* MIPS floating-point mode */ #define NT_MIPS_MSA 0x802 /* MIPS SIMD registers */ +#define NT_RISCV_VECTOR 0x900 /* RISC-V vector registers */ #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 */