From nobody Sat May 18 10:07:53 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1602131214; cv=none; d=zohomail.com; s=zohoarc; b=YEJo8w5JN4lr42WF1xuO2ymfo3vt3CBwQulydbfj6a+I3ffwwFXG4l/LFPnvgwDZ/vgKAuvczxHoFhZBnn9DGFiXMMKdakTGPJF7Omt5GjrGhz4Q/lwFm5ljAvIKSbzCPROP8YjHiXKUE33r1fMom80f9eaTBJBFsSoPj3bFLbQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602131214; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=R3lI4amypm4Y14UDaKZYyZcVftKV0uE8Dmf+V/RQkLA=; b=NrD0+7CxcxhKLrw0UCBVc2dhR8pYPsyar3Y0FpZqg2PoCQYz3TFzHwNUMvh8b80em/z+8QPOIi7n7G/y6sUdV5METhd/h2awWam/OBR3z87w6SEGFDt72W6CazstvdjH0hRE8RMxZL7RVUchM/A144GvT0Bi+VOpkBRC5alOZcM= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602131214314689.2174293861085; Wed, 7 Oct 2020 21:26:54 -0700 (PDT) Received: from localhost ([::1]:55566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQNVz-00087B-NK for importer@patchew.org; Thu, 08 Oct 2020 00:26:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56718) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQNUj-0007DL-8b for qemu-devel@nongnu.org; Thu, 08 Oct 2020 00:25:33 -0400 Received: from lucky1.263xmail.com ([211.157.147.132]:43458) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQNUf-0001gt-CB for qemu-devel@nongnu.org; Thu, 08 Oct 2020 00:25:32 -0400 Received: from localhost (unknown [192.168.167.8]) by lucky1.263xmail.com (Postfix) with ESMTP id 3A972EF1F0; Thu, 8 Oct 2020 12:25:18 +0800 (CST) Received: from localhost.localdomain (unknown [111.30.214.76]) by smtp.263.net (postfix) whith ESMTP id P2452T140206445422336S1602131103681870_; Thu, 08 Oct 2020 12:25:18 +0800 (CST) X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-ADDR-CHECKED4: 1 X-ANTISPAM-LEVEL: 2 X-ABS-CHECKED: 0 X-UNIQUE-TAG: <6b4f0a22e018b87b7eb2b0dc47b5f28d> X-RL-SENDER: chengang@emindsoft.com.cn X-SENDER: chengang@emindsoft.com.cn X-LOGIN-NAME: chengang@emindsoft.com.cn X-FST-TO: laurent@vivier.eu X-SENDER-IP: 111.30.214.76 X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 X-System-Flag: 0 From: chengang@emindsoft.com.cn To: laurent@vivier.eu, riku.voipio@iki.fi Subject: [PATCH] linux-user: signal: Support TARGET_SS_AUTODISARM Date: Thu, 8 Oct 2020 12:25:01 +0800 Message-Id: <20201008042501.16857-1-chengang@emindsoft.com.cn> X-Mailer: git-send-email 2.24.0.308.g228f53135a MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=211.157.147.132; envelope-from=chengang@emindsoft.com.cn; helo=lucky1.263xmail.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/08 00:25:19 X-ACL-Warn: Detected OS = ??? 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: Chen Gang , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Chen Gang Microsoft sqlserver 2017 x86_64 uses it. The implementation references from the linux kernel. Signed-off-by: Chen Gang --- linux-user/generic/signal.h | 6 ++++++ linux-user/signal.c | 23 ++++++++++++++++++----- 2 files changed, 24 insertions(+), 5 deletions(-) diff --git a/linux-user/generic/signal.h b/linux-user/generic/signal.h index e1083f8fba..943bc1a1e2 100644 --- a/linux-user/generic/signal.h +++ b/linux-user/generic/signal.h @@ -54,4 +54,10 @@ #define TARGET_SIG_BLOCK 0 /* for blocking signals */ #define TARGET_SIG_UNBLOCK 1 /* for unblocking signals */ #define TARGET_SIG_SETMASK 2 /* for setting the signal mask */ + +/* bit-flags */ +#define TARGET_SS_AUTODISARM (1U << 31) /* disable sas during sighandling = */ +/* mask for all SS_xxx flags */ +#define TARGET_SS_FLAG_BITS TARGET_SS_AUTODISARM + #endif diff --git a/linux-user/signal.c b/linux-user/signal.c index 8cf51ffecd..b5f04ae160 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -263,6 +263,10 @@ int on_sig_stack(unsigned long sp) { TaskState *ts =3D (TaskState *)thread_cpu->opaque; =20 + if (ts->sigaltstack_used.ss_flags & TARGET_SS_AUTODISARM) { + return 0; + } + return (sp - ts->sigaltstack_used.ss_sp < ts->sigaltstack_used.ss_size); } @@ -293,8 +297,13 @@ void target_save_altstack(target_stack_t *uss, CPUArch= State *env) TaskState *ts =3D (TaskState *)thread_cpu->opaque; =20 __put_user(ts->sigaltstack_used.ss_sp, &uss->ss_sp); - __put_user(sas_ss_flags(get_sp_from_cpustate(env)), &uss->ss_flags); + __put_user(ts->sigaltstack_used.ss_flags, &uss->ss_flags); __put_user(ts->sigaltstack_used.ss_size, &uss->ss_size); + if (ts->sigaltstack_used.ss_flags & TARGET_SS_AUTODISARM) { + ts->sigaltstack_used.ss_sp =3D 0; + ts->sigaltstack_used.ss_size =3D 0; + ts->sigaltstack_used.ss_flags =3D TARGET_SS_DISABLE; + } } =20 /* siginfo conversion */ @@ -768,7 +777,7 @@ abi_long do_sigaltstack(abi_ulong uss_addr, abi_ulong u= oss_addr, abi_ulong sp) { __put_user(ts->sigaltstack_used.ss_sp, &oss.ss_sp); __put_user(ts->sigaltstack_used.ss_size, &oss.ss_size); - __put_user(sas_ss_flags(sp), &oss.ss_flags); + __put_user(ts->sigaltstack_used.ss_flags, &oss.ss_flags); } =20 if(uss_addr) @@ -776,6 +785,7 @@ abi_long do_sigaltstack(abi_ulong uss_addr, abi_ulong u= oss_addr, abi_ulong sp) struct target_sigaltstack *uss; struct target_sigaltstack ss; size_t minstacksize =3D TARGET_MINSIGSTKSZ; + int ss_mode; =20 #if defined(TARGET_PPC64) /* ELF V2 for PPC64 has a 4K minimum stack size for signal handler= s */ @@ -799,10 +809,12 @@ abi_long do_sigaltstack(abi_ulong uss_addr, abi_ulong= uoss_addr, abi_ulong sp) goto out; =20 ret =3D -TARGET_EINVAL; - if (ss.ss_flags !=3D TARGET_SS_DISABLE - && ss.ss_flags !=3D TARGET_SS_ONSTACK - && ss.ss_flags !=3D 0) + ss_mode =3D ss.ss_flags & ~TARGET_SS_FLAG_BITS; + if (ss_mode !=3D TARGET_SS_DISABLE + && ss_mode !=3D TARGET_SS_ONSTACK + && ss_mode !=3D 0) { goto out; + } =20 if (ss.ss_flags =3D=3D TARGET_SS_DISABLE) { ss.ss_size =3D 0; @@ -814,6 +826,7 @@ abi_long do_sigaltstack(abi_ulong uss_addr, abi_ulong u= oss_addr, abi_ulong sp) } } =20 + ts->sigaltstack_used.ss_flags =3D ss.ss_flags; ts->sigaltstack_used.ss_sp =3D ss.ss_sp; ts->sigaltstack_used.ss_size =3D ss.ss_size; } --=20 2.24.0.308.g228f53135a