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=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 95500C4338F for ; Fri, 20 Aug 2021 10:35:26 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (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 C9B766112E for ; Fri, 20 Aug 2021 10:35:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C9B766112E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.ozlabs.org Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4GrdM01Hpbz3cWr for ; Fri, 20 Aug 2021 20:35:24 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=mOrUjni5; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::530; helo=mail-pg1-x530.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=mOrUjni5; dkim-atps=neutral Received: from mail-pg1-x530.google.com (mail-pg1-x530.google.com [IPv6:2607:f8b0:4864:20::530]) (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 4GrdLG54M2z3bTV for ; Fri, 20 Aug 2021 20:34:45 +1000 (AEST) Received: by mail-pg1-x530.google.com with SMTP id o2so8715175pgr.9 for ; Fri, 20 Aug 2021 03:34:45 -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:mime-version :content-transfer-encoding; bh=FvFA8OvjYF0NHx6jFUT6i973XvFUrP0HUeve6gGw7oc=; b=mOrUjni5EReHow2Hc2sk7PgilAAmGZtC+oPHIepS80kAaJGbZeTh06VB7yvwj0VxHn iJO7eIKVr/EwCwVLliRvYqAjKel47Yx2dDrFmZjwd4G4xXICmFZCiIueojk7mXcBP4sx 5ADS/Bt4Nk1mnkZqeCjjLCPJwH7m/PehbFDhKgLCYnzASSqhAsR/gZn1X3355nhnwLt/ lvzm94s0yPO0WI7Boord4l2+PddebZwjNqHRg7jYg1R9xSNCyvuNMZFWQCSnwqSbioRT 1ofAntuMuceTNoSL9xpG1n+ENturtQvOvuzFSijQ2rkVjNRqDo1gEwuim+ZjXQo1uZBB Ttqg== 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:mime-version :content-transfer-encoding; bh=FvFA8OvjYF0NHx6jFUT6i973XvFUrP0HUeve6gGw7oc=; b=Z7x41b9Y4LwzOfXEh3hSWmU+4/xt36x/Cgp4flZNjMGJyMe4WOMkM+fz9LgI0Ag03b G+onhfM9siewZNrUJmTRRH7rTdXeJnYf+2y2HWt2iGO1Oe96ufYd83o7EOw2C+tKAMqD Pru7B9ercOvRRBXJ2x6ga0BHoXCvlLq4BeTCyq70X8RGwh/C/UsS0sqMAKoFxgBnZMm9 sd+DN4XkReDV2BmBOsDpyg6zguGs7N2Ia52F5gu1Rq1INEM/RNuiTMDgcZLR+mJmShpz pRAKLWZ2N72zopFfNFsGqprQVhvJKi+xJI/0Ewvu/zK/UPisszp8op6OoRAQddA1C9Jf XtIQ== X-Gm-Message-State: AOAM533IkWf0y2UqNkyoHltLPtt+sALGvHiDQGJnAQF24CsjC+qeGd7w LPTbz127D0RQrmImOgBIUoddW2sg684= X-Google-Smtp-Source: ABdhPJwA2nxqm0NnNARkbJXvkXF6FJzn0oD5i2P4HBy7D48DXd7Wxkc2IOgatRrBtV7Ar3EU51LVIw== X-Received: by 2002:a63:f654:: with SMTP id u20mr17795184pgj.130.1629455680852; Fri, 20 Aug 2021 03:34:40 -0700 (PDT) Received: from bobo.ibm.com (193-116-119-33.tpgi.com.au. [193.116.119.33]) by smtp.gmail.com with ESMTPSA id j185sm6466056pfb.86.2021.08.20.03.34.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Aug 2021 03:34:40 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v1] powerpc/64s: Fix scv implicit soft-mask table for relocated kernels Date: Fri, 20 Aug 2021 20:34:31 +1000 Message-Id: <20210820103431.1701240-1-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 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: Hari Bathini , Nicholas Piggin Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" The implict soft-mask table addresses get relocated if they use a relative symbol like a label. This is right for code that runs relocated but not for unrelocated. The scv interrupt vectors run unrelocated, so absolute addresses are required for their soft-mask table entry. This fixes crashing with relocated kernels, usually an asynchronous interrupt hitting in the scv handler, then hitting the trap that checks whether r1 is in userspace. Cc: Hari Bathini Fixes: 325678fd0522 ("powerpc/64s: add a table of implicit soft-masked addresses") Signed-off-by: Nicholas Piggin --- arch/powerpc/kernel/exceptions-64s.S | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S index 4aec59a77d4c..37859e62a8dc 100644 --- a/arch/powerpc/kernel/exceptions-64s.S +++ b/arch/powerpc/kernel/exceptions-64s.S @@ -812,7 +812,6 @@ __start_interrupts: * syscall register convention is in Documentation/powerpc/syscall64-abi.rst */ EXC_VIRT_BEGIN(system_call_vectored, 0x3000, 0x1000) -1: /* SCV 0 */ mr r9,r13 GET_PACA(r13) @@ -842,10 +841,12 @@ EXC_VIRT_BEGIN(system_call_vectored, 0x3000, 0x1000) b system_call_vectored_sigill #endif .endr -2: EXC_VIRT_END(system_call_vectored, 0x3000, 0x1000) -SOFT_MASK_TABLE(1b, 2b) // Treat scv vectors as soft-masked, see comment above. +// Treat scv vectors as soft-masked, see comment above. +// Use absolute values rather than labels here, so they don't get relocated, +// because this code runs unrelocated. +SOFT_MASK_TABLE(0xc000000000003000, 0xc000000000004000) #ifdef CONFIG_RELOCATABLE TRAMP_VIRT_BEGIN(system_call_vectored_tramp) -- 2.23.0