From patchwork Tue Jan 28 00:18:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 1230092 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4866jk41n5z9sNx for ; Tue, 28 Jan 2020 11:21:30 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: 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=domCpCTs; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 4866jk3LVpzDqGp for ; Tue, 28 Jan 2020 11:21:30 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) 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.a=rsa-sha256 header.s=20161025 header.b=domCpCTs; 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 4866gV4TclzDqCw for ; Tue, 28 Jan 2020 11:19:34 +1100 (AEDT) Received: by mail-pl1-x643.google.com with SMTP id t14so4371957plr.8 for ; Mon, 27 Jan 2020 16:19:34 -0800 (PST) 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=3o9Ljrv2OFMBZ5wku5kz1JiDVYgrxI773FBvRA5QFhQ=; b=domCpCTs9Z4h0obKKlHsrz3e7GM2VXNR/DiPpfLhSgf0A8e8mK+w8GJkqlrydBihYy Gefip/MVhwwNe0VgB3aBwGIaXxok5btzUNlDzcvRUpNNIF5t35ObnQ8HR3FFye9gpcsJ zqh2EhQNlo3/yYBG31BEx/cZEXgFXszwoqcrxwJmHYsY4Q7d6Bc3QJUSk7JvQ4HnrVl/ qDZvXxb8pI8ukl0/LCC0z5nlYdKC3PE6p1nedB03jxfkvtCfvKY9kBceXI3EexSWoYpW dIcqp/+//V/1v/9FXP/TGVcItznqgbmTssOZRM3O6XSiBJ5+Z14m7+mrjMxfpoZdPnG3 5nsw== 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=3o9Ljrv2OFMBZ5wku5kz1JiDVYgrxI773FBvRA5QFhQ=; b=i1tO0PvXqKVNQKOq3iHas5CZueg+zM4tn4KhZ5sR8cBkMF6H6RnRJ2Xy+HEDgMWryZ +dIWz6dm0U0lktES+aMqSeHp30kKKaaNlecaA2C+PoC6y9kZlqjJ7QzV/kKNOlsrxWh2 pUn+TXmbdCsm7Nuvgz39RNg27la+AD/rLOKtyl48YyVXrxvKGL+Hjbb9nYg25EOR0hjJ lkxuaoWWaq2k3G1GSeL1E+Q+/F11S4oS/PdFy7iRM0+3OdjCVy2E+rnxtnFX86d7DmlX F3PO9glH1E/f1TwWSPDokhscr5TlUVVbYDMGVJ1CEFf/QbFXlBMxIYFzLwCsni140xm+ ZgKA== X-Gm-Message-State: APjAAAXZF2VV8kp98J/5L+pYpsTAL7NWdK3W+odaIz2EuzyafTm3iLo2 v45Gph7OWRHrKCIarQPqNt23p6Mb X-Google-Smtp-Source: APXvYqyPj5G3E/+clRgJ7vG72KIzBd8zrHb6V/rEzIvTbfgcUP4Db3JX+fCrdv0e/BrEZqYMLYHLag== X-Received: by 2002:a17:90a:8a08:: with SMTP id w8mr1449486pjn.125.1580170771608; Mon, 27 Jan 2020 16:19:31 -0800 (PST) Received: from bobo.local0.net (203-219-188-70.tpgi.com.au. [203.219.188.70]) by smtp.gmail.com with ESMTPSA id h3sm250385pjs.0.2020.01.27.16.19.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jan 2020 16:19:31 -0800 (PST) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH] powerpc/64: system call implement the bulk of the logic in C fix 2 (tabort_syscall) Date: Tue, 28 Jan 2020 10:18:54 +1000 Message-Id: <20200128001854.195896-1-npiggin@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 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: Michal Suchanek , Nicholas Piggin Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Another incremental patch which fixes silly tabort_syscall bug that causes kernel crashes when making system calls in transactional state. Signed-off-by: Nicholas Piggin --- arch/powerpc/kernel/entry_64.S | 9 +++------ arch/powerpc/kernel/syscall_64.c | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index d0bb238805e6..94b3db203ec3 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S @@ -165,16 +165,13 @@ syscall_restore_regs: b .Lsyscall_restore_regs_cont #ifdef CONFIG_PPC_TRANSACTIONAL_MEM -_GLOBAL(tabort_syscall) +_GLOBAL(tabort_syscall) /* (unsigned long nip, unsigned long msr) */ /* Firstly we need to enable TM in the kernel */ mfmsr r10 li r9, 1 rldimi r10, r9, MSR_TM_LG, 63-MSR_TM_LG mtmsrd r10, 0 - ld r11,_NIP(r13) - ld r12,_MSR(r13) - /* tabort, this dooms the transaction, nothing else */ li r9, (TM_CAUSE_SYSCALL|TM_CAUSE_PERSISTENT) TABORT(R9) @@ -188,8 +185,8 @@ _GLOBAL(tabort_syscall) li r9, MSR_RI andc r10, r10, r9 mtmsrd r10, 1 - mtspr SPRN_SRR0, r11 - mtspr SPRN_SRR1, r12 + mtspr SPRN_SRR0, r3 + mtspr SPRN_SRR1, r4 RFI_TO_USER b . /* prevent speculative execution */ #endif diff --git a/arch/powerpc/kernel/syscall_64.c b/arch/powerpc/kernel/syscall_64.c index cfe458adde07..69a4ef13973b 100644 --- a/arch/powerpc/kernel/syscall_64.c +++ b/arch/powerpc/kernel/syscall_64.c @@ -15,7 +15,7 @@ #include #include -extern void __noreturn tabort_syscall(void); +extern void __noreturn tabort_syscall(unsigned long nip, unsigned long msr); typedef long (*syscall_fn)(long, long, long, long, long, long); @@ -30,7 +30,7 @@ notrace long system_call_exception(long r3, long r4, long r5, long r6, long r7, if (IS_ENABLED(CONFIG_PPC_TRANSACTIONAL_MEM) && unlikely(regs->msr & MSR_TS_T)) - tabort_syscall(); + tabort_syscall(regs->nip, regs->msr); account_cpu_user_entry();