From nobody Tue Dec 9 01:37:06 2025 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3EF0B254AE4 for ; Mon, 10 Nov 2025 15:33:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762788787; cv=none; b=ESkLkl7OXPoJwlDCMRwjCXajW3Ra+muJ5jueKzzl05l2kz6QdE6y1ASpv7OFDWFKLhmcJFOgFSwEz6LA/aQDMSm2di3TJWMi5G7g1LgVfUnCcgQQ2cYNAcGdWSrZ4xmz5zEzohCivYoRjDNpDddL1qCCedfF4zUgE+GHGuTpIKY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762788787; c=relaxed/simple; bh=7szRnvDXRClX30TM/OIP1tdILUm5mNjOW0/aqx1c1HM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JhXBvk5pZqyXhLbSUSOXVKjtMW3vmC8pY1xTZrwgjYJQqiaDZfjFTgsFFdJP86hT9zj15vD8UbA/wE50S6r8HCgYXNqc4ziFmfCI+VfrewPWLB3OeWWTGW18pOwGJ2x3BlTmltTwZtoTxIIBcz2Jf/OJeSqCV1th3wV/uCl078k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=mary.zone; spf=none smtp.mailfrom=mary.zone; dkim=pass (2048-bit key) header.d=mary.zone header.i=@mary.zone header.b=Dr7NecRP; arc=none smtp.client-ip=209.85.218.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=mary.zone Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=mary.zone Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=mary.zone header.i=@mary.zone header.b="Dr7NecRP" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-b727f330dd2so537395566b.2 for ; Mon, 10 Nov 2025 07:33:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mary.zone; s=google; t=1762788782; x=1763393582; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=BRP34ynAc/7hi14dXs+NgfdoIivClYQMM5FEDBipMJE=; b=Dr7NecRP/RklVJC5C+xmJF+IgyQ4HCDiXHnN3sbk2TKQIK0uJEA1p3HvJTdebLV/Vo 4do1GJBOriKAY4WbQqQcxlKvLElYjAqu8+E/uXDDYF0EE617UbtTNHk8ko14VbUo3LoX IzNMwKZhOJVt7LyLTDHZCgsDGsK6AoCHCajOwqQ104Hdx7vlUjPfKgFTVKoUTZljaQTh LNLeiAtJ2mwS/qKbrxaev0nvN+Us0c6QZpQus3DECAN4+2vcUJmWBOtMGLISlWjMu50y 461lPGtG2OFLCytY6VnLV/yuCPcpB5eDFqm2rFJKoVQea10ky+coam8LsAXXeVVOc1Sc jI+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1762788782; x=1763393582; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=BRP34ynAc/7hi14dXs+NgfdoIivClYQMM5FEDBipMJE=; b=TI2lk7zzMQWV2Merx7vcqXA9VJDrv7V9BNG0R9i6JRjPuKgD7+/wbcpB4IkpwbXBiJ oepW3FSMjtJMIbGUxv/huk/fNFv0ZvlqXAbQvGxs2SILbxOmUupZPWcr5L58VXdlscPk 7wzE5WA8IVcN7qjS146iFOoej8SSFljx2m9cDd3FUdbFOMEp9HtqCq70A0Wd3ZDOReFE CpZkK/UMiWTWYKJzKygt3ZjY7ZPaUdu2LElmmGDWy1NV1HSSyi8Q49MR+sGFjNDGl7m2 PXfRCJ7zaIn0xQBX7erZkJ0SxizZnuNA84tcoMA1eCCVkj0bbvB4z192jK1EmsGK1nK+ EtKg== X-Forwarded-Encrypted: i=1; AJvYcCXCI8CmqiyUgbuPks2sKKtSIOnkcQZqH6a7suwKFfsEN4gmggBtQuk55osPoawfNexc6N6RFdDGVqI4rHA=@vger.kernel.org X-Gm-Message-State: AOJu0YyuPQjjneA2afEQtmR21wPDiw1WnkNRtlGnSGEL7KQpOj+aTGil MAiuVxBIpjnapVPynB51zV9M9Pl3e4UklpC12wHovuyU3EUHMAKFXXMe0b8qQQPyrRs= X-Gm-Gg: ASbGncuGqEajPBkX+ugUvbVthMVvtNUyNOsRWm/Enb9OBmBCgSOaTpHGajoK3HLLxep 5IkBNIoqzqf+j+aOzeKxX1sBcM9/eHio8kM1pM1Pa61EwtbJPM5qq1+nB0VNXK4Xa7vHrQG1vvI ZeRVylDahAAYTlBXp5stzQoTzatu4gwWE2jZUy8NUkFLqgblWYzd1JNV8TYGvHWdM/s3vRLRh04 Zq9Z7FnIj2kfVzIrVOx0jdmpxqoW/ASiCojdzFypo/dfU042+UF8oi+Y3RX9J2ct5by+Z0QIjMF PbzuRp2bpvDy86TVhWCfGwgcWKQb+zZWuMAVRviPftMKHUZZZqUJSrN/dnmvo8MzY8693zwAsgk nVYi/yEtPGtDYpnjBH+t2d2LxN9Pv94RdnZBBTwImneUUxWM4j6xSxVXUmFIK/skz2YbDTcJowb PPNT0vaNiCzm4YHRhJD2eHrmfcLQDOPt0+LOyk4UbnP4O2Qg+H1ZPvIKZYA/knjpwBtHNshDM= X-Google-Smtp-Source: AGHT+IHMJVqiZ5lOq86QnXg9J71+0KT8IUuz+GUymC/UorVBujVugU4imA46tP3Lef8TLSkE7bsnOA== X-Received: by 2002:a17:907:3c91:b0:b3c:193:820e with SMTP id a640c23a62f3a-b72e02ca102mr850800266b.13.1762788782413; Mon, 10 Nov 2025 07:33:02 -0800 (PST) Received: from [192.168.1.42] (2a01cb0405e83a000cb38cfe29807c1e.ipv6.abo.wanadoo.fr. [2a01:cb04:5e8:3a00:cb3:8cfe:2980:7c1e]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b72bf7231dcsm1115978466b.31.2025.11.10.07.33.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Nov 2025 07:33:02 -0800 (PST) From: Mary Guillemard Date: Mon, 10 Nov 2025 16:32:56 +0100 Subject: [PATCH v6 1/5] drm/nouveau/uvmm: Prepare for larger pages 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 Message-Id: <20251110-nouveau-compv6-v6-1-83b05475f57c@mary.zone> References: <20251110-nouveau-compv6-v6-0-83b05475f57c@mary.zone> In-Reply-To: <20251110-nouveau-compv6-v6-0-83b05475f57c@mary.zone> To: Mohamed Ahmed , James Jones , Lyude Paul , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, Mary Guillemard X-Mailer: b4 0.14.3 Currently memory allocated by VM_BIND uAPI can only have a granuality matching PAGE_SIZE (4KiB in common case) To have a better memory management and to allow big (64KiB) and huge (2MiB) pages later in the series, we are now passing the page shift all around the internals of UVMM. Signed-off-by: Mary Guillemard Co-developed-by: Mohamed Ahmed Signed-off-by: Mohamed Ahmed Reviewed-by: Lyude Paul Reviewed-by: James Jones --- drivers/gpu/drm/nouveau/nouveau_uvmm.c | 46 +++++++++++++++++++++---------= ---- drivers/gpu/drm/nouveau/nouveau_uvmm.h | 1 + 2 files changed, 30 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_uvmm.c b/drivers/gpu/drm/nouve= au/nouveau_uvmm.c index 79eefdfd08a2..2cd0835b05e8 100644 --- a/drivers/gpu/drm/nouveau/nouveau_uvmm.c +++ b/drivers/gpu/drm/nouveau/nouveau_uvmm.c @@ -107,34 +107,34 @@ nouveau_uvmm_vmm_sparse_unref(struct nouveau_uvmm *uv= mm, =20 static int nouveau_uvmm_vmm_get(struct nouveau_uvmm *uvmm, - u64 addr, u64 range) + u64 addr, u64 range, u8 page_shift) { struct nvif_vmm *vmm =3D &uvmm->vmm.vmm; =20 - return nvif_vmm_raw_get(vmm, addr, range, PAGE_SHIFT); + return nvif_vmm_raw_get(vmm, addr, range, page_shift); } =20 static int nouveau_uvmm_vmm_put(struct nouveau_uvmm *uvmm, - u64 addr, u64 range) + u64 addr, u64 range, u8 page_shift) { struct nvif_vmm *vmm =3D &uvmm->vmm.vmm; =20 - return nvif_vmm_raw_put(vmm, addr, range, PAGE_SHIFT); + return nvif_vmm_raw_put(vmm, addr, range, page_shift); } =20 static int nouveau_uvmm_vmm_unmap(struct nouveau_uvmm *uvmm, - u64 addr, u64 range, bool sparse) + u64 addr, u64 range, u8 page_shift, bool sparse) { struct nvif_vmm *vmm =3D &uvmm->vmm.vmm; =20 - return nvif_vmm_raw_unmap(vmm, addr, range, PAGE_SHIFT, sparse); + return nvif_vmm_raw_unmap(vmm, addr, range, page_shift, sparse); } =20 static int nouveau_uvmm_vmm_map(struct nouveau_uvmm *uvmm, - u64 addr, u64 range, + u64 addr, u64 range, u8 page_shift, u64 bo_offset, u8 kind, struct nouveau_mem *mem) { @@ -163,7 +163,7 @@ nouveau_uvmm_vmm_map(struct nouveau_uvmm *uvmm, return -ENOSYS; } =20 - return nvif_vmm_raw_map(vmm, addr, range, PAGE_SHIFT, + return nvif_vmm_raw_map(vmm, addr, range, page_shift, &args, argc, &mem->mem, bo_offset); } @@ -182,8 +182,9 @@ nouveau_uvma_vmm_put(struct nouveau_uvma *uvma) { u64 addr =3D uvma->va.va.addr; u64 range =3D uvma->va.va.range; + u8 page_shift =3D uvma->page_shift; =20 - return nouveau_uvmm_vmm_put(to_uvmm(uvma), addr, range); + return nouveau_uvmm_vmm_put(to_uvmm(uvma), addr, range, page_shift); } =20 static int @@ -193,9 +194,11 @@ nouveau_uvma_map(struct nouveau_uvma *uvma, u64 addr =3D uvma->va.va.addr; u64 offset =3D uvma->va.gem.offset; u64 range =3D uvma->va.va.range; + u8 page_shift =3D uvma->page_shift; =20 return nouveau_uvmm_vmm_map(to_uvmm(uvma), addr, range, - offset, uvma->kind, mem); + page_shift, offset, uvma->kind, + mem); } =20 static int @@ -203,12 +206,13 @@ nouveau_uvma_unmap(struct nouveau_uvma *uvma) { u64 addr =3D uvma->va.va.addr; u64 range =3D uvma->va.va.range; + u8 page_shift =3D uvma->page_shift; bool sparse =3D !!uvma->region; =20 if (drm_gpuva_invalidated(&uvma->va)) return 0; =20 - return nouveau_uvmm_vmm_unmap(to_uvmm(uvma), addr, range, sparse); + return nouveau_uvmm_vmm_unmap(to_uvmm(uvma), addr, range, page_shift, spa= rse); } =20 static int @@ -501,7 +505,8 @@ nouveau_uvmm_sm_prepare_unwind(struct nouveau_uvmm *uvm= m, =20 if (vmm_get_range) nouveau_uvmm_vmm_put(uvmm, vmm_get_start, - vmm_get_range); + vmm_get_range, + PAGE_SHIFT); break; } case DRM_GPUVA_OP_REMAP: { @@ -528,6 +533,7 @@ nouveau_uvmm_sm_prepare_unwind(struct nouveau_uvmm *uvm= m, u64 ustart =3D va->va.addr; u64 urange =3D va->va.range; u64 uend =3D ustart + urange; + u8 page_shift =3D uvma_from_va(va)->page_shift; =20 /* Nothing to do for mappings we merge with. */ if (uend =3D=3D vmm_get_start || @@ -538,7 +544,8 @@ nouveau_uvmm_sm_prepare_unwind(struct nouveau_uvmm *uvm= m, u64 vmm_get_range =3D ustart - vmm_get_start; =20 nouveau_uvmm_vmm_put(uvmm, vmm_get_start, - vmm_get_range); + vmm_get_range, + page_shift); } vmm_get_start =3D uend; break; @@ -592,6 +599,7 @@ op_map_prepare(struct nouveau_uvmm *uvmm, =20 uvma->region =3D args->region; uvma->kind =3D args->kind; + uvma->page_shift =3D PAGE_SHIFT; =20 drm_gpuva_map(&uvmm->base, &uvma->va, op); =20 @@ -633,7 +641,8 @@ nouveau_uvmm_sm_prepare(struct nouveau_uvmm *uvmm, =20 if (vmm_get_range) { ret =3D nouveau_uvmm_vmm_get(uvmm, vmm_get_start, - vmm_get_range); + vmm_get_range, + new->map->page_shift); if (ret) { op_map_prepare_unwind(new->map); goto unwind; @@ -689,6 +698,7 @@ nouveau_uvmm_sm_prepare(struct nouveau_uvmm *uvmm, u64 ustart =3D va->va.addr; u64 urange =3D va->va.range; u64 uend =3D ustart + urange; + u8 page_shift =3D uvma_from_va(va)->page_shift; =20 op_unmap_prepare(u); =20 @@ -704,7 +714,7 @@ nouveau_uvmm_sm_prepare(struct nouveau_uvmm *uvmm, u64 vmm_get_range =3D ustart - vmm_get_start; =20 ret =3D nouveau_uvmm_vmm_get(uvmm, vmm_get_start, - vmm_get_range); + vmm_get_range, page_shift); if (ret) { op_unmap_prepare_unwind(va); goto unwind; @@ -799,10 +809,11 @@ op_unmap_range(struct drm_gpuva_op_unmap *u, u64 addr, u64 range) { struct nouveau_uvma *uvma =3D uvma_from_va(u->va); + u8 page_shift =3D uvma->page_shift; bool sparse =3D !!uvma->region; =20 if (!drm_gpuva_invalidated(u->va)) - nouveau_uvmm_vmm_unmap(to_uvmm(uvma), addr, range, sparse); + nouveau_uvmm_vmm_unmap(to_uvmm(uvma), addr, range, page_shift, sparse); } =20 static void @@ -882,6 +893,7 @@ nouveau_uvmm_sm_cleanup(struct nouveau_uvmm *uvmm, struct drm_gpuva_op_map *n =3D r->next; struct drm_gpuva *va =3D r->unmap->va; struct nouveau_uvma *uvma =3D uvma_from_va(va); + u8 page_shift =3D uvma->page_shift; =20 if (unmap) { u64 addr =3D va->va.addr; @@ -893,7 +905,7 @@ nouveau_uvmm_sm_cleanup(struct nouveau_uvmm *uvmm, if (n) end =3D n->va.addr; =20 - nouveau_uvmm_vmm_put(uvmm, addr, end - addr); + nouveau_uvmm_vmm_put(uvmm, addr, end - addr, page_shift); } =20 nouveau_uvma_gem_put(uvma); diff --git a/drivers/gpu/drm/nouveau/nouveau_uvmm.h b/drivers/gpu/drm/nouve= au/nouveau_uvmm.h index 9d3c348581eb..51925711ae90 100644 --- a/drivers/gpu/drm/nouveau/nouveau_uvmm.h +++ b/drivers/gpu/drm/nouveau/nouveau_uvmm.h @@ -33,6 +33,7 @@ struct nouveau_uvma { =20 struct nouveau_uvma_region *region; u8 kind; + u8 page_shift; }; =20 #define uvmm_from_gpuvm(x) container_of((x), struct nouveau_uvmm, base) --=20 2.51.1