Skip to contentSkip to conversation

nvmet: add missing lock around nvmet_ns_changed in nvmet_ns_revalidate

PATCH Superseded Niels Dossche 2 participants 7 messages Mar 10, 2022 – Mar 13, 2022

Subsystems (2)

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 nvmet: add missing lock around nvmet_ns_changed in nvmet_ns_revalidate

nvmet_ns_changed states via lockdep that the ns->subsys->lock must be held. The only caller of nvmet_ns_changed which does not acquire that lock is nvmet_ns_revalidate. nvmet_ns_revalidate has 3 callers, of which 2 do not acquire that lock: nvmet_execute_identify_cns_cs_ns and nvmet_execute_identify_ns. The other caller nvmet_ns_revalidate_size_store does acquire the lock. Add a parameter to nvmet_ns_revalidate to indicate whether the lock was already taken or not, and thus whether the function still needs to take a lock when calling nvmet_ns_changed.

The alternative solution is to let nvmet_ns_revalidate return a bool which indicates whether nvmet_ns_changed needs to be called and let the callers handle the locking responsibility. This however places the responsibility with its callers and causes more duplicate code and potential to forget to check the return value.

Both of those identify functions are called from a common function nvmet_execute_identify, which itself is called indirectly via the req->execute function pointer.

This issue was found using a static type-based analyser and manually verified.

---

Changes in v3:
- improve commit description
- do the locking locally

Changes in v2:
- added sentence about how the issue was found.
- added missing &

 drivers/nvme/target/admin-cmd.c | 2 +-
 drivers/nvme/target/configfs.c  | 2 +-
 drivers/nvme/target/core.c      | 9 +++++++--
 drivers/nvme/target/nvmet.h     | 2 +-
 drivers/nvme/target/zns.c       | 3 ++-
 5 files changed, 12 insertions(+), 6 deletions(-)
drivers/nvme/target/admin-cmd.c +1 -1
index 6fb24746de06..efa462374783 100644
@@ -511,7 +511,7 @@ static void nvmet_execute_identify_ns(struct nvmet_req *req)
 		goto done;
 	}
 
-	nvmet_ns_revalidate(req->ns);
+	nvmet_ns_revalidate(req->ns, true);
 
 	/*
 	 * nuse = ncap = nsze isn't always true, but we have no way to find
drivers/nvme/target/configfs.c +1 -1
index 091a0ca16361..a803cd66dc4b 100644
@@ -586,7 +586,7 @@ static ssize_t nvmet_ns_revalidate_size_store(struct config_item *item,
 		mutex_unlock(&ns->subsys->lock);
 		return -EINVAL;
 	}
-	nvmet_ns_revalidate(ns);
+	nvmet_ns_revalidate(ns, false);
 	mutex_unlock(&ns->subsys->lock);
 	return count;
 }
drivers/nvme/target/core.c +7 -2
index 5119c687de68..0ceef97e4093 100644
@@ -531,7 +531,7 @@ static void nvmet_p2pmem_ns_add_p2p(struct nvmet_ctrl *ctrl,
 		ns->nsid);
 }
 
-void nvmet_ns_revalidate(struct nvmet_ns *ns)
+void nvmet_ns_revalidate(struct nvmet_ns *ns, bool should_acquire_lock)
 {
 	loff_t oldsize = ns->size;
 
@@ -540,8 +540,13 @@ void nvmet_ns_revalidate(struct nvmet_ns *ns)
 	else
 		nvmet_file_ns_revalidate(ns);
 
-	if (oldsize != ns->size)
+	if (oldsize != ns->size) {
+		if (should_acquire_lock)
+			mutex_lock(&ns->subsys->lock);
 		nvmet_ns_changed(ns->subsys, ns->nsid);
+		if (should_acquire_lock)
+			mutex_unlock(&ns->subsys->lock);
+	}
 }
 
 int nvmet_ns_enable(struct nvmet_ns *ns)
drivers/nvme/target/nvmet.h +1 -1
index af193423c10b..e4f20fe95613 100644
@@ -542,7 +542,7 @@ u16 nvmet_file_flush(struct nvmet_req *req);
 void nvmet_ns_changed(struct nvmet_subsys *subsys, u32 nsid);
 void nvmet_bdev_ns_revalidate(struct nvmet_ns *ns);
 int nvmet_file_ns_revalidate(struct nvmet_ns *ns);
-void nvmet_ns_revalidate(struct nvmet_ns *ns);
+void nvmet_ns_revalidate(struct nvmet_ns *ns, bool should_acquire_lock);
 u16 blk_to_nvme_status(struct nvmet_req *req, blk_status_t blk_sts);
 
 bool nvmet_bdev_zns_enable(struct nvmet_ns *ns);
drivers/nvme/target/zns.c +2 -1
index 46bc30fe85d2..1987358bc855 100644
@@ -123,7 +123,8 @@ void nvmet_execute_identify_cns_cs_ns(struct nvmet_req *req)
 		goto done;
 	}
 
-	nvmet_ns_revalidate(req->ns);
+	nvmet_ns_revalidate(req->ns, true);
+
 	zsze = (bdev_zone_sectors(req->ns->bdev) << 9) >>
 					req->ns->blksize_shift;
 	id_zns->lbafe[0].zsze = cpu_to_le64(zsze);
Signature · 1 line
2.35.1
maintainer
#1 lore raw
Quoted 82 lines · Niels Dossche

nvmet_ns_changed states via lockdep that the ns->subsys->lock must be held. The only caller of nvmet_ns_changed which does not acquire that lock is nvmet_ns_revalidate. nvmet_ns_revalidate has 3 callers, of which 2 do not acquire that lock: nvmet_execute_identify_cns_cs_ns and nvmet_execute_identify_ns. The other caller nvmet_ns_revalidate_size_store does acquire the lock. Add a parameter to nvmet_ns_revalidate to indicate whether the lock was already taken or not, and thus whether the function still needs to take a lock when calling nvmet_ns_changed.

The alternative solution is to let nvmet_ns_revalidate return a bool which indicates whether nvmet_ns_changed needs to be called and let the callers handle the locking responsibility. This however places the responsibility with its callers and causes more duplicate code and potential to forget to check the return value.

Both of those identify functions are called from a common function nvmet_execute_identify, which itself is called indirectly via the req->execute function pointer.

This issue was found using a static type-based analyser and manually verified.

---

Changes in v3:
- improve commit description
- do the locking locally

Changes in v2:
- added sentence about how the issue was found.
- added missing &

  drivers/nvme/target/admin-cmd.c | 2 +-
  drivers/nvme/target/configfs.c  | 2 +-
  drivers/nvme/target/core.c      | 9 +++++++--
  drivers/nvme/target/nvmet.h     | 2 +-
  drivers/nvme/target/zns.c       | 3 ++-
  5 files changed, 12 insertions(+), 6 deletions(-)
drivers/nvme/target/admin-cmd.c +1 -1
index 6fb24746de06..efa462374783 100644
@@ -511,7 +511,7 @@ static void nvmet_execute_identify_ns(struct nvmet_req *req)
  		goto done;
  	}
 
-	nvmet_ns_revalidate(req->ns);
+	nvmet_ns_revalidate(req->ns, true);
 
  	/*
  	 * nuse = ncap = nsze isn't always true, but we have no way to find
drivers/nvme/target/configfs.c +1 -1
index 091a0ca16361..a803cd66dc4b 100644
@@ -586,7 +586,7 @@ static ssize_t nvmet_ns_revalidate_size_store(struct config_item *item,
  		mutex_unlock(&ns->subsys->lock);
  		return -EINVAL;
  	}
-	nvmet_ns_revalidate(ns);
+	nvmet_ns_revalidate(ns, false);
  	mutex_unlock(&ns->subsys->lock);
  	return count;
  }
drivers/nvme/target/core.c +1 -1
index 5119c687de68..0ceef97e4093 100644
@@ -531,7 +531,7 @@ static void nvmet_p2pmem_ns_add_p2p(struct nvmet_ctrl *ctrl,
  		ns->nsid);
  }
 
-void nvmet_ns_revalidate(struct nvmet_ns *ns)
+void nvmet_ns_revalidate(struct nvmet_ns *ns, bool should_acquire_lock)
  {
  	loff_t oldsize = ns->size;
 
@@ -540,8 +540,13 @@ void nvmet_ns_revalidate(struct nvmet_ns *ns)
  	else

drivers/nvme/target/core.c void nvmet_ns_revalidate(struct nvmet_ns *ns) · line 549

Quoted 10 lines
drivers/nvme/target/core.c +6 -1
  		nvmet_file_ns_revalidate(ns);
 
-	if (oldsize != ns->size)
+	if (oldsize != ns->size) {
+		if (should_acquire_lock)
+			mutex_lock(&ns->subsys->lock);
  		nvmet_ns_changed(ns->subsys, ns->nsid);
+		if (should_acquire_lock)
+			mutex_unlock(&ns->subsys->lock);
+	}

What is the harm locking it always and avoid the conditional?

#2 lore raw
Quoted 87 lines · Sagi Grimberg
Quoted 84 lines · Niels Dossche

nvmet_ns_changed states via lockdep that the ns->subsys->lock must be held. The only caller of nvmet_ns_changed which does not acquire that lock is nvmet_ns_revalidate. nvmet_ns_revalidate has 3 callers, of which 2 do not acquire that lock: nvmet_execute_identify_cns_cs_ns and nvmet_execute_identify_ns. The other caller nvmet_ns_revalidate_size_store does acquire the lock. Add a parameter to nvmet_ns_revalidate to indicate whether the lock was already taken or not, and thus whether the function still needs to take a lock when calling nvmet_ns_changed.

The alternative solution is to let nvmet_ns_revalidate return a bool which indicates whether nvmet_ns_changed needs to be called and let the callers handle the locking responsibility. This however places the responsibility with its callers and causes more duplicate code and potential to forget to check the return value.

Both of those identify functions are called from a common function nvmet_execute_identify, which itself is called indirectly via the req->execute function pointer.

This issue was found using a static type-based analyser and manually verified.

Signed-off-by Niels Dossche <dossche.niels at gmail.com>

---

Changes in v3:
- improve commit description
- do the locking locally

Changes in v2:
- added sentence about how the issue was found.
- added missing &

  drivers/nvme/target/admin-cmd.c | 2 +-
  drivers/nvme/target/configfs.c  | 2 +-
  drivers/nvme/target/core.c      | 9 +++++++--
  drivers/nvme/target/nvmet.h     | 2 +-
  drivers/nvme/target/zns.c       | 3 ++-
  5 files changed, 12 insertions(+), 6 deletions(-)
drivers/nvme/target/admin-cmd.c +1 -1
index 6fb24746de06..efa462374783 100644
@@ -511,7 +511,7 @@ static void nvmet_execute_identify_ns(struct nvmet_req *req)
  		goto done;
  	}
 
-	nvmet_ns_revalidate(req->ns);
+	nvmet_ns_revalidate(req->ns, true);
 
  	/*
  	 * nuse = ncap = nsze isn't always true, but we have no way to find
drivers/nvme/target/configfs.c +1 -1
index 091a0ca16361..a803cd66dc4b 100644
@@ -586,7 +586,7 @@ static ssize_t nvmet_ns_revalidate_size_store(struct config_item *item,
  		mutex_unlock(&ns->subsys->lock);
  		return -EINVAL;
  	}
-	nvmet_ns_revalidate(ns);
+	nvmet_ns_revalidate(ns, false);
  	mutex_unlock(&ns->subsys->lock);
  	return count;
  }
drivers/nvme/target/core.c +1 -1
index 5119c687de68..0ceef97e4093 100644
@@ -531,7 +531,7 @@ static void nvmet_p2pmem_ns_add_p2p(struct nvmet_ctrl *ctrl,
  		ns->nsid);
  }
 
-void nvmet_ns_revalidate(struct nvmet_ns *ns)
+void nvmet_ns_revalidate(struct nvmet_ns *ns, bool should_acquire_lock)
  {
  	loff_t oldsize = ns->size;
 
@@ -540,8 +540,13 @@ void nvmet_ns_revalidate(struct nvmet_ns *ns)
  	else
  		nvmet_file_ns_revalidate(ns);
 
Quoted 10 lines

drivers/nvme/target/core.c void nvmet_ns_revalidate(struct nvmet_ns *ns) · line 549

Quoted 8 lines
drivers/nvme/target/core.c +6 -1
-	if (oldsize != ns->size)
+	if (oldsize != ns->size) {
+		if (should_acquire_lock)
+			mutex_lock(&ns->subsys->lock);
  		nvmet_ns_changed(ns->subsys, ns->nsid);
+		if (should_acquire_lock)
+			mutex_unlock(&ns->subsys->lock);
+	}

What is the harm locking it always and avoid the conditional?

In my patch v2 submission I wrote the following text in my commit message:

Quoted 3 lines

nvmet_ns_changed states via lockdep that the ns->subsys->lock must be held. The only caller of nvmet_ns_changed which does not acquire that lock is nvmet_ns_revalidate.

on which Christoph Hellwig replied:

Quoted 3 lines

So acquire it in nvmet_ns_revalidate only when we actually call nvmet_ns_changed. Otherwise we take a subsystem-wide lock for every Identify Namespace all.

Therefore, I changed it to a conditional lock in this patch submission.

My commit message in v2 did not clearly state that nvmet_ns_revalidate has 3 callers, of which
2 do not acquire that lock: nvmet_execute_identify_cns_cs_ns and nvmet_execute_identify_ns. The other caller nvmet_ns_revalidate_size_store does acquire the lock. Maybe I caused some confusion because of the unclear wording.

Thanks

maintainer
#3 lore raw
Quoted 99 lines · Niels Dossche
Quoted 87 lines · Sagi Grimberg
Quoted 84 lines · Niels Dossche

nvmet_ns_changed states via lockdep that the ns->subsys->lock must be held. The only caller of nvmet_ns_changed which does not acquire that lock is nvmet_ns_revalidate. nvmet_ns_revalidate has 3 callers, of which 2 do not acquire that lock: nvmet_execute_identify_cns_cs_ns and nvmet_execute_identify_ns. The other caller nvmet_ns_revalidate_size_store does acquire the lock. Add a parameter to nvmet_ns_revalidate to indicate whether the lock was already taken or not, and thus whether the function still needs to take a lock when calling nvmet_ns_changed.

The alternative solution is to let nvmet_ns_revalidate return a bool which indicates whether nvmet_ns_changed needs to be called and let the callers handle the locking responsibility. This however places the responsibility with its callers and causes more duplicate code and potential to forget to check the return value.

Both of those identify functions are called from a common function nvmet_execute_identify, which itself is called indirectly via the req->execute function pointer.

This issue was found using a static type-based analyser and manually verified.

Signed-off-by Niels Dossche <dossche.niels at gmail.com>

---

Changes in v3:
- improve commit description
- do the locking locally

Changes in v2:
- added sentence about how the issue was found.
- added missing &

   drivers/nvme/target/admin-cmd.c | 2 +-
   drivers/nvme/target/configfs.c  | 2 +-
   drivers/nvme/target/core.c      | 9 +++++++--
   drivers/nvme/target/nvmet.h     | 2 +-
   drivers/nvme/target/zns.c       | 3 ++-
   5 files changed, 12 insertions(+), 6 deletions(-)
drivers/nvme/target/admin-cmd.c +1 -1
index 6fb24746de06..efa462374783 100644
@@ -511,7 +511,7 @@ static void nvmet_execute_identify_ns(struct nvmet_req *req)
   		goto done;
   	}
 
-	nvmet_ns_revalidate(req->ns);
+	nvmet_ns_revalidate(req->ns, true);
 
   	/*
   	 * nuse = ncap = nsze isn't always true, but we have no way to find
drivers/nvme/target/configfs.c +1 -1
index 091a0ca16361..a803cd66dc4b 100644
@@ -586,7 +586,7 @@ static ssize_t nvmet_ns_revalidate_size_store(struct config_item *item,
   		mutex_unlock(&ns->subsys->lock);
   		return -EINVAL;
   	}
-	nvmet_ns_revalidate(ns);
+	nvmet_ns_revalidate(ns, false);
   	mutex_unlock(&ns->subsys->lock);
   	return count;
   }
drivers/nvme/target/core.c +1 -1
index 5119c687de68..0ceef97e4093 100644
@@ -531,7 +531,7 @@ static void nvmet_p2pmem_ns_add_p2p(struct nvmet_ctrl *ctrl,
   		ns->nsid);
   }
 
-void nvmet_ns_revalidate(struct nvmet_ns *ns)
+void nvmet_ns_revalidate(struct nvmet_ns *ns, bool should_acquire_lock)
   {
   	loff_t oldsize = ns->size;
 
@@ -540,8 +540,13 @@ void nvmet_ns_revalidate(struct nvmet_ns *ns)
   	else
   		nvmet_file_ns_revalidate(ns);
 
Quoted 10 lines

drivers/nvme/target/core.c void nvmet_ns_revalidate(struct nvmet_ns *ns) · line 549

Quoted 8 lines
drivers/nvme/target/core.c +6 -1
-	if (oldsize != ns->size)
+	if (oldsize != ns->size) {
+		if (should_acquire_lock)
+			mutex_lock(&ns->subsys->lock);
   		nvmet_ns_changed(ns->subsys, ns->nsid);
+		if (should_acquire_lock)
+			mutex_unlock(&ns->subsys->lock);
+	}

What is the harm locking it always and avoid the conditional?

Quoted 8 lines

In my patch v2 submission I wrote the following text in my commit message:

Quoted 3 lines

nvmet_ns_changed states via lockdep that the ns->subsys->lock must be held. The only caller of nvmet_ns_changed which does not acquire that lock is nvmet_ns_revalidate.

on which Christoph Hellwig replied:

Quoted 3 lines

So acquire it in nvmet_ns_revalidate only when we actually call nvmet_ns_changed. Otherwise we take a subsystem-wide lock for every Identify Namespace all.

Yea, only wrap nvmet_ns_changed, but always.

Quoted 6 lines

Therefore, I changed it to a conditional lock in this patch submission.

My commit message in v2 did not clearly state that nvmet_ns_revalidate has 3 callers, of which
2 do not acquire that lock: nvmet_execute_identify_cns_cs_ns and nvmet_execute_identify_ns. The other caller nvmet_ns_revalidate_size_store does acquire the lock. Maybe I caused some confusion because of the unclear wording.

It is simpler to just move that call-site outside of the lock imo.

#4 lore raw
Quoted 106 lines · Sagi Grimberg
Quoted 103 lines · Niels Dossche
Quoted 87 lines · Sagi Grimberg
Quoted 84 lines · Niels Dossche

nvmet_ns_changed states via lockdep that the ns->subsys->lock must be held. The only caller of nvmet_ns_changed which does not acquire that lock is nvmet_ns_revalidate. nvmet_ns_revalidate has 3 callers, of which 2 do not acquire that lock: nvmet_execute_identify_cns_cs_ns and nvmet_execute_identify_ns. The other caller nvmet_ns_revalidate_size_store does acquire the lock. Add a parameter to nvmet_ns_revalidate to indicate whether the lock was already taken or not, and thus whether the function still needs to take a lock when calling nvmet_ns_changed.

The alternative solution is to let nvmet_ns_revalidate return a bool which indicates whether nvmet_ns_changed needs to be called and let the callers handle the locking responsibility. This however places the responsibility with its callers and causes more duplicate code and potential to forget to check the return value.

Both of those identify functions are called from a common function nvmet_execute_identify, which itself is called indirectly via the req->execute function pointer.

This issue was found using a static type-based analyser and manually verified.

Signed-off-by Niels Dossche <dossche.niels at gmail.com>

---

Changes in v3:
- improve commit description
- do the locking locally

Changes in v2:
- added sentence about how the issue was found.
- added missing &

  drivers/nvme/target/admin-cmd.c | 2 +-
  drivers/nvme/target/configfs.c  | 2 +-
  drivers/nvme/target/core.c      | 9 +++++++--
  drivers/nvme/target/nvmet.h     | 2 +-
  drivers/nvme/target/zns.c       | 3 ++-
  5 files changed, 12 insertions(+), 6 deletions(-)
drivers/nvme/target/admin-cmd.c +1 -1
index 6fb24746de06..efa462374783 100644
@@ -511,7 +511,7 @@ static void nvmet_execute_identify_ns(struct nvmet_req *req)
  		goto done;
  	}
 
-	nvmet_ns_revalidate(req->ns);
+	nvmet_ns_revalidate(req->ns, true);
 
  	/*
  	 * nuse = ncap = nsze isn't always true, but we have no way to find
drivers/nvme/target/configfs.c +1 -1
index 091a0ca16361..a803cd66dc4b 100644
@@ -586,7 +586,7 @@ static ssize_t nvmet_ns_revalidate_size_store(struct config_item *item,
  		mutex_unlock(&ns->subsys->lock);
  		return -EINVAL;
  	}
-	nvmet_ns_revalidate(ns);
+	nvmet_ns_revalidate(ns, false);
  	mutex_unlock(&ns->subsys->lock);
  	return count;
  }
drivers/nvme/target/core.c +1 -1
index 5119c687de68..0ceef97e4093 100644
@@ -531,7 +531,7 @@ static void nvmet_p2pmem_ns_add_p2p(struct nvmet_ctrl *ctrl,
  		ns->nsid);
  }
 
-void nvmet_ns_revalidate(struct nvmet_ns *ns)
+void nvmet_ns_revalidate(struct nvmet_ns *ns, bool should_acquire_lock)
  {
  	loff_t oldsize = ns->size;
 
@@ -540,8 +540,13 @@ void nvmet_ns_revalidate(struct nvmet_ns *ns)
  	else
  		nvmet_file_ns_revalidate(ns);
 
Quoted 10 lines

drivers/nvme/target/core.c void nvmet_ns_revalidate(struct nvmet_ns *ns) · line 549

Quoted 8 lines
drivers/nvme/target/core.c +6 -1
-	if (oldsize != ns->size)
+	if (oldsize != ns->size) {
+		if (should_acquire_lock)
+			mutex_lock(&ns->subsys->lock);
  		nvmet_ns_changed(ns->subsys, ns->nsid);
+		if (should_acquire_lock)
+			mutex_unlock(&ns->subsys->lock);
+	}

What is the harm locking it always and avoid the conditional?

In my patch v2 submission I wrote the following text in my commit message:

Quoted 3 lines

nvmet_ns_changed states via lockdep that the ns->subsys->lock must be held. The only caller of nvmet_ns_changed which does not acquire that lock is nvmet_ns_revalidate.

Quoted 7 lines
Quoted 4 lines

on which Christoph Hellwig replied:

Quoted 3 lines

So acquire it in nvmet_ns_revalidate only when we actually call nvmet_ns_changed.  Otherwise we take a subsystem-wide lock for every Identify Namespace all.

Yea, only wrap nvmet_ns_changed, but always.

Alright, I can send in a patch that does it like that.

Quoted 8 lines
Quoted 6 lines

Therefore, I changed it to a conditional lock in this patch submission.

My commit message in v2 did not clearly state that nvmet_ns_revalidate has 3 callers, of which
2 do not acquire that lock: nvmet_execute_identify_cns_cs_ns and nvmet_execute_identify_ns. The other caller nvmet_ns_revalidate_size_store does acquire the lock. Maybe I caused some confusion because of the unclear wording.

It is simpler to just move that call-site outside of the lock imo.

The callsite that has the lock is nvmet_ns_revalidate_size_store. It checks for the enabled flag under that lock.
If nvmet_ns_revalidate_size_store calls nvmet_ns_revalidate without that lock taken, but with the lock acquired inside the nvmet_ns_revalidate_size_store function itself, is it not possible that the ns->enabled flag changes in between the ns->enabled check and the call to nvmet_ns_revalidate_size_store? I thought the locking in that function was to also make sure that the enabled flag does not change during the execution of nvmet_ns_revalidate?

maintainer
#5 lore raw
Quoted 9 lines
Quoted 6 lines
Quoted 4 lines

My commit message in v2 did not clearly state that nvmet_ns_revalidate has 3 callers, of which
2 do not acquire that lock: nvmet_execute_identify_cns_cs_ns and nvmet_execute_identify_ns. The other caller nvmet_ns_revalidate_size_store does acquire the lock. Maybe I caused some confusion because of the unclear wording.

It is simpler to just move that call-site outside of the lock imo.

The callsite that has the lock is nvmet_ns_revalidate_size_store. It checks for the enabled flag under that lock.
If nvmet_ns_revalidate_size_store calls nvmet_ns_revalidate without that lock taken, but with the lock acquired inside the nvmet_ns_revalidate_size_store function itself, is it not possible that the ns->enabled flag changes in between the ns->enabled check and the call to nvmet_ns_revalidate_size_store? I thought the locking in that function was to also make sure that the enabled flag does not change during the execution of nvmet_ns_revalidate?

The lock just protects subsys->ctrls traversal, can't see any harm with sending 2 aens out of order, twice...

#6 lore raw
Quoted 5 lines · Sagi Grimberg
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines

My commit message in v2 did not clearly state that nvmet_ns_revalidate has 3 callers, of which
2 do not acquire that lock: nvmet_execute_identify_cns_cs_ns and nvmet_execute_identify_ns. The other caller nvmet_ns_revalidate_size_store does acquire the lock. Maybe I caused some confusion because of the unclear wording.

Quoted 8 lines
Quoted 4 lines
Quoted 1 line

It is simpler to just move that call-site outside of the lock imo.

The callsite that has the lock is nvmet_ns_revalidate_size_store. It checks for the enabled flag under that lock.
If nvmet_ns_revalidate_size_store calls nvmet_ns_revalidate without that lock taken, but with the lock acquired inside the nvmet_ns_revalidate_size_store function itself, is it not possible that the ns->enabled flag changes in between the ns->enabled check and the call to nvmet_ns_revalidate_size_store? I thought the locking in that function was to also make sure that the enabled flag does not change during the execution of nvmet_ns_revalidate?

The lock just protects subsys->ctrls traversal, can't see any harm with sending 2 aens out of order, twice...

I understand, thanks. I'll send a patch.