From patchwork Fri May 13 06:27:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zou Mingzhe X-Patchwork-Id: 572475 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64815C4321E for ; Fri, 13 May 2022 06:53:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377486AbiEMGx6 (ORCPT ); Fri, 13 May 2022 02:53:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1377479AbiEMGx5 (ORCPT ); Fri, 13 May 2022 02:53:57 -0400 X-Greylist: delayed 1563 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Thu, 12 May 2022 23:53:53 PDT Received: from mail-m2457.qiye.163.com (mail-m2457.qiye.163.com [220.194.24.57]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41FCB266E23; Thu, 12 May 2022 23:53:50 -0700 (PDT) Received: from localhost.localdomain (unknown [218.94.118.90]) by mail-m2457.qiye.163.com (Hmail) with ESMTPA id 1B1A8C40904; Fri, 13 May 2022 14:27:46 +0800 (CST) From: mingzhe.zou@easystack.cn To: torvalds@linux-foundation.org, zgrieee@gmail.com, martin.petersen@oracle.com, michael.christie@oracle.com Cc: linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org, dongsheng.yang@easystack.cn, zoumingzhe@qq.com Subject: [PATCH] scsi: target: fixup incorrect use of 'cpumask_t' Date: Fri, 13 May 2022 14:27:45 +0800 Message-Id: <20220513062745.3245-1-mingzhe.zou@easystack.cn> X-Mailer: git-send-email 2.17.1 X-HM-Spam-Status: e1kfGhgUHx5ZQUtXWQgPGg8OCBgUHx5ZQUlOS1dZCBgUCR5ZQVlLVUtZV1 kWDxoPAgseWUFZKDYvK1lXWShZQUlCN1dZLVlBSVdZDwkaFQgSH1lBWRlIS0JWSBoYHUkYQ0IYSE hNVRkRExYaEhckFA4PWVdZFhoPEhUdFFlBWU9LSFVKSktITUpVS1kG X-HM-Sender-Digest: e1kMHhlZQR0aFwgeV1kSHx4VD1lBWUc6NQg6Sgw5AzIYGhYiCD9ICDU8 EywwCklVSlVKTU5JT0lISU1NTElCVTMWGhIXVRYSFRwBEx5VARQOOx4aCAIIDxoYEFUYFUVZV1kS C1lBWUlKQ1VCT1VKSkNVQktZV1kIAVlBT0NISTcG X-HM-Tid: 0a80bc1a109f8c16kuqt1b1a8c40904 Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org From: mingzhe 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); ``` Reported-by: Test Bot Signed-off-by: mingzhe --- drivers/target/iscsi/iscsi_target.c | 32 ++++++++++++++------ drivers/target/iscsi/iscsi_target_configfs.c | 20 ++++++++---- 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c index 6fe6a6bab3f4..3f9f5b8879fe 100644 --- a/drivers/target/iscsi/iscsi_target.c +++ b/drivers/target/iscsi/iscsi_target.c @@ -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.. diff --git a/drivers/target/iscsi/iscsi_target_configfs.c b/drivers/target/iscsi/iscsi_target_configfs.c index 0cedcfe207b5..ae9319934cd0 100644 --- a/drivers/target/iscsi/iscsi_target_configfs.c +++ b/drivers/target/iscsi/iscsi_target_configfs.c @@ -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; }