From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Guo Ren <guoren@linux.alibaba.com>,
Sasha Levin <sashal@kernel.org>,
linux-csky@vger.kernel.org
Subject: [PATCH AUTOSEL 5.5 61/66] csky: Set regs->usp to kernel sp, when the exception is from kernel
Date: Mon, 2 Mar 2020 21:46:10 -0500 [thread overview]
Message-ID: <20200303024615.8889-61-sashal@kernel.org> (raw)
In-Reply-To: <20200303024615.8889-1-sashal@kernel.org>
From: Guo Ren <guoren@linux.alibaba.com>
[ Upstream commit f8e17c17b81070f38062dce79ca7f4541851dadd ]
In the past, we didn't care about kernel sp when saving pt_reg. But in some
cases, we still need pt_reg->usp to represent the kernel stack before enter
exception.
For cmpxhg in atomic.S, we need save and restore usp for above.
Signed-off-by: Guo Ren <guoren@linux.alibaba.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/csky/abiv1/inc/abi/entry.h | 19 ++++++++++++++-----
arch/csky/abiv2/inc/abi/entry.h | 11 +++++++++++
arch/csky/kernel/atomic.S | 8 ++++++--
3 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/arch/csky/abiv1/inc/abi/entry.h b/arch/csky/abiv1/inc/abi/entry.h
index 7ab78bd0f3b13..f35a9f3315ee6 100644
--- a/arch/csky/abiv1/inc/abi/entry.h
+++ b/arch/csky/abiv1/inc/abi/entry.h
@@ -16,14 +16,16 @@
#define LSAVE_A4 40
#define LSAVE_A5 44
+#define usp ss1
+
.macro USPTOKSP
- mtcr sp, ss1
+ mtcr sp, usp
mfcr sp, ss0
.endm
.macro KSPTOUSP
mtcr sp, ss0
- mfcr sp, ss1
+ mfcr sp, usp
.endm
.macro SAVE_ALL epc_inc
@@ -45,7 +47,13 @@
add lr, r13
stw lr, (sp, 8)
+ mov lr, sp
+ addi lr, 32
+ addi lr, 32
+ addi lr, 16
+ bt 2f
mfcr lr, ss1
+2:
stw lr, (sp, 16)
stw a0, (sp, 20)
@@ -79,9 +87,10 @@
ldw a0, (sp, 12)
mtcr a0, epsr
btsti a0, 31
+ bt 1f
ldw a0, (sp, 16)
mtcr a0, ss1
-
+1:
ldw a0, (sp, 24)
ldw a1, (sp, 28)
ldw a2, (sp, 32)
@@ -102,9 +111,9 @@
addi sp, 32
addi sp, 8
- bt 1f
+ bt 2f
KSPTOUSP
-1:
+2:
rte
.endm
diff --git a/arch/csky/abiv2/inc/abi/entry.h b/arch/csky/abiv2/inc/abi/entry.h
index 9897a16b45e5d..94a7a58765dff 100644
--- a/arch/csky/abiv2/inc/abi/entry.h
+++ b/arch/csky/abiv2/inc/abi/entry.h
@@ -31,7 +31,13 @@
mfcr lr, epsr
stw lr, (sp, 12)
+ btsti lr, 31
+ bf 1f
+ addi lr, sp, 152
+ br 2f
+1:
mfcr lr, usp
+2:
stw lr, (sp, 16)
stw a0, (sp, 20)
@@ -64,8 +70,10 @@
mtcr a0, epc
ldw a0, (sp, 12)
mtcr a0, epsr
+ btsti a0, 31
ldw a0, (sp, 16)
mtcr a0, usp
+ mtcr a0, ss0
#ifdef CONFIG_CPU_HAS_HILO
ldw a0, (sp, 140)
@@ -86,6 +94,9 @@
addi sp, 40
ldm r16-r30, (sp)
addi sp, 72
+ bf 1f
+ mfcr sp, ss0
+1:
rte
.endm
diff --git a/arch/csky/kernel/atomic.S b/arch/csky/kernel/atomic.S
index 5b84f11485aeb..3821ef9b75672 100644
--- a/arch/csky/kernel/atomic.S
+++ b/arch/csky/kernel/atomic.S
@@ -17,10 +17,12 @@ ENTRY(csky_cmpxchg)
mfcr a3, epc
addi a3, TRAP0_SIZE
- subi sp, 8
+ subi sp, 16
stw a3, (sp, 0)
mfcr a3, epsr
stw a3, (sp, 4)
+ mfcr a3, usp
+ stw a3, (sp, 8)
psrset ee
#ifdef CONFIG_CPU_HAS_LDSTEX
@@ -47,7 +49,9 @@ ENTRY(csky_cmpxchg)
mtcr a3, epc
ldw a3, (sp, 4)
mtcr a3, epsr
- addi sp, 8
+ ldw a3, (sp, 8)
+ mtcr a3, usp
+ addi sp, 16
KSPTOUSP
rte
END(csky_cmpxchg)
--
2.20.1
next prev parent reply other threads:[~2020-03-03 2:59 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-03 2:45 [PATCH AUTOSEL 5.5 01/66] ALSA: hda: do not override bus codec_mask in link_get() Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 02/66] usb: charger: assign specific number for enum value Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 03/66] serial: ar933x_uart: set UART_CS_{RX,TX}_READY_ORIDE Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 04/66] Kernel selftests: tpm2: check for tpm support Sasha Levin
2020-04-14 16:04 ` shuah
2020-04-16 13:12 ` Jarkko Sakkinen
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 05/66] selftests: fix too long argument Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 06/66] usb: gadget: composite: Support more than 500mA MaxPower Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 07/66] usb: gadget: ffs: ffs_aio_cancel(): Save/restore IRQ flags Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 08/66] usb: gadget: serial: fix Tx stall after buffer overflow Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 09/66] habanalabs: halt the engines before hard-reset Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 10/66] habanalabs: do not halt CoreSight during hard reset Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 11/66] habanalabs: patched cb equals user cb in device memset Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 12/66] drm/msm/mdp5: rate limit pp done timeout warnings Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 13/66] drm: msm: Fix return type of dsi_mgr_connector_mode_valid for kCFI Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 14/66] drm/modes: Make sure to parse valid rotation value from cmdline Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 15/66] drm/modes: Allow DRM_MODE_ROTATE_0 when applying video mode parameters Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 16/66] scsi: megaraid_sas: silence a warning Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 17/66] drm/msm/dsi: save pll state before dsi host is powered off Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 18/66] drm/msm/dsi/pll: call vco set rate explicitly Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 19/66] selftests: forwarding: use proto icmp for {gretap, ip6gretap}_mac testing Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 20/66] net: macb: ensure interface is not suspended on at91rm9200 Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 21/66] selftests: forwarding: vxlan_bridge_1d: fix tos value Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 22/66] net: atlantic: checksum compat issue Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 23/66] net: atlantic: check rpc result and wait for rpc address Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 24/66] net: atlantic: ptp gpio adjustments Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 25/66] net: atlantic: better loopback mode handling Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 26/66] net: atlantic: fix use after free kasan warn Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 27/66] net: atlantic: fix potential error handling Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 28/66] net: atlantic: possible fault in transition to hibernation Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 29/66] net: atlantic: fix out of range usage of active_vlans array Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 30/66] net: phy: restore mdio regs in the iproc mdio driver Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 31/66] net: dsa: b53: Ensure the default VID is untagged Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 32/66] bonding: add missing netdev_update_lockdep_key() Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 33/66] net: ks8851-ml: Remove 8-bit bus accessors Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 34/66] net: ks8851-ml: Fix 16-bit data access Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 35/66] net: ks8851-ml: Fix 16-bit IO operation Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 36/66] net: ethernet: dm9000: Handle -EPROBE_DEFER in dm9000_parse_dt() Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 37/66] watchdog: da9062: do not ping the hw during stop() Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 38/66] s390/cio: cio_ignore_proc_seq_next should increase position index Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 39/66] s390: make 'install' not depend on vmlinux Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 40/66] net: mscc: fix in frame extraction Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 41/66] efi: Only print errors about failing to get certs if EFI vars are found Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 42/66] qede: Fix race between rdma destroy workqueue and link change event Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 43/66] net/mlx5: DR, Fix matching on vport gvmi Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 44/66] iommu/amd: Disable IOMMU on Stoney Ridge systems Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 45/66] nvme/pci: Add sleep quirk for Samsung and Toshiba drives Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 46/66] nvme-pci: Use single IRQ vector for old Apple models Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 47/66] x86/boot/compressed: Don't declare __force_order in kaslr_64.c Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 48/66] s390/qdio: fill SL with absolute addresses Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 49/66] nvme: Fix uninitialized-variable warning Sasha Levin
2020-03-03 2:45 ` [PATCH AUTOSEL 5.5 50/66] nfc: pn544: Fix occasional HW initialization failure Sasha Levin
2020-03-03 2:46 ` [PATCH AUTOSEL 5.5 51/66] ice: Don't tell the OS that link is going down Sasha Levin
2020-03-03 2:46 ` [PATCH AUTOSEL 5.5 52/66] x86/xen: Distribute switch variables for initialization Sasha Levin
2020-03-03 2:46 ` [PATCH AUTOSEL 5.5 53/66] s390/qeth: vnicc Fix EOPNOTSUPP precedence Sasha Levin
2020-03-03 2:46 ` [PATCH AUTOSEL 5.5 54/66] s390/qeth: fix off-by-one in RX copybreak check Sasha Levin
2020-03-03 2:46 ` [PATCH AUTOSEL 5.5 55/66] net: macb: Properly handle phylink on at91rm9200 Sasha Levin
2020-03-03 2:46 ` [PATCH AUTOSEL 5.5 56/66] ionic: fix fw_status read Sasha Levin
2020-03-03 2:46 ` [PATCH AUTOSEL 5.5 57/66] net: thunderx: workaround BGX TX Underflow issue Sasha Levin
2020-03-03 2:46 ` [PATCH AUTOSEL 5.5 58/66] bnxt_en: Improve device shutdown method Sasha Levin
2020-03-03 2:46 ` [PATCH AUTOSEL 5.5 59/66] bnxt_en: Issue PCIe FLR in kdump kernel to cleanup pending DMAs Sasha Levin
2020-03-03 2:46 ` [PATCH AUTOSEL 5.5 60/66] csky/mm: Fixup export invalid_pte_table symbol Sasha Levin
2020-03-03 2:46 ` Sasha Levin [this message]
2020-03-03 2:46 ` [PATCH AUTOSEL 5.5 62/66] csky/smp: Fixup boot failed when CONFIG_SMP Sasha Levin
2020-03-03 2:46 ` [PATCH AUTOSEL 5.5 63/66] csky: Fixup ftrace modify panic Sasha Levin
2020-03-03 2:46 ` [PATCH AUTOSEL 5.5 64/66] csky: Fixup compile warning for three unimplemented syscalls Sasha Levin
2020-03-03 2:46 ` [PATCH AUTOSEL 5.5 65/66] arch/csky: fix some Kconfig typos Sasha Levin
2020-03-03 2:46 ` [PATCH AUTOSEL 5.5 66/66] selftests: forwarding: vxlan_bridge_1d: use more proper tos value Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200303024615.8889-61-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=guoren@linux.alibaba.com \
--cc=linux-csky@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).