From: Anup Patel <anup.patel@oss.qualcomm.com>
To: Palmer Dabbelt <palmer@dabbelt.com>,
Paul Walmsley <pjw@kernel.org>,
Rahul Pathak <rahul@summations.net>,
Stephen Boyd <sboyd@kernel.org>,
Brian Masney <bmasney+clk@redhat.com>,
Jerome Brunet <jbrunet+clk@baylibre.com>,
Thomas Gleixner <tglx@kernel.org>, Radu Rendec <radu@rendec.net>,
Jassi Brar <jassisinghbrar@gmail.com>
Cc: Sunil V L <sunilvl@oss.qualcomm.com>,
Himanshu Chauhan <himanshu.chauhan@oss.qualcomm.com>,
Atish Patra <atish.patra@linux.dev>,
Anup Patel <anup@brainfault.org>,
Amirreza Zarrabi <amirreza.zarrabi@oss.qualcomm.com>,
linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org,
linux-clk@vger.kernel.org,
Anup Patel <anup.patel@oss.qualcomm.com>
Subject: [PATCH v2 2/5] RISC-V: Use irqsave to prevent interrupt when accessing MPXY shared memory
Date: Mon, 16 Nov 2026 09:30:46 +0530 [thread overview]
Message-ID: <20261116040049.1795610-3-anup.patel@oss.qualcomm.com> (raw)
In-Reply-To: <20261116040049.1795610-1-anup.patel@oss.qualcomm.com>
Currently, get_cpu()/put_cpu() is used to prevent getting preempted when
accessing shared memory but an external interrupt can still be taken which
may invoke RPMI system IRQ driver potentially corrupting MPXY shared memory.
To prevent the above, replace get_cpu()/put_cpu() with irq save/restore
which ensures external interrupt can't corrupt MPXY shared memory.
Co-developed-by: Jassi Brar <jassisinghbrar@gmail.com>
Signed-off-by: Jassi Brar <jassisinghbrar@gmail.com>
Signed-off-by: Anup Patel <anup.patel@oss.qualcomm.com>
---
arch/riscv/kernel/sbi_mpxy.c | 114 +++++++++++++++++------------------
1 file changed, 57 insertions(+), 57 deletions(-)
diff --git a/arch/riscv/kernel/sbi_mpxy.c b/arch/riscv/kernel/sbi_mpxy.c
index 17a2cee21311..99ab3e552da3 100644
--- a/arch/riscv/kernel/sbi_mpxy.c
+++ b/arch/riscv/kernel/sbi_mpxy.c
@@ -6,8 +6,10 @@
*/
#define pr_fmt(fmt) "riscv: " fmt
+#include <linux/cleanup.h>
#include <linux/cpu.h>
#include <linux/init.h>
+#include <linux/irqflags.h>
#include <linux/mm.h>
#include <linux/percpu.h>
#include <linux/printk.h>
@@ -50,113 +52,116 @@ EXPORT_SYMBOL_GPL(sbi_mpxy_shmem_size);
int sbi_mpxy_get_channel_count(u32 *channel_count)
{
- struct mpxy_local *mpxy = this_cpu_ptr(&mpxy_local);
- struct sbi_mpxy_channel_ids_data *sdata = mpxy->shmem;
+ struct sbi_mpxy_channel_ids_data *sdata;
+ struct mpxy_local *mpxy;
u32 remaining, returned;
struct sbiret sret;
- if (!mpxy->shmem_active)
- return -ENODEV;
if (!channel_count)
return -EINVAL;
- get_cpu();
+ /*
+ * The shared memory is per-CPU. Disable IRQs so that a local IRQ
+ * cannot re-enter and clobber the buffer while the SBI call uses it.
+ * This also pins the current CPU for this_cpu_ptr().
+ */
+ guard(irqsave)();
+ mpxy = this_cpu_ptr(&mpxy_local);
+ if (!mpxy->shmem_active)
+ return -ENODEV;
+ sdata = mpxy->shmem;
/* Get the remaining and returned fields to calculate total */
sret = sbi_ecall(SBI_EXT_MPXY, SBI_EXT_MPXY_GET_CHANNEL_IDS,
0, 0, 0, 0, 0, 0);
if (sret.error)
- goto err_put_cpu;
+ return sbi_err_map_linux_errno(sret.error);
remaining = le32_to_cpu(sdata->remaining);
returned = le32_to_cpu(sdata->returned);
*channel_count = remaining + returned;
-err_put_cpu:
- put_cpu();
- return sbi_err_map_linux_errno(sret.error);
+ return 0;
}
EXPORT_SYMBOL_GPL(sbi_mpxy_get_channel_count);
int sbi_mpxy_get_channel_ids(u32 channel_count, u32 *channel_ids)
{
- struct mpxy_local *mpxy = this_cpu_ptr(&mpxy_local);
- struct sbi_mpxy_channel_ids_data *sdata = mpxy->shmem;
u32 remaining, returned, count, start_index = 0;
+ struct sbi_mpxy_channel_ids_data *sdata;
+ struct mpxy_local *mpxy;
struct sbiret sret;
- if (!mpxy->shmem_active)
- return -ENODEV;
if (!channel_count || !channel_ids)
return -EINVAL;
- get_cpu();
+ guard(irqsave)();
+ mpxy = this_cpu_ptr(&mpxy_local);
+ if (!mpxy->shmem_active)
+ return -ENODEV;
+ sdata = mpxy->shmem;
do {
sret = sbi_ecall(SBI_EXT_MPXY, SBI_EXT_MPXY_GET_CHANNEL_IDS,
start_index, 0, 0, 0, 0, 0);
if (sret.error)
- goto err_put_cpu;
+ return sbi_err_map_linux_errno(sret.error);
remaining = le32_to_cpu(sdata->remaining);
returned = le32_to_cpu(sdata->returned);
- count = returned < (channel_count - start_index) ?
- returned : (channel_count - start_index);
+ count = min(returned, channel_count - start_index);
memcpy_from_le32(&channel_ids[start_index], sdata->channel_array, count);
start_index += count;
} while (remaining && start_index < channel_count);
-err_put_cpu:
- put_cpu();
- return sbi_err_map_linux_errno(sret.error);
+ return 0;
}
EXPORT_SYMBOL_GPL(sbi_mpxy_get_channel_ids);
int sbi_mpxy_read_attrs(u32 channel_id, u32 base_attrid, u32 attr_count,
u32 *attrs_buf)
{
- struct mpxy_local *mpxy = this_cpu_ptr(&mpxy_local);
+ struct mpxy_local *mpxy;
struct sbiret sret;
- if (!mpxy->shmem_active)
- return -ENODEV;
if (!attr_count || !attrs_buf)
return -EINVAL;
- get_cpu();
+ guard(irqsave)();
+ mpxy = this_cpu_ptr(&mpxy_local);
+ if (!mpxy->shmem_active)
+ return -ENODEV;
sret = sbi_ecall(SBI_EXT_MPXY, SBI_EXT_MPXY_READ_ATTRS,
channel_id, base_attrid, attr_count, 0, 0, 0);
if (sret.error)
- goto err_put_cpu;
+ return sbi_err_map_linux_errno(sret.error);
memcpy_from_le32(attrs_buf, (__le32 *)mpxy->shmem, attr_count);
-err_put_cpu:
- put_cpu();
- return sbi_err_map_linux_errno(sret.error);
+ return 0;
}
EXPORT_SYMBOL_GPL(sbi_mpxy_read_attrs);
int sbi_mpxy_write_attrs(u32 channel_id, u32 base_attrid, u32 attr_count,
u32 *attrs_buf)
{
- struct mpxy_local *mpxy = this_cpu_ptr(&mpxy_local);
+ struct mpxy_local *mpxy;
struct sbiret sret;
- if (!mpxy->shmem_active)
- return -ENODEV;
if (!attr_count || !attrs_buf)
return -EINVAL;
- get_cpu();
+ guard(irqsave)();
+ mpxy = this_cpu_ptr(&mpxy_local);
+ if (!mpxy->shmem_active)
+ return -ENODEV;
memcpy_to_le32((__le32 *)mpxy->shmem, attrs_buf, attr_count);
sret = sbi_ecall(SBI_EXT_MPXY, SBI_EXT_MPXY_WRITE_ATTRS,
channel_id, base_attrid, attr_count, 0, 0, 0);
- put_cpu();
return sbi_err_map_linux_errno(sret.error);
}
EXPORT_SYMBOL_GPL(sbi_mpxy_write_attrs);
@@ -166,16 +171,17 @@ int sbi_mpxy_send_message_with_resp(u32 channel_id, u32 msg_id,
void *rx, unsigned long max_rx_len,
unsigned long *rx_len)
{
- struct mpxy_local *mpxy = this_cpu_ptr(&mpxy_local);
+ struct mpxy_local *mpxy;
unsigned long rx_bytes;
struct sbiret sret;
- if (!mpxy->shmem_active)
- return -ENODEV;
if (!tx && tx_len)
return -EINVAL;
- get_cpu();
+ guard(irqsave)();
+ mpxy = this_cpu_ptr(&mpxy_local);
+ if (!mpxy->shmem_active)
+ return -ENODEV;
/* Message protocols allowed to have no data in messages */
if (tx_len)
@@ -185,17 +191,14 @@ int sbi_mpxy_send_message_with_resp(u32 channel_id, u32 msg_id,
channel_id, msg_id, tx_len, 0, 0, 0);
if (rx && !sret.error) {
rx_bytes = sret.value;
- if (rx_bytes > max_rx_len) {
- put_cpu();
+ if (rx_bytes > max_rx_len)
return -ENOSPC;
- }
memcpy(rx, mpxy->shmem, rx_bytes);
if (rx_len)
*rx_len = rx_bytes;
}
- put_cpu();
return sbi_err_map_linux_errno(sret.error);
}
EXPORT_SYMBOL_GPL(sbi_mpxy_send_message_with_resp);
@@ -203,15 +206,16 @@ EXPORT_SYMBOL_GPL(sbi_mpxy_send_message_with_resp);
int sbi_mpxy_send_message_without_resp(u32 channel_id, u32 msg_id,
void *tx, unsigned long tx_len)
{
- struct mpxy_local *mpxy = this_cpu_ptr(&mpxy_local);
+ struct mpxy_local *mpxy;
struct sbiret sret;
- if (!mpxy->shmem_active)
- return -ENODEV;
if (!tx && tx_len)
return -EINVAL;
- get_cpu();
+ guard(irqsave)();
+ mpxy = this_cpu_ptr(&mpxy_local);
+ if (!mpxy->shmem_active)
+ return -ENODEV;
/* Message protocols allowed to have no data in messages */
if (tx_len)
@@ -220,7 +224,6 @@ int sbi_mpxy_send_message_without_resp(u32 channel_id, u32 msg_id,
sret = sbi_ecall(SBI_EXT_MPXY, SBI_EXT_MPXY_SEND_MSG_WITHOUT_RESP,
channel_id, msg_id, tx_len, 0, 0, 0);
- put_cpu();
return sbi_err_map_linux_errno(sret.error);
}
EXPORT_SYMBOL_GPL(sbi_mpxy_send_message_without_resp);
@@ -229,32 +232,29 @@ int sbi_mpxy_get_notifications(u32 channel_id,
struct sbi_mpxy_notification_data *notif_data,
unsigned long *events_data_len)
{
- struct mpxy_local *mpxy = this_cpu_ptr(&mpxy_local);
+ struct mpxy_local *mpxy;
struct sbiret sret;
- if (!mpxy->shmem_active)
- return -ENODEV;
if (!notif_data || !events_data_len)
return -EINVAL;
- get_cpu();
+ guard(irqsave)();
+ mpxy = this_cpu_ptr(&mpxy_local);
+ if (!mpxy->shmem_active)
+ return -ENODEV;
sret = sbi_ecall(SBI_EXT_MPXY, SBI_EXT_MPXY_GET_NOTIFICATION_EVENTS,
channel_id, 0, 0, 0, 0, 0);
if (sret.error)
- goto err_put_cpu;
+ return sbi_err_map_linux_errno(sret.error);
if (sret.value < 0 || mpxy_shmem_size < sizeof(*notif_data) ||
- sret.value > mpxy_shmem_size - sizeof(*notif_data)) {
- put_cpu();
+ sret.value > mpxy_shmem_size - sizeof(*notif_data))
return -EOVERFLOW;
- }
memcpy(notif_data, mpxy->shmem, sret.value + sizeof(*notif_data));
*events_data_len = sret.value;
-err_put_cpu:
- put_cpu();
- return sbi_err_map_linux_errno(sret.error);
+ return 0;
}
EXPORT_SYMBOL_GPL(sbi_mpxy_get_notifications);
--
2.43.0
next prev parent reply other threads:[~2026-11-16 4:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 4:00 [PATCH v2 0/5] Parallel message send using SBI MPXY Anup Patel
2026-11-16 4:00 ` [PATCH v2 1/5] RISC-V: Move common MPXY helper routines to arch/riscv Anup Patel
2026-11-16 4:00 ` Anup Patel [this message]
2026-11-16 4:00 ` [PATCH v2 3/5] mailbox: add direct synchronous transmit API Anup Patel
2026-11-16 4:00 ` [PATCH v2 4/5] mailbox: document direct synchronous transmit Anup Patel
2026-11-16 4:00 ` [PATCH v2 5/5] mailbox: convert RISC-V SBI MPXY to direct transmit Anup Patel
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=20261116040049.1795610-3-anup.patel@oss.qualcomm.com \
--to=anup.patel@oss.qualcomm.com \
--cc=amirreza.zarrabi@oss.qualcomm.com \
--cc=anup@brainfault.org \
--cc=atish.patra@linux.dev \
--cc=bmasney+clk@redhat.com \
--cc=himanshu.chauhan@oss.qualcomm.com \
--cc=jassisinghbrar@gmail.com \
--cc=jbrunet+clk@baylibre.com \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@dabbelt.com \
--cc=pjw@kernel.org \
--cc=radu@rendec.net \
--cc=rahul@summations.net \
--cc=sboyd@kernel.org \
--cc=sunilvl@oss.qualcomm.com \
--cc=tglx@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
all inboxes | Powered by JetHome®