From nobody Thu May 9 11:44:07 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1659115576; cv=none; d=zohomail.com; s=zohoarc; b=GDlLQzA7mrD3hp4GqWx1Y8fi63URko9ZnsRDcH98W2vVTLWL7GvRrfCt+BDUrVcGPUke1qLqbrEhvtusG3QWaNuteBKbigTTjRjHRePNKfJhabc4sfPiXOoJSJZbMv/iukP5C9DiUvM23gQdJqulO+YAqKSvb0eWnlnEsRsDACI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659115576; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=A9GgmeiJQSr2xjaj5SsR3wBj4T3CMWdOAEf/FFOx6HQ=; b=a8cK3Lnga1RooOczxSklUk1fV31pRI7k/LDirH294Dua1iIgh0MNDYyOr6VwKeNNFYYzNaAz8sfujiKbDLQwMRP6i9e2Fj2RoZNxgjikd5qu/FbjmUIKIDZgpCihU/ngifjs+61FUhOa4tg41T/zz76C7ljp1hCXFoHuBpLfS8k= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1659115576928440.14266488574583; Fri, 29 Jul 2022 10:26:16 -0700 (PDT) Received: from localhost ([::1]:38024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHTkd-0000Ko-UF for importer@patchew.org; Fri, 29 Jul 2022 13:26:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43708) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHTgL-0002pn-FR for qemu-devel@nongnu.org; Fri, 29 Jul 2022 13:21:50 -0400 Received: from mail-pj1-x102e.google.com ([2607:f8b0:4864:20::102e]:35698) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oHTgH-0003nW-8f for qemu-devel@nongnu.org; Fri, 29 Jul 2022 13:21:48 -0400 Received: by mail-pj1-x102e.google.com with SMTP id a7-20020a17090a008700b001f325db8b90so4442404pja.0 for ; Fri, 29 Jul 2022 10:21:44 -0700 (PDT) Received: from stoup.. ([2602:ae:1549:801:51c4:5cf0:5954:aeb6]) by smtp.gmail.com with ESMTPSA id d18-20020a170902aa9200b0016bb24f5d19sm3881039plr.209.2022.07.29.10.21.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 10:21:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A9GgmeiJQSr2xjaj5SsR3wBj4T3CMWdOAEf/FFOx6HQ=; b=BEZjAcpAfEOV9i1gp9Z3PVL1JV3gHV18ZnrHS8HlzIicrQ20cMbYxogeeQ74RHxhPW vIn4dKBPKtHio7S7/fd08UhSCA0jeF54Hbh5VtqxTS9l85SVgE5kLS/VEoHgXYIao4lq 2doI+X7FKpi9+a5BlgzFFRGx7FOT7nR+mvO4serkSRWVEADSO/VwdVl0MxOpccvwUik9 JdlPtm+9bDCcrJ9jxTPK8CB41fNeud0WpQTt4YkMBwilxpjsioVaYoEAuzval4Oo87Cx JCL49tHiWS8OPsx2xX1KeP3oV6MwLYsfTM0LFkhVD2agaugi8AnyRsFnJkh4/NU8cYUy 1R9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=A9GgmeiJQSr2xjaj5SsR3wBj4T3CMWdOAEf/FFOx6HQ=; b=oPkLvGKW1+vYMJjiBHy9gO5MCz8ZvtihB29SAhKgrBRmuNklKTnM++cxj3tIreA+AV XaN+1OHnZWcrA31Sqh/FjOB9vc/fRAAch5jhGfEaQiu2QdX4rr5DcNjpPATCx9Z6fa1O Gg2RopLESdiSDCawMIP2mrzCJnh3NJJ4BwpZxKGuP2hnVg23EWNxKcJMUh6+qJk8r7fn 2qSB3JkptFguMHS5NihXMCdY2mKsEkdzG3zAZ18BwufKCwqExdY3NmEXfG5BD/+kmGhf zhSx6i/NfkPXcvet7WcUgmdyJrSCi9NL6gD+cS72Hqd6cDXhUzFFA8YzVjO2/hzxxoE+ 3BUg== X-Gm-Message-State: ACgBeo2TFTY0QLQ/LqN1IKY7z7w+TKhdAf4L+LP9fS50vx0t1OX1AQst Ln0BFuGVZpwy8ADinFM83/URbHP1c2EF0Q== X-Google-Smtp-Source: AA6agR4zRC+qK8q1CpbI3KbA+LoGvxDx4fcVENPJ7agzH7iDq07FeDH+vGktL0f/erRgS6L57+D6ig== X-Received: by 2002:a17:90a:8a8d:b0:1f3:155:3324 with SMTP id x13-20020a17090a8a8d00b001f301553324mr5117194pjn.89.1659115303917; Fri, 29 Jul 2022 10:21:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: mark.cave-ayland@ilande.co.uk, qemu-ppc@nongnu.org, laurent@vivier.eu Subject: [PATCH 1/2] common-user/host/ppc: Implement safe-syscall.inc.S Date: Fri, 29 Jul 2022 10:21:40 -0700 Message-Id: <20220729172141.1789105-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220729172141.1789105-1-richard.henderson@linaro.org> References: <20220729172141.1789105-1-richard.henderson@linaro.org> 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: pass client-ip=2607:f8b0:4864:20::102e; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1659115578454100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson Reviewed-by: Daniel Henrique Barboza --- common-user/host/ppc/safe-syscall.inc.S | 107 ++++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 common-user/host/ppc/safe-syscall.inc.S diff --git a/common-user/host/ppc/safe-syscall.inc.S b/common-user/host/ppc= /safe-syscall.inc.S new file mode 100644 index 0000000000..0851f6c0b8 --- /dev/null +++ b/common-user/host/ppc/safe-syscall.inc.S @@ -0,0 +1,107 @@ +/* + * safe-syscall.inc.S : host-specific assembly fragment + * to handle signals occurring at the same time as system calls. + * This is intended to be included by common-user/safe-syscall.S + * + * Copyright (C) 2022 Linaro, Ltd. + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +/* + * Standardize on the _CALL_FOO symbols used by GCC: + * Apple XCode does not define _CALL_DARWIN. + * Clang defines _CALL_ELF (64-bit) but not _CALL_SYSV (32-bit). + */ +#if !defined(_CALL_SYSV) && \ + !defined(_CALL_DARWIN) && \ + !defined(_CALL_AIX) && \ + !defined(_CALL_ELF) +# if defined(__APPLE__) +# define _CALL_DARWIN +# elif defined(__ELF__) && TCG_TARGET_REG_BITS =3D=3D 32 +# define _CALL_SYSV +# else +# error "Unknown ABI" +# endif +#endif=20 + +#ifndef _CALL_SYSV +# error "Unsupported ABI" +#endif + + + .global safe_syscall_base + .global safe_syscall_start + .global safe_syscall_end + .type safe_syscall_base, @function + + .text + + /* + * This is the entry point for making a system call. The calling + * convention here is that of a C varargs function with the + * first argument an 'int *' to the signal_pending flag, the + * second one the system call number (as a 'long'), and all further + * arguments being syscall arguments (also 'long'). + */ +safe_syscall_base: + .cfi_startproc + stwu 1, -8(1) + .cfi_def_cfa_offset 8 + stw 30, 4(1) + .cfi_offset 30, -4 + + /* + * We enter with r3 =3D=3D &signal_pending + * r4 =3D=3D syscall number + * r5 ... r10 =3D=3D syscall arguments + * and return the result in r3 + * and the syscall instruction needs + * r0 =3D=3D syscall number + * r3 ... r8 =3D=3D syscall arguments + * and returns the result in r3 + * Shuffle everything around appropriately. + */ + mr 30, 3 /* signal_pending */ + mr 0, 4 /* syscall number */ + mr 3, 5 /* syscall arguments */ + mr 4, 6 + mr 5, 7 + mr 6, 8 + mr 7, 9 + mr 8, 10 + + /* + * This next sequence of code works in conjunction with the + * rewind_if_safe_syscall_function(). If a signal is taken + * and the interrupted PC is anywhere between 'safe_syscall_start' + * and 'safe_syscall_end' then we rewind it to 'safe_syscall_start= '. + * The code sequence must therefore be able to cope with this, and + * the syscall instruction must be the final one in the sequence. + */ +safe_syscall_start: + /* if signal_pending is non-zero, don't do the call */ + lwz 12, 0(30) + cmpwi 0, 12, 0 + bne- 2f + sc +safe_syscall_end: + /* code path when we did execute the syscall */ + lwz 30, 4(1) /* restore r30 */ + addi 1, 1, 8 /* restore stack */ + .cfi_restore 30 + .cfi_def_cfa_offset 0 + bnslr+ /* return on success */ + b safe_syscall_set_errno_tail + + /* code path when we didn't execute the syscall */ +2: lwz 30, 4(1) + addi 1, 1, 8 + addi 3, 0, QEMU_ERESTARTSYS + b safe_syscall_set_errno_tail + + .cfi_endproc + + .size safe_syscall_base, .-safe_syscall_base --=20 2.34.1 From nobody Thu May 9 11:44:07 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1659115430; cv=none; d=zohomail.com; s=zohoarc; b=mbX2SWY/JIYmmai4Hi7InIoWzCB7BhhpRLrtwugvg5YwZgQd7qQlx3kewlqA6SZn1lC95WvkS1vMIOXe4Oic9tEnuuhqJLrbixOEiDQ8yE5YOaykF6UM3TIy9nKpMABx8XnBsIJjVEhnlPE41/0aO/7vz250RXsFLTI3WFgR0v8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1659115430; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0q4lynJszics53xcZKYUS9IEsGSast3cy0Ggpgs4xg4=; b=BSF0J+2Q0YMfTotE0gQ+tBWH1d5e2dS2MAoRDTEuVr7MkfSkoccGOVppQKVSgsP/a3xwI63R3eZuLJecVmp0rdoZTT16YWtqqgmbomzmuL11UMkEgyUTceOSD/8YoVLQ+htocZPUrovbWu56TsO4IuVbEMcky2ROqVF+K0EQJ2Y= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1659115430293438.12877497417924; Fri, 29 Jul 2022 10:23:50 -0700 (PDT) Received: from localhost ([::1]:33434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oHTiH-0005er-5d for importer@patchew.org; Fri, 29 Jul 2022 13:23:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oHTgM-0002pq-C4 for qemu-devel@nongnu.org; Fri, 29 Jul 2022 13:21:50 -0400 Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]:34415) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oHTgJ-0003nm-FP for qemu-devel@nongnu.org; Fri, 29 Jul 2022 13:21:49 -0400 Received: by mail-pl1-x632.google.com with SMTP id z19so5190057plb.1 for ; Fri, 29 Jul 2022 10:21:47 -0700 (PDT) Received: from stoup.. ([2602:ae:1549:801:51c4:5cf0:5954:aeb6]) by smtp.gmail.com with ESMTPSA id d18-20020a170902aa9200b0016bb24f5d19sm3881039plr.209.2022.07.29.10.21.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 10:21:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0q4lynJszics53xcZKYUS9IEsGSast3cy0Ggpgs4xg4=; b=rt0qJ1Xj3xiS3VZPwZe413MA0FzWOr8P+yzdbdX/mhWGiRaoS907oCWvpH9mUcDQve nm2YkLen9Unm4jTHLYERCK/JpNeqW/j/f0ZTbuKkG3PHrPEz7FJefowONfRkV95x8ALx PSzVt4CXioxGHwc05UIzWSNbkk3iFE1iK3J4IRNzu4AEQYVkJMmHXnEFQC9SqVcsa5DP ROV3X4zQcFNrPp3LZVYqZtR+fotr9Q2bNNQhq7QrvPA/9cPYMXtvm6ML1L52SaoDc1W1 CApwoQLhZecYVfvj+bAFBg39TOhSmQjlH9UQRv0l/zFOmT3Vxj/DTi7Z2Kk/otlKAJQS Ogsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0q4lynJszics53xcZKYUS9IEsGSast3cy0Ggpgs4xg4=; b=VnM3K1KA/NGNqneG3iHk2A6bdy3Xlsn7A5pdkesfaRKIneRcOt+iZgZ6Ex0RRdK1sh 9OHodzlb3l8SpxdkVKpKPS2+sjZatEKRGKdp/J2QYK2i8lSdaZDHRggxkRBL0g7vR3DA uGA22mGeDpzDkccFy4GojHuYW78Ul6Y8xutPNbEnrqtyKf9ehgBp6RNQRrQ+Es2idB9w WSPOwx7JRWzWnbcYPFCGpuOLg9q4e0EBkisjP5qwvC4cCQYoPptSHYEDPcM+9zsScDsX X/25OVQ4oZ64Xcj++FElvFWzWlQv/Aw51ybD3GOI98GSPYcLQWRIznZMETVcguZ+jpCL nXrw== X-Gm-Message-State: ACgBeo00NJ0z0JNeNpBDArVdA0r707YZMIFJfxSkbNR6MvcR52gcpl5x IQwFxxIz6K7IErtelxswmP0pu+QqH4yAHA== X-Google-Smtp-Source: AA6agR6R3frQmRLOROcArVyYIwMLHaH3GDQ7o+dK9QnSGm93SF7+OPk/+cvr4H3K+fmpkBQSYf+pOw== X-Received: by 2002:a17:90a:1c01:b0:1f1:bf54:67ff with SMTP id s1-20020a17090a1c0100b001f1bf5467ffmr5782119pjs.172.1659115306036; Fri, 29 Jul 2022 10:21:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: mark.cave-ayland@ilande.co.uk, qemu-ppc@nongnu.org, laurent@vivier.eu Subject: [PATCH 2/2] linux-user: Implment host/ppc/host-signal.h Date: Fri, 29 Jul 2022 10:21:41 -0700 Message-Id: <20220729172141.1789105-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220729172141.1789105-1-richard.henderson@linaro.org> References: <20220729172141.1789105-1-richard.henderson@linaro.org> 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: pass client-ip=2607:f8b0:4864:20::632; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x632.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1659115431541100001 Content-Type: text/plain; charset="utf-8" This commit re-enables ppc32 as a linux-user host, as existance of the directory is noted by configure. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1097 Signed-off-by: Richard Henderson Reviewed-by: Daniel Henrique Barboza --- linux-user/include/host/ppc/host-signal.h | 39 +++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 linux-user/include/host/ppc/host-signal.h diff --git a/linux-user/include/host/ppc/host-signal.h b/linux-user/include= /host/ppc/host-signal.h new file mode 100644 index 0000000000..de25c803f5 --- /dev/null +++ b/linux-user/include/host/ppc/host-signal.h @@ -0,0 +1,39 @@ +/* + * host-signal.h: signal info dependent on the host architecture + * + * Copyright (c) 2022 Linaro Ltd. + * + * This work is licensed under the terms of the GNU LGPL, version 2.1 or l= ater. + * See the COPYING file in the top-level directory. + */ + +#ifndef PPC_HOST_SIGNAL_H +#define PPC_HOST_SIGNAL_H + +#include + +/* The third argument to a SA_SIGINFO handler is ucontext_t. */ +typedef ucontext_t host_sigcontext; + +static inline uintptr_t host_signal_pc(host_sigcontext *uc) +{ + return uc->uc_mcontext.regs->nip; +} + +static inline void host_signal_set_pc(host_sigcontext *uc, uintptr_t pc) +{ + uc->uc_mcontext.regs->nip =3D pc; +} + +static inline void *host_signal_mask(host_sigcontext *uc) +{ + return &uc->uc_sigmask; +} + +static inline bool host_signal_write(siginfo_t *info, host_sigcontext *uc) +{ + return uc->uc_mcontext.regs->trap !=3D 0x400 + && (uc->uc_mcontext.regs->dsisr & 0x02000000); +} + +#endif --=20 2.34.1