From patchwork Fri Jun 12 07:10:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greentime Hu X-Patchwork-Id: 11601351 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EE2FB14B7 for ; Fri, 12 Jun 2020 07:10:55 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id CBC72207D8 for ; Fri, 12 Jun 2020 07:10:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="uhZApzYj"; dkim=pass (2048-bit key) header.d=sifive.com header.i=@sifive.com header.b="lzm/7SHi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CBC72207D8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sifive.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+patchwork-linux-riscv=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To: Cc:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=A2QaBTJhBJQRzylOX9vPhPzTgEPwvSh2CxTZj+1fI78=; b=uhZApzYjlbtPU9oCM3VHICgFA2 4I4c93vWZmpQNVecYfu4Li5yeD3cBRCINdUXdegCUAFr/sj8Y+PH1kYNwOKU55k5vjNiISaC4O/ZG sx3SDXj69g7cej6EIum8NQl14IOvjK5RQy/CQBaflIB93rrXMcmMYLvfL4otxNmEWw6yp6Fu0b+hz Aa78bci0XJwjNFcv7qAN4/Hqi24Ba4UNJnfj9fIXaj6G45/AWIgvSdu15I/4Kc0Yjl1Cx6IBj9/fl CO/6SZys96gIDFHoUO69Zlpoeo9lvK0LokVEbK7qHzbvDb8VbaDadls6O+D9LVn830IzLGcvhRKKX QD/qpM7Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jjdq0-0005mV-LC; Fri, 12 Jun 2020 07:10:52 +0000 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jjdpj-0005Oj-9S for linux-riscv@lists.infradead.org; Fri, 12 Jun 2020 07:10:37 +0000 Received: by mail-pl1-x641.google.com with SMTP id k1so3285888pls.2 for ; Fri, 12 Jun 2020 00:10:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=A2QaBTJhBJQRzylOX9vPhPzTgEPwvSh2CxTZj+1fI78=; b=lzm/7SHi4Y2LnyTA2A6iUc8tChivg1S6hfjql+7CInfU7VGpxRokFhUHYMnD8+Wi91 ctpVZi3Rn9n6ZrzfRbrfTLRxG1DorH3KDQrEWyhdGpOZpg414iGAyH8q+vT64LqlgLwY aRBMLWzD2ce9ZQJ5LbdubChokm0OqeOeklDcc10mRMUO/SVoR1PT5nI58TZm8JRTOPdK qtwfn78qSOYNsOC8XPIX08/SLIY03WtsZfThrWRmErGEFoBydRpxcNK8y9/HlTABJspM V0OIZiy+xSK37sJlqwy4MLNvhX09bUHvwuoZKk76m7a/+Tyu2Xm0IJ+HHWqH1iZRudDU IlwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=A2QaBTJhBJQRzylOX9vPhPzTgEPwvSh2CxTZj+1fI78=; b=UKgBdtXEn1dJziKf+MkSuVAZyBIK6XMZVLOZtCGq7zUNoTvcjZJ+Tg8cdLb18YDeSf HjM7cBVvabtJKUDkZRs9JGL+hJ/QOwqx7V/3y4gIig/qexm/E4oiq/rhA7TJF9wyKPW4 ve8DDgOibGVRlN9j4bIWbYZzSof5hssqu7Rdz6t0732pJW1JAdFU0jpygQjSBLXliWjz vXoh7bUB6/p8g4PfaF6xzuuhm5Iyz0UnW0rQxGIL0lJ1MG+nijN1/hKDKfAOpZrfgcK1 4gpucCQZFBjGH1z7xHL2XVQg1z79XriYvhiU2GsOnFLOMDyUFjoUj+/UXtLYooRDSnOd s0bA== X-Gm-Message-State: AOAM533erVgfzRo8LmpcOs6su5GoUMVFlLE/xMa/nSCM7FZpIwXRajhH LOF+Jwjlme5qcllfVYJJmdrU4A== X-Google-Smtp-Source: ABdhPJyoKYtGQArQjTuuVyk6DTQSNswCQAgwB0evJSXQ5wo1oNwLXoJhzMrYI9PQQTF4Yt6WX7vQ+A== X-Received: by 2002:a17:902:8342:: with SMTP id z2mr10294966pln.300.1591945834535; Fri, 12 Jun 2020 00:10:34 -0700 (PDT) Received: from hsinchu02.internal.sifive.com (114-34-229-221.HINET-IP.hinet.net. [114.34.229.221]) by smtp.gmail.com with ESMTPSA id d2sm4336919pgp.56.2020.06.12.00.10.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jun 2020 00:10:34 -0700 (PDT) From: Greentime Hu To: greentime.hu@sifive.com, oleg@redhat.com, guoren@linux.alibaba.com, vincent.chen@sifive.com, paul.walmsley@sifive.com, palmerdabbelt@google.com, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 11/13] riscv: Add ptrace vector support Date: Fri, 12 Jun 2020 15:10:00 +0800 Message-Id: <32bf683f9e25b3dd291edd77cc9a75c7bac07e88.1591344965.git.greentime.hu@sifive.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200612_001035_357233_48974784 X-CRM114-Status: GOOD ( 15.64 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:641 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+patchwork-linux-riscv=patchwork.kernel.org@lists.infradead.org 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. [guoren@linux.alibaba.com: Add the first version porting to support vector of ptrace] Signed-off-by: Greentime Hu Signed-off-by: Guo Ren --- arch/riscv/include/uapi/asm/elf.h | 1 + arch/riscv/kernel/ptrace.c | 114 ++++++++++++++++++++++++++++++ include/uapi/linux/elf.h | 1 + 3 files changed, 116 insertions(+) diff --git a/arch/riscv/include/uapi/asm/elf.h b/arch/riscv/include/uapi/asm/elf.h index d696d6610231..099434d075a7 100644 --- a/arch/riscv/include/uapi/asm/elf.h +++ b/arch/riscv/include/uapi/asm/elf.h @@ -23,6 +23,7 @@ typedef struct user_regs_struct elf_gregset_t; typedef __u64 elf_fpreg_t; typedef union __riscv_fp_state elf_fpregset_t; #define ELF_NFPREG (sizeof(struct __riscv_d_ext_state) / sizeof(elf_fpreg_t)) +#define ELF_NVREG (sizeof(struct __riscv_v_state) / sizeof(elf_greg_t)) #if __riscv_xlen == 64 #define ELF_RISCV_R_SYM(r_info) ELF64_R_SYM(r_info) diff --git a/arch/riscv/kernel/ptrace.c b/arch/riscv/kernel/ptrace.c index 444dc7b0fd78..b5b83260e674 100644 --- a/arch/riscv/kernel/ptrace.c +++ b/arch/riscv/kernel/ptrace.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include @@ -26,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, @@ -92,6 +96,106 @@ 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, + unsigned int pos, unsigned int count, + void *kbuf, void __user *ubuf) +{ + int ret; + struct __riscv_v_state *vstate = &target->thread.vstate; + /* Set the datap right after the address of vstate. */ + void *datap = ubuf + sizeof(struct __riscv_v_state); + u32 magic = RVV_MAGIC; + + /* Copy the magic number. */ + ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, &magic, 0, + sizeof(u32)); + if (unlikely(ret)) + return ret; + + /* Copy rest of vstate except datap. */ + ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, vstate, 0, + RISCV_V_STATE_DATAP); + if (unlikely(ret)) + return ret; + + /* Copy the pointer datap itself. */ + pos = 0; + ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, &datap, 0, + sizeof(vstate->datap)); + if (unlikely(ret)) + return ret; + +#if __riscv_xlen == 32 + /* Skip copy _padding. */ + count -= sizeof(vstate->__padding); + ubuf += sizeof(vstate->__padding); +#endif + + /* Copy all the vector registers. */ + pos = 0; + ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf, + vstate->datap, 0, vstate->size); + return ret; +} + +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; + const void *datap = ubuf + sizeof(struct __riscv_v_state); + const void *datap_addr = ubuf + RISCV_V_STATE_DATAP; + long val_datap; + + /* Skip copy magic because kernel doesn't need to use it. */ + size = sizeof(vstate->magic); + pos += size; + count -= size; + ubuf += size; + + /* 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; + + /* Check if the datap is correct address of ubuf. */ + __get_user(val_datap, (long *)datap_addr); + if (val_datap != (long)datap) + return -EFAULT; + + /* 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, vstate->size); + return ret; +} +static unsigned int riscv_vr_get_size(struct task_struct *target, + const struct user_regset *regset) +{ + if (!has_vector) + return 0; + + return sizeof(struct __riscv_v_state) + riscv_vsize; +} +#endif + static const struct user_regset riscv_user_regset[] = { [REGSET_X] = { .core_note_type = NT_PRSTATUS, @@ -111,6 +215,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, + .size = sizeof(unsigned long), + .get = riscv_vr_get, + .set = riscv_vr_set, + .get_size = riscv_vr_get_size, + }, +#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 34c02e4290fe..e428f9e8710a 100644 --- a/include/uapi/linux/elf.h +++ b/include/uapi/linux/elf.h @@ -428,6 +428,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 */ /* Note header in a PT_NOTE section */ typedef struct elf32_note {