Skip to content

[PW_SID:1147259] iommu/riscv: Fix command queue publishing races - #2483

Closed
linux-riscv-bot wants to merge 6 commits into
workflow__riscv__fixesfrom
pw1147259
Closed

[PW_SID:1147259] iommu/riscv: Fix command queue publishing races#2483
linux-riscv-bot wants to merge 6 commits into
workflow__riscv__fixesfrom
pw1147259

Conversation

@linux-riscv-bot

@linux-riscv-bot linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown

PR for series 1147259 applied to workflow__riscv__fixes

Name: iommu/riscv: Fix command queue publishing races
URL: https://patchwork.kernel.org/project/linux-riscv/list/?series=1147259
Version: 1

ThreeBottleCap and others added 6 commits August 14, 2026 14:12
@ThreeBottleCap Paul Walmsley
riscv: mm: make EXECMEM_KPROBES writable without CONFIG_STRICT_MODULE…
784f45c 
…_RWX

When CONFIG_STRICT_MODULE_RWX is not set, execmem cannot create
temporary writable mappings for read-only executable pages. In this
case, the execmem ranges must already have writable permissions.

Currently EXECMEM_KPROBES unconditionally uses PAGE_KERNEL_READ_EXEC,
which causes kprobe instruction slot writes to trigger page faults
on systems where CONFIG_STRICT_MODULE_RWX is not enabled.

Fix this by using PAGE_KERNEL_EXEC when CONFIG_STRICT_MODULE_RWX
is not available.

Signed-off-by: Xiaofeng Yuan <xiaofengmian@163.com>
Tested-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Reviewed-by: Nam Cao <namcao@linutronix.de>
Link: https://patch.msgid.link/20260814082742.148403-2-xiaofengmian@163.com
Signed-off-by: Paul Walmsley <pjw@kernel.org>
@ThreeBottleCap Paul Walmsley
riscv: patch: skip fixmap mapping when kernel text is already writable
8d9d4fd 
patch_map() always creates a temporary writable mapping via fixmap for
kernel text addresses, even when CONFIG_STRICT_KERNEL_RWX is disabled
and the kernel text is already mapped with _PAGE_WRITE.

This is unnecessary overhead at best, and on minimal configurations
it can cause page faults.

Skip the fixmap path for kernel text when CONFIG_STRICT_KERNEL_RWX
is not enabled, since the text pages are already writable in that case.
The module text path is already gated on CONFIG_STRICT_MODULE_RWX and
is kept unchanged.

Reported-by: Klara Modin <klara@kasm.eu>
Closes: https://lore.kernel.org/all/ant_8TaBbov_GS4i@soda.int.kasm.eu/
Reported-by: Lad Prabhakar <prabhakar.csengg@gmail.com>
Closes: https://lore.kernel.org/all/CA+V-a8tQK8rih9SGGTyqrEBGpNkx4H0eX2YccCRrgkVAPr+EBg@mail.gmail.com/
Tested-by: Klara Modin <klarasmodin@gmail.com>
Tested-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Link: https://patch.msgid.link/20260814082742.148403-3-xiaofengmian@163.com
Signed-off-by: Paul Walmsley <pjw@kernel.org>
Linux RISC-V bot
Adding CI files
492cc66
@fangyu0809 Linux RISC-V bot
iommu/riscv: Add command queue lock
81b7bd4 
Add a raw spinlock to the RISC-V IOMMU queue state so command queue
publishing can be serialized by a later change.

Fixes: 856c0cf ("iommu/riscv: Command and fault queue support")
Signed-off-by: Fangyu Yu <fangyu.yu@linux.alibaba.com>
Signed-off-by: Linux RISC-V bot <linux.riscv.bot@gmail.com>
@fangyu0809 Linux RISC-V bot
iommu/riscv: Serialize command queue publishing
ab56c37 
Serialize command queue publishing so software producer state advances only
after a command is written and the hardware tail is updated. Wait for
hardware consumption outside the queue lock when the command queue is full
so other CPUs are not blocked behind a long poll.

Fixes: 856c0cf ("iommu/riscv: Command and fault queue support")
Signed-off-by: Fangyu Yu <fangyu.yu@linux.alibaba.com>
Signed-off-by: Linux RISC-V bot <linux.riscv.bot@gmail.com>
@fangyu0809 Linux RISC-V bot
iommu/riscv: Avoid waiting on failed command enqueue
c153d1b 
Do not wait for IOFENCE.C completion when the command failed to enter the
queue. The command was not published to hardware, so waiting for its
producer index can only report a misleading execution timeout.

Fixes: 856c0cf ("iommu/riscv: Command and fault queue support")
Signed-off-by: Fangyu Yu <fangyu.yu@linux.alibaba.com>
Signed-off-by: Linux RISC-V bot <linux.riscv.bot@gmail.com>
@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 1: "[1/3] iommu/riscv: Add command queue lock"
build-rv32-defconfig
Desc: Builds riscv32 defconfig
Duration: 143.47 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 1: "[1/3] iommu/riscv: Add command queue lock"
build-rv64-clang-allmodconfig
Desc: Builds riscv64 allmodconfig with Clang, and checks for errors and added warnings
Duration: 1409.80 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 1: "[1/3] iommu/riscv: Add command queue lock"
build-rv64-gcc-allmodconfig
Desc: Builds riscv64 allmodconfig with GCC, and checks for errors and added warnings
Duration: 1731.53 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 1: "[1/3] iommu/riscv: Add command queue lock"
build-rv64-nommu-k210-defconfig
Desc: Builds riscv64 defconfig with NOMMU for K210
Duration: 26.80 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 1: "[1/3] iommu/riscv: Add command queue lock"
build-rv64-nommu-k210-virt
Desc: Builds riscv64 defconfig with NOMMU for the virt platform
Duration: 28.24 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 1: "[1/3] iommu/riscv: Add command queue lock"
checkpatch
Desc: Runs checkpatch.pl on the patch
Duration: 1.03 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 1: "[1/3] iommu/riscv: Add command queue lock"
dtb-warn-rv64
Desc: Checks for Device Tree warnings/errors
Duration: 92.85 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 1: "[1/3] iommu/riscv: Add command queue lock"
header-inline
Desc: Detects static functions without inline keyword in header files
Duration: 0.24 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 1: "[1/3] iommu/riscv: Add command queue lock"
kdoc
Desc: Detects for kdoc errors
Duration: 0.86 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 1: "[1/3] iommu/riscv: Add command queue lock"
module-param
Desc: Detect module_param changes
Duration: 0.26 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 1: "[1/3] iommu/riscv: Add command queue lock"
verify-fixes
Desc: Verifies that the Fixes: tags exist
Duration: 0.27 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 1: "[1/3] iommu/riscv: Add command queue lock"
verify-signedoff
Desc: Verifies that Signed-off-by: tags are correct
Duration: 0.31 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 2: "[2/3] iommu/riscv: Serialize command queue publishing"
build-rv32-defconfig
Desc: Builds riscv32 defconfig
Duration: 143.25 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 2: "[2/3] iommu/riscv: Serialize command queue publishing"
build-rv64-clang-allmodconfig
Desc: Builds riscv64 allmodconfig with Clang, and checks for errors and added warnings
Duration: 1491.19 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 2: "[2/3] iommu/riscv: Serialize command queue publishing"
build-rv64-gcc-allmodconfig
Desc: Builds riscv64 allmodconfig with GCC, and checks for errors and added warnings
Duration: 1730.74 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 2: "[2/3] iommu/riscv: Serialize command queue publishing"
build-rv64-nommu-k210-defconfig
Desc: Builds riscv64 defconfig with NOMMU for K210
Duration: 26.37 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 2: "[2/3] iommu/riscv: Serialize command queue publishing"
build-rv64-nommu-k210-virt
Desc: Builds riscv64 defconfig with NOMMU for the virt platform
Duration: 28.19 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 2: "[2/3] iommu/riscv: Serialize command queue publishing"
checkpatch
Desc: Runs checkpatch.pl on the patch
Duration: 2.12 seconds
Result: WARNING
Output:

CHECK: Alignment should match open parenthesis
#33: FILE: drivers/iommu/riscv/iommu.c:386:
+static int riscv_iommu_queue_wait_for_space(struct riscv_iommu_queue *queue,
+						   unsigned int last)

CHECK: Alignment should match open parenthesis
#42: FILE: drivers/iommu/riscv/iommu.c:395:
+	ret = riscv_iommu_readl_timeout(queue->iommu, Q_HEAD(queue), hw_head,
+					      !(hw_head & ~queue->mask) && hw_head != last,

total: 0 errors, 0 warnings, 2 checks, 139 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
      mechanically convert to the typical style using --fix or --fix-inplace.

Commit ab56c37718ea ("iommu/riscv: Serialize command queue publishing") has style problems, please review.

NOTE: Ignored message types: ALLOC_SIZEOF_STRUCT CAMELCASE COMMIT_LOG_LONG_LINE GIT_COMMIT_ID MACRO_ARG_REUSE NO_AUTHOR_SIGN_OFF

NOTE: If any of the errors are false positives, please report
      them to the maintainer, see CHECKPATCH in MAINTAINERS.
total: 0 errors, 0 warnings, 2 checks, 139 lines checked
CHECK: Alignment should match open parenthesis

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 2: "[2/3] iommu/riscv: Serialize command queue publishing"
dtb-warn-rv64
Desc: Checks for Device Tree warnings/errors
Duration: 86.80 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 2: "[2/3] iommu/riscv: Serialize command queue publishing"
header-inline
Desc: Detects static functions without inline keyword in header files
Duration: 0.24 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 2: "[2/3] iommu/riscv: Serialize command queue publishing"
kdoc
Desc: Detects for kdoc errors
Duration: 0.87 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 2: "[2/3] iommu/riscv: Serialize command queue publishing"
module-param
Desc: Detect module_param changes
Duration: 0.26 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 2: "[2/3] iommu/riscv: Serialize command queue publishing"
verify-fixes
Desc: Verifies that the Fixes: tags exist
Duration: 0.28 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 2: "[2/3] iommu/riscv: Serialize command queue publishing"
verify-signedoff
Desc: Verifies that Signed-off-by: tags are correct
Duration: 0.31 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 3: "[3/3] iommu/riscv: Avoid waiting on failed command enqueue"
build-rv32-defconfig
Desc: Builds riscv32 defconfig
Duration: 143.64 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 3: "[3/3] iommu/riscv: Avoid waiting on failed command enqueue"
build-rv64-clang-allmodconfig
Desc: Builds riscv64 allmodconfig with Clang, and checks for errors and added warnings
Duration: 1407.82 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 3: "[3/3] iommu/riscv: Avoid waiting on failed command enqueue"
build-rv64-gcc-allmodconfig
Desc: Builds riscv64 allmodconfig with GCC, and checks for errors and added warnings
Duration: 1748.46 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 3: "[3/3] iommu/riscv: Avoid waiting on failed command enqueue"
build-rv64-nommu-k210-defconfig
Desc: Builds riscv64 defconfig with NOMMU for K210
Duration: 26.97 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 3: "[3/3] iommu/riscv: Avoid waiting on failed command enqueue"
build-rv64-nommu-k210-virt
Desc: Builds riscv64 defconfig with NOMMU for the virt platform
Duration: 28.08 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 3: "[3/3] iommu/riscv: Avoid waiting on failed command enqueue"
checkpatch
Desc: Runs checkpatch.pl on the patch
Duration: 1.90 seconds
Result: WARNING
Output:

CHECK: Alignment should match open parenthesis
#28: FILE: drivers/iommu/riscv/iommu.c:423:
+static int riscv_iommu_queue_send(struct riscv_iommu_queue *queue,
+					  void *entry, size_t entry_size,

total: 0 errors, 0 warnings, 1 checks, 52 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
      mechanically convert to the typical style using --fix or --fix-inplace.

Commit c153d1b91983 ("iommu/riscv: Avoid waiting on failed command enqueue") has style problems, please review.

NOTE: Ignored message types: ALLOC_SIZEOF_STRUCT CAMELCASE COMMIT_LOG_LONG_LINE GIT_COMMIT_ID MACRO_ARG_REUSE NO_AUTHOR_SIGN_OFF

NOTE: If any of the errors are false positives, please report
      them to the maintainer, see CHECKPATCH in MAINTAINERS.
total: 0 errors, 0 warnings, 1 checks, 52 lines checked
CHECK: Alignment should match open parenthesis

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 3: "[3/3] iommu/riscv: Avoid waiting on failed command enqueue"
dtb-warn-rv64
Desc: Checks for Device Tree warnings/errors
Duration: 88.90 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 3: "[3/3] iommu/riscv: Avoid waiting on failed command enqueue"
header-inline
Desc: Detects static functions without inline keyword in header files
Duration: 0.23 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 3: "[3/3] iommu/riscv: Avoid waiting on failed command enqueue"
kdoc
Desc: Detects for kdoc errors
Duration: 0.85 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 3: "[3/3] iommu/riscv: Avoid waiting on failed command enqueue"
module-param
Desc: Detect module_param changes
Duration: 0.26 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 3: "[3/3] iommu/riscv: Avoid waiting on failed command enqueue"
verify-fixes
Desc: Verifies that the Fixes: tags exist
Duration: 0.29 seconds
Result: PASS

@linux-riscv-bot

linux-riscv-bot commented Aug 17, 2026

Copy link
Copy Markdown
Author

Patch 3: "[3/3] iommu/riscv: Avoid waiting on failed command enqueue"
verify-signedoff
Desc: Verifies that Signed-off-by: tags are correct
Duration: 0.31 seconds
Result: PASS

@linux-riscv-bot
linux-riscv-bot force-pushed the workflow__riscv__fixes branch 2 times, most recently from bb1a926 to 6f6f7c0 Compare August 21, 2026 03:35
@linux-riscv-bot
linux-riscv-bot deleted the pw1147259 branch August 25, 2026 00:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@linux-riscv-bot @ThreeBottleCap @fangyu0809