Skip to content

fix(ramshared): guard clauses for request queue initialization parameters #1904

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
emersonbusson wants to merge 4 commits into from
Closed

fix(ramshared): guard clauses for request queue initialization parameters #1904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7df1804
fix(ramshared): guard clauses for request queue initialization parame…
emersonbusson Sep 18, 2026
973ccb5
fix(ramshared): guard clauses for request queue initialization parame…
emersonbusson Sep 18, 2026
c09fa66
fix(ramshared): guard clauses for request queue initialization parame…
emersonbusson Sep 18, 2026
9c2faeb
fix(ramshared): guard clauses for request queue initialization parame…
emersonbusson Sep 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions drivers/block/ramshared/queue.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,18 +260,18 @@ const struct attribute_group *ramshared_attr_groups[] = {
int ramshared_queue_init(struct ramshared_device *rs_dev,
struct device *parent_dev, unsigned int q_depth)
{
unsigned int valid_depth;
int ret;

if (!rs_dev || !parent_dev)
return -EINVAL;

valid_depth = clamp_t(unsigned int, q_depth, 16U, 1024U);
if (q_depth < 16U || q_depth > 1024U)
return -EINVAL;

memset(&rs_dev->tag_set, 0, sizeof(rs_dev->tag_set));
rs_dev->tag_set.ops = &ramshared_mq_ops;
rs_dev->tag_set.nr_hw_queues = num_online_cpus();
rs_dev->tag_set.queue_depth = valid_depth;
rs_dev->tag_set.queue_depth = q_depth;
rs_dev->tag_set.numa_node = NUMA_NO_NODE;
#ifdef BLK_MQ_F_SHOULD_MERGE
rs_dev->tag_set.flags = BLK_MQ_F_SHOULD_MERGE;
Expand Down
13 changes: 13 additions & 0 deletions patch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import re

with open('drivers/block/ramshared/queue.c', 'r') as f:
content = f.read()

content = re.sub(
r'\tunsigned int valid_depth;\n\tint ret;\n\n\tif \(!rs_dev \|\| !parent_dev\)\n\t\treturn -EINVAL;\n\n\tvalid_depth = clamp_t\(unsigned int, q_depth, 16U, 1024U\);\n\n\tmemset\(&rs_dev->tag_set, 0, sizeof\(rs_dev->tag_set\)\);\n\trs_dev->tag_set\.ops = &ramshared_mq_ops;\n\trs_dev->tag_set\.nr_hw_queues = num_online_cpus\(\);\n\trs_dev->tag_set\.queue_depth = valid_depth;',
'\tint ret;\n\n\tif (!rs_dev || !parent_dev)\n\t\treturn -EINVAL;\n\n\tif (q_depth < 16U || q_depth > 1024U)\n\t\treturn -EINVAL;\n\n\tmemset(&rs_dev->tag_set, 0, sizeof(rs_dev->tag_set));\n\trs_dev->tag_set.ops = &ramshared_mq_ops;\n\trs_dev->tag_set.nr_hw_queues = num_online_cpus();\n\trs_dev->tag_set.queue_depth = q_depth;',
content
)

with open('drivers/block/ramshared/queue.c', 'w') as f:
f.write(content)
Loading