From patchwork Fri Jun 24 09:53:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 640133 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rbZBb5Np5z9s8d for ; Fri, 24 Jun 2016 20:21:59 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b=Su0usdIW; dkim-atps=neutral Received: from localhost ([::1]:42389 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGOFJ-0000bF-ET for incoming@patchwork.ozlabs.org; Fri, 24 Jun 2016 06:21:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59094) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGNoG-00018w-8q for qemu-devel@nongnu.org; Fri, 24 Jun 2016 05:54:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bGNoB-0003YL-Hv for qemu-devel@nongnu.org; Fri, 24 Jun 2016 05:54:00 -0400 Received: from mail-lf0-x22e.google.com ([2a00:1450:4010:c07::22e]:32977) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bGNoB-0003YE-5K for qemu-devel@nongnu.org; Fri, 24 Jun 2016 05:53:55 -0400 Received: by mail-lf0-x22e.google.com with SMTP id f6so112309541lfg.0 for ; Fri, 24 Jun 2016 02:53:54 -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; bh=xB0/ClSVsWi8OfDbSzqTuWTHmqorFo/YYFXtagGbWJg=; b=Su0usdIWnS2y+h/ch7u+jtOmchIj2ySkcWd/cXcYQDiQLOA2ssd0c8IbcVjSFJu+Zi GGJJi+jb9UeQV8iiHllohkxiDa+68hF5WHupFDtaFAhxY9xEjf/NLFdf6iy9EtIVNwfy XbE7J1q1shqX7LR4uFNsu7R6aK6QXlF/pM5ok= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xB0/ClSVsWi8OfDbSzqTuWTHmqorFo/YYFXtagGbWJg=; b=jzI2KdOFufGHwjZy9KC8r1SiK5M9SPdfiyNSQfEfWYcV8OgltanvTPcCdmjOwCcgfu fSBoQ+KeeOkYpDTPAXrbbbidX3FPxhLNcvTMJfdatL17Tc1yLYxcF3k0hPdxH4Z6L/tW lpApgEzw0wtgVOUyWlhLqUD6A7nQVH+3oRcseAMJvvwO8sT8GGwbiBDQstJW9adMDut5 iW+JiEg9GHB410hbOhOqkCUmqpY/tTb8rtfbssbAoT1lZmXhETY+FkJdnENlGG0q14AG bQtOgVWrNxWtpZEm3EGgPBzN+7P5PE2IGZtkDydvC724lIn4T88enEd4TBb5GHoGGTv0 FtKg== X-Gm-Message-State: ALyK8tI22jccIu8Th2599ZLs6C0ELK4iBOEbjX60K/1iSZTByXbr0kE0ek88TQdwK4t60WM5 X-Received: by 10.25.152.200 with SMTP id a191mr1040613lfe.104.1466762034239; Fri, 24 Jun 2016 02:53:54 -0700 (PDT) Received: from beaming.home (85-76-80-69-nat.elisa-mobile.fi. [85.76.80.69]) by smtp.gmail.com with ESMTPSA id o137sm798203lfe.2.2016.06.24.02.53.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 Jun 2016 02:53:53 -0700 (PDT) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Fri, 24 Jun 2016 12:53:19 +0300 Message-Id: <895b3c88e8ed1017bbcf0aa9aaf3d90754494ab5.1466760944.git.riku.voipio@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::22e Subject: [Qemu-devel] [PULL 24/24] 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: Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Signed-off-by: Richard Henderson Signed-off-by: Riku Voipio --- 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