Received: by 2002:a25:ef43:0:0:0:0:0 with SMTP id w3csp190029ybm; Wed, 27 May 2020 23:45:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9rkWBEzZdUOqDxeHw97naPtUB15LrfxIlvF7ub5x86QUvacsxPOkT3h/xsws1vsZpDea+ X-Received: by 2002:a17:906:1cc6:: with SMTP id i6mr1590343ejh.552.1590648320698; Wed, 27 May 2020 23:45:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590648320; cv=none; d=google.com; s=arc-20160816; b=Ysd51z3fCsnNNWt7Ifa7VG2sdTofXpE+5EJKBNWbUxidCDRfzN7BnoVoXdhu8Qx2QS u3ev514gJsh/HIDaCPpDbqdRQSJNGGx4cM1R6z+Ot/+tym+KE+75VHMBmA0DBENAduvK 89OpqzqlYoE1dDidsdo9VG7TaWi7eI7VUxjjsDwZcYH/W8l2nzhWwtZV9wsndXxAiOaW ZN0BFSriyO7O3LGYaNiuv7rlyQxVD9XUIyf8Oehm8HwdAqzb5sFDcies/97jpDlD05AQ RdRrbisG2ohHbQHkfT0mnseUaesZJ8a9BAWGbWJ5cTwRhRHje4BC1NSm/wSzaCQL6YS3 HH+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=f85Vn4OuGxjQe/WprhGo5P1pwBgJ5q0VeEPd5gC4HYw=; b=BbHps2MwTyL11G8K4M9sx+Otj1/9HVQoNp/DONyEdVetjlfkhrWO0cI3MC1vs/SaSY MJJ7vqApg4bVwajF63PRLlyUkfGJt44xqRMhK4v0MUzkjBY7WK0K0PcE1BsM/irS58C2 cgyL9luW0NxBVT5p3yDVXD2DspFspr9SMhU14qxYrrvtgFVYXoieuI+9m/RHsb+/KysV OHIhWoq6AWff3u7M9jEvIJPWHQ+3dCAibXLqbiHRtx5iNyMXQRNOEOKCVlF7hR7Cam6G imJmyKWWiYeyNrwSODQTiTVd+yZJ+DMjPRyLqp6yMcVhThGGh0/1pRLr+1CQGPZuVl6j FDXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=DYoeHxtC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l22si2573961ejg.740.2020.05.27.23.44.57; Wed, 27 May 2020 23:45:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@sifive.com header.s=google header.b=DYoeHxtC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726860AbgE1Glp (ORCPT + 99 others); Thu, 28 May 2020 02:41:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726831AbgE1Gln (ORCPT ); Thu, 28 May 2020 02:41:43 -0400 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5EA27C05BD1E for ; Wed, 27 May 2020 23:41:43 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id 185so4729220pgb.10 for ; Wed, 27 May 2020 23:41:43 -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=f85Vn4OuGxjQe/WprhGo5P1pwBgJ5q0VeEPd5gC4HYw=; b=DYoeHxtCDLNaK4vTg4LXeFpK3991FjhrOeogIln0htFW3mpJQaBBYg/q+xdoOYA/mP VyhoHpQFurqflmvyQCW3h4gityj/4jHYiazZ2HRNAVwdv/UMMi8CbX6Bx9g8Mbkb+GQY sWPsc1+c3tKrZg9ECu/AJUrtKqLC+XUxViXjJYAc9cLIAcW2JbsrHyCEhy9DqxVrShAx Xbmqb1YnOBK3BB5czzY+vFNIGoKtL4kXeTlKXLu0S3DNMHDtO7frMkzVsKL+Fw05219h 6T0On7F7k3exzrn3IebkZSn07IaMRkB9nm3V0m8CAjYal9SZ80azSuOl+mphtfhFHWmd tmgg== 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=f85Vn4OuGxjQe/WprhGo5P1pwBgJ5q0VeEPd5gC4HYw=; b=RM5EmxbhId0cXdwXpXvHqT9etkB6M7iu4LPUI0qUGlDI9nbZzrSJDG06NS/CTYMl3I +6ARAv9AUgSifOMlOpxCObs7lF4aIhtM9CST6/2M0kepQs0qCW0Cu6fjxxZqjuLcQ16r 4sdDHitpB/RykDR+kNulRb2uL3SEFp/bq9Nyi3e7I8AhHoyIRXpRYte/twy5LOVxSkBr 1VKNVDSCqL16ZbU9iSOjt/DuNAAYXycHhqANSomAUL/Onlo3n/uS2R0RuyEMAKYS1UWB em51MhuIx97QiWo9rjWDQJ3g2U4WuyVtsjPlqh1cDomi8V5C0/KYzFg/XVlxTecbDhRc 1PZg== X-Gm-Message-State: AOAM532FKTiiRWEokBzzN23vBLRTzkEIAtVPlS6XKqumez7JM0oqBnmt y4HodMRKp6vOOxFb87ZBRcPhzA== X-Received: by 2002:a63:4906:: with SMTP id w6mr1507671pga.79.1590648096154; Wed, 27 May 2020 23:41:36 -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 q29sm3773366pfg.79.2020.05.27.23.41.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 23:41:35 -0700 (PDT) From: Greentime Hu To: greentime.hu@sifive.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, oleg@redhat.com Subject: [RFC PATCH v5 12/13] riscv: Add sigcontext save/restore for vector Date: Thu, 28 May 2020 14:41:00 +0800 Message-Id: <8b544fbcee934ad31235049f49a14c8e7601692b.1590646208.git.greentime.hu@sifive.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Guo Ren This patch adds sigcontext save/restore for vector. The vector registers will be saved in datap pointer. The datap pointer will be allocaed dynamically when the task needs in kernel space. The datap pointer will be set right after the __riscv_v_state data structure to save all the vector registers in the signal handler stack. [greentime.hu@sifive.com: add support for dynamic vlen] Signed-off-by: Greentime Hu Signed-off-by: Guo Ren --- arch/riscv/include/uapi/asm/sigcontext.h | 2 + arch/riscv/kernel/signal.c | 92 +++++++++++++++++++++++- 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/arch/riscv/include/uapi/asm/sigcontext.h b/arch/riscv/include/uapi/asm/sigcontext.h index 84f2dfcfdbce..4217f3f1c8ba 100644 --- a/arch/riscv/include/uapi/asm/sigcontext.h +++ b/arch/riscv/include/uapi/asm/sigcontext.h @@ -8,6 +8,7 @@ #include +#define RVV_MAGIC 0x53465457 /* * Signal context structure * @@ -17,6 +18,7 @@ struct sigcontext { struct user_regs_struct sc_regs; union __riscv_fp_state sc_fpregs; + struct __riscv_v_state sc_vregs; }; #endif /* _UAPI_ASM_RISCV_SIGCONTEXT_H */ diff --git a/arch/riscv/kernel/signal.c b/arch/riscv/kernel/signal.c index 17ba190e84a5..9ada6f74bb95 100644 --- a/arch/riscv/kernel/signal.c +++ b/arch/riscv/kernel/signal.c @@ -83,6 +83,80 @@ static long save_fp_state(struct pt_regs *regs, #define restore_fp_state(task, regs) (0) #endif +#ifdef CONFIG_VECTOR +static long restore_v_state(struct pt_regs *regs, struct sigcontext *sc) +{ + long err; + struct __riscv_v_state __user *state = &sc->sc_vregs; + void *datap; + __u32 magic; + + /* Get magic number and check it. */ + err = __get_user(magic, &state->magic); + if (unlikely(err)) + return err; + + if (magic != RVV_MAGIC) + return -EINVAL; + + /* Copy everything of __riscv_v_state except datap. */ + err = __copy_from_user(¤t->thread.vstate, state, + RISCV_V_STATE_DATAP); + if (unlikely(err)) + return err; + + /* Copy the pointer datap itself. */ + err = __get_user(datap, &state->datap); + if (unlikely(err)) + return err; + + + /* Copy the whole vector content from user space datap. */ + err = __copy_from_user(current->thread.vstate.datap, datap, + current->thread.vstate.size); + if (unlikely(err)) + return err; + + vstate_restore(current, regs); + + return err; +} + +static long save_v_state(struct pt_regs *regs, struct sigcontext *sc) +{ + long err; + struct __riscv_v_state __user *state = &sc->sc_vregs; + /* Set the datap right after the sigcntext structure. */ + void *datap = sc + 1; + + vstate_save(current, regs); + /* Copy everything of vstate but datap. */ + err = __copy_to_user(state, ¤t->thread.vstate, + RISCV_V_STATE_DATAP); + if (unlikely(err)) + return err; + + /* Copy the magic number. */ + err = __put_user(RVV_MAGIC, &state->magic); + if (unlikely(err)) + return err; + + /* Copy the pointer datap itself. */ + err = __put_user(datap, &state->datap); + if (unlikely(err)) + return err; + + /* Copy the whole vector content to user space datap. */ + err = __copy_to_user(datap, current->thread.vstate.datap, + current->thread.vstate.size); + + return err; +} +#else +#define save_v_state(task, regs) (0) +#define restore_v_state(task, regs) (0) +#endif + static long restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc) { @@ -92,6 +166,9 @@ static long restore_sigcontext(struct pt_regs *regs, /* Restore the floating-point state. */ if (has_fpu) err |= restore_fp_state(regs, &sc->sc_fpregs); + /* Restore the vector state. */ + if (has_vector) + err |= restore_v_state(regs, sc); return err; } @@ -101,13 +178,16 @@ SYSCALL_DEFINE0(rt_sigreturn) struct rt_sigframe __user *frame; struct task_struct *task; sigset_t set; + size_t frame_size = sizeof(*frame); /* Always make any pending restarted system calls return -EINTR */ current->restart_block.fn = do_no_restart_syscall; frame = (struct rt_sigframe __user *)regs->sp; - if (!access_ok(frame, sizeof(*frame))) + if (has_vector) + frame_size += current->thread.vstate.size; + if (!access_ok(frame, frame_size)) goto badframe; if (__copy_from_user(&set, &frame->uc.uc_sigmask, sizeof(set))) @@ -145,6 +225,9 @@ static long setup_sigcontext(struct rt_sigframe __user *frame, /* Save the floating-point state. */ if (has_fpu) err |= save_fp_state(regs, &sc->sc_fpregs); + /* Save the vector state. */ + if (has_vector) + err |= save_v_state(regs, sc); return err; } @@ -176,9 +259,12 @@ static int setup_rt_frame(struct ksignal *ksig, sigset_t *set, { struct rt_sigframe __user *frame; long err = 0; + size_t frame_size = sizeof(*frame); - frame = get_sigframe(ksig, regs, sizeof(*frame)); - if (!access_ok(frame, sizeof(*frame))) + if (has_vector) + frame_size += current->thread.vstate.size; + frame = get_sigframe(ksig, regs, frame_size); + if (!access_ok(frame, frame_size)) return -EFAULT; err |= copy_siginfo_to_user(&frame->info, &ksig->info); -- 2.26.2