From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D1D5C32750 for ; Fri, 2 Aug 2019 11:39:27 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C9F36206A3 for ; Fri, 2 Aug 2019 11:39:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GVYtYAxC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C9F36206A3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 460QDX5V6ZzDqjj for ; Fri, 2 Aug 2019 21:39:24 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::643; helo=mail-pl1-x643.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="GVYtYAxC"; dkim-atps=neutral Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 460PMV364mzDqgj for ; Fri, 2 Aug 2019 21:00:22 +1000 (AEST) Received: by mail-pl1-x643.google.com with SMTP id c2so33486240plz.13 for ; Fri, 02 Aug 2019 04:00:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ycxDcWZtlkCQ1tMVmSZA/ZfExudWUJUXlte1q489Imk=; b=GVYtYAxCu9h62disAps7RBRMbKlINqY/uwfzGwufKawYeBx47JsxYKutDmfVZgUAyv 55b7cRkhOor7yHd4NO3dVzcXKoOin6Z1Ux51QsAnQMHZ1qx9bMtNyZfxVQx301JG7AQt rVgeMi80GfKjEiTPjvgDPx2BAwNJElu9GZktnszEcU+SiVngKAt2d6dBn29QwtX1osWD KiJ6uiEUHhrxTYPoqb3SYciAYjJIM3QRMcSSUDxSH1y5E8Zd15MwmY5QDNUq2Y0ZToXB 48yKjtDDA7McmuHS12ep+5DF5Jk3i41WyRNFjExcKhFr7o1TUFl8g1dgpKQZ634++jR1 iyeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ycxDcWZtlkCQ1tMVmSZA/ZfExudWUJUXlte1q489Imk=; b=ZD7WkF1m8zi79+rF8jwg2RX7IkzM3OxuI4xFrZ8zvdOnXR3NhTTXG9dWuGBqnBoe30 EWbhvgMsggS5t3LZB7hYvXJxDjvRl+0eezLbf/X4xnDwbXA82i70anUEv/7YgfynB9+P DZaGOGwmGQgtjj4D+kcSXD4oJU1VgyEbshSTm9S1QgTy34IniKufas9dKdVE9ZL55jua upwc+RgIUPr8uggSE1lB0/CV5NLzq0Mxq9CG2PFuAI4uetsCfuTmbIuaXa4c/1nnZbcJ +I1ZUxXaFC+zTJyS1hfzcOtJzK4X0SjDytcJpj96ViElJhN2Rnqamg3ep4QxolWiELbg aQOg== X-Gm-Message-State: APjAAAWsP3VwJ1NBRjTc2+rd6oT/1otm/gelnCpOvodMXfOFyYCXJe+u Ob/Lhi75SqZJyCYUMF1kf/94yy8n3Xg= X-Google-Smtp-Source: APXvYqzQeCNsrNEB/lXUbBmHVkAvit64Y0k5cDae/RI6kXMRAl6lpVsuAhy5H9td5Vy7wI05E3bnMg== X-Received: by 2002:a17:902:6b86:: with SMTP id p6mr133930154plk.14.1564743620410; Fri, 02 Aug 2019 04:00:20 -0700 (PDT) Received: from bobo.local0.net (193-116-68-11.tpgi.com.au. [193.116.68.11]) by smtp.gmail.com with ESMTPSA id t96sm7377118pjb.1.2019.08.02.04.00.18 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Fri, 02 Aug 2019 04:00:19 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v2 17/44] powerpc/64s/exception: Fix DAR load for handle_page_fault error case Date: Fri, 2 Aug 2019 20:56:42 +1000 Message-Id: <20190802105709.27696-18-npiggin@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190802105709.27696-1-npiggin@gmail.com> References: <20190802105709.27696-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nicholas Piggin Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" This buglet goes back to before the 64/32 arch merge, but it does not seem to have had practical consequences because bad_page_fault does not use the 2nd argument, but rather regs->dar/nip. Signed-off-by: Nicholas Piggin --- arch/powerpc/kernel/exceptions-64s.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 6b409d62d36c..f79f811ee131 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -2336,7 +2336,7 @@ handle_page_fault: bl save_nvgprs mr r5,r3 addi r3,r1,STACK_FRAME_OVERHEAD - lwz r4,_DAR(r1) + ld r4,_DAR(r1) bl bad_page_fault b ret_from_except -- 2.22.0