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: bB/4xpovxTZtcriVjBLOB3tenFBqQdLNmWeLzH9L+7dKpKLBXXz1H2lA+5pg5MQoo9ejLrw5T6
 S1stMr1/0Km4FMmdvV3z4uKHCuDJts1MduaT7nKof7v2gBczyR7iBDdWWWqhW4x0Yg5dd0zaQF
 olKDPXWXJ7Sg70bvyu0y2buVg6S5MZ1O8RMnQIEkjA/Tgto7RN4htVoYjnVzdk0vAiynel5EIW
 ybNi4/u84CJyJVOUKT8zm3t3Ic92z2R3JgIhwDgmwRrczXxNkjzyeU6jwVAZx0dNB13Ymiwp19
 49s=
IronPort-SDR: gCtU1Xv82jyhqld4htIyMfHMuOGyYkmvp8Yl9lUdXj/nF+6/NIgPxwN6Kq2U1jPbHnBfWn1RmM
 DZpK6QbyFkgflKeLH3ZviR1qo6+4kRhKboW/hCr35MUeLdCUCo1BwZRphaxmxYC8DLTBhDJUmA
 Tzuq5IQiM+iVIssZpmqzlP2DJEY7RdbkGkYyWMJIaVRTrziY9R/fd2U4F7FTTAt9dxT4PcXXv8
 BiWkBPg9pJT9ew9/BmFe/ePJCmPSX2GuMk3+KFQdBLCwEBbun0PIX7w/1/zpOiOz0SpF7HZ+E7
 Ghp/jj/Z90fmE2CScQHyiS0r
IronPort-SDR: aRUZk5rD3fNbDYiSuvFlErv8VaNlAzujCEMzNrb/I8RfYRckLLEfLSlG++CCgYMrHKxIwCIGjH
 4bnutSSV/SNa50G5+TiwAcmwxXRXOELdgaESIjj7sWeYvGd8yOta1kfCAoye2vXqR33mnoK22c
 D3QpNI0pIAYl+27TkveT9+AgXI/8ApxISAod3Rgr/p0EQWjNXMwez8W/syA6r88Pm0XdencZg8
 Z43I4nbMTHfOGDIg7RMhuWB3io6f3KO+t0iiYTRAAaC2MLYEp3IjQemjOeKYIe9mfH4W+eP1pT
 OE4=
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 v11 03/12] scsi: ufshpb: Transform set_dirty to iterate_rgn
Date:   Wed, 16 Jun 2021 14:27:51 +0300
Message-Id: <20210616112800.52963-4-avri.altman@wdc.com>
In-Reply-To: <20210616112800.52963-1-avri.altman@wdc.com>
References: <20210616112800.52963-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 3fd9fd5cb43e..7db553769717 100644
--- a/drivers/scsi/ufs/ufshpb.c
+++ b/drivers/scsi/ufs/ufshpb.c
@@ -145,13 +145,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;
@@ -167,11 +168,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) {
@@ -591,10 +595,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