From patchwork Tue Jun 28 19:12:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 641732 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 3rfGLm1R8zz9sdb for ; Wed, 29 Jun 2016 05:38:24 +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=PoY51Ns8; dkim-atps=neutral Received: from localhost ([::1]:39119 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHypx-0005Nt-Oq for incoming@patchwork.ozlabs.org; Tue, 28 Jun 2016 15:38:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38619) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHyRy-0002M5-Av for qemu-devel@nongnu.org; Tue, 28 Jun 2016 15:13:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bHyRs-0006yf-F8 for qemu-devel@nongnu.org; Tue, 28 Jun 2016 15:13:33 -0400 Received: from mail-lf0-x236.google.com ([2a00:1450:4010:c07::236]:34597) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHyRs-0006ya-2Q for qemu-devel@nongnu.org; Tue, 28 Jun 2016 15:13:28 -0400 Received: by mail-lf0-x236.google.com with SMTP id h129so18190745lfh.1 for ; Tue, 28 Jun 2016 12:13:28 -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=dl6A+AvpfA54SMHfjQhUT+lDeJgYKbJuL5k8Lsm0cc8=; b=PoY51Ns8THg+YQ8G9lmNKrJX/voa0ecCFs1XyJGEPUDK+Nx/q6faPUml7QXdA6OTw4 3Csr31J+tAAqL7QMVYTPiMFZ5LeerncJzSHNE9dQGT7F6/hJAA1rmhBOx58NQJfHAEQY Ye760p4gXuMHJvUwmEB+HCsAm1smU2SJaY8mQ= 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=dl6A+AvpfA54SMHfjQhUT+lDeJgYKbJuL5k8Lsm0cc8=; b=LQnf7EsVqEBMcdasNhOOFZwSJ2ysK1jpBXst7YiHD9BhZ4/gYb9VLVDgMjOg+X3oJG teVw4ci9tA6fbw3FfpdxPPfUJRHJH6mIoHaIxpUoISD2G1FNu/kxEeiw8IaRXSFhF/A3 wISPW/kGEscXj42kS+u4OZL+7etdzMmu8CeoxSsHMpXbHUZT0CLvNLOd/+DAeLUeBnfk osPHYQKevDQIe0YnQAf7V/AouWfcB2c/MSFc0SWoMcM3046dfonTFJGRdiHKbaNG+sw1 rDOhMa4+dT4VveaOOQwZn7NEmf/hbP8/PEiGnLGLm1H6wtP0101y8U/mv3ockgpUIk41 1Hmg== X-Gm-Message-State: ALyK8tJFboIzIKxrw2kLDEJ9Ca30aIWKFd2+norpwN4PpGIiX/Kl73IRujebSoZi+K8GoB+V X-Received: by 10.25.20.35 with SMTP id k35mr1804038lfi.228.1467141207354; Tue, 28 Jun 2016 12:13:27 -0700 (PDT) Received: from beaming.home (91-157-170-157.elisa-laajakaista.fi. [91.157.170.157]) by smtp.gmail.com with ESMTPSA id h10sm4262823ljh.38.2016.06.28.12.13.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Jun 2016 12:13:26 -0700 (PDT) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Tue, 28 Jun 2016 22:12:54 +0300 Message-Id: <5d3acaf89cab0ecd8d835717dc93e43b482ef145.1467138806.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::236 Subject: [Qemu-devel] [PULL v2 20/24] linux-user: Provide safe_syscall for i386 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 Reviewed-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/host/i386/hostdep.h | 23 +++++++ linux-user/host/i386/safe-syscall.inc.S | 112 ++++++++++++++++++++++++++++++++ 2 files changed, 135 insertions(+) create mode 100644 linux-user/host/i386/safe-syscall.inc.S diff --git a/linux-user/host/i386/hostdep.h b/linux-user/host/i386/hostdep.h index 7609bf5..5a12f4a 100644 --- a/linux-user/host/i386/hostdep.h +++ b/linux-user/host/i386/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; + greg_t *pcreg = &uc->uc_mcontext.gregs[REG_EIP]; + + 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/i386/safe-syscall.inc.S b/linux-user/host/i386/safe-syscall.inc.S new file mode 100644 index 0000000..766d0de --- /dev/null +++ b/linux-user/host/i386/safe-syscall.inc.S @@ -0,0 +1,112 @@ +/* + * 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 + + /* 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. + */ +safe_syscall_base: + .cfi_startproc + push %ebp + .cfi_adjust_cfa_offset 4 + .cfi_rel_offset ebp, 0 + push %esi + .cfi_adjust_cfa_offset 4 + .cfi_rel_offset esi, 0 + push %edi + .cfi_adjust_cfa_offset 4 + .cfi_rel_offset edi, 0 + push %ebx + .cfi_adjust_cfa_offset 4 + .cfi_rel_offset ebx, 0 + + /* The syscall calling convention isn't the same as the C one: + * we enter with 0(%esp) == return address + * 4(%esp) == *signal_pending + * 8(%esp) == syscall number + * 12(%esp) ... 32(%esp) == syscall arguments + * and return the result in eax + * and the syscall instruction needs + * eax == syscall number + * ebx, ecx, edx, esi, edi, ebp == syscall arguments + * and returns the result in eax + * Shuffle everything around appropriately. + * Note the 16 bytes that we pushed to save registers. + */ + mov 12+16(%esp), %ebx /* the syscall arguments */ + mov 16+16(%esp), %ecx + mov 20+16(%esp), %edx + mov 24+16(%esp), %esi + mov 28+16(%esp), %edi + mov 32+16(%esp), %ebp + + /* 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 */ + mov 4+16(%esp), %eax /* signal_pending */ + cmp $0, (%eax) + jnz 1f + mov 8+16(%esp), %eax /* syscall number */ + int $0x80 +safe_syscall_end: + /* code path for having successfully executed the syscall */ + pop %ebx + .cfi_remember_state + .cfi_def_cfa_offset -4 + .cfi_restore ebx + pop %edi + .cfi_def_cfa_offset -4 + .cfi_restore edi + pop %esi + .cfi_def_cfa_offset -4 + .cfi_restore esi + pop %ebp + .cfi_def_cfa_offset -4 + .cfi_restore ebp + ret + +1: + /* code path when we didn't execute the syscall */ + .cfi_restore_state + mov $-TARGET_ERESTARTSYS, %eax + pop %ebx + .cfi_def_cfa_offset -4 + .cfi_restore ebx + pop %edi + .cfi_def_cfa_offset -4 + .cfi_restore edi + pop %esi + .cfi_def_cfa_offset -4 + .cfi_restore esi + pop %ebp + .cfi_def_cfa_offset -4 + .cfi_restore ebp + ret + .cfi_endproc + + .size safe_syscall_base, .-safe_syscall_base