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: bu4wAJL+C1W/ZBQmrbXUvppPWxXU96xqITadjDdYRIGmsYwrAkAoJ54UgOC4q0aTX2dluKvx1b
 Uq8HYOWD+C6z+LwkN0TTD1YR0w0hJwcdkRH1sHykIr6I14qauX5yeQyqJ6L82Q90ANJ9Xs9zih
 /xUyWcufPHwlyIJotsXOhjgyLs74u5QRfLODYoc/FsJsyEMLk50s8SVpINC+Nw+3xGk6WhJ6T7
 ruGzw5PMiHwpopC5qvsM5c3dZTbYO9rIlEYV/CAMbm7sVKjKT70GXDtkXiDD5EcQ+uNzLjRGGg
 o70=
IronPort-SDR: 36/tyPWbgdWIH/fiYJJx45b/cQBZgQczIHP3JEBtV1JMrEIJiUnBjyMpVcU6BBuSrp3JhUTkSS
 RSdFLhOYAB6mkZjfYyul7SCDqZndOvH96UrtCoYPtUpadQs5fchanxBTr7bMVDUWw1y/1PMM66
 oBVHhvKrRE2MYD9WtkRoL+JADpcD3/Xzn5jCabTE8zd9u1mdqj0wOAstm1a2qj2vIPWmqjPOus
 Zslju5l/7icHO3nvMBLuELyGA4QEsE+7BxibU9D4Hr0qP5X8qY6206N8ytIAPX6+nRo3XsPInW
 bqks2kSH2/wS3PM6I245tCAD
IronPort-SDR: 6CM1oLgCbxZF9hau8fAPMMnyHg/vcrf7CtpVj7B+45WR+T8vgoJkAOCIKC/KFy1a2b0ECax2Cl
 KI45lmjwSjal6obqSe6Qp1E/h8jGTJDtGj6qffGte/Xd6Au007NJ8HFrMrZ+I1mwIR6K/LuiE+
 IYPara+PDuRnT0GF7th6vNA/U5vAowe0LsXI6yJcF1NoBsFIeozNLXAlSrAlSF2QBHSJopIL7f
 U6AbezCo9nZZT+ca92HisUboJuXy1TN2A/3ponFJf2yGs64LrL30X3FDL6tMt5z25A3LbZQgEH
 UkA=
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 v3 4/9] scsi: ufshpb: Make eviction depends on region's reads
Date:   Thu, 18 Feb 2021 15:19:27 +0200
Message-Id: <20210218131932.106997-5-avri.altman@wdc.com>
In-Reply-To: <20210218131932.106997-1-avri.altman@wdc.com>
References: <20210218131932.106997-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 | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/ufs/ufshpb.c b/drivers/scsi/ufs/ufshpb.c
index 348185964c32..9cb17c97cf93 100644
--- a/drivers/scsi/ufs/ufshpb.c
+++ b/drivers/scsi/ufs/ufshpb.c
@@ -17,6 +17,7 @@
 #include "../sd.h"
 
 #define ACTIVATION_THRESHOLD 4 /* 4 IOs */
+#define EVICTION_THRESHOLD (ACTIVATION_THRESHOLD << 6) /* 256 IOs */
 
 /* memory management */
 static struct kmem_cache *ufshpb_mctx_cache;
@@ -995,6 +996,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_THRESHOLD >> 1))
+			continue;
+
 		victim_rgn = rgn;
 		break;
 	}
@@ -1150,7 +1158,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;
@@ -1178,6 +1186,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_THRESHOLD) {
+				ret = -EACCES;
+				goto out;
+			}
+
 			victim_rgn = ufshpb_victim_lru_info(hpb);
 			if (!victim_rgn) {
 				dev_warn(&hpb->sdev_ufs_lu->sdev_dev,
-- 
2.25.1