From patchwork Tue May 18 05:31:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 441132 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1785745jac; Mon, 17 May 2021 22:53:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxb1c93mykY+dt+JzKPjEfgQlYetqSBzhixzo1xHdbXDhLXYRxz9RyxPZmON2lEmT7+o7wc X-Received: by 2002:a37:a2c5:: with SMTP id l188mr3726875qke.413.1621317213261; Mon, 17 May 2021 22:53:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621317213; cv=none; d=google.com; s=arc-20160816; b=FVs9Sw6nDAd7hPQo194hCOSM1eU7f8vXscAbCmIFnbSdbT0P9oXPPzRVcIkYT1B18E HHV0lHZl5Hasd/vhrstWqSLluDOET2XS9MMKLfAk0kpeBe5Ctz5xu0Jc0LfMjbm7AuSv UJMVYo64zz/5afF8Z838Y8W7Kk3O5jnqBwwOfR3MyLaKWb1cQoArFT8wqnDrAMyy/vBU Ei5NYoiQtcSvLNqrNJ6hxinzSISX6AF2Lly5nDKrPLhnkZCORQIASWyNcep3aTBbmgDP CYpq42dQ8bGkukSQbddhpDpzrGFcRRRT0tSxYCBA4cD0y7veFT+50E7hrqUeZTUCyD9C 0wcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=c6LPnyio8Cv+TSghNAq5xCG139DThUAiHcH9HMINg68=; b=GqCC+EGQzKbtfquAP6hCh4/dEmBY0aFAKJkQg94XGP76Zab5gSzfCSBsFB4sIeQC1b 2CM+lniSIM4Bu67JDxI/IhXw28HIvt8ha1WLndxnGeZhmIVHtHqbaAwo/Pg7d8Xd0o6u YHYTMRAy061Ro4Le6nPZp4iTl92kXIvvH5lkfucO8XFI6S3LTdeA5EfGSvnA7lCFoTuS G9J72DJlFRA6IMD6VAsgodwCSc3xblIiC/WknRi4GJZZNDHtLTwegPKYDE56Thn7aR+f qiZyk/EQPHSQjOtK4uZQHbAH3vXWg7s0UrCMb0EGKrRIGDZjbYN8OUBhkyTnAWTgg7tE CZgQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r127si12565825qkc.364.2021.05.17.22.53.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 17 May 2021 22:53:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:42748 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lisfc-000557-KV for patch@linaro.org; Tue, 18 May 2021 01:53:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lisKu-0007zl-GF for qemu-devel@nongnu.org; Tue, 18 May 2021 01:32:08 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:46875) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lisKn-0007Ap-CK for qemu-devel@nongnu.org; Tue, 18 May 2021 01:32:08 -0400 Received: from quad ([82.142.31.78]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MpCz1-1l7vEI1HAN-00qiVV; Tue, 18 May 2021 07:31:57 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 47/59] linux-user/s390x: Handle vector regs in signal stack Date: Tue, 18 May 2021 07:31:19 +0200 Message-Id: <20210518053131.87212-48-laurent@vivier.eu> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210518053131.87212-1-laurent@vivier.eu> References: <20210518053131.87212-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:pduDJBBa1j5WPg2tbxd0kzTYo3QwAuSCsOz4rlxPUwgEnVg+AEE LJpbYsVCkvvPMs/NuVj9ANsiMT/c+6wWdyiLVfDGugjXSpeWskKp5R5Jk+v/TrC4QzPIkpL VSKYq0aD+91admWhBOkPeniHzOnL0O5QJxj7BBsS7UwH81j5tY0mwcpTg28mABPE9gNoxT0 YEqh/afnmsMJhMj+wo11g== X-UI-Out-Filterresults: notjunk:1; V03:K0:A6io08Te8Bo=:oXg6fa3ITkINEKenSFhoBK uo+qihW+pOWPcQJ+SJ8Ky5AbtP9WxwtINoz3+B631Fee47ErhuLQfx3bp5HNhJo3njx0ToGyW 3Sx11exjflrj3/wMLIRAvSQjSv6EPArX7pKC+BE/dbWT6x789BBS464j6YT5zNU2NpYV4vtbo WPPWCXbWa3F9rQCABDynqUPdfG37NHkMxDErG3J3c85YsD7P/PXve4rYlhdSYPWWzms8XuITg NKTap23Fcd1Z2H0yv0A/Ipi8rghc+xdElXqazVmIlCWwf6AsPDDvtHNLjy8jbN75ZBG6s6F5L S7kQSe67b1FvIFHduO0A8X/RuRAvFxrckIj73lSWHCoIki76oZWinHFfHyhQnobtVVrzqvO9S Ygz+1IzTrqEw+dI1syuhaC2W2UtBdPXoou5UgCKXj8PJYekjws3PM6V5sB4X/9Z16B+k1Xcpf QenNi7IKdZXcy8HKRMLPqUlrCgcmfHyGOtWZ1/s2NovscET2O66Bqkq40DUx9I3NsvrbsKV1P ga9L2EqHd9O6KzE069ddVw= Received-SPF: none client-ip=212.227.126.187; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , Laurent Vivier , David Hildenbrand Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Signed-off-by: Richard Henderson Reviewed-by: David Hildenbrand Message-Id: <20210428193408.233706-16-richard.henderson@linaro.org> [lv: fix indentation] Signed-off-by: Laurent Vivier --- linux-user/s390x/signal.c | 62 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 2 deletions(-) -- 2.31.1 diff --git a/linux-user/s390x/signal.c b/linux-user/s390x/signal.c index 9d470e4ca069..ef136dae3348 100644 --- a/linux-user/s390x/signal.c +++ b/linux-user/s390x/signal.c @@ -50,6 +50,12 @@ typedef struct { target_s390_fp_regs fpregs; } target_sigregs; +typedef struct { + uint64_t vxrs_low[16]; + uint64_t vxrs_high[16][2]; + uint8_t reserved[128]; +} target_sigregs_ext; + typedef struct { abi_ulong oldmask[_SIGCONTEXT_NSIG_WORDS]; abi_ulong sregs; @@ -60,15 +66,20 @@ typedef struct { target_sigcontext sc; target_sigregs sregs; int signo; + target_sigregs_ext sregs_ext; uint16_t retcode; } sigframe; +#define TARGET_UC_VXRS 2 + struct target_ucontext { abi_ulong tuc_flags; abi_ulong tuc_link; target_stack_t tuc_stack; target_sigregs tuc_mcontext; - target_sigset_t tuc_sigmask; /* mask last for extensibility */ + target_sigset_t tuc_sigmask; + uint8_t reserved[128 - sizeof(target_sigset_t)]; + target_sigregs_ext tuc_mcontext_ext; }; typedef struct { @@ -128,6 +139,24 @@ static void save_sigregs(CPUS390XState *env, target_sigregs *sregs) } } +static void save_sigregs_ext(CPUS390XState *env, target_sigregs_ext *ext) +{ + int i; + + /* + * if (MACHINE_HAS_VX) ... + * That said, we always allocate the stack storage and the + * space is always available in env. + */ + for (i = 0; i < 16; ++i) { + __put_user(env->vregs[i][1], &ext->vxrs_low[i]); + } + for (i = 0; i < 16; ++i) { + __put_user(env->vregs[i + 16][0], &ext->vxrs_high[i][0]); + __put_user(env->vregs[i + 16][1], &ext->vxrs_high[i][1]); + } +} + void setup_frame(int sig, struct target_sigaction *ka, target_sigset_t *set, CPUS390XState *env) { @@ -161,6 +190,9 @@ void setup_frame(int sig, struct target_sigaction *ka, */ __put_user(sig, &frame->signo); + /* Create sigregs_ext on the signal stack. */ + save_sigregs_ext(env, &frame->sregs_ext); + /* * Set up to return from userspace. * If provided, use a stub already in userspace. @@ -202,6 +234,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, rt_sigframe *frame; abi_ulong frame_addr; abi_ulong restorer; + abi_ulong uc_flags; frame_addr = get_sigframe(ka, env, sizeof *frame); trace_user_setup_rt_frame(env, frame_addr); @@ -229,10 +262,15 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, tswap_siginfo(&frame->info, info); /* Create ucontext on the signal stack. */ - __put_user(0, &frame->uc.tuc_flags); + uc_flags = 0; + if (s390_has_feat(S390_FEAT_VECTOR)) { + uc_flags |= TARGET_UC_VXRS; + } + __put_user(uc_flags, &frame->uc.tuc_flags); __put_user(0, &frame->uc.tuc_link); target_save_altstack(&frame->uc.tuc_stack, env); save_sigregs(env, &frame->uc.tuc_mcontext); + save_sigregs_ext(env, &frame->uc.tuc_mcontext_ext); tswap_sigset(&frame->uc.tuc_sigmask, set); /* Set up registers for signal handler */ @@ -271,6 +309,24 @@ static void restore_sigregs(CPUS390XState *env, target_sigregs *sc) } } +static void restore_sigregs_ext(CPUS390XState *env, target_sigregs_ext *ext) +{ + int i; + + /* + * if (MACHINE_HAS_VX) ... + * That said, we always allocate the stack storage and the + * space is always available in env. + */ + for (i = 0; i < 16; ++i) { + __get_user(env->vregs[i][1], &ext->vxrs_low[i]); + } + for (i = 0; i < 16; ++i) { + __get_user(env->vregs[i + 16][0], &ext->vxrs_high[i][0]); + __get_user(env->vregs[i + 16][1], &ext->vxrs_high[i][1]); + } +} + long do_sigreturn(CPUS390XState *env) { sigframe *frame; @@ -292,6 +348,7 @@ long do_sigreturn(CPUS390XState *env) set_sigmask(&set); /* ~_BLOCKABLE? */ restore_sigregs(env, &frame->sregs); + restore_sigregs_ext(env, &frame->sregs_ext); unlock_user_struct(frame, frame_addr, 0); return -TARGET_QEMU_ESIGRETURN; @@ -313,6 +370,7 @@ long do_rt_sigreturn(CPUS390XState *env) set_sigmask(&set); /* ~_BLOCKABLE? */ restore_sigregs(env, &frame->uc.tuc_mcontext); + restore_sigregs_ext(env, &frame->uc.tuc_mcontext_ext); target_restore_altstack(&frame->uc.tuc_stack, env);