From patchwork Wed May 25 10:31:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 9135141 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 6DE746075C for ; Wed, 25 May 2016 10:54:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 605AF28164 for ; Wed, 25 May 2016 10:54:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 550A92824F; Wed, 25 May 2016 10:54:24 +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=-5.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, FSL_HELO_HOME, 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 C298C28164 for ; Wed, 25 May 2016 10:54:23 +0000 (UTC) Received: from localhost ([::1]:58904 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5WSE-00046m-Sb for patchwork-qemu-devel@patchwork.kernel.org; Wed, 25 May 2016 06:54:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41456) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5W78-0001Cu-EJ for qemu-devel@nongnu.org; Wed, 25 May 2016 06:32:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b5W70-0003Ax-Ti for qemu-devel@nongnu.org; Wed, 25 May 2016 06:32:34 -0400 Received: from mail-lf0-x22e.google.com ([2a00:1450:4010:c07::22e]:36151) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b5W70-0003Ac-Kt for qemu-devel@nongnu.org; Wed, 25 May 2016 06:32:26 -0400 Received: by mail-lf0-x22e.google.com with SMTP id e130so16303649lfe.3 for ; Wed, 25 May 2016 03:32:26 -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=3x9+G9baziSKjeVXNr5OVcI/sXfsnFovopGpwHVs+II=; b=MeA1GXoyMFug8m7zvqiPrXmXsJ8eewZlhxv3wGd1tDG5XJxxr+rdwui5qIr45csCNq Yd+MboI3VF603hr3SrnDKgqoxAOAbZ4O7E4ztlpRXoKlvHcVALFoglnRdDQBbu3WWQcX uebhfErezMrLeDUeG8l+OeApg6ICvF3TNZKd4= 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=3x9+G9baziSKjeVXNr5OVcI/sXfsnFovopGpwHVs+II=; b=D3I4l49s5hiUSZnu8kpTL1uJJzmksFseRH7Wr/l7NrSuCqP65/gGZ/ZKEWXDWXYY8E VNBhiyrQ8H4fop87DXDaZelBdCqngsCQS2P1WTYmy7x/dNf2Byz2EhbyvYQyixpWWYRp f/ZavgU41LFg1LzAl6aapSRbZdPbvGvgDetWzgOAuk0ZwHG1Z+MitceEpSnIKVlN1w+t NLvpMwQsWD+cMmcs3EmsApYEKIjsZS2Tvsu4gjYp5nEbcIjXFe9MkrDNod0+JnbHuzku NYgWZZivttv0yoD7S85HMNabXWoTkMkanOxRlUD3BZIjZtND5RKb7+7i7fzzOaFDEqWF Kr3g== X-Gm-Message-State: ALyK8tLMMG4jTuYzLBuw6KkWVJfwqw2dZ4OkxdqULlryTqlqsIDjhM6mwUE6LAkD4t+4vAx3 X-Received: by 10.25.19.101 with SMTP id j98mr741326lfi.13.1464172345907; Wed, 25 May 2016 03:32:25 -0700 (PDT) Received: from beaming.home (91-157-168-132.elisa-laajakaista.fi. [91.157.168.132]) by smtp.gmail.com with ESMTPSA id o75sm1379610lfi.9.2016.05.25.03.32.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 25 May 2016 03:32:25 -0700 (PDT) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Wed, 25 May 2016 13:31:52 +0300 Message-Id: <8e766539126edc7ced4fa798c39f2edb580fa7e2.1464153942.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 20/38] linux-user: Support for restarting system calls for Microblaze targets 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: Timothy E Baldwin Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Timothy E Baldwin Update the Microblaze main loop and sigreturn code: * on TARGET_ERESTARTSYS, wind guest PC backwards to repeat syscall insn * set all guest CPU state within signal.c code on sigreturn * handle TARGET_QEMU_ESIGRETURN in the main loop as the indication that the main loop should not touch any guest CPU state Note that this in passing fixes a bug where we were corrupting the guest r[3] on sigreturn with the guest's r[10] because do_sigreturn() was returning env->regs[10] but the register for syscall return values is env->regs[3]. Signed-off-by: Timothy Edward Baldwin Message-id: 1441497448-32489-11-git-send-email-T.E.Baldwin99@members.leeds.ac.uk Reviewed-by: Edgar E. Iglesias Reviewed-by: Peter Maydell [PMM: Commit message tweaks; drop TARGET_USE_ERESTARTSYS define; drop whitespace changes] Signed-off-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/main.c | 7 ++++++- linux-user/microblaze/target_signal.h | 1 + linux-user/signal.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index aa6b414..40aea6e 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -2982,7 +2982,12 @@ void cpu_loop(CPUMBState *env) env->regs[9], env->regs[10], 0, 0); - env->regs[3] = ret; + if (ret == -TARGET_ERESTARTSYS) { + /* Wind back to before the syscall. */ + env->sregs[SR_PC] -= 4; + } else if (ret != -TARGET_QEMU_ESIGRETURN) { + env->regs[3] = ret; + } /* All syscall exits result in guest r14 being equal to the * PC we return to, because the kernel syscall exit "rtbd" does * this. (This is true even for sigreturn(); note that r14 is diff --git a/linux-user/microblaze/target_signal.h b/linux-user/microblaze/target_signal.h index 3d1f7a7..acdf3b5 100644 --- a/linux-user/microblaze/target_signal.h +++ b/linux-user/microblaze/target_signal.h @@ -26,4 +26,5 @@ static inline abi_ulong get_sp_from_cpustate(CPUMBState *state) return state->regs[14]; } + #endif /* TARGET_SIGNAL_H */ diff --git a/linux-user/signal.c b/linux-user/signal.c index b4641df..9e85550 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -3618,7 +3618,7 @@ long do_sigreturn(CPUMBState *env) env->regs[14] = env->sregs[SR_PC]; unlock_user_struct(frame, frame_addr, 0); - return env->regs[10]; + return -TARGET_QEMU_ESIGRETURN; badframe: force_sig(TARGET_SIGSEGV); }