From patchwork Wed Jun 22 00:32:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9191573 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 35FE66075E 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 2473F28365 for ; Wed, 22 Jun 2016 00:33:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 174732838C; 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 81E0328365 for ; Wed, 22 Jun 2016 00:33:31 +0000 (UTC) Received: from localhost ([::1]:54967 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFW6k-0001lN-Lh 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]:44162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFW68-0001ac-TA for qemu-devel@nongnu.org; Tue, 21 Jun 2016 20:32:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bFW66-0004El-HZ for qemu-devel@nongnu.org; Tue, 21 Jun 2016 20:32:51 -0400 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:34624) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bFW66-0004Ea-Ce for qemu-devel@nongnu.org; Tue, 21 Jun 2016 20:32:50 -0400 Received: by mail-qk0-x244.google.com with SMTP id j2so6634376qkf.1 for ; Tue, 21 Jun 2016 17:32:50 -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=Wa9tl3mFrqT5ZsljNclODURiE//+6xEjjnsP3WjT20Q=; b=MdJzErS0i0foux8oK2/RKTzq0mhdg6ZGfOngES/L0GK4mfcNbZdMBRswVpsv+MTMHD UdEyeSuM4Z8Tb/et7V8pSYNDzlxOqaKXPC5Jtmgl4LFcriVaLFjVu9y1UhMgicEYPd9p sk+GdHqZk8PVL/zY42uDZOfs27EdQs5Rb1R5uEPP1Zn8oL+BVl+yxir/hWK50EQV9oDq CIPxzSENpWX61hkc2/pa8MQPbohFcn3ejavdsMwWiCbWsVm5tDpfFl/qpJ8Rpz6yX2ZF buARRptd5JNfgfQKQw//gOXYEeCW8BwA+4cZGfXwgkc1enuEUw370p0Ysjke/m6cTL3r 330A== 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=Wa9tl3mFrqT5ZsljNclODURiE//+6xEjjnsP3WjT20Q=; b=UQ31gMJNtQMl6e5Q0CfPjyYmBnnkYo3zI7xvDUSrcFMjRSLkNqPbaLUXJv+gdkIrKp khUUlZ/7t/S6tlveYMm9otOCjNx/qfjSdDz1pv/qRz5hr7e9EhK2iCNlHpUW7w4yt0Sk AajpjPkNy7bZbRx48eLWyDqKJAZZJRvbTk1xOeCWkSh6eEqETqirtRDEu/XBjGTVtz0r xGPkC3s8BFXJ49rgUovQ9HMYccVSd9BjRmUHFdxFeiuVCXnLvv7FO23Quj1RUxceLuZh qYX3rd93Sk05JjJ8H4SELxxAHA4fRTW7BKQBf8kGJMN/CymYC4j+c9P/rAB10+AnvBLC 1p4A== X-Gm-Message-State: ALyK8tIKlcI7ouHE29uSz+ONfcYlEE7kjKFPBcs/hvaoTl/c+7woolq6evdTwR0nSuBfKA== X-Received: by 10.200.54.110 with SMTP id n43mr32689437qtb.47.1466555569891; Tue, 21 Jun 2016 17:32:49 -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.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Jun 2016 17:32:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 21 Jun 2016 17:32:12 -0700 Message-Id: <1466555533-18359-5-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 4/5] linux-user: Provide safe_syscall for s390x 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/s390x/hostdep.h | 23 ++++++++ linux-user/host/s390x/safe-syscall.inc.S | 90 ++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 linux-user/host/s390x/safe-syscall.inc.S diff --git a/linux-user/host/s390x/hostdep.h b/linux-user/host/s390x/hostdep.h index 7609bf5..e95871c 100644 --- a/linux-user/host/s390x/hostdep.h +++ b/linux-user/host/s390x/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.psw.addr; + + 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/s390x/safe-syscall.inc.S b/linux-user/host/s390x/safe-syscall.inc.S new file mode 100644 index 0000000..f1b446a --- /dev/null +++ b/linux-user/host/s390x/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 + + /* 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 + stmg %r6,%r15,48(%r15) /* save all call-saved registers */ + .cfi_offset %r15,-40 + .cfi_offset %r14,-48 + .cfi_offset %r13,-56 + .cfi_offset %r12,-64 + .cfi_offset %r11,-72 + .cfi_offset %r10,-80 + .cfi_offset %r9,-88 + .cfi_offset %r8,-96 + .cfi_offset %r7,-104 + .cfi_offset %r6,-112 + lgr %r1,%r15 + lg %r0,8(%r15) /* load eos */ + aghi %r15,-160 + .cfi_adjust_cfa_offset 160 + stg %r1,0(%r15) /* store back chain */ + stg %r0,8(%r15) /* store eos */ + + /* The syscall calling convention isn't the same as the + * C one: + * we enter with r2 == *signal_pending + * r3 == syscall number + * r4, r5, r6, (stack) == syscall arguments + * and return the result in r2 + * and the syscall instruction needs + * r1 == syscall number + * r2 ... r7 == syscall arguments + * and returns the result in r2 + * Shuffle everything around appropriately. + */ + lgr %r8,%r2 /* signal_pending pointer */ + lgr %r1,%r3 /* syscall number */ + lgr %r2,%r4 /* syscall args */ + lgr %r3,%r5 + lgr %r4,%r6 + lmg %r5,%r7,320(%r15) + + /* 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 */ + lt %r0,0(%r8) + jne 2f + svc 0 +safe_syscall_end: + +1: lg %r15,0(%r15) /* load back chain */ + .cfi_remember_state + .cfi_adjust_cfa_offset -160 + lmg %r6,%r15,48(%r15) /* load saved registers */ + br %r14 + .cfi_restore_state +2: lghi %r2, -TARGET_ERESTARTSYS + j 1b + .cfi_endproc + + .size safe_syscall_base, .-safe_syscall_base