From patchwork Wed Jun 22 00:32:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9191575 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 5F3316089F for ; Wed, 22 Jun 2016 00:33:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4FB6F28365 for ; Wed, 22 Jun 2016 00:33:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4418528383; Wed, 22 Jun 2016 00:33:32 +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 8D3332837F for ; Wed, 22 Jun 2016 00:33:31 +0000 (UTC) Received: from localhost ([::1]:54968 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFW6k-0001m8-Mc for patchwork-qemu-devel@patchwork.kernel.org; Tue, 21 Jun 2016 20:33:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFW69-0001ad-OD for qemu-devel@nongnu.org; Tue, 21 Jun 2016 20:32:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFW63-0004BT-TW for qemu-devel@nongnu.org; Tue, 21 Jun 2016 20:32:52 -0400 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:33251) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFW63-0004BG-OM for qemu-devel@nongnu.org; Tue, 21 Jun 2016 20:32:47 -0400 Received: by mail-qk0-x244.google.com with SMTP id a186so6615348qkf.0 for ; Tue, 21 Jun 2016 17:32:47 -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=uVG4+M8x0/tduD3mhaLxf/ptHu89WbOv1G03R3e1DuA=; b=cg3kYLcitCNab3kgf68xIb3bZSonAI1/gaTRdk14hjNHJ/51PE8u/+KkqJ0YEMZOXj 4yoRIq7RxNTWaRKqNzwdHWrMTxllxgGNVp0KpsAbjqxtS1xNoTHaXjruRyz2USUTDQjD 8N7mHOdAqbNf/+z8kPpKNyGrxnMVuc/3r6kt5Svlnj4HLeX+7u6OyF4gc6eB6fMb6Y8o TelJm01iaDBnwS4mto1OYfCrvS67gfDBc+JQaPA4D6bRFz7Ry1wfvzjrMV4K2qMN1NUz 4Hse3ONFky4JoiXT2WUwYskZ7RdbIAtoDGrv6REl0lngH+DJS82Exj1r455eo4n4UUvl ti2Q== 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=uVG4+M8x0/tduD3mhaLxf/ptHu89WbOv1G03R3e1DuA=; b=AwPhvwXYCzN8vog6H9MLjSI7ayLcdm6uF3BUd9jEE93Ou1hfDTOXbBJRmZ8lQgg15a hTmDcH+7WB8QlvIhdl6BsKXa6q7zva3LJ0fbf6TXbZSmKUlU3qcFxm9A9jjrYdZnWRkt nrefVPNdYs0JZB+xywqJxQPUkcf3PAUkuuF/ruGvcnEg7SxYISmFKDufvbJbnLkUiYQr 0Msk3eyZCSNPByOTcxASGV3wdXNZi9gNkTgCHDYH2HRVa+mcXavcUUfiEvjLyDgSI3IM ls4tZopQ+77yHR7UIONRgdNg0d8hDB1NmIWSKPvTaUJjQmM+ULSWBBAK9efDJxKo3Ehi vBQA== X-Gm-Message-State: ALyK8tLhyX/BozeUPWEVZIXUGdB94+97PGxSXvtyMceaHXjp2Kp7BczQTf4pMZGkxPTVgQ== X-Received: by 10.200.49.73 with SMTP id h9mr32906189qtb.60.1466555567364; Tue, 21 Jun 2016 17:32:47 -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.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2016 17:32:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 21 Jun 2016 17:32:10 -0700 Message-Id: <1466555533-18359-3-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::244 Subject: [Qemu-devel] [PATCH v2 2/5] linux-user: Provide safe_syscall for arm 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 Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- linux-user/host/arm/hostdep.h | 23 +++++++++ linux-user/host/arm/safe-syscall.inc.S | 90 ++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 linux-user/host/arm/safe-syscall.inc.S diff --git a/linux-user/host/arm/hostdep.h b/linux-user/host/arm/hostdep.h index 7609bf5..8e1ff2f 100644 --- a/linux-user/host/arm/hostdep.h +++ b/linux-user/host/arm/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.arm_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/arm/safe-syscall.inc.S b/linux-user/host/arm/safe-syscall.inc.S new file mode 100644 index 0000000..88c4958 --- /dev/null +++ b/linux-user/host/arm/safe-syscall.inc.S @@ -0,0 +1,90 @@ +/* + * 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 + + .cfi_sections .debug_frame + + .text + .syntax unified + .arm + .align 2 + + /* 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: + .fnstart + .cfi_startproc + mov r12, sp /* save entry stack */ + push { r4, r5, r6, r7, r8, lr } + .save { r4, r5, r6, r7, r8, lr } + .cfi_adjust_cfa_offset 24 + .cfi_rel_offset r4, 0 + .cfi_rel_offset r5, 4 + .cfi_rel_offset r6, 8 + .cfi_rel_offset r7, 12 + .cfi_rel_offset r8, 16 + .cfi_rel_offset lr, 20 + + /* The syscall calling convention isn't the same as the C one: + * we enter with r0 == *signal_pending + * r1 == syscall number + * r2, r3, [sp+0] ... [sp+12] == syscall arguments + * and return the result in r0 + * and the syscall instruction needs + * r7 == syscall number + * r0 ... r6 == syscall arguments + * and returns the result in r0 + * Shuffle everything around appropriately. + * Note the 16 bytes that we pushed to save registers. + */ + mov r8, r0 /* copy signal_pending */ + mov r7, r1 /* syscall number */ + mov r0, r2 /* syscall args */ + mov r1, r3 + ldm r12, { r2, r3, r4, r5, r6 } + + /* 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 r12, [r8] /* signal_pending */ + tst r12, r12 + bne 1f + swi 0 +safe_syscall_end: + /* code path for having successfully executed the syscall */ + pop { r4, r5, r6, r7, r8, pc } + +1: + /* code path when we didn't execute the syscall */ + ldr r0, =-TARGET_ERESTARTSYS + pop { r4, r5, r6, r7, r8, pc } + .fnend + .cfi_endproc + + .size safe_syscall_base, .-safe_syscall_base