From nobody Sat Nov 23 20:42:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1730932673; cv=none; d=zohomail.com; s=zohoarc; b=MS4mIwLCjHQTJrhVlh8uaMzbWtmOpyyakEdE+BwGYBMhFhHQwrR5aDmcLJCNxuRPUvh/u9zePbd9Dw2N5fP17clB3TCllOL5nT4/jeuvg7fqcIhhlE56Ks1kkKEvo4lq986BWEn9vP1EhV9IuqzyRpkdBtgt+Q5/8nsOsgzY1HM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1730932673; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TXEDPvrPW+KpzpgVgWZBv+7ZlGIxTLrvq9RB5xDFys4=; b=CxKdB9O2fHT2lWhtfvT4Ha/QGLF9PuOTupdEBjb7G+lOhQbvy1BmtjJ1TKVwb1CEsxBzfI42JHtjWMpBLqpkiKn5ipSQHJ7CzxTiH6QJXh155v87XODdjc+/p/Rq5n9GD2Bi/PqlhAbR4c9t77nhD6P/qQ8W/qgSU2vjNKL6IdE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1730932673158433.0537479524502; Wed, 6 Nov 2024 14:37:53 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t8oeE-0005My-PB; Wed, 06 Nov 2024 17:37:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t8oeA-0005MQ-4p for qemu-devel@nongnu.org; Wed, 06 Nov 2024 17:37:06 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t8oe8-0005Oh-5z for qemu-devel@nongnu.org; Wed, 06 Nov 2024 17:37:05 -0500 Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 4A6MA6d8022158; Wed, 6 Nov 2024 22:36:37 GMT Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 42rh0rg3bc-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 Nov 2024 22:36:36 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 4A6GhLkA012249; Wed, 6 Nov 2024 22:36:36 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 42p140y16r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 Nov 2024 22:36:35 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 4A6MaYRm29557232 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 6 Nov 2024 22:36:34 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 31FFA20043; Wed, 6 Nov 2024 22:36:34 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8D61C20040; Wed, 6 Nov 2024 22:36:33 +0000 (GMT) Received: from heavy.ibm.com (unknown [9.171.88.240]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 6 Nov 2024 22:36:33 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=TXEDPvrPW+KpzpgVg WZBv+7ZlGIxTLrvq9RB5xDFys4=; b=MHE/0xWtq7y2pmDNlBJnQGexQ+by42xvD jqp61CaKsXk7Hw4EuVos25xZL9Lw4nMt0oPp+IBsipnEnCJIe+wzTuppflgfHYWD DsBZGEmC0NJmRKeRGpfbo4m6UDdQpauPqo7z5A5+/aBHtyC2+wbUf9ht+PFw6tCm oS2S8kopM/fi+8bctlYrNF9TiFuX0LjUCNpe8TB5uZ9SqDNf4G8L1rIu/mx6ZwLU H5xgWbRv4lHafXYiyhZ2jfZyCby2hkFZybksDRFFps42nZvXZjBhil9TmSjs9EV8 +jnH2Gz51U85e5K+Icd0rCAurBjOOr/fjLNF67Lss+GL+wO7WtZmg== From: Ilya Leoshkevich To: Warner Losh , Riku Voipio , Laurent Vivier , Paolo Bonzini , Richard Henderson Cc: Kyle Evans , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Ilya Leoshkevich Subject: [PATCH v2 4/8] user: Introduce host_interrupt_signal Date: Wed, 6 Nov 2024 23:31:03 +0100 Message-ID: <20241106223629.2608-5-iii@linux.ibm.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241106223629.2608-1-iii@linux.ibm.com> References: <20241106223629.2608-1-iii@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: 7MRRCHTA6vOfuEN8L9QWIqcr_R4d1G2f X-Proofpoint-GUID: 7MRRCHTA6vOfuEN8L9QWIqcr_R4d1G2f X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1051,Hydra:6.0.680,FMLib:17.12.62.30 definitions=2024-10-15_01,2024-10-11_01,2024-09-30_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 phishscore=0 spamscore=0 impostorscore=0 lowpriorityscore=0 bulkscore=0 adultscore=0 priorityscore=1501 malwarescore=0 clxscore=1015 mlxscore=0 mlxlogscore=983 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2409260000 definitions=main-2411060174 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: pass client-ip=148.163.158.5; envelope-from=iii@linux.ibm.com; helo=mx0b-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1730932674896116600 Content-Type: text/plain; charset="utf-8" Attaching to the gdbstub of a running process requires stopping its threads. For threads that run on a CPU, cpu_exit() is enough, but the only way to grab attention of a thread that is stuck in a long-running syscall is to interrupt it with a signal. Reserve a host realtime signal for this, just like it's already done for TARGET_SIGABRT on Linux. This may reduce the number of available guest realtime signals by one, but this is acceptable, since there are quite a lot of them, and it's unlikely that there are apps that need them all. Set signal_pending for the safe_sycall machinery to prevent invoking the syscall. This is a lie, since we don't queue a guest signal, but process_pending_signals() can handle the absence of pending signals. The syscall returns with QEMU_ERESTARTSYS errno, which arranges for the automatic restart. This is important, because it helps avoiding disturbing poorly written guests. Reviewed-by: Warner Losh Signed-off-by: Ilya Leoshkevich --- bsd-user/signal.c | 12 ++++++++++++ include/user/signal.h | 2 ++ linux-user/signal.c | 25 ++++++++++++++++++++----- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/bsd-user/signal.c b/bsd-user/signal.c index a2b11a97131..992736df5c5 100644 --- a/bsd-user/signal.c +++ b/bsd-user/signal.c @@ -49,6 +49,8 @@ static inline int sas_ss_flags(TaskState *ts, unsigned lo= ng sp) on_sig_stack(ts, sp) ? SS_ONSTACK : 0; } =20 +int host_interrupt_signal =3D SIGRTMAX; + /* * The BSD ABIs use the same signal numbers across all the CPU architectur= es, so * (unlike Linux) these functions are just the identity mapping. This migh= t not @@ -489,6 +491,12 @@ static void host_signal_handler(int host_sig, siginfo_= t *info, void *puc) uintptr_t pc =3D 0; bool sync_sig =3D false; =20 + if (host_sig =3D=3D host_interrupt_signal) { + ts->signal_pending =3D 1; + cpu_exit(thread_cpu); + return; + } + /* * Non-spoofed SIGSEGV and SIGBUS are synchronous, and need special * handling wrt signal blocking and unwinding. @@ -852,6 +860,9 @@ void signal_init(void) =20 for (i =3D 1; i <=3D TARGET_NSIG; i++) { host_sig =3D target_to_host_signal(i); + if (host_sig =3D=3D host_interrupt_signal) { + continue; + } sigaction(host_sig, NULL, &oact); if (oact.sa_sigaction =3D=3D (void *)SIG_IGN) { sigact_table[i - 1]._sa_handler =3D TARGET_SIG_IGN; @@ -870,6 +881,7 @@ void signal_init(void) sigaction(host_sig, &act, NULL); } } + sigaction(host_interrupt_signal, &act, NULL); } =20 static void handle_pending_signal(CPUArchState *env, int sig, diff --git a/include/user/signal.h b/include/user/signal.h index 19b6b9e5ddc..7fa33b05d91 100644 --- a/include/user/signal.h +++ b/include/user/signal.h @@ -20,4 +20,6 @@ */ int target_to_host_signal(int sig); =20 +extern int host_interrupt_signal; + #endif diff --git a/linux-user/signal.c b/linux-user/signal.c index b1c468cf5c3..551c6bb1448 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -515,6 +515,8 @@ static int core_dump_signal(int sig) } } =20 +int host_interrupt_signal; + static void signal_table_init(const char *rtsig_map) { int hsig, tsig, count; @@ -578,10 +580,10 @@ static void signal_table_init(const char *rtsig_map) * Attempts for configure "missing" signals via sigaction will be * silently ignored. * - * Reserve one signal for internal usage (see below). + * Reserve two signals for internal usage (see below). */ =20 - hsig =3D SIGRTMIN + 1; + hsig =3D SIGRTMIN + 2; for (tsig =3D TARGET_SIGRTMIN; hsig <=3D SIGRTMAX && tsig <=3D TARGET_NSIG; hsig++, tsig++) { @@ -602,12 +604,17 @@ static void signal_table_init(const char *rtsig_map) host_to_target_signal_table[SIGABRT] =3D 0; for (hsig =3D SIGRTMIN; hsig <=3D SIGRTMAX; hsig++) { if (!host_to_target_signal_table[hsig]) { - host_to_target_signal_table[hsig] =3D TARGET_SIGABRT; - break; + if (host_interrupt_signal) { + host_to_target_signal_table[hsig] =3D TARGET_SIGABRT; + break; + } else { + host_interrupt_signal =3D hsig; + } } } if (hsig > SIGRTMAX) { - fprintf(stderr, "No rt signals left for SIGABRT mapping\n"); + fprintf(stderr, + "No rt signals left for interrupt and SIGABRT mapping\n"); exit(EXIT_FAILURE); } =20 @@ -687,6 +694,8 @@ void signal_init(const char *rtsig_map) } sigact_table[tsig - 1]._sa_handler =3D thand; } + + sigaction(host_interrupt_signal, &act, NULL); } =20 /* Force a synchronously taken signal. The kernel force_sig() function @@ -1034,6 +1043,12 @@ static void host_signal_handler(int host_sig, siginf= o_t *info, void *puc) bool sync_sig =3D false; void *sigmask; =20 + if (host_sig =3D=3D host_interrupt_signal) { + ts->signal_pending =3D 1; + cpu_exit(thread_cpu); + return; + } + /* * Non-spoofed SIGSEGV and SIGBUS are synchronous, and need special * handling wrt signal blocking and unwinding. Non-spoofed SIGILL, --=20 2.47.0