Skip to contentSkip to conversation

habanalabs: add prefetch flag to the MAP operation

PATCH New Oded Gabbay 1 participant 2 messages Apr 14, 2022 Char and misc drivers

lore
Share & tools
lore
#1 lore raw

PATCH 2/2 habanalabs: use get_task_pid() to take PID

In reply to Oded Gabbay

From: Dani Liberman <[email protected]>

find_get_pid() isn't good in case the user process was run inside docker.

As a result, we didn't had the PID and we couldn't kill the user process in case the device got stuck and we needed to reset the device.

---
 drivers/misc/habanalabs/common/habanalabs_drv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/habanalabs/common/habanalabs_drv.c +1 -1
index 28549d34d99c..b85ca1e66eb2 100644
@@ -237,7 +237,7 @@ int hl_device_open_ctrl(struct inode *inode, struct file *filp)
 	hpriv->filp = filp;
 	nonseekable_open(inode, filp);
 
-	hpriv->taskpid = find_get_pid(current->pid);
+	hpriv->taskpid = get_task_pid(current, PIDTYPE_PID);
 
 	mutex_lock(&hdev->fpriv_ctrl_list_lock);
 
Signature · 1 line
2.25.1
#0 lore raw

PATCH 1/2 habanalabs: add prefetch flag to the MAP operation

From: Ohad Sharabi <[email protected]>

This patch let the user decide whether the translations done in the page tables will be fetched directly to the STLB right after the map.

We want to let the user control whether to perform prefetch upon map operation.

To do so a memory flag was added, to be used in the MAP ioctl, called HL_MEM_PREFETCH and if set- the mappings will be fetched directly to the STLB after map operation.

---
 drivers/misc/habanalabs/common/memory.c | 11 ++++++-----
 include/uapi/misc/habanalabs.h          |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)
drivers/misc/habanalabs/common/memory.c +6 -5
index 326c2179628f..6face45c57e3 100644
@@ -1250,11 +1250,12 @@ static int map_device_va(struct hl_ctx *ctx, struct hl_mem_in *args,
 	if (rc)
 		goto map_err;
 
-	/* already prefetch the relevant translations to the cache */
-	rc = hl_mmu_prefetch_cache_range(hdev, *vm_type, ctx->asid, ret_vaddr,
-						phys_pg_pack->total_size);
-	if (rc)
-		goto map_err;
+	if (args->flags & HL_MEM_PREFETCH) {
+		rc = hl_mmu_prefetch_cache_range(hdev, *vm_type, ctx->asid, ret_vaddr,
+							phys_pg_pack->total_size);
+		if (rc)
+			goto map_err;
+	}
 
 	mutex_unlock(&ctx->mmu_lock);
 
include/uapi/misc/habanalabs.h +1 -0
index ca2af5f98056..3576bf2b4841 100644
@@ -1134,6 +1134,7 @@ union hl_wait_cs_args {
 #define HL_MEM_SHARED		0x2
 #define HL_MEM_USERPTR		0x4
 #define HL_MEM_FORCE_HINT	0x8
+#define HL_MEM_PREFETCH		0x40
 
 /**
  * structure hl_mem_in - structure that handle input args for memory IOCTL
Signature · 1 line
2.25.1