From patchwork Wed Jun 22 00:32:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9191571 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 E59F56075E for ; Wed, 22 Jun 2016 00:33:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D537328365 for ; Wed, 22 Jun 2016 00:33:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C945C28383; Wed, 22 Jun 2016 00:33:26 +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 0A6B428365 for ; Wed, 22 Jun 2016 00:33:25 +0000 (UTC) Received: from localhost ([::1]:54966 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFW6c-0001av-Ha for patchwork-qemu-devel@patchwork.kernel.org; Tue, 21 Jun 2016 20:33:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44140) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFW67-0001Xc-Bi for qemu-devel@nongnu.org; Tue, 21 Jun 2016 20:32:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFW65-0004CE-2r for qemu-devel@nongnu.org; Tue, 21 Jun 2016 20:32:50 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:34623) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFW64-0004C0-Ux for qemu-devel@nongnu.org; Tue, 21 Jun 2016 20:32:49 -0400 Received: by mail-qk0-x243.google.com with SMTP id j2so6634275qkf.1 for ; Tue, 21 Jun 2016 17:32:48 -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=UKCt/Wnw4k/JWo3fMiM83OE/TcR4rE95bAoFOmqvDAk=; b=FK0U8NMvbHzBGNTFEqDXbOz9xpN6jgfXXX8ZUUqqaIJtIusM/MiIj2PEBkRnfv4Qye DnjHYkVyh2kaOI2EUml9pWI1UK0bRDFuHIS3kkA7jQgGLQ5VGBll1SYROV1HhkV+a2M8 bc8hAH+RrlR2fXV1yX66Nk2wDLCSAEzHaNgweC0uGP2vwPiJ9beXgFzA/OcQFkxQ4Z14 7IwA4ItKvGjLApa84BcsiGPeJ3BVP9Dm3AuhFIKpzsocchxcRD1PttfIcvnngdHOk9nr 2FHU85NY1LvJMABKk7ESNraOIy4avnVHeKmwlyALfiU1Tv72+ui14DChdqvS+tqyUJ5C 1EkA== 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=UKCt/Wnw4k/JWo3fMiM83OE/TcR4rE95bAoFOmqvDAk=; b=eZqUht1b6+zZIRKr87Rh87UMIOOwrzJbSJEWfjtSe0FR1yMJeUSo+BLCQf7yAmbJrY zPynuU53CWTYdzOKwd5EfZ8C1egW88oNVpeBM+4w5zRUlpyjT9IulGyzlyT6GADfnZI1 EMCVf0iFqlITxo5bTSWC2Iud0yG/8BPj0DyJEm6zRv8eypSBnl0MuXoW0YkVfJBkwUZN ijg1l9ykgUGwIq7y82xX9GujXt3JNa8fO5hbeAlkfXkdb2McjroAmfzUcftFf+lNMwNW bJR0J55m+sebeKwTjdd8Gk8IViBcOCN9cGirPEncDX8cPCht9mk2MTF4M1vp73RWFbMb sc0w== X-Gm-Message-State: ALyK8tKpZCbvTi55ME8IW8oYPtC6i5GdUJ9ZWE3FlTtHRqh8W/kUkzVs7VPQwhoUKQftfw== X-Received: by 10.200.51.76 with SMTP id u12mr34241378qta.55.1466555568530; Tue, 21 Jun 2016 17:32:48 -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.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2016 17:32:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 21 Jun 2016 17:32:11 -0700 Message-Id: <1466555533-18359-4-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 3/5] linux-user: Provide safe_syscall for aarch64 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 Reviewed-by: Peter Maydell --- linux-user/host/aarch64/hostdep.h | 23 +++++++++ linux-user/host/aarch64/safe-syscall.inc.S | 75 ++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) create mode 100644 linux-user/host/aarch64/safe-syscall.inc.S diff --git a/linux-user/host/aarch64/hostdep.h b/linux-user/host/aarch64/hostdep.h index 7609bf5..b79eaf1 100644 --- a/linux-user/host/aarch64/hostdep.h +++ b/linux-user/host/aarch64/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; + __u64 *pcreg = &uc->uc_mcontext.pc; + + 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/aarch64/safe-syscall.inc.S b/linux-user/host/aarch64/safe-syscall.inc.S new file mode 100644 index 0000000..e4058bb --- /dev/null +++ b/linux-user/host/aarch64/safe-syscall.inc.S @@ -0,0 +1,75 @@ +/* + * 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 + .type safe_syscall_start, #function + .type safe_syscall_end, #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 + /* The syscall calling convention isn't the same as the + * C one: + * we enter with x0 == *signal_pending + * x1 == syscall number + * x2 ... x7, (stack) == syscall arguments + * and return the result in x0 + * and the syscall instruction needs + * x8 == syscall number + * x0 ... x6 == syscall arguments + * and returns the result in x0 + * Shuffle everything around appropriately. + */ + mov x9, x0 /* signal_pending pointer */ + mov x8, x1 /* syscall number */ + mov x0, x2 /* syscall arguments */ + mov x1, x3 + mov x2, x4 + mov x3, x5 + mov x4, x6 + mov x6, x7 + ldr x7, [sp] + + /* 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 */ + ldr w10, [x9] + cbnz w10, 0f + svc 0x0 +safe_syscall_end: + /* code path for having successfully executed the syscall */ + ret + +0: + /* code path when we didn't execute the syscall */ + mov x0, #-TARGET_ERESTARTSYS + ret + .cfi_endproc + + .size safe_syscall_base, .-safe_syscall_base