From patchwork Tue Sep 6 03:40:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 9315465 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 D6DA760760 for ; Tue, 6 Sep 2016 03:58:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C95B228B34 for ; Tue, 6 Sep 2016 03:58:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE26E28B38; Tue, 6 Sep 2016 03:58:14 +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 390F928B34 for ; Tue, 6 Sep 2016 03:58:14 +0000 (UTC) Received: from localhost ([::1]:58215 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7WV-0000Wb-J4 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 05 Sep 2016 23:58:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48465) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7EE-0000zj-Sr for qemu-devel@nongnu.org; Mon, 05 Sep 2016 23:39:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bh7E6-0007Am-7b for qemu-devel@nongnu.org; Mon, 05 Sep 2016 23:39:17 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:36085) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bh7E5-0006zI-Kt; Mon, 05 Sep 2016 23:39:10 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3sSslQ3D4jz9vF4; Tue, 6 Sep 2016 13:38:57 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1473133138; bh=hx2KMDIHqWdJPWF9iV/MKB5iQHhAoy5hzOZwh0sWihs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NmqIRadM2HPHmUvRkjNT/T/NDE4HpjOa3s/G7sfso7KBudSklYEUrEBAtXiQnOqzi lpeoPM6t2j+J8W1klSTva75h8O+K2+JTmfXxvNPKbQqYkn3YFHx1h39/0i1XJpDffA V6XUtp9iE1/EvyTN5/IdDObyB6iioigK6dAjXfTs= From: David Gibson To: peter.maydell@linearo.org Date: Tue, 6 Sep 2016 13:40:45 +1000 Message-Id: <1473133253-17598-59-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473133253-17598-1-git-send-email-david@gibson.dropbear.id.au> References: <1473133253-17598-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 58/66] ppc: Fix catching some segfaults in user mode 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: David Gibson , qemu-ppc@nongnu.org, agraf@suse.de, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Benjamin Herrenschmidt The usermode "translate" code generates an error code value that has the "is_write" bit set, which causes our switch/case to miss and display "Invalid segfault errno" and a spurrious second state dump. Fix it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: David Gibson --- linux-user/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/linux-user/main.c b/linux-user/main.c index d112834..32070a4 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -1656,6 +1656,7 @@ void cpu_loop(CPUPPCState *env) /* XXX: check this. Seems bugged */ switch (env->error_code & 0xFF000000) { case 0x40000000: + case 0x42000000: info.si_signo = TARGET_SIGSEGV; info.si_errno = 0; info.si_code = TARGET_SEGV_MAPERR;