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: 83u+PghaWSpWTABALpDE6br5GmCpYrJraOBLy/zpm2Ok/GSRVKw7j4VnE9UMitkIxCB2Rs1nLq
 DpN6mSfYjWSWKH7OO27qwMiR2bLhhnxtMLDousAHhSWnXLC4EEYGi6arTvSjgreIzRRo0kbW3E
 oBGopc2Fu/hMj2Q5erWhcyYUqvXIsWA050Zmw28W/SKSgJAKk4kQIfhIVt5VOAIg3H91jTr4rS
 keQYTA9CG2kOGVd7BpoQ0z3LcPweMrUsEHDnylZrcCf3Mb3E53Fb6osUYIAsBb3hcJK9CChYAe
 /Gf+wRUrRK8BaB2s6cGU5tri
IronPort-SDR: MvainrtFaVLAlaDkMytM+8LF9gvdmrlqkrT/wV6jpXD1nWsc4TeRvFukgzLfjVaUjHasKLvKFT
 WDHxA1H0hDLy3qEtoPpbmrrr5xyBuNNvC05RJ6dXbTF5vwn1iCcIUpiLTUHmen+b2vs7MLF+4D
 2iI5BqrPFAN36owde/x/BR8zltlpwLwxOuG81tb4Mmqz1ectgltpbyutRe5Uc6+x4h3rOGxZKM
 Q17o/i2EB3iTltrsoQlZ8/rstvW2joLaTq2fBImo2dIH7o7KH3oh7xjZUteboqKE1SGMq4O6eY
 EoY=
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>
Cc:     linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
        Bart Van Assche <bvanassche@acm.org>,
        Daejun Park <daejun7.park@samsung.com>,
        Avri Altman <avri.altman@wdc.com>
Subject: [PATCH 1/4] scsi: ufshpb: re-wind the read timeout on every read
Date:   Sun,  8 Aug 2021 12:00:21 +0300
Message-Id: <20210808090024.21721-2-avri.altman@wdc.com>
In-Reply-To: <20210808090024.21721-1-avri.altman@wdc.com>
References: <20210808090024.21721-1-avri.altman@wdc.com>
Precedence: bulk

The "cold"-timer purpose is not to hang-on to active regions with no
reads.  Therefore the read-timeout should be re-wind on every read, and
not just when the region is activated.

Fixes: 13c044e91678 (scsi: ufs: ufshpb: Add "cold" regions timer)
Signed-off-by: Avri Altman <avri.altman@wdc.com>
---
 drivers/scsi/ufs/ufshpb.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/ufs/ufshpb.c b/drivers/scsi/ufs/ufshpb.c
index d0eb14be47a3..8e92c61ed9d4 100644
--- a/drivers/scsi/ufs/ufshpb.c
+++ b/drivers/scsi/ufs/ufshpb.c
@@ -178,9 +178,19 @@ static void ufshpb_iterate_rgn(struct ufshpb_lu *hpb, int rgn_idx, int srgn_idx,
 		set_bit_len = cnt;
 
 	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);
+	if (rgn->rgn_state != HPB_RGN_INACTIVE) {
+		if (set_dirty) {
+			if (srgn->srgn_state == HPB_SRGN_VALID)
+				bitmap_set(srgn->mctx->ppn_dirty, srgn_offset,
+					   set_bit_len);
+		} else if (hpb->is_hcm) {
+			 /* rewind the read timer for lru regions */
+			rgn->read_timeout = ktime_add_ms(ktime_get(),
+					rgn->hpb->params.read_timeout_ms);
+			rgn->read_timeout_expiries =
+				rgn->hpb->params.read_timeout_expiries;
+		}
+	}
 	spin_unlock_irqrestore(&hpb->rgn_state_lock, flags);
 
 	if (hpb->is_hcm && prev_srgn != srgn) {
-- 
2.17.1