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: uQh6wbbH6kmOIukTx91PoRmSnnqdeBNsvImasfTkkGY+132t1xJ6ZuaH/ZMj5DgaPLXdhKP3Hv
 hR3IwsAHDGSK6jR37ZIHZW4nvThZlY9aXiUnsTNeCuAZhRsoK4Msr6MA36/pEHyGcAI6BMOiUm
 MBfK+9XD2z0UtlAw6U1OJ7kmWy6dF2TK12awO8etWOcVIvyjqfRIO9QSUwsXfC2HhywAYAOXC/
 a+BXESwqMFwMEDeId66lHFNOor2eCDi1ngb/ru/XRLXVmVgG3mZII9RTBwhkWl4FtmRUZxldNB
 Y2Q=
IronPort-SDR: HrDXkslQFKxFHzHEIVJmKLXAG8sAc5hoUxODX+ptRZEvZ9HE2fIBxS2mDLMB+zAKXLNy25iWiL
 Hx+TJAn911ottkK/3GLastTI79kgKYQXMb/bUmxLDpuUESeubpQvnMkXI/BlPWdVXqVCphUV1j
 t6lg+ZfISrfC6Rsq7DhGJauAABAbZMxh0T8E8NOrQKo3/NGJ+jw5KB3e/+RvqiSaP2D7ANqYma
 806njrIDysnvzEGterleMp4j8ikqKVxeaqy2BNJPOB8kx4divhGjwBLXWwjrRTqifQ5pUvmHkV
 2nPjEbbB46+0p7c7MPh0mn6z
IronPort-SDR: eubKs3W8xT23Z8jNrEmRNgAYGnsiD7dWenQgNHEndpVCRMRP4+5t5gRQrJ3vz6+9FSjv9ZPEqH
 b0Km3e/0DGhauYMPjlV3eG6LohKbDUI7nVQm2o42cwcF7BSPK9BVS6/X5KlPzyvT6kfiVGmrsG
 p9CMchWI25dIvzkyp0XNx+yGBDdrqnswkOKILyGP16vWtlDCCziR1EKY4fzBuilsUXueCWlhVr
 quq6HXWP2MB3KRrF97b62RMcVWfrp7mgvBQ50Qs3aN4YA+sqNzNki/cZEszsdv2qz0wBvRuf2b
 l1A=
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 v4 4/9] scsi: ufshpb: Make eviction depends on region's reads
Date:   Fri, 26 Feb 2021 10:32:55 +0200
Message-Id: <20210226083300.30934-5-avri.altman@wdc.com>
In-Reply-To: <20210226083300.30934-1-avri.altman@wdc.com>
References: <20210226083300.30934-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 717ccb66b33e..44e56a6d7102 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;
@@ -1051,6 +1052,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;
 	}
@@ -1236,7 +1244,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;
@@ -1264,6 +1272,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