Commit fe2bc2d2 authored by Moti Haimovski's avatar Moti Haimovski Committed by Oded Gabbay
Browse files

habanalabs: share a single ctx-mutex between all MMUs 



Multiple locks are usually a source of problems, which in the MMU
case can be avoided since it is relatively rare that both MMU
tables are updated at the same time.

Therefore, use a single shared lock instead of two separate ones.

Signed-off-by: default avatarMoti Haimovski <mhaimovski@habana.ai>
Reviewed-by: default avatarOded Gabbay <ogabbay@kernel.org>
Signed-off-by: default avatarOded Gabbay <ogabbay@kernel.org>
parent 412c41fc

drivers/misc/habanalabs/common/mmu.c

+4 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ int hl_mmu_ctx_init(struct hl_ctx *ctx) 
	if (!hdev->mmu_enable)

		return 0;



	mutex_init(&ctx->mmu_lock);



	if (hdev->mmu_func[MMU_DR_PGT].ctx_init != NULL) {

		rc = hdev->mmu_func[MMU_DR_PGT].ctx_init(ctx);

		if (rc)
@@ -115,6 +117,8 @@ void hl_mmu_ctx_fini(struct hl_ctx *ctx) 


	if (hdev->mmu_func[MMU_HR_PGT].ctx_fini != NULL)

		hdev->mmu_func[MMU_HR_PGT].ctx_fini(ctx);



	mutex_destroy(&ctx->mmu_lock);

}



/*

drivers/misc/habanalabs/common/mmu_v1.c

+0 −4
Original line number Diff line number Diff line
@@ -481,9 +481,7 @@ static void hl_mmu_v1_fini(struct hl_device *hdev) 
 */

static int hl_mmu_v1_ctx_init(struct hl_ctx *ctx)

{

	mutex_init(&ctx->mmu_lock);

	hash_init(ctx->mmu_shadow_hash);



	return dram_default_mapping_init(ctx);

}
@@ -516,8 +514,6 @@ static void hl_mmu_v1_ctx_fini(struct hl_ctx *ctx) 
			pgt_info->phys_addr, ctx->asid, pgt_info->num_of_ptes);

		_free_hop(ctx, pgt_info);

	}



	mutex_destroy(&ctx->mmu_lock);

}



static int _hl_mmu_v1_unmap(struct hl_ctx *ctx,