From nobody Tue Apr 7 12:53:41 2026 Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) (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 EA1E43A5E61 for ; Fri, 13 Mar 2026 15:11:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.112 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773414693; cv=pass; b=L5eLfswKKclDGbkvBpg4ZdtEMJdxQY6/AHaFFD1SCrzNNUCc79B7JYklBg1pVz/p0X5EvM1cwBuBJg2TuICUYNeEuPSAumhQ796EE6iGtJtyVx6uCmA5iDGi77Wb/V4NZxUXM233LN9g+Y+ujuJXyiZ5w2pL4chyrmp4Ux+At/o= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773414693; c=relaxed/simple; bh=EY2m/AUbAxz3QBo89EsL7Zx4fPRTkfN5Z0VILx06QjA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=BlU/MoYYJdM5mLwCtMBvYXJj5xM9OtuSiBSxxspZyPSTCVoShkkOE2bOLOxM9SiZ8QdzcJmnHyTlo6WahDyoHMXlz2P/emcpwRKXMc/nHsXznTdwWp8IKZfyLBy8K6u5d9BhKJ3avbWK6RQnGQBS0bL+OPXK0mN+JIplC74Kklo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b=UYw6stbk; arc=pass smtp.client-ip=136.143.188.112 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 (1024-bit key) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="UYw6stbk" ARC-Seal: i=1; a=rsa-sha256; t=1773414674; cv=none; d=zohomail.com; s=zohoarc; b=V4vsuUaofgd8lt0XzGwpkWlQjfq6Y1PPNiDJ8nJj8sWL3pKOO45mnZfUhrYUyX4hCvuW/+cx27tj0Z954sudKteCpxJfAsfVu8nWk49OWs3QVRyspY3vgKQJswp12vg+6NFoYBhUbIhTpGEXci70jG0v3NntbRlHytCAEC9nTM0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773414674; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=ddH5Yc4c0IevX3wa5L4ZVOfMqtq9xMzu+E7rLqoDebY=; b=jkGOZvMQJuaOpmJPHZJPGhVJK6zJ5YZiUm38lGsuKhoitL4a/asT+rt0XxciYfcNtj1VNfzJIw66sWU4Teodf1+dp9LuuS6d4uav4fEjvoOrkJpqWag2jeEt6QUx25dp70DLPuCtl5Hsp7I9fGJQVmyNSlxvvKi0wR8H1WTXgP4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=adrian.larumbe@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1773414674; s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=ddH5Yc4c0IevX3wa5L4ZVOfMqtq9xMzu+E7rLqoDebY=; b=UYw6stbki7TROzm+DDJQDDTYJqAZp6x3idB/5ISLL/J5v92952so0i6Mt5uMbQiL IUvQ8BICjBXA0GcCwt69MhTjckB/UYxUgmZZsiieIzRnaiulZDcUxhFf7/QT5PfTFLT KDlRoTZ4Gl+8JT6ui8t2O92OpVhBXYfoLLainFl0= Received: by mx.zohomail.com with SMTPS id 1773414672194873.5209431416926; Fri, 13 Mar 2026 08:11:12 -0700 (PDT) From: =?UTF-8?q?Adri=C3=A1n=20Larumbe?= To: linux-kernel@vger.kernel.org Cc: dri-devel@lists.freedesktop.org, Steven Price , Boris Brezillon , Janne Grunau , kernel@collabora.com, =?UTF-8?q?Adri=C3=A1n=20Larumbe?= , Danilo Krummrich , Matthew Brost , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Alice Ryhl , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Subject: [PATCH v5 07/11] drm/gpuvm: Ensure correctness of unmap/remaps of repeated regions Date: Fri, 13 Mar 2026 15:09:44 +0000 Message-ID: <20260313150956.1618635-8-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260313150956.1618635-1-adrian.larumbe@collabora.com> References: <20260313150956.1618635-1-adrian.larumbe@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable When an unmap or map operation that leads to a remap intersects with a GPU VA that spans over a repeated range, the newly spawned VAs must preserve the repeated property, ie, VA's range must be a multiple of gem.range, and also the VA's start address must be on a gem.range boundary. When this doesn't hold, disallow such operations and notify UM with an invalid argument error. Signed-off-by: Adri=C3=A1n Larumbe --- drivers/gpu/drm/drm_gpuvm.c | 67 +++++++++++++++++++++++++++++++++++++ include/drm/drm_gpuvm.h | 7 +++- 2 files changed, 73 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_gpuvm.c b/drivers/gpu/drm/drm_gpuvm.c index ca7445f767fc..80750119221d 100644 --- a/drivers/gpu/drm/drm_gpuvm.c +++ b/drivers/gpu/drm/drm_gpuvm.c @@ -2462,6 +2462,65 @@ static int validate_map_request(struct drm_gpuvm *gp= uvm, return 0; } =20 +static int +validate_repeated_unmap_request(struct drm_gpuvm *gpuvm, + u64 req_addr, u64 req_end) +{ + struct drm_gpuva *first, *last, *va; + u64 multiple; + + if (!(gpuvm->flags & DRM_GPUVM_HAS_REPEAT_MAPS)) + return 0; + + /* Find the first and last VAs the map request intersects with */ + first =3D last =3D NULL; + drm_gpuvm_for_each_va_range(va, gpuvm, req_addr, req_end) { + if (!first) + first =3D va; + last =3D va; + } + + if (!first) + return 0; + + if (first->flags & DRM_GPUVA_REPEAT) { + u64 addr =3D first->va.addr; + u64 range =3D first->va.range; + u64 end =3D addr + range; + + drm_WARN_ON(gpuvm->drm, first->gem.repeat_range =3D=3D 0); + + if (addr < req_addr) { + multiple =3D req_addr; + if (do_div(multiple, first->gem.repeat_range)) + return -EINVAL; + } + + if (end > req_end) { + multiple =3D req_end; + if (do_div(multiple, first->gem.repeat_range)) + return -EINVAL; + return 0; + } + } + + if ((first !=3D last) && (last->flags & DRM_GPUVA_REPEAT)) { + u64 addr =3D last->va.addr; + u64 range =3D last->va.range; + u64 end =3D addr + range; + + drm_WARN_ON(last->vm->drm, last->gem.repeat_range =3D=3D 0); + + if (end > req_end) { + multiple =3D req_end; + if (do_div(multiple, last->gem.repeat_range)) + return -EINVAL; + } + } + + return 0; +} + static int __drm_gpuvm_sm_map(struct drm_gpuvm *gpuvm, const struct drm_gpuvm_ops *ops, void *priv, @@ -2479,6 +2538,10 @@ __drm_gpuvm_sm_map(struct drm_gpuvm *gpuvm, if (unlikely(ret)) return -EINVAL; =20 + ret =3D validate_repeated_unmap_request(gpuvm, req_addr, req_end); + if (ret) + return ret; + drm_gpuvm_for_each_va_range_safe(va, next, gpuvm, req_addr, req_end) { struct drm_gem_object *obj =3D va->gem.obj; u64 offset =3D va->gem.offset; @@ -2653,6 +2716,10 @@ __drm_gpuvm_sm_unmap(struct drm_gpuvm *gpuvm, if (unlikely(!drm_gpuvm_range_valid(gpuvm, req_addr, req_range))) return -EINVAL; =20 + ret =3D validate_repeated_unmap_request(gpuvm, req_addr, req_end); + if (ret) + return ret; + drm_gpuvm_for_each_va_range_safe(va, next, gpuvm, req_addr, req_end) { struct drm_gpuva_op_map prev =3D {}, next =3D {}; bool prev_split =3D false, next_split =3D false; diff --git a/include/drm/drm_gpuvm.h b/include/drm/drm_gpuvm.h index cd2f55bc1707..61f66dfe4ed7 100644 --- a/include/drm/drm_gpuvm.h +++ b/include/drm/drm_gpuvm.h @@ -230,10 +230,15 @@ enum drm_gpuvm_flags { */ DRM_GPUVM_IMMEDIATE_MODE =3D BIT(1), =20 + /** + * @DRM_GPUVM_HAS_REPEAT_MAPS: There are repeated VAs in the GPUVM + */ + DRM_GPUVM_HAS_REPEAT_MAPS =3D BIT(2), + /** * @DRM_GPUVM_USERBITS: user defined bits */ - DRM_GPUVM_USERBITS =3D BIT(2), + DRM_GPUVM_USERBITS =3D BIT(3), }; =20 /** --=20 2.53.0