2023-05-03 16:31:45

by Yue Zhao

Subject: [PATCH] lkdtm: replace ll_rw_block with submit_bh

Function ll_rw_block was removed in commit 79f597842069 ("fs/buffer:
remove ll_rw_block() helper"). There is no unified function to sumbit
read or write buffer in block layer for now. Consider similar sematics,
we can choose submit_bh() to replace ll_rw_block() as predefined crash
point. In submit_bh(), it also takes read or write flag as the first
argument and invoke submit_bio() to submit I/O request to block layer.

Fixes: 79f597842069 ("fs/buffer: remove ll_rw_block() helper")

Signed-off-by: Yue Zhao <[email protected]>
---
Documentation/fault-injection/provoke-crashes.rst | 2 +-
drivers/misc/lkdtm/core.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/fault-injection/provoke-crashes.rst b/Documentation/fault-injection/provoke-crashes.rst
index 3abe84225613..1f087e502ca6 100644
--- a/Documentation/fault-injection/provoke-crashes.rst
+++ b/Documentation/fault-injection/provoke-crashes.rst
@@ -29,7 +29,7 @@ recur_count
cpoint_name
Where in the kernel to trigger the action. It can be
one of INT_HARDWARE_ENTRY, INT_HW_IRQ_EN, INT_TASKLET_ENTRY,
- FS_DEVRW, MEM_SWAPOUT, TIMERADD, SCSI_QUEUE_RQ, or DIRECT.
+ FS_SUBMIT_BH, MEM_SWAPOUT, TIMERADD, SCSI_QUEUE_RQ, or DIRECT.

cpoint_type
Indicates the action to be taken on hitting the crash point.
diff --git a/drivers/misc/lkdtm/core.c b/drivers/misc/lkdtm/core.c
index b4712ff196b4..0772e4a4757e 100644
--- a/drivers/misc/lkdtm/core.c
+++ b/drivers/misc/lkdtm/core.c
@@ -79,7 +79,7 @@ static struct crashpoint crashpoints[] = {
CRASHPOINT("INT_HARDWARE_ENTRY", "do_IRQ"),
CRASHPOINT("INT_HW_IRQ_EN", "handle_irq_event"),
CRASHPOINT("INT_TASKLET_ENTRY", "tasklet_action"),
- CRASHPOINT("FS_DEVRW", "ll_rw_block"),
+ CRASHPOINT("FS_SUBMIT_BH", "submit_bh"),
CRASHPOINT("MEM_SWAPOUT", "shrink_inactive_list"),
CRASHPOINT("TIMERADD", "hrtimer_start"),
CRASHPOINT("SCSI_QUEUE_RQ", "scsi_queue_rq"),
--
2.17.1

2023-05-04 01:30:12

by Kees Cook

Subject: Re: [PATCH] lkdtm: replace ll_rw_block with submit_bh

On Thu, May 04, 2023 at 12:29:44AM +0800, Yue Zhao wrote:
> Function ll_rw_block was removed in commit 79f597842069 ("fs/buffer:
> remove ll_rw_block() helper"). There is no unified function to sumbit
> read or write buffer in block layer for now. Consider similar sematics,
> we can choose submit_bh() to replace ll_rw_block() as predefined crash
> point. In submit_bh(), it also takes read or write flag as the first
> argument and invoke submit_bio() to submit I/O request to block layer.
>
> Fixes: 79f597842069 ("fs/buffer: remove ll_rw_block() helper")
>
> Signed-off-by: Yue Zhao <[email protected]>

Acked-by: Kees Cook <[email protected]>

--
Kees Cook