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: RSyhR/xZ9s+xochbjeod4FBsP8cwS+9fHzZMY4e7/bZ5VfzavdF0FzG/0hMCI98RQ7VADAwt8E
 lFeLnBX/QRufpUuAXVzo3Nemw+NbRLQ9E3s7kwX5Of8s2ME2L6oIBPlVYBzA5KG22i1xa3EJR3
 fJTzq3wyJFv6sBxuilW5bkg4NKI83GovqOqhZdjWRPmv3A/xlJ3Aeow3l0tuYBYIIHckYdZJkN
 +e3ezXsbh7PxZ+1MBe9zytZiMdCILaNcHLwhu3iBSOGhxIe0xyVkm93xxY6KpXV1V9un+wacfJ
 SMg=
IronPort-SDR: M8eCInVLMSb8vP6NrF/mSJyNq31JYwAUQNrmTqVJ4+p9enmHNfY6ovK0z3lvPuluOgEii1qO5d
 ccc+lkOVe+8bxqyMM53LrzuBaHcS7erYEL1sv7aBhetIrsY3oKb9SmtGIqblvM3IeNzyRKEuIV
 ahLiKlQi5yYz3gk3mSHM8fLraNe2OVwpWzguzic0wOx/mCRMbS38HIuaIR7FuOGzm23VM5C0cJ
 Nn1CdYNaQq65+ZW7MLesE79kk7ccXUV7W6jxdlniCnzmv1DJSWnso7sn+0O4fLrgXk9ETWyUQj
 G1LTMovYuHA27XhpNv9EDEiS
IronPort-SDR: ahMIH6VADxBtNa9HQR4ouPqnrzLNVR5sfgIEPlCIwgA5y0A900GRbCSNSEluB9XypR9dcLcucz
 rFlrZF2nEhAFyv48aWszEOudkBE8rAA+Cz+OM7fmKTQlcpCDOwMHSP2YYoHQ84vwF35UbsUJzO
 9sXSnB3+l2xLEhT/on0n2VP1K6b60U8iCXO1bpe36Sn9nPDFnITPBr6FzBCPbd8zbpU7XNYs50
 P7Vr0gHTCF6zx+v6keMxBPRsR2On8ySPIekPfyXqANLy3yc3FiyXX5lUatgr2MWqiNMzELbhPc
 TuM=
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 v2 4/9] scsi: ufshpb: Make eviction depends on region's reads
Date:   Tue,  2 Feb 2021 10:30:02 +0200
Message-Id: <20210202083007.104050-5-avri.altman@wdc.com>
In-Reply-To: <20210202083007.104050-1-avri.altman@wdc.com>
References: <20210202083007.104050-1-avri.altman@wdc.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

In host mode, eviction is considered an extreme measure.
verify that the entering region has enough reads, and the exiting
region has much less reads.

Signed-off-by: Avri Altman <avri.altman@wdc.com>
---
 drivers/scsi/ufs/ufshpb.c | 42 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/drivers/scsi/ufs/ufshpb.c b/drivers/scsi/ufs/ufshpb.c
index de4866d42df0..bae7dca105da 100644
--- a/drivers/scsi/ufs/ufshpb.c
+++ b/drivers/scsi/ufs/ufshpb.c
@@ -18,6 +18,7 @@
 
 #define WORK_PENDING 0
 #define ACTIVATION_THRSHLD 4 /* 4 IOs */
+#define EVICTION_THRSHLD (ACTIVATION_THRSHLD << 6) /* 256 IOs */
 
 /* memory management */
 static struct kmem_cache *ufshpb_mctx_cache;
@@ -644,6 +645,13 @@ static struct ufshpb_region *ufshpb_victim_lru_info(struct ufshpb_lu *hpb)
 		if (ufshpb_check_srgns_issue_state(hpb, rgn))
 			continue;
 
+		/*
+		 * in host control mode, verify that the exiting region
+		 * has less reads
+		 */
+		if (hpb->is_hcm && rgn->reads > (EVICTION_THRSHLD >> 1))
+			continue;
+
 		victim_rgn = rgn;
 		break;
 	}
@@ -799,7 +807,7 @@ static int ufshpb_issue_map_req(struct ufshpb_lu *hpb,
 
 static int ufshpb_add_region(struct ufshpb_lu *hpb, struct ufshpb_region *rgn)
 {
-	struct ufshpb_region *victim_rgn;
+	struct ufshpb_region *victim_rgn = NULL;
 	struct victim_select_info *lru_info = &hpb->lru_info;
 	unsigned long flags;
 	int ret = 0;
@@ -827,6 +835,16 @@ static int ufshpb_add_region(struct ufshpb_lu *hpb, struct ufshpb_region *rgn)
 			 * because the device could detect this region
 			 * by not issuing HPB_READ
 			 */
+
+			/*
+			 * in host control mode, verify that the entering
+			 * region has enough reads
+			 */
+			if (hpb->is_hcm && rgn->reads < EVICTION_THRSHLD) {
+				ret = -EACCES;
+				goto out;
+			}
+
 			victim_rgn = ufshpb_victim_lru_info(hpb);
 			if (!victim_rgn) {
 				dev_warn(&hpb->sdev_ufs_lu->sdev_dev,
@@ -1034,8 +1052,13 @@ static void ufshpb_run_active_subregion_list(struct ufshpb_lu *hpb)
 
 		rgn = hpb->rgn_tbl + srgn->rgn_idx;
 		ret = ufshpb_add_region(hpb, rgn);
-		if (ret)
-			goto active_failed;
+		if (ret) {
+			if (ret == -EACCES) {
+				spin_lock_irqsave(&hpb->rsp_list_lock, flags);
+				continue;
+			}
+			goto add_region_failed;
+		}
 
 		ret = ufshpb_issue_map_req(hpb, rgn, srgn);
 		if (ret) {
@@ -1049,9 +1072,22 @@ static void ufshpb_run_active_subregion_list(struct ufshpb_lu *hpb)
 	spin_unlock_irqrestore(&hpb->rsp_list_lock, flags);
 	return;
 
+add_region_failed:
+	if (hpb->is_hcm) {
+		/*
+		 * In host control mode, it is common that eviction trials
+		 * fail, either because the entering region didn't have enough
+		 * reads, or a poor-performing exiting region wasn't found.
+		 * No need to re-insert those regions to the "to-be-activated"
+		 * list.
+		 */
+		return;
+	}
+
 active_failed:
 	dev_err(&hpb->sdev_ufs_lu->sdev_dev, "failed to activate region %d - %d, will retry\n",
 		   rgn->rgn_idx, srgn->srgn_idx);
+
 	spin_lock_irqsave(&hpb->rsp_list_lock, flags);
 	ufshpb_add_active_list(hpb, rgn, srgn);
 	spin_unlock_irqrestore(&hpb->rsp_list_lock, flags);
-- 
2.25.1