scsi: target: fixup incorrect use of 'cpumask_t'
Subsystems (2)
PATCH 1/1 scsi: target: fixup incorrect use of 'cpumask_t'
From: mingzhe <[email protected]>
In commit d72d827f2f26, I used 'cpumask_t' incorrectly.
```
void iscsit_thread_get_cpumask(struct iscsi_conn *conn)
{
int ord, cpu;
cpumask_t conn_allowed_cpumask;
......
}
static ssize_t lio_target_wwn_cpus_allowed_list_store(
struct config_item *item, const char *page, size_t count)
{
int ret;
char *orig;
cpumask_t new_allowed_cpumask;
......
}
```So, that the correct pattern should be as follows:
``` cpumask_var_t mask; if (!alloc_cpumask_var(&mask, GFP_KERNEL)) return -ENOMEM; ... use 'mask' here as a ... free_cpumask_var(mask); ```
--- drivers/target/iscsi/iscsi_target.c | 32 ++++++++++++++------ drivers/target/iscsi/iscsi_target_configfs.c | 20 ++++++++---- 2 files changed, 36 insertions(+), 16 deletions(-)
drivers/target/iscsi/iscsi_target.c +22 -10
@@ -3596,10 +3596,7 @@ static int iscsit_send_reject(void iscsit_thread_get_cpumask (struct iscsi_conn *conn) {int ord, cpu; -cpumask_t conn_allowed_cpumask; - -cpumask_and (&conn_allowed_cpumask, iscsit_global->allowed_cpumask, - cpu_online_mask); +cpumask_var_t conn_allowed_cpumask;/* * bitmap_id is assigned from iscsit_global->ts_bitmap from
@@ -3609,13 +3606,28 @@ void iscsit_thread_get_cpumask(struct iscsi_conn *conn)* iSCSI connection's RX/TX threads will be scheduled to * execute upon. */ -cpumask_clear (conn->conn_cpumask); - ord = conn->bitmap_id %cpumask_weight (&conn_allowed_cpumask); -for_each_cpu (cpu, &conn_allowed_cpumask) { -if (ord-- ==0 ) { -cpumask_set_cpu (cpu, conn->conn_cpumask); -return ; +if (!alloc_cpumask_var (&conn_allowed_cpumask,GFP_KERNEL )) { + ord = conn->bitmap_id %cpumask_weight (cpu_online_mask); +for_each_online_cpu (cpu) { +if (ord-- ==0 ) { +cpumask_set_cpu (cpu, conn->conn_cpumask); +return ; + } + } + }else { +cpumask_and (conn_allowed_cpumask, iscsit_global->allowed_cpumask, + cpu_online_mask); + +cpumask_clear (conn->conn_cpumask); + ord = conn->bitmap_id %cpumask_weight (conn_allowed_cpumask); +for_each_cpu (cpu, conn_allowed_cpumask) { +if (ord-- ==0 ) { +cpumask_set_cpu (cpu, conn->conn_cpumask); +free_cpumask_var (conn_allowed_cpumask); +return ; + } } +free_cpumask_var (conn_allowed_cpumask); }/* * This should never be reached..
drivers/target/iscsi/iscsi_target_configfs.c +14 -6
@@ -1139,20 +1139,28 @@ static ssize_t lio_target_wwn_cpus_allowed_list_store( {int ret;char *orig; -cpumask_t new_allowed_cpumask; +cpumask_var_t new_allowed_cpumask; + +if (!alloc_cpumask_var (&new_allowed_cpumask,GFP_KERNEL )) +return -ENOMEM ; orig =kstrdup (page,GFP_KERNEL ); -if (!orig) +if (!orig) { +free_cpumask_var (new_allowed_cpumask);return -ENOMEM ; + } -cpumask_clear (&new_allowed_cpumask); - ret =cpulist_parse (orig, &new_allowed_cpumask); +cpumask_clear (new_allowed_cpumask); + ret =cpulist_parse (orig, new_allowed_cpumask);kfree (orig); -if (ret !=0 ) +if (ret !=0 ) { +free_cpumask_var (new_allowed_cpumask);return ret; + } -cpumask_copy (iscsit_global->allowed_cpumask, &new_allowed_cpumask); +cpumask_copy (iscsit_global->allowed_cpumask, new_allowed_cpumask); +free_cpumask_var (new_allowed_cpumask);return count; }
Signature · 1 line
2.17.1
Quoted 22 lines · On 5/13/22 1:27 AM, [email protected] wrote:
From: mingzhe <[email protected]>
In commit
d72d827f2f26, I used 'cpumask_t' incorrectly.``` void iscsit_thread_get_cpumask(struct iscsi_conn *conn) { int ord, cpu; cpumask_t conn_allowed_cpumask; ...... } static ssize_t lio_target_wwn_cpus_allowed_list_store( struct config_item *item, const char *page, size_t count) { int ret; char *orig; cpumask_t new_allowed_cpumask; ...... } ```So, that the correct pattern should be as follows:
Quoted 9 lines
``` cpumask_var_t mask; if (!alloc_cpumask_var(&mask, GFP_KERNEL)) return -ENOMEM; ... use 'mask' here as a ... free_cpumask_var(mask); ```
Add a:
to make it easier for people to pick up.
Quoted 24 lines
Reported-by Test Bot <[email protected]>Signed-off-by mingzhe <[email protected]>--- drivers/target/iscsi/iscsi_target.c | 32 ++++++++++++++------ drivers/target/iscsi/iscsi_target_configfs.c | 20 ++++++++---- 2 files changed, 36 insertions(+), 16 deletions(-)drivers/target/iscsi/iscsi_target.c +1
-4@@ -3596,10 +3596,7 @@ static int iscsit_send_reject(void iscsit_thread_get_cpumask (struct iscsi_conn *conn) {int ord, cpu; -cpumask_t conn_allowed_cpumask; - -cpumask_and (&conn_allowed_cpumask, iscsit_global->allowed_cpumask, - cpu_online_mask); +cpumask_var_t conn_allowed_cpumask;/* * bitmap_id is assigned from iscsit_global->ts_bitmap from
drivers/target/iscsi/iscsi_target.c void iscsit_thread_get_cpumask(struct iscsi_conn *conn) · line 3609
Quoted 10 lines
drivers/target/iscsi/iscsi_target.c +1
-6@@ -3609,13 +3606,28 @@ void iscsit_thread_get_cpumask(struct iscsi_conn *conn)* iSCSI connection's RX/TX threads will be scheduled to * execute upon. */ -cpumask_clear (conn->conn_cpumask); - ord = conn->bitmap_id %cpumask_weight (&conn_allowed_cpumask); -for_each_cpu (cpu, &conn_allowed_cpumask) { -if (ord-- ==0 ) { -cpumask_set_cpu (cpu, conn->conn_cpumask); -return ; +if (!alloc_cpumask_var (&conn_allowed_cpumask,GFP_KERNEL )) {
Do a zalloc_cpumask_var to make sure it's all initialized.
Quoted 29 lines
drivers/target/iscsi/iscsi_target.c +20
-0+ ord = conn->bitmap_id %cpumask_weight (cpu_online_mask); +for_each_online_cpu (cpu) { +if (ord-- ==0 ) { +cpumask_set_cpu (cpu, conn->conn_cpumask); +return ; + } + } + }else { +cpumask_and (conn_allowed_cpumask, iscsit_global->allowed_cpumask, + cpu_online_mask); + +cpumask_clear (conn->conn_cpumask); + ord = conn->bitmap_id %cpumask_weight (conn_allowed_cpumask); +for_each_cpu (cpu, conn_allowed_cpumask) { +if (ord-- ==0 ) { +cpumask_set_cpu (cpu, conn->conn_cpumask); +free_cpumask_var (conn_allowed_cpumask); +return ; + } } +free_cpumask_var (conn_allowed_cpumask); }/* * This should never be reached.. drivers/target/iscsi/iscsi_target_configfs.c +0
-0
drivers/target/iscsi/iscsi_target_configfs.c static ssize_t lio_target_wwn_cpus_allowed_list_store( · line 1145
Quoted 8 lines
drivers/target/iscsi/iscsi_target_configfs.c +4
-1@@ -1139,20 +1139,28 @@ static ssize_t lio_target_wwn_cpus_allowed_list_store( {int ret;char *orig; -cpumask_t new_allowed_cpumask; +cpumask_var_t new_allowed_cpumask; + +if (!alloc_cpumask_var (&new_allowed_cpumask,GFP_KERNEL )) +return -ENOMEM ;
You can do zalloc_cpumask_var and then drop the clear call below.
drivers/target/iscsi/iscsi_target_configfs.c static ssize_t lio_target_wwn_cpus_allowed_list_store( · line 1150
Quoted 6 lines
drivers/target/iscsi/iscsi_target_configfs.c +2
-1orig =kstrdup (page,GFP_KERNEL ); -if (!orig) +if (!orig) { +free_cpumask_var (new_allowed_cpumask);return -ENOMEM ;
Just add a goto at the bottom before free_cpumask_var then have this and the other failure path use it. Make sure to also fix up the return code (set count to -ENOMEM/ret or use ret at the bottom and set count to ret).
Quoted 20 lines
drivers/target/iscsi/iscsi_target_configfs.c +8
-4+ } -cpumask_clear (&new_allowed_cpumask); - ret =cpulist_parse (orig, &new_allowed_cpumask); +cpumask_clear (new_allowed_cpumask); + ret =cpulist_parse (orig, new_allowed_cpumask);kfree (orig); -if (ret !=0 ) +if (ret !=0 ) { +free_cpumask_var (new_allowed_cpumask);return ret; + } -cpumask_copy (iscsit_global->allowed_cpumask, &new_allowed_cpumask); +cpumask_copy (iscsit_global->allowed_cpumask, new_allowed_cpumask); +free_cpumask_var (new_allowed_cpumask);return count; }