Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
IronPort-SDR: nh1xG4cHH8VII9sYr9FemQbv1bB/kvQT1KGFo3raqtQ1j/+QexURcG9QJkdngZTxN08U736Wo8
 wIeRYOvbT+MyNF/2P+rIOD9z49wFV0J5sD90KxRBuNLBUNStCstEdxaG7P2UEiw0JbHADhnRra
 u0/o4wMDEk00VWPViHFizbdIAnyMAJIXz/0x+lm//z8T5itpQ7VlA8odMHt26jxxWbtb107HQ+
 2/gPAria5tCEW6M3I1fdyTTPO/MpSeSFmdagUeFZ2s3s33xW48wIK9gH8nRYiN95wrOMQFzD4D
 V2I=
IronPort-SDR: wtq1VG7qNrDlK3mmRxuCGg8cO4ly88jp7F4LMXQckZT28meIGJ3UQNK6InM9EA/D/h+qf1u2LQ
 3dOf34GZEMj/FrKaiYMW3cfcvA4dcb9CyxL+toUoO7y7J3DpNw/WpGowlskV21E5v8TwPe23t3
 iVc7lLOl5Mr/Nm0wpEvHdZuzcpMaqePpGkoRvUS/lJFokKKgtnAj58+M/0InWAufb3pvw+U9u2
 NYu4ZB7Sb1WvMWrdJFgjGQw640aMz2YC5AYaW2hWQduXpOwcW5S929eo7DWvShtE4LvjscecDc
 DSOzESuuKZ6qHiNV1iA//4nf
IronPort-SDR: r4f0BotFgqFvD6TPDDjycWzwmDZpe8r2VaGTPxT8xA1m4PVXlapLJcT8prsWScBUlzddVq+wml
 QPIa0Cb5nhXBJQYPhYTyjCzi66VBWfhDJ1QAzowsEqV+yRAijM8Afhy286MpBb/DXezna2LzQl
 5ngYFWGyUm5d7dCDEKeDh6EVpJEy1OK6BdLUdt3q2kNVvc/+r7F/fo+nqrlbcANC5XU/yQBzX2
 9shmSY+zRXwcQPCWSaR2zw+gFyHVgkW45c/PVb/yjClHdTH7lna03CN4inlZl3vJaeUboTRYl9
 TXE=
WDCIronportException: Internal
From:   Avri Altman <avri.altman@wdc.com>
To:     "James E . J . Bottomley" <jejb@linux.vnet.ibm.com>,
        "Martin K . Petersen" <martin.petersen@oracle.com>,
        linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     gregkh@linuxfoundation.org, Bart Van Assche <bvanassche@acm.org>,
        yongmyung lee <ymhungry.lee@samsung.com>,
        Daejun Park <daejun7.park@samsung.com>,
        alim.akhtar@samsung.com, asutoshd@codeaurora.org,
        Zang Leigang <zangleigang@hisilicon.com>,
        Avi Shchislowski <avi.shchislowski@wdc.com>,
        Bean Huo <beanhuo@micron.com>, cang@codeaurora.org,
        stanley.chu@mediatek.com, Avri Altman <avri.altman@wdc.com>
Subject: [PATCH v10 03/12] scsi: ufshpb: Transform set_dirty to iterate_rgn
Date:   Mon,  7 Jun 2021 09:13:52 +0300
Message-Id: <20210607061401.58884-4-avri.altman@wdc.com>
In-Reply-To: <20210607061401.58884-1-avri.altman@wdc.com>
References: <20210607061401.58884-1-avri.altman@wdc.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Given a transfer length, set_dirty meticulously runs over all the
entries, across subregions and regions if needed. Currently its only use
is to mark dirty blocks, but soon HCM may profit from it as well, when
managing its read counters.

Signed-off-by: Avri Altman <avri.altman@wdc.com>
Reviewed-by: Daejun Park <daejun7.park@samsung.com>
---
 drivers/scsi/ufs/ufshpb.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/scsi/ufs/ufshpb.c b/drivers/scsi/ufs/ufshpb.c
index 6f2e3b3c9252..01a4efa37db8 100644
--- a/drivers/scsi/ufs/ufshpb.c
+++ b/drivers/scsi/ufs/ufshpb.c
@@ -144,13 +144,14 @@ static bool ufshpb_is_hpb_rsp_valid(struct ufs_hba *hba,
 	return true;
 }
 
-static void ufshpb_set_ppn_dirty(struct ufshpb_lu *hpb, int rgn_idx,
-				 int srgn_idx, int srgn_offset, int cnt)
+static void ufshpb_iterate_rgn(struct ufshpb_lu *hpb, int rgn_idx, int srgn_idx,
+			       int srgn_offset, int cnt, bool set_dirty)
 {
 	struct ufshpb_region *rgn;
 	struct ufshpb_subregion *srgn;
 	int set_bit_len;
 	int bitmap_len;
+	unsigned long flags;
 
 next_srgn:
 	rgn = hpb->rgn_tbl + rgn_idx;
@@ -166,11 +167,14 @@ static void ufshpb_set_ppn_dirty(struct ufshpb_lu *hpb, int rgn_idx,
 	else
 		set_bit_len = cnt;
 
-	set_bit(RGN_FLAG_DIRTY, &rgn->rgn_flags);
+	if (set_dirty)
+		set_bit(RGN_FLAG_DIRTY, &rgn->rgn_flags);
 
-	if (rgn->rgn_state != HPB_RGN_INACTIVE &&
+	spin_lock_irqsave(&hpb->rgn_state_lock, flags);
+	if (set_dirty && rgn->rgn_state != HPB_RGN_INACTIVE &&
 	    srgn->srgn_state == HPB_SRGN_VALID)
 		bitmap_set(srgn->mctx->ppn_dirty, srgn_offset, set_bit_len);
+	spin_unlock_irqrestore(&hpb->rgn_state_lock, flags);
 
 	srgn_offset = 0;
 	if (++srgn_idx == hpb->srgns_per_rgn) {
@@ -590,10 +594,8 @@ int ufshpb_prep(struct ufs_hba *hba, struct ufshcd_lrb *lrbp)
 
 	/* If command type is WRITE or DISCARD, set bitmap as drity */
 	if (ufshpb_is_write_or_discard(cmd)) {
-		spin_lock_irqsave(&hpb->rgn_state_lock, flags);
-		ufshpb_set_ppn_dirty(hpb, rgn_idx, srgn_idx, srgn_offset,
-				 transfer_len);
-		spin_unlock_irqrestore(&hpb->rgn_state_lock, flags);
+		ufshpb_iterate_rgn(hpb, rgn_idx, srgn_idx, srgn_offset,
+				   transfer_len, true);
 		return 0;
 	}
 
-- 
2.25.1