From nobody Wed Oct 8 02:04:52 2025 Received: from bali.collaboradmins.com (bali.collaboradmins.com [148.251.105.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 694D52BE62F for ; Thu, 3 Jul 2025 20:53:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.251.105.195 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751576022; cv=none; b=By6L+QJorjd3C1eOj1e4soDQlZ8PN6Cq4NnKuhf6yvSuDuUQvDSdYTPdMU1gOuwiQ4KINAeuFRqHoXRkHCnwHNukna1wrN9pSCsJu7V2vzVr/pSFaP9ULzZJlyZ5gjSdfgf/14yP9Fq7JU2TdjBX1LLLxf+Y9nZ5voECY6KSLiQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751576022; c=relaxed/simple; bh=OIk9l0FOEp7+ye4kPRY6W7rKZcEBc03NnC+TtauGJG8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=phXGFOoESE66bacIpguUPePnQyHcTibKx+SBG+zdX0GAyiKSHcbcNqfABdd3Az30kyfRbY0+Ad+uOq1F1FX0XhSA8NsPq6jAbOxFYv4Z7mKBNArVeaozjKPjUY8P+d61TYDQ9uTOcrpWKZPc4GORU9A6xNG+oSO96+ikCyxncv4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=ijADUnub; arc=none smtp.client-ip=148.251.105.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="ijADUnub" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1751576017; bh=OIk9l0FOEp7+ye4kPRY6W7rKZcEBc03NnC+TtauGJG8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ijADUnub30K7IRNCkHWfKf33cDoz2Dz0FwOW7vGLgntpTKHiJneOaom4XHJCF3007 7e3QORyb61K0i5ew2+H5eR/lgqZUzVvkt4p9qoK5cr8pP2/ofK0Foyq2IlLAxYIzOK c0ievSIQBkSCguebiAhdXj/bQy8YZbJMwrYQdJfNNF3FbExYrIeI2u9dEpylQfniJs 6SIeQTKp4lkdGbrxAJs56Brrzb2gA6z9oS1lsgJJwBQALm+ekbup4/iPQV1qX5DF6J xKoswO/Z2eVLEM1CNQQbIWKxlorDP8EvWbjmxX26svH49Annz5IKIQ/VyELCfoDEBH snz+FZtXQ3A+g== Received: from debian-rockchip-rock5b-rk3588.. (unknown [90.168.160.154]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: nanokatze) by bali.collaboradmins.com (Postfix) with ESMTPSA id 1E52A17E0E12; Thu, 3 Jul 2025 22:53:36 +0200 (CEST) From: Caterina Shablia To: "Maarten Lankhorst" , "Maxime Ripard" , "Thomas Zimmermann" , "David Airlie" , "Simona Vetter" , "Frank Binns" , "Matt Coster" , "Karol Herbst" , "Lyude Paul" , "Danilo Krummrich" , "Boris Brezillon" , "Steven Price" , "Liviu Dudau" , "Lucas De Marchi" , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , "Rodrigo Vivi" Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, nouveau@lists.freedesktop.org, intel-xe@lists.freedesktop.org, Asahi Lina , Caterina Shablia Subject: [PATCH v3 1/7] drm/panthor: Add support for atomic page table updates Date: Thu, 3 Jul 2025 20:52:53 +0000 Message-ID: <20250703205308.19419-2-caterina.shablia@collabora.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250703205308.19419-1-caterina.shablia@collabora.com> References: <20250703205308.19419-1-caterina.shablia@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Boris Brezillon Move the lock/flush_mem operations around the gpuvm_sm_map() calls so we can implement true atomic page updates, where any access in the locked range done by the GPU has to wait for the page table updates to land before proceeding. This is needed for vkQueueBindSparse(), so we can replace the dummy page mapped over the entire object by actual BO backed pages in an atomic way. Signed-off-by: Boris Brezillon Signed-off-by: Caterina Shablia --- drivers/gpu/drm/panthor/panthor_mmu.c | 65 +++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/panthor/panthor_mmu.c b/drivers/gpu/drm/pantho= r/panthor_mmu.c index b39ea6acc6a9..1e58948587a9 100644 --- a/drivers/gpu/drm/panthor/panthor_mmu.c +++ b/drivers/gpu/drm/panthor/panthor_mmu.c @@ -387,6 +387,15 @@ struct panthor_vm { * flagged as faulty as a result. */ bool unhandled_fault; + + /** @locked_region: Information about the currently locked region current= ly. */ + struct { + /** @locked_region.start: Start of the locked region. */ + u64 start; + + /** @locked_region.size: Size of the locked region. */ + u64 size; + } locked_region; }; =20 /** @@ -775,6 +784,10 @@ int panthor_vm_active(struct panthor_vm *vm) } =20 ret =3D panthor_mmu_as_enable(vm->ptdev, vm->as.id, transtab, transcfg, v= m->memattr); + if (!ret && vm->locked_region.size) { + lock_region(ptdev, vm->as.id, vm->locked_region.start, vm->locked_region= .size); + ret =3D wait_ready(ptdev, vm->as.id); + } =20 out_make_active: if (!ret) { @@ -902,6 +915,9 @@ static int panthor_vm_unmap_pages(struct panthor_vm *vm= , u64 iova, u64 size) struct io_pgtable_ops *ops =3D vm->pgtbl_ops; u64 offset =3D 0; =20 + drm_WARN_ON(&ptdev->base, + (iova < vm->locked_region.start) || + (iova + size > vm->locked_region.start + vm->locked_region.size)); drm_dbg(&ptdev->base, "unmap: as=3D%d, iova=3D%llx, len=3D%llx", vm->as.i= d, iova, size); =20 while (offset < size) { @@ -915,13 +931,12 @@ static int panthor_vm_unmap_pages(struct panthor_vm *= vm, u64 iova, u64 size) iova + offset + unmapped_sz, iova + offset + pgsize * pgcount, iova, iova + size); - panthor_vm_flush_range(vm, iova, offset + unmapped_sz); return -EINVAL; } offset +=3D unmapped_sz; } =20 - return panthor_vm_flush_range(vm, iova, size); + return 0; } =20 static int @@ -938,6 +953,10 @@ panthor_vm_map_pages(struct panthor_vm *vm, u64 iova, = int prot, if (!size) return 0; =20 + drm_WARN_ON(&ptdev->base, + (iova < vm->locked_region.start) || + (iova + size > vm->locked_region.start + vm->locked_region.size)); + for_each_sgtable_dma_sg(sgt, sgl, count) { dma_addr_t paddr =3D sg_dma_address(sgl); size_t len =3D sg_dma_len(sgl); @@ -985,7 +1004,7 @@ panthor_vm_map_pages(struct panthor_vm *vm, u64 iova, = int prot, offset =3D 0; } =20 - return panthor_vm_flush_range(vm, start_iova, iova - start_iova); + return 0; } =20 static int flags_to_prot(u32 flags) @@ -1654,6 +1673,38 @@ static const char *access_type_name(struct panthor_d= evice *ptdev, } } =20 +static int panthor_vm_lock_region(struct panthor_vm *vm, u64 start, u64 si= ze) +{ + struct panthor_device *ptdev =3D vm->ptdev; + int ret; + + mutex_lock(&ptdev->mmu->as.slots_lock); + drm_WARN_ON(&ptdev->base, vm->locked_region.start || vm->locked_region.si= ze); + vm->locked_region.start =3D start; + vm->locked_region.size =3D size; + if (vm->as.id >=3D 0) { + lock_region(ptdev, vm->as.id, start, size); + ret =3D wait_ready(ptdev, vm->as.id); + } + mutex_unlock(&ptdev->mmu->as.slots_lock); + + return ret; +} + +static void panthor_vm_unlock_region(struct panthor_vm *vm) +{ + struct panthor_device *ptdev =3D vm->ptdev; + + mutex_lock(&ptdev->mmu->as.slots_lock); + if (vm->as.id >=3D 0) { + write_cmd(ptdev, vm->as.id, AS_COMMAND_FLUSH_MEM); + drm_WARN_ON(&ptdev->base, wait_ready(ptdev, vm->as.id)); + } + vm->locked_region.start =3D 0; + vm->locked_region.size =3D 0; + mutex_unlock(&ptdev->mmu->as.slots_lock); +} + static void panthor_mmu_irq_handler(struct panthor_device *ptdev, u32 stat= us) { bool has_unhandled_faults =3D false; @@ -2179,6 +2230,11 @@ panthor_vm_exec_op(struct panthor_vm *vm, struct pan= thor_vm_op_ctx *op, =20 mutex_lock(&vm->op_lock); vm->op_ctx =3D op; + + ret =3D panthor_vm_lock_region(vm, op->va.addr, op->va.range); + if (ret) + goto out; + switch (op_type) { case DRM_PANTHOR_VM_BIND_OP_TYPE_MAP: if (vm->unusable) { @@ -2199,6 +2255,9 @@ panthor_vm_exec_op(struct panthor_vm *vm, struct pant= hor_vm_op_ctx *op, break; } =20 + panthor_vm_unlock_region(vm); + +out: if (ret && flag_vm_unusable_on_failure) vm->unusable =3D true; =20 base-commit: 026a60e3c1c55845bd9fdaa202dad81c3f95ae6b --=20 2.47.2