From mboxrd@z Thu Jan 1 00:00:00 1970 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 73DF9ECAAD8 for ; Wed, 21 Sep 2022 21:50:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 18A4E94000B; Wed, 21 Sep 2022 17:50:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 139D8940008; Wed, 21 Sep 2022 17:50:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F1CA794000B; Wed, 21 Sep 2022 17:50:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id E47C2940008 for ; Wed, 21 Sep 2022 17:50:45 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id B76CF12131F for ; Wed, 21 Sep 2022 21:50:45 +0000 (UTC) X-FDA: 79937437650.16.BDA468A Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by imf27.hostedemail.com (Postfix) with ESMTP id 652644000B for ; Wed, 21 Sep 2022 21:50:45 +0000 (UTC) Received: by mail-pf1-f182.google.com with SMTP id e5so7340934pfl.2 for ; Wed, 21 Sep 2022 14:50:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=+2Y/W36PtIBBFhLsRM7jN1P/q6NhH3hMDNv7n9pXDHw=; b=qCm1QFMAxTIfPcPUm4pzRx+jDvS7vMRzF6JW/wuRfu+wRhB/SOFquS8a2LWYrLuc9u AChH1XhIBzusCXwftsb3LPZlW4/5kbkfeJmTSTMgqt/5Zp94uzFCLVU10jKkGgVZ4erc aIoYPVajpNZkf5OZWmcMvbvFW6coRGbNimCk0QLTu/rPD03QD9h4WlrVzzcs6vQTEDfc pHSFPhogIqkNe2a/ATfPdYc5YA/4GAjAc3jbAB9Wq3e4MIfI8fNHLAr3MJEG5dbCZY7j OvBeSuENXhZRWI0XXRB4f81pipgdlva5Ws1d8lPZJmtWg7lApyyFn5AX9Ftn0ATSmPiA vFAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=+2Y/W36PtIBBFhLsRM7jN1P/q6NhH3hMDNv7n9pXDHw=; b=Fk9nsFK3vBLzKlCSDTJXV5f/FP9bf0FxxdpAIj3yLyHMj0To/j0f8x0K3s/exRq6TR jK+oUWX6FIhYOScA7Tg5bOYVledVPiIwKXDa9X/e7nPpUC//YrX4Nmmz/6KHlggchJFm dpDKUkZV2oM4yUFxfvFQKKWbnJS0NvFaND8thakWSm5ILQGuiexJSB7Cwx1APUQlO/KI Ox5c9aqmNA0XmLdCxBjp7Kc2VBv3uz6PMQ3sepeR9F/h8xIDrCGISdE/Sajt0mw7prRA 1P6m42lh/PLOkCBWbrcprnEsBRGt+yZQwKywwj4SXsfjrre9Gl8fNGqy8UvWUq38sP6I E5TQ== X-Gm-Message-State: ACrzQf2OAwfMl1247jmtKnlwH4W3JEOy6/QcfoGrZ4fG8AvNSKqTG1+P oqZOZQjXOe7AL8eRjgXz/e2ncg== X-Google-Smtp-Source: AMsMyM6xihhqXZEV+L1F3aQGghgomWUQzsdYWKvtgiRAi5dEMTt8yQFXbNqYyV4J1EsPbbZpgDNCvA== X-Received: by 2002:aa7:9107:0:b0:553:92a4:d930 with SMTP id 7-20020aa79107000000b0055392a4d930mr273417pfh.72.1663797044500; Wed, 21 Sep 2022 14:50:44 -0700 (PDT) Received: from stillson.ba.rivosinc.com ([66.220.2.162]) by smtp.gmail.com with ESMTPSA id k7-20020aa79727000000b005484d133127sm2634536pfg.129.2022.09.21.14.50.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Sep 2022 14:50:43 -0700 (PDT) From: Chris Stillson To: Cc: Greentime Hu , Vincent Chen , Paul Walmsley , Palmer Dabbelt , Albert Ou , Eric Biederman , Kees Cook , Anup Patel , Atish Patra , Oleg Nesterov , Guo Ren , Heinrich Schuchardt , Arnaud Pouliquen , Conor Dooley , Chris Stillson , Paolo Bonzini , Qinglin Pan , Alexandre Ghiti , Arnd Bergmann , Heiko Stuebner , Dao Lu , Jisheng Zhang , Sunil V L , Nick Knight , Han-Kuan Chen , Li Zhengyu , Changbin Du , Alexander Graf , Ard Biesheuvel , Tsukasa OI , Yury Norov , Mark Rutland , "Paul E. McKenney" , Frederic Weisbecker , Vitaly Wool , Myrtle Shah , Catalin Marinas , Mark Brown , Will Deacon , Alexey Dobriyan , Huacai Chen , Christian Brauner , Colin Cross , Peter Collingbourne , Eugene Syromiatnikov , Andrew Morton , Barret Rhoden , Suren Baghdasaryan , Davidlohr Bueso , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, kvm@vger.kernel.org, kvm-riscv@lists.infradead.org Subject: [PATCH v12 09/17] riscv: Add ptrace vector support Date: Wed, 21 Sep 2022 14:43:51 -0700 Message-Id: <20220921214439.1491510-9-stillson@rivosinc.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220921214439.1491510-1-stillson@rivosinc.com> References: <20220921214439.1491510-1-stillson@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1663797045; a=rsa-sha256; cv=none; b=TjUdRtHrYNgzZpBu7O04AWB39Ot5Ms+lGycqO9URGehdhKhpvBlNF7B60Rr5/SgjOhRHmW Oe+i9FHJT6nvvgaICLJ5H9Zc5HN+DUvz+1BiS4OgTpMuDif40GvtsgIYfWGYrPobMbEGeL MTrGyYPttqIQnY54c1akmcEVtBr0AVY= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=rivosinc-com.20210112.gappssmtp.com header.s=20210112 header.b=qCm1QFMA; dmarc=none; spf=pass (imf27.hostedemail.com: domain of stillson@rivosinc.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=stillson@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1663797045; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=+2Y/W36PtIBBFhLsRM7jN1P/q6NhH3hMDNv7n9pXDHw=; b=JhvURf5CJpW2WZd47xyyq7seKCuNV/2Qdgdzc9I4QxDbAMxkdtaqFELT/85SaQhbSb/5vb flYAC3/upzAjYkBeqATf8rhPh44cdyQjrmHHQB+DS3Er7iAAdLMB158tIAACvNS07TDuy8 vLE5xr08uRxwgvRNV7UUSk+h0UGDfbw= X-Stat-Signature: s1mtk4sm9b4jkdsu56to1mdzp4oyjz33 X-Rspamd-Queue-Id: 652644000B Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=rivosinc-com.20210112.gappssmtp.com header.s=20210112 header.b=qCm1QFMA; dmarc=none; spf=pass (imf27.hostedemail.com: domain of stillson@rivosinc.com designates 209.85.210.182 as permitted sender) smtp.mailfrom=stillson@rivosinc.com X-Rspamd-Server: rspam02 X-Rspam-User: X-HE-Tag: 1663797045-188204 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: From: Greentime Hu This patch adds ptrace support for riscv vector. The vector registers will be saved in datap pointer of __riscv_v_state. This pointer will be set right after the __riscv_v_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 --- arch/riscv/include/uapi/asm/ptrace.h | 6 +++ arch/riscv/kernel/ptrace.c | 71 ++++++++++++++++++++++++++++ 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 6ee1ca2edfa7..2491875be80d 100644 --- a/arch/riscv/include/uapi/asm/ptrace.h +++ b/arch/riscv/include/uapi/asm/ptrace.h @@ -94,6 +94,12 @@ struct __riscv_v_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 2ae8280ae475..cce459ff551d 100644 --- a/arch/riscv/kernel/ptrace.c +++ b/arch/riscv/kernel/ptrace.c @@ -27,6 +27,9 @@ enum riscv_regset { #ifdef CONFIG_FPU REGSET_F, #endif +#ifdef CONFIG_VECTOR + REGSET_V, +#endif }; static int riscv_gpr_get(struct task_struct *target, @@ -83,6 +86,64 @@ static int riscv_fpr_set(struct task_struct *target, } #endif +#ifdef CONFIG_VECTOR +static int riscv_vr_get(struct task_struct *target, + const struct user_regset *regset, + struct membuf to) +{ + struct __riscv_v_state *vstate = &target->thread.vstate; + + /* + * Ensure the vector registers have been saved to the memory before + * copying them to membuf. + */ + if (target == current) + vstate_save(current, task_pt_regs(current)); + + /* Copy vector header from vstate. */ + membuf_write(&to, vstate, RISCV_V_STATE_DATAP); + membuf_zero(&to, sizeof(void *)); +#if __riscv_xlen == 32 + membuf_zero(&to, sizeof(__u32)); +#endif + + /* Copy all the vector registers from vstate. */ + return membuf_write(&to, vstate->datap, riscv_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_state *vstate = &target->thread.vstate; + + /* Copy rest of the vstate except datap and __padding. */ + ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, vstate, 0, + RISCV_V_STATE_DATAP); + if (unlikely(ret)) + return ret; + + /* Skip copy datap. */ + size = sizeof(vstate->datap); + count -= size; + ubuf += size; +#if __riscv_xlen == 32 + /* Skip copy _padding. */ + size = sizeof(vstate->__padding); + count -= size; + ubuf += size; +#endif + + /* Copy all the vector registers. */ + pos = 0; + ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, vstate->datap, + 0, riscv_vsize); + return ret; +} +#endif + static const struct user_regset riscv_user_regset[] = { [REGSET_X] = { .core_note_type = NT_PRSTATUS, @@ -102,6 +163,16 @@ static const struct user_regset riscv_user_regset[] = { .set = riscv_fpr_set, }, #endif +#ifdef CONFIG_VECTOR + [REGSET_V] = { + .core_note_type = NT_RISCV_VECTOR, + .align = 16, + .n = (32 * RISCV_MAX_VLENB)/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 c7b056af9ef0..5a5056c6a2a1 100644 --- a/include/uapi/linux/elf.h +++ b/include/uapi/linux/elf.h @@ -439,6 +439,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 */ -- 2.25.1