From nobody Fri Dec 19 14:37:41 2025 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 6219526A1CC; Tue, 20 May 2025 10:27:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747736859; cv=none; b=ZQ5mDs1vRilaK7GBK92FxAB6pZgmrtzzwH64mz3sIpGplcWgQ+pgDouOqkjPtKiWejmK+VNM/8W9sn+PIoF7ydln6RNtF4RPB1wL/VUI6M505eFWXMUJHnj5IgF9eNFXGiCjmNAGDn6znCQL5XFXB13wU7NZt3Yv55Kp29mAxSQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747736859; c=relaxed/simple; bh=6mxLF+fY/K5SeVg2UY7bVTArO057srKI+V5ZNScuYzg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=t+12okaxrNT/xzVjHMBPBrOQ3K5/5vkMVZfgwgyYov5GliqOY0H5onoV2Qom2u+26S0i0NfHsJ/0cvicmsMT93ZctFW4KYT7zFtgevUB/zBEgn4fSJ/ZEoQ9phyp5frCn09yAUKpV+6nPT5bYMfwVDFtZoDn2xlpKMIJZb0o9r8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=tomeuvizoso.net; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.128.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=tomeuvizoso.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-443a787bd14so22906925e9.1; Tue, 20 May 2025 03:27:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747736856; x=1748341656; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+gLe0I37lfp8+VYdv4GvyXGqk7LE/D8X5AGQ6ueKR7M=; b=tHJTj+HZZ1jUyNep7gPlMTxfNUzDJmayPGFQuq6XzA/gpi4Nod+TVvsX+58Vxt8Gha Dd5+l6McwRgx987/j6btQTDhdf3wQwQWupergHp6WMpVl7jVF97zLl02lwfn9n9rWEU/ gTTonHmxRDDbaCkXLciha5jlLjS/UNJ4cY4FJcIkpbUSV3+Jj2NvpYWQPHpUczX3Ozes VLgEzn125xPeI5QbzHu1m1gSyvTNSrdK4R83njNiYkO48OaB80HX7z5Q6cHOsac6wIYn 8bOdGlGwXoEsp8jzvdWnhnGkKsEeoG7ZYcBNwrdR0bYi57nzcIaIAlrozyR4+W1zKGs7 10Jw== X-Forwarded-Encrypted: i=1; AJvYcCUbDZ/NHN9r5IpM0TTWINXCJU8YlLwE2hbsnO1rIEDicUfnLbRD7x+sm9U3M9YPZbz1hVgt6o2fu8U=@vger.kernel.org, AJvYcCVcrEEGM/MhSMfC35gxoJ/Hbs0+8N4uxQkP1hznrpDt7xLuZY2dLaIU6AiYUb42F3QloWIwFZv1BSd9jew=@vger.kernel.org, AJvYcCWc4/Q2RVSKL12g5BDb5nf8MPiIlArQy4a/HfPx4Hmr/suRmlvbYdbQdpYtgecKQUjmGM1b4UDqzzp8GgYP@vger.kernel.org X-Gm-Message-State: AOJu0Yzlwi3l6b47faynSc9Y7TyQWE7TMeijQVqyGlX/FIRRo98ejpDF D3LrVUJIz41mChcMaMuO67tIOS5OgwmQz6qOV7ZUlAlFjpL/X3gPLWSAhBr/Y2qB X-Gm-Gg: ASbGncu4bmndEXnPTwuIGzhkNlrWysTEBh5dsAchy3fp9O57RYAn97spsha6jwg6Hdo m9ZwwlJjiK9n8RHBM81fWZ1/8YlKOrSPXxHUUuvQQ7bKW7l7aznCUYIVQdrC8RblTvoI2wW9kuC Q29Damds6yh0H4Y2kpVfjbmNRJ1U9ektCioFA1IB0b1Scw3PgtXRJdxqMIoujpFqih5YjlMjzQQ smTMNZzVK/CJNGbhnSb2gY9h5vHFh4Qu+AdIb88hoDvEJlx2xdtbzpx46f0VPiF5ix1wYlfhcGV UDur2C3l/WEQr5V3cHNaXOW8dfP3FbS3HufCPYYzsknoiJoFupi9iVkIXBjbl5O+9bJMdGNRwnY gMiMX6usJlw== X-Google-Smtp-Source: AGHT+IH4v1K2qNWy/6eplteJr85a35IjQ4KWOcchT/u5GVjvoFl82aOl4lAorHAclFQbqZ7TgO5zCg== X-Received: by 2002:a05:600c:c1c8:10b0:441:d228:3a07 with SMTP id 5b1f17b1804b1-442f8524304mr120968585e9.13.1747736855438; Tue, 20 May 2025 03:27:35 -0700 (PDT) Received: from [10.42.0.1] (cst-prg-46-162.cust.vodafone.cz. [46.135.46.162]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-447f73d3defsm24680025e9.18.2025.05.20.03.27.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 May 2025 03:27:35 -0700 (PDT) From: Tomeu Vizoso Date: Tue, 20 May 2025 12:26:59 +0200 Subject: [PATCH v5 06/10] accel/rocket: Add IOCTL for BO creation 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: <20250520-6-10-rocket-v5-6-18c9ca0fcb3c@tomeuvizoso.net> References: <20250520-6-10-rocket-v5-0-18c9ca0fcb3c@tomeuvizoso.net> In-Reply-To: <20250520-6-10-rocket-v5-0-18c9ca0fcb3c@tomeuvizoso.net> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heiko Stuebner , Oded Gabbay , Jonathan Corbet , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sumit Semwal , =?utf-8?q?Christian_K=C3=B6nig?= , Sebastian Reichel , Nicolas Frattaroli , Jeff Hugo Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org, Tomeu Vizoso X-Mailer: b4 0.14.2 This uses the SHMEM DRM helpers and we map right away to the CPU and NPU sides, as all buffers are expected to be accessed from both. v2: - Sync the IOMMUs for the other cores when mapping and unmapping. v3: - Make use of GPL-2.0-only for the copyright notice (Jeff Hugo) Reviewed-by: Jeffrey Hugo Signed-off-by: Tomeu Vizoso --- drivers/accel/rocket/Makefile | 3 +- drivers/accel/rocket/rocket_device.c | 4 ++ drivers/accel/rocket/rocket_device.h | 2 + drivers/accel/rocket/rocket_drv.c | 7 +- drivers/accel/rocket/rocket_gem.c | 131 +++++++++++++++++++++++++++++++= ++++ drivers/accel/rocket/rocket_gem.h | 26 +++++++ include/uapi/drm/rocket_accel.h | 44 ++++++++++++ 7 files changed, 215 insertions(+), 2 deletions(-) diff --git a/drivers/accel/rocket/Makefile b/drivers/accel/rocket/Makefile index abdd75f2492eaecf8bf5e78a2ac150ea19ac3e96..4deef267f9e1238c4d8bd108dcc= 8afd9dc8b2b8f 100644 --- a/drivers/accel/rocket/Makefile +++ b/drivers/accel/rocket/Makefile @@ -5,4 +5,5 @@ obj-$(CONFIG_DRM_ACCEL_ROCKET) :=3D rocket.o rocket-y :=3D \ rocket_core.o \ rocket_device.o \ - rocket_drv.o + rocket_drv.o \ + rocket_gem.o diff --git a/drivers/accel/rocket/rocket_device.c b/drivers/accel/rocket/ro= cket_device.c index 97e32d19a1b4a36177b8039b67b4892887daa880..ee81810dd171ef1cdb1582c1bbe= 5099c669e42cc 100644 --- a/drivers/accel/rocket/rocket_device.c +++ b/drivers/accel/rocket/rocket_device.c @@ -4,6 +4,7 @@ #include #include #include +#include =20 #include "rocket_device.h" =20 @@ -21,10 +22,13 @@ int rocket_device_init(struct rocket_device *rdev) if (err) return err; =20 + mutex_init(&rdev->iommu_lock); + return 0; } =20 void rocket_device_fini(struct rocket_device *rdev) { + mutex_destroy(&rdev->iommu_lock); rocket_core_fini(&rdev->cores[0]); } diff --git a/drivers/accel/rocket/rocket_device.h b/drivers/accel/rocket/ro= cket_device.h index 55f4da252cfbd1f102c56e5009472deff59aaaec..2e22aa2b95252a2850a40c3271a= 91cb3aca578ae 100644 --- a/drivers/accel/rocket/rocket_device.h +++ b/drivers/accel/rocket/rocket_device.h @@ -14,6 +14,8 @@ struct rocket_device { =20 struct clk_bulk_data clks[2]; =20 + struct mutex iommu_lock; + struct rocket_core *cores; unsigned int num_cores; }; diff --git a/drivers/accel/rocket/rocket_drv.c b/drivers/accel/rocket/rocke= t_drv.c index d1a1be32760feed864db86963b9942f1e37b17eb..685499537a0a8a206452b745ff2= 3f9ff170b35db 100644 --- a/drivers/accel/rocket/rocket_drv.c +++ b/drivers/accel/rocket/rocket_drv.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -15,6 +16,7 @@ #include =20 #include "rocket_drv.h" +#include "rocket_gem.h" =20 static int rocket_open(struct drm_device *dev, struct drm_file *file) @@ -43,6 +45,8 @@ rocket_postclose(struct drm_device *dev, struct drm_file = *file) static const struct drm_ioctl_desc rocket_drm_driver_ioctls[] =3D { #define ROCKET_IOCTL(n, func) \ DRM_IOCTL_DEF_DRV(ROCKET_##n, rocket_ioctl_##func, 0) + + ROCKET_IOCTL(CREATE_BO, create_bo), }; =20 DEFINE_DRM_ACCEL_FOPS(rocket_accel_driver_fops); @@ -52,9 +56,10 @@ DEFINE_DRM_ACCEL_FOPS(rocket_accel_driver_fops); * - 1.0 - initial interface */ static const struct drm_driver rocket_drm_driver =3D { - .driver_features =3D DRIVER_COMPUTE_ACCEL, + .driver_features =3D DRIVER_COMPUTE_ACCEL | DRIVER_GEM, .open =3D rocket_open, .postclose =3D rocket_postclose, + .gem_create_object =3D rocket_gem_create_object, .ioctls =3D rocket_drm_driver_ioctls, .num_ioctls =3D ARRAY_SIZE(rocket_drm_driver_ioctls), .fops =3D &rocket_accel_driver_fops, diff --git a/drivers/accel/rocket/rocket_gem.c b/drivers/accel/rocket/rocke= t_gem.c new file mode 100644 index 0000000000000000000000000000000000000000..8a8a7185daac4740081293aae69= 45c9b2bbeb2dd --- /dev/null +++ b/drivers/accel/rocket/rocket_gem.c @@ -0,0 +1,131 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright 2024-2025 Tomeu Vizoso */ + +#include +#include +#include +#include +#include + +#include "rocket_device.h" +#include "rocket_gem.h" + +static void rocket_gem_bo_free(struct drm_gem_object *obj) +{ + struct rocket_device *rdev =3D to_rocket_device(obj->dev); + struct rocket_gem_object *bo =3D to_rocket_bo(obj); + struct sg_table *sgt; + + drm_WARN_ON(obj->dev, bo->base.pages_use_count > 1); + + mutex_lock(&rdev->iommu_lock); + + sgt =3D drm_gem_shmem_get_pages_sgt(&bo->base); + + /* Unmap this object from the IOMMUs for cores > 0 */ + for (unsigned int core =3D 1; core < rdev->num_cores; core++) { + struct iommu_domain *domain =3D iommu_get_domain_for_dev(rdev->cores[cor= e].dev); + size_t unmapped =3D iommu_unmap(domain, sgt->sgl->dma_address, bo->size); + + drm_WARN_ON(obj->dev, unmapped !=3D bo->size); + } + + /* This will unmap the pages from the IOMMU linked to core 0 */ + drm_gem_shmem_free(&bo->base); + + mutex_unlock(&rdev->iommu_lock); +} + +static const struct drm_gem_object_funcs rocket_gem_funcs =3D { + .free =3D rocket_gem_bo_free, + .print_info =3D drm_gem_shmem_object_print_info, + .pin =3D drm_gem_shmem_object_pin, + .unpin =3D drm_gem_shmem_object_unpin, + .get_sg_table =3D drm_gem_shmem_object_get_sg_table, + .vmap =3D drm_gem_shmem_object_vmap, + .vunmap =3D drm_gem_shmem_object_vunmap, + .mmap =3D drm_gem_shmem_object_mmap, + .vm_ops =3D &drm_gem_shmem_vm_ops, +}; + +struct drm_gem_object *rocket_gem_create_object(struct drm_device *dev, si= ze_t size) +{ + struct rocket_gem_object *obj; + + obj =3D kzalloc(sizeof(*obj), GFP_KERNEL); + if (!obj) + return ERR_PTR(-ENOMEM); + + obj->base.base.funcs =3D &rocket_gem_funcs; + + return &obj->base.base; +} + +int rocket_ioctl_create_bo(struct drm_device *dev, void *data, struct drm_= file *file) +{ + struct drm_rocket_create_bo *args =3D data; + struct rocket_device *rdev =3D to_rocket_device(dev); + struct drm_gem_shmem_object *shmem_obj; + struct rocket_gem_object *rkt_obj; + struct drm_gem_object *gem_obj; + struct sg_table *sgt; + int ret; + + shmem_obj =3D drm_gem_shmem_create(dev, args->size); + if (IS_ERR(shmem_obj)) + return PTR_ERR(shmem_obj); + + gem_obj =3D &shmem_obj->base; + rkt_obj =3D to_rocket_bo(gem_obj); + + rkt_obj->size =3D args->size; + rkt_obj->offset =3D 0; + + ret =3D drm_gem_handle_create(file, gem_obj, &args->handle); + drm_gem_object_put(gem_obj); + if (ret) + goto err; + + mutex_lock(&rdev->iommu_lock); + + /* This will map the pages to the IOMMU linked to core 0 */ + sgt =3D drm_gem_shmem_get_pages_sgt(shmem_obj); + if (IS_ERR(sgt)) { + ret =3D PTR_ERR(sgt); + goto err_unlock; + } + + /* Map the pages to the IOMMUs linked to the other cores, so all cores ca= n access this BO */ + for (unsigned int core =3D 1; core < rdev->num_cores; core++) { + ret =3D iommu_map_sgtable(iommu_get_domain_for_dev(rdev->cores[core].dev= ), + sgt->sgl->dma_address, + sgt, + IOMMU_READ | IOMMU_WRITE); + if (ret < 0 || ret < args->size) { + drm_err(dev, "failed to map buffer: size=3D%d request_size=3D%u\n", + ret, args->size); + ret =3D -ENOMEM; + goto err_unlock; + } + + /* iommu_map_sgtable might have aligned the size */ + rkt_obj->size =3D ret; + + dma_sync_sgtable_for_device(rdev->cores[core].dev, shmem_obj->sgt, + DMA_BIDIRECTIONAL); + } + + mutex_unlock(&rdev->iommu_lock); + + args->offset =3D drm_vma_node_offset_addr(&gem_obj->vma_node); + args->dma_address =3D sg_dma_address(shmem_obj->sgt->sgl); + + return 0; + +err_unlock: + mutex_unlock(&rdev->iommu_lock); +err: + drm_gem_shmem_object_free(gem_obj); + + return ret; +} diff --git a/drivers/accel/rocket/rocket_gem.h b/drivers/accel/rocket/rocke= t_gem.h new file mode 100644 index 0000000000000000000000000000000000000000..41497554366961cfe18cf6c7e93= ab1e4e5dc1886 --- /dev/null +++ b/drivers/accel/rocket/rocket_gem.h @@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright 2024-2025 Tomeu Vizoso */ + +#ifndef __ROCKET_GEM_H__ +#define __ROCKET_GEM_H__ + +#include + +struct rocket_gem_object { + struct drm_gem_shmem_object base; + + size_t size; + u32 offset; +}; + +struct drm_gem_object *rocket_gem_create_object(struct drm_device *dev, si= ze_t size); + +int rocket_ioctl_create_bo(struct drm_device *dev, void *data, struct drm_= file *file); + +static inline +struct rocket_gem_object *to_rocket_bo(struct drm_gem_object *obj) +{ + return container_of(to_drm_gem_shmem_obj(obj), struct rocket_gem_object, = base); +} + +#endif diff --git a/include/uapi/drm/rocket_accel.h b/include/uapi/drm/rocket_acce= l.h new file mode 100644 index 0000000000000000000000000000000000000000..95720702b7c4413d72b89c1f0f5= 9abb22dc8c6b3 --- /dev/null +++ b/include/uapi/drm/rocket_accel.h @@ -0,0 +1,44 @@ +/* SPDX-License-Identifier: MIT */ +/* + * Copyright =C2=A9 2024 Tomeu Vizoso + */ +#ifndef __DRM_UAPI_ROCKET_ACCEL_H__ +#define __DRM_UAPI_ROCKET_ACCEL_H__ + +#include "drm.h" + +#if defined(__cplusplus) +extern "C" { +#endif + +#define DRM_ROCKET_CREATE_BO 0x00 + +#define DRM_IOCTL_ROCKET_CREATE_BO DRM_IOWR(DRM_COMMAND_BASE + DRM_ROCKET= _CREATE_BO, struct drm_rocket_create_bo) + +/** + * struct drm_rocket_create_bo - ioctl argument for creating Rocket BOs. + * + */ +struct drm_rocket_create_bo { + /** Input: Size of the requested BO. */ + __u32 size; + + /** Output: GEM handle for the BO. */ + __u32 handle; + + /** + * Output: DMA address for the BO in the NPU address space. This address + * is private to the DRM fd and is valid for the lifetime of the GEM + * handle. + */ + __u64 dma_address; + + /** Output: Offset into the drm node to use for subsequent mmap call. */ + __u64 offset; +}; + +#if defined(__cplusplus) +} +#endif + +#endif /* __DRM_UAPI_ROCKET_ACCEL_H__ */ --=20 2.49.0