[PATCH] target: make sure the np under each tpg is unique

[PATCH] target: make sure the np under each tpg is unique

[mingzhe.zou]

From: ZouMingzhe <mingzhe.zou@easystack.cn>

iscsit_tpg_check_network_portal() has two-layer for loop, and
should return true When a match is found. Then, the tpg loop
will still continue after break the tpg_np loop. If this tpg_np
is not the last, the match value will be changed.

This patch break all loops after finding a match, and make sure
the np under each tpg is unique.

Signed-off-by: ZouMingzhe <mingzhe.zou@easystack.cn>
---
 drivers/target/iscsi/iscsi_target_tpg.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/target/iscsi/iscsi_target_tpg.c b/drivers/target/iscsi/iscsi_target_tpg.c
index 8075f60fd02c..2d5cf1714ae0 100644
--- a/drivers/target/iscsi/iscsi_target_tpg.c
+++ b/drivers/target/iscsi/iscsi_target_tpg.c
@@ -443,6 +443,9 @@ static bool iscsit_tpg_check_network_portal(
 				break;
 		}
 		spin_unlock(&tpg->tpg_np_lock);
+
+		if (match)
+			break;
 	}
 	spin_unlock(&tiqn->tiqn_tpg_lock);
 
-- 
2.17.1

Re: [PATCH] target: make sure the np under each tpg is unique

[Mike Christie]

On 1/10/22 11:45 PM, mingzhe.zou@easystack.cn wrote:
> From: ZouMingzhe <mingzhe.zou@easystack.cn>
> 
> iscsit_tpg_check_network_portal() has two-layer for loop, and
> should return true When a match is found. Then, the tpg loop
> will still continue after break the tpg_np loop. If this tpg_np
> is not the last, the match value will be changed.
> 
> This patch break all loops after finding a match, and make sure
> the np under each tpg is unique.
> 
> Signed-off-by: ZouMingzhe <mingzhe.zou@easystack.cn>
> ---
>  drivers/target/iscsi/iscsi_target_tpg.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/drivers/target/iscsi/iscsi_target_tpg.c b/drivers/target/iscsi/iscsi_target_tpg.c
> index 8075f60fd02c..2d5cf1714ae0 100644
> --- a/drivers/target/iscsi/iscsi_target_tpg.c
> +++ b/drivers/target/iscsi/iscsi_target_tpg.c
> @@ -443,6 +443,9 @@ static bool iscsit_tpg_check_network_portal(
>  				break;
>  		}
>  		spin_unlock(&tpg->tpg_np_lock);
> +
> +		if (match)
> +			break;
>  	}
>  	spin_unlock(&tiqn->tiqn_tpg_lock);
>  

Reviewed-by: Mike Christie <michael.christie@oracle.com>

[PATCH] target: make sure the np under each tpg is unique

[mingzhe.zou]

From: ZouMingzhe <mingzhe.zou@easystack.cn>

iscsit_tpg_check_network_portal() has two-layer for loop, and
should return true When a match is found. Then, the tpg loop
will still continue after break the tpg_np loop. If this tpg_np
is not the last, the match value will be changed.

This patch break all loops after finding a match, and make sure
the np under each tpg is unique.

Signed-off-by: ZouMingzhe <mingzhe.zou@easystack.cn>
---
 drivers/target/iscsi/iscsi_target_tpg.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/target/iscsi/iscsi_target_tpg.c b/drivers/target/iscsi/iscsi_target_tpg.c
index 8075f60fd02c..2d5cf1714ae0 100644
--- a/drivers/target/iscsi/iscsi_target_tpg.c
+++ b/drivers/target/iscsi/iscsi_target_tpg.c
@@ -443,6 +443,9 @@ static bool iscsit_tpg_check_network_portal(
 				break;
 		}
 		spin_unlock(&tpg->tpg_np_lock);
+
+		if (match)
+			break;
 	}
 	spin_unlock(&tiqn->tiqn_tpg_lock);
 
-- 
2.17.1

Re: [PATCH] target: make sure the np under each tpg is unique

[Martin K. Petersen]

> iscsit_tpg_check_network_portal() has two-layer for loop, and should
> return true When a match is found. Then, the tpg loop will still
> continue after break the tpg_np loop. If this tpg_np is not the last,
> the match value will be changed.

Applied to 5.17/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH] target: make sure the np under each tpg is unique

[Martin K. Petersen]

On Tue, 11 Jan 2022 13:47:42 +0800, mingzhe.zou@easystack.cn wrote:

> From: ZouMingzhe <mingzhe.zou@easystack.cn>
> 
> iscsit_tpg_check_network_portal() has two-layer for loop, and
> should return true When a match is found. Then, the tpg loop
> will still continue after break the tpg_np loop. If this tpg_np
> is not the last, the match value will be changed.
> 
> [...]

Applied to 5.17/scsi-fixes, thanks!

[1/1] target: make sure the np under each tpg is unique
      https://git.kernel.org/mkp/scsi/c/a861790afaa8

-- 
Martin K. Petersen	Oracle Linux Engineering