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: se8vgd3ifR3hWY/tv3aQb0kq68YrZR8rw8a9LB+CjwijJHSC2Kt05Y9ymtqcM7pohJZfnj8lqE
 lTv9+AVU4eRv9WHd2vEwWIbGPN0c95yawUCiNLxmImRgbY3AlBluj5NfCBlAJMaIDxHuML8b0E
 fvBCj4csOuKFdgBHYor3VHNygCgxszERgcpIeag/kWInK9s2CjSYbQORBc1z4zW/FKUqzL8WVq
 OgqXOjslOFiYIM0D2Opp0BHUMLpdKT9EMPX5bq9I2xbuK4G+fsQTO5fCA+rE602Cf+mXvh+RzO
 lJE=
IronPort-SDR: 1DeuyRWzIPPNfTz2HDIX4hKticQCTYarGlqmbQx9SRmcphxo1LfusKVOCZJh+EjE5KTQWypcYg
 Q5cP/2JFEd4AfrYsXwWOwhmusstb8dzKI1Nh8YgLqBZXaBMc9xnGdFPU9GF4kVKTTT+Xtz908V
 3bvS1dXn3v94kc0RRXiT7oIWkoc07nQAhkSL7u1MZQiRrHWL0xIPRJBZ+0fximoNHxtjzuC2kl
 NyVO/cPf1ZySFpb+fk5FTS6umSY60bs9fvTE84FYaUNe/XQ0lhYg44E41Gu4UJz6hUxws20LEi
 6k3N3po8/uvJISmdt6ZIfuAc
IronPort-SDR: ktsiY3aG4gNm9Fzuw+r26RectOBYMVCRNNXDqKfWMuW8iT6Gcs6K26tvWuAmmXIbdcXhSqGBeI
 j11GUhE9A9TjT8mo4Wl7IEKRsWNma6M/lfRnbHp4bckPjxLk561ROC00rZ3My6ca9m+Yr/zpd7
 BBzoY69tCvF83K3D54r/hOeJ7xwgXrOrEdwSnJrnlOvJXWpmFCnc7X3inbTgnnrYiN9rn/fZ/7
 pf64Z9+p06/h6UHGO97XGT00APGqdGIcTu4APjIbeZ/HYdta4HCNEQOQyrRc8ubmJiIfnU3uLF
 p0A=
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 v5 04/10] scsi: ufshpb: Make eviction depends on region's reads
Date:   Tue,  2 Mar 2021 15:24:57 +0200
Message-Id: <20210302132503.224670-5-avri.altman@wdc.com>
In-Reply-To: <20210302132503.224670-1-avri.altman@wdc.com>
References: <20210302132503.224670-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 a8f8d13af21a..6f4fd22eaf2f 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;
@@ -1050,6 +1051,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;
 	}
@@ -1235,7 +1243,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;
@@ -1263,6 +1271,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