[Devel] [PATCH vz9 v1 51/63] dm-ploop: proplerly access nr_bat_entries

[Alexander Atanasov]

nr_bat_entries are updated while resizing, some places
read it without holding the bat_lock, to ensure a good
value is read use READ_ONCE and WRITE_ONCE when updating.
During grow/resize and shrink pios are suspended and
code waits for all active inflight pios to complete.

https://virtuozzo.atlassian.net/browse/VSTOR-91821
Signed-off-by: Alexander Atanasov <alexander.atanasov at virtuozzo.com>
---
 drivers/md/dm-ploop-cmd.c | 13 +++++++++----
 drivers/md/dm-ploop-map.c | 12 ++++++------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/drivers/md/dm-ploop-cmd.c b/drivers/md/dm-ploop-cmd.c
index 50a23212270d..011d37f8fe3e 100644
--- a/drivers/md/dm-ploop-cmd.c
+++ b/drivers/md/dm-ploop-cmd.c
@@ -465,10 +465,14 @@ static int ploop_process_resize_cmd(struct ploop *ploop, struct ploop_cmd *cmd)
 			ploop_hole_set_bit(dst_clu, ploop);
 			dst_clu--;
 		}
-		swap(ploop->hb_nr, cmd->resize.hb_nr);
+		WRITE_ONCE(ploop->hb_nr, cmd->resize.hb_nr);
 	} else {
 		ploop_add_md_pages(ploop, &cmd->resize.md_pages_root);
-		swap(ploop->nr_bat_entries, cmd->resize.nr_bat_entries);
+		/*
+		 * In some places code reads nr_bat_entries without lock
+		 * it is ok for grow but if we do shrink this may be a problem.
+		 */
+		WRITE_ONCE(ploop->nr_bat_entries, cmd->resize.nr_bat_entries);
 	}
 	spin_unlock_irq(&ploop->bat_lock);
 
@@ -638,7 +642,7 @@ static int ploop_process_merge_latest_snapshot(struct ploop *ploop)
 	int ret = 0;
 	u32 clu;
 
-	for (clu = 0; clu < ploop->nr_bat_entries; clu++) {
+	for (clu = 0; clu < READ_ONCE(ploop->nr_bat_entries); clu++) {
 		if (fatal_signal_pending(current)) {
 			ret = -EINTR;
 			break;
@@ -974,7 +978,8 @@ static int process_flip_upper_deltas(struct ploop *ploop)
 	struct md_page *md;
 	u64 size;
 
-	size = (PLOOP_MAP_OFFSET + ploop->nr_bat_entries) * sizeof(map_index_t);
+	size = (PLOOP_MAP_OFFSET + READ_ONCE(ploop->nr_bat_entries))
+		* sizeof(map_index_t);
         bat_clusters = DIV_ROUND_UP(size, CLU_SIZE(ploop));
 	hb_nr = ploop->hb_nr;
 
diff --git a/drivers/md/dm-ploop-map.c b/drivers/md/dm-ploop-map.c
index a1dcf401409c..3b24778e0894 100644
--- a/drivers/md/dm-ploop-map.c
+++ b/drivers/md/dm-ploop-map.c
@@ -106,14 +106,14 @@ static int ploop_rq_valid(struct ploop *ploop, struct request *rq)
 	end_byte = to_bytes(sector) + blk_rq_bytes(rq) - 1;
 	end_clu = POS_TO_CLU(ploop, end_byte);
 
-	if (unlikely(end_clu >= ploop->nr_bat_entries)) {
+	if (unlikely(end_clu >= READ_ONCE(ploop->nr_bat_entries))) {
 		/*
 		 * This mustn't happen, since we set max_io_len
 		 * via dm_set_target_max_io_len().
 		 */
 		WARN_ONCE(1, "sec=%llu, size=%u, end_clu=%u, nr=%u\n",
 			  sector, blk_rq_bytes(rq),
-			  end_clu, ploop->nr_bat_entries);
+			  end_clu, READ_ONCE(ploop->nr_bat_entries));
 		return -EINVAL;
 	}
 
@@ -824,8 +824,9 @@ static void ploop_advance_local_after_bat_wb(struct ploop *ploop,
 	off = piwb->page_id * PAGE_SIZE / sizeof(map_index_t);
 	off -= PLOOP_MAP_OFFSET;
 
+	spin_lock_irqsave(&ploop->bat_lock, flags);
 	/* Last and first index in copied page */
-	last = ploop->nr_bat_entries - off;
+	last = READ_ONCE(ploop->nr_bat_entries) - off;
 	if (last > PAGE_SIZE / sizeof(map_index_t))
 		last = PAGE_SIZE / sizeof(map_index_t);
 	i = 0;
@@ -835,7 +836,6 @@ static void ploop_advance_local_after_bat_wb(struct ploop *ploop,
 	dst_clu = kmap_local_page(piwb->bat_page);
 
 	/* holes bit map requires bat_lock */
-	spin_lock_irqsave(&ploop->bat_lock, flags);
 	spin_lock(&md->md_lock);
 #ifdef PLOOP_DELAYWB
 	if (piwb->type == PIWB_TYPE_ALLOC)
@@ -1023,7 +1023,7 @@ static int ploop_prepare_bat_update(struct ploop *ploop, struct md_page *md,
 	off -= PLOOP_MAP_OFFSET;
 
 	/* Last and first index in copied page */
-	last = ploop->nr_bat_entries - off;
+	last = READ_ONCE(ploop->nr_bat_entries) - off;
 	if (last > PAGE_SIZE / sizeof(map_index_t)) {
 		last = PAGE_SIZE / sizeof(map_index_t);
 		is_last_page = false;
@@ -2431,7 +2431,7 @@ loff_t ploop_llseek_hole(struct dm_target *ti, loff_t offset, int whence)
 	clu = SEC_TO_CLU(ploop, to_sector(offset) + ploop->skip_off);
 	id = U32_MAX;
 
-	while (clu < ploop->nr_bat_entries) {
+	while (clu < READ_ONCE(ploop->nr_bat_entries)) {
 		if (id != ploop_bat_clu_to_page_nr(clu)) {
 			id = ploop_bat_clu_to_page_nr(clu);
 			md = ploop_md_page_find(ploop, id);
-- 
2.43.0