From patchwork Wed Jun 22 00:32:13 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9191577 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 421EC6075E for ; Wed, 22 Jun 2016 00:37:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 26B1D28358 for ; Wed, 22 Jun 2016 00:37:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1B68E28383; Wed, 22 Jun 2016 00:37:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6473828358 for ; Wed, 22 Jun 2016 00:37:49 +0000 (UTC) Received: from localhost ([::1]:54992 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFWAu-0006F5-JI for patchwork-qemu-devel@patchwork.kernel.org; Tue, 21 Jun 2016 20:37:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44185) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFW6A-0001aj-6b for qemu-devel@nongnu.org; Tue, 21 Jun 2016 20:32:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFW67-0004FR-MX for qemu-devel@nongnu.org; Tue, 21 Jun 2016 20:32:53 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:33255) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFW67-0004FH-Hr for qemu-devel@nongnu.org; Tue, 21 Jun 2016 20:32:51 -0400 Received: by mail-qk0-x243.google.com with SMTP id a186so6615542qkf.0 for ; Tue, 21 Jun 2016 17:32:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=UwFwfWSJktmFbvusxdhhpAI072IqULuixtNUgVU98wg=; b=CXvc95Y53gsN4DESS/E7kClpig9PiwMUvGTbwWERX0uASoahsWdjFNDBl6RUj3qUNg E6F5aCGdAKzweaNn7G2P+pY1JpJfcnQn4tR0cosc923X/XXu+bN7MiQxi07Mcp9luyeb s8gzKUbwQ8If0pbgAyIlX4PAt2fHRev1SbS2J0/+gXSyRtDJ8dvRHWa3e8oEI21YssLT D9rzY5Yi75/LAezopRAo8JS89cVSm+I/EK6q0L8lL6ygjluEJvxUpDp/hj22aFVG8uYd dbsBIRLluCLnw7ZLkU/xngIWH+/EqQ+jky+qJ+5vlw8pTC00woIAmTnqSV5pFWw4XQxC D8aw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=UwFwfWSJktmFbvusxdhhpAI072IqULuixtNUgVU98wg=; b=Oax/8zgJoMOEPQz4gFliKrjnSmbmUfsqBgah/cXWQ968lLMtToEjZqH9TD4tudQtev QGRyTY1NhDIio0aohSYgfXlw9qtialkprlz9xKgx/IjibzK9EKY8GX/CLIQlmW5s+kAi ulgCsXFmWSZL790KH+XpMJbXZseBRehNk0Rt3Ih/U8ms7y3aqBPmat0Ux+nWTHZxyGsT UdUwyVXB0jseVAJYNGuiPACqn27GsElzZPzHP33bbH531yzoNq7wSUa2niUK9JMANSfq hYPA38A8SkIM6oHB0eiwWkcOshVE9hVyS+BL7yiaqEok46pUyTg9geAJnuio8F5FRguX wDNg== X-Gm-Message-State: ALyK8tJEIMsr8J81JwWHlDDpoZ0SvXkZERioO9h4f/ruH1Kd8VqaK8i/0E2JeZTaOtiEmQ== X-Received: by 10.55.87.194 with SMTP id l185mr34376725qkb.204.1466555571074; Tue, 21 Jun 2016 17:32:51 -0700 (PDT) Received: from bigtime.com (71-37-54-227.tukw.qwest.net. [71.37.54.227]) by smtp.gmail.com with ESMTPSA id c83sm8951214qkb.13.2016.06.21.17.32.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2016 17:32:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 21 Jun 2016 17:32:13 -0700 Message-Id: <1466555533-18359-6-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1466555533-18359-1-git-send-email-rth@twiddle.net> References: <1466555533-18359-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH v2 5/5] linux-user: Provide safe_syscall for ppc64 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, riku.voipio@iki.fi Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Richard Henderson --- linux-user/host/ppc64/hostdep.h | 23 ++++++++ linux-user/host/ppc64/safe-syscall.inc.S | 92 ++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 linux-user/host/ppc64/safe-syscall.inc.S diff --git a/linux-user/host/ppc64/hostdep.h b/linux-user/host/ppc64/hostdep.h index 7609bf5..310e7d1 100644 --- a/linux-user/host/ppc64/hostdep.h +++ b/linux-user/host/ppc64/hostdep.h @@ -12,4 +12,27 @@ #ifndef QEMU_HOSTDEP_H #define QEMU_HOSTDEP_H +/* We have a safe-syscall.inc.S */ +#define HAVE_SAFE_SYSCALL + +#ifndef __ASSEMBLER__ + +/* These are defined by the safe-syscall.inc.S file */ +extern char safe_syscall_start[]; +extern char safe_syscall_end[]; + +/* Adjust the signal context to rewind out of safe-syscall if we're in it */ +static inline void rewind_if_in_safe_syscall(void *puc) +{ + struct ucontext *uc = puc; + unsigned long *pcreg = &uc->uc_mcontext.gp_regs[PT_NIP]; + + if (*pcreg > (uintptr_t)safe_syscall_start + && *pcreg < (uintptr_t)safe_syscall_end) { + *pcreg = (uintptr_t)safe_syscall_start; + } +} + +#endif /* __ASSEMBLER__ */ + #endif diff --git a/linux-user/host/ppc64/safe-syscall.inc.S b/linux-user/host/ppc64/safe-syscall.inc.S new file mode 100644 index 0000000..d30050a --- /dev/null +++ b/linux-user/host/ppc64/safe-syscall.inc.S @@ -0,0 +1,92 @@ +/* + * 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 linux-user/safe-syscall.S + * + * Written by Richard Henderson + * Copyright (C) 2016 Red Hat, Inc. + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + + .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'). + * We return a long which is the syscall's return value, which + * may be negative-errno on failure. Conversion to the + * -1-and-errno-set convention is done by the calling wrapper. + */ +#if _CALL_ELF == 2 +safe_syscall_base: + .cfi_startproc + .localentry safe_syscall_base,0 +#else + .section ".opd","aw" + .align 3 +safe_syscall_base: + .quad .L.safe_syscall_base,.TOC.@tocbase,0 + .previous +.L.safe_syscall_base: + .cfi_startproc +#endif + /* We enter with r3 == *signal_pending + * r4 == syscall number + * r5 ... r10 == syscall arguments + * and return the result in r3 + * and the syscall instruction needs + * r0 == syscall number + * r3 ... r8 == syscall arguments + * and returns the result in r3 + * Shuffle everything around appropriately. + */ + mr 11, 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(11) + cmpwi 0, 12, 0 + bne- 0f + sc +safe_syscall_end: + /* code path when we did execute the syscall */ + bnslr+ + + /* syscall failed; return negative errno */ + neg 3, 3 + blr + + /* code path when we didn't execute the syscall */ +0: addi 3, 0, -TARGET_ERESTARTSYS + blr + .cfi_endproc + +#if _CALL_ELF == 2 + .size safe_syscall_base, .-safe_syscall_base +#else + .size safe_syscall_base, .-.L.safe_syscall_base + .size .L.safe_syscall_base, .-.L.safe_syscall_base +#endif