habanalabs: define uAPI to export FD for DMA-BUF
PATCH 1/2 habanalabs: define uAPI to export FD for DMA-BUF
From: Oded Gabbay <[email protected]>
User process might want to share the device memory with another driver/device, and to allow it to access it over PCIe (P2P).
To enable this, we utilize the dma-buf mechanism and add a dma-buf exporter support, so the other driver can import the device memory and access it.
The device memory is allocated using our existing allocation uAPI, where the user will get a handle that represents the allocation.
The user will then need to call the new
uAPI (HL_MEM_OP_EXPORT_DMABUF_FD) and give the handle as a parameter.
The driver will return a FD that represents the DMA-BUF object that was created to match that allocation.
--- include/uapi/misc/habanalabs.h | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-)
include/uapi/misc/habanalabs.h +27 -1
@@ -808,6 +808,10 @@ union hl_wait_cs_args {#define HL_MEM_OP_UNMAP 3/* Opcode to map a hw block */ #define HL_MEM_OP_MAP_BLOCK 4 +/* Opcode to create DMA-BUF object for an existing device memory allocation +* and to export an FD of that DMA-BUF back to the caller +*/ +#define HL_MEM_OP_EXPORT_DMABUF_FD 5/* Memory flags */ #define HL_MEM_CONTIGUOUS 0x1
@@ -878,11 +882,26 @@ struct hl_mem_in {/* Virtual address returned from HL_MEM_OP_MAP */ __u64 device_virt_addr; } unmap; + +/* HL_MEM_OP_EXPORT_DMABUF_FD */ +struct { +/* Handle returned from HL_MEM_OP_ALLOC. In Gaudi, +* where we don't have MMU for the device memory, the +* driver expects a physical address (instead of +* a handle) in the device memory space. +*/ +__u64 handle; +/* Size of memory allocation. Relevant only for GAUDI */ +__u64 mem_size; + } export_dmabuf_fd; };/* HL_MEM_OP_* */ __u32 op; -/* HL_MEM_* flags */ +/* HL_MEM_* flags. +* For the HL_MEM_OP_EXPORT_DMABUF_FD opcode, this field holds the +* DMA-BUF file/FD flags. +*/ __u32 flags;/* Context ID - Currently not in use */ __u32 ctx_id;
@@ -919,6 +938,13 @@ struct hl_mem_out {__u32 pad; }; + +/* Returned in HL_MEM_OP_EXPORT_DMABUF_FD. Represents the +* DMA-BUF object that was created to describe a memory +* allocation on the device's memory space. The FD should be +* passed to the importer driver +*/ +__u64 fd; }; };
Signature · 1 line
2.25.1
PATCH 2/2 habanalabs: add support for dma-buf exporter
From: Tomer Tayar <[email protected]>
Implement the calls to the dma-buf kernel api to create a dma-buf object backed by FD.
We block the option to mmap the DMA-BUF object because we don't support DIRECT_IO and implicit P2P. We only implement support for explicit P2P through importing the FD of the DMA-BUF.
In the export phase, we provide a static SG list to the DMA-BUF object because in Habanalabs's ASICs, the device memory is pinned and immutable. Therefore, there is no need for dynamic mappings and pinning callbacks.
Note that in GAUDI we don't have an MMU towards the device memory and the user works on physical addresses. Therefore, the user doesn't pass through the kernel driver to allocate memory there. As a result, only for GAUDI we receive from the user a device memory physical address (instead of a handle) and a size.
--- drivers/misc/habanalabs/Kconfig | 1 + drivers/misc/habanalabs/common/context.c | 4 + drivers/misc/habanalabs/common/habanalabs.h | 32 ++ drivers/misc/habanalabs/common/memory.c | 427 +++++++++++++++++++- drivers/misc/habanalabs/gaudi/gaudi.c | 1 + drivers/misc/habanalabs/goya/goya.c | 1 + 6 files changed, 463 insertions(+), 3 deletions(-)
drivers/misc/habanalabs/Kconfig +1 -0
@@ -8,6 +8,7 @@ config HABANA_AI depends on PCI && HAS_IOMEM select GENERIC_ALLOCATOR select HWMON + select DMA_SHARED_BUFFER help Enables PCIe card driver for Habana's AI Processors (AIP) that are designed to accelerate Deep Learning inference and training workloads.
drivers/misc/habanalabs/common/context.c +4 -0
@@ -37,6 +37,8 @@ static void hl_ctx_fini(struct hl_ctx *ctx)kfree (ctx->cs_pending); +mutex_destroy (&ctx->dmabuf_list_lock); +if (ctx->asid !=HL_KERNEL_ASID_ID ) {dev_dbg (hdev->dev,"closing user context %d\n" , ctx->asid);
@@ -146,6 +148,8 @@ int hl_ctx_init(struct hl_device *hdev, struct hl_ctx *ctx, bool is_kernel_ctx) ctx->cs_sequence =1 ;INIT_LIST_HEAD (&ctx->pending_cb_list);spin_lock_init (&ctx->pending_cb_lock); +INIT_LIST_HEAD (&ctx->dmabuf_list); +mutex_init (&ctx->dmabuf_list_lock);spin_lock_init (&ctx->cs_lock);atomic_set (&ctx->thread_ctx_switch_token,1 );atomic_set (&ctx->thread_pending_cb_token,1 );
drivers/misc/habanalabs/common/habanalabs.h +32 -0
@@ -20,6 +20,7 @@#include <linux/scatterlist.h> #include <linux/hashtable.h> #include <linux/debugfs.h> +#include <linux/dma-buf.h> #include <linux/bitfield.h> #include <linux/genalloc.h> #include <linux/sched/signal.h>
@@ -1290,6 +1291,29 @@ struct hl_pending_cb {u32 hw_queue_id; }; +/** +* struct hl_dmabuf_wrapper - a dma-buf wrapper object. +* @dmabuf: pointer to dma-buf object. +* @ctx: pointer to the dma-buf owner's context. +* @node: @node in a dma-buf wrapper objects list of a context. +* @phys_pg_pack: pointer to physical page pack if the dma-buf was exported for +* memory allocation handle. +* @sgt: scatter-gather table that holds the exported pages. +* @total_size: total size of all exported pages. +* @handle: allocation handle or physical address of the exported memory. +* @fd: file descriptor which is associated with the dma_buf. +*/ +struct hl_dmabuf_wrapper { +struct dma_buf *dmabuf; +struct hl_ctx *ctx; +struct hl_vm_phys_pg_pack *phys_pg_pack; +struct list_head node; +struct sg_table sgt; +u64 total_size; +u64 handle; +int fd; +}; +/** * struct hl_ctx - user/kernel context. * @mem_hash: holds mapping from virtual address to virtual memory area
@@ -1305,10 +1329,12 @@ struct hl_pending_cb {* @mmu_lock: protects the MMU page tables. Any change to the PGT, modifying the * MMU hash or walking the PGT requires talking this lock. * @hw_block_list_lock: protects the HW block memory list. +* @dmabuf_list_lock: protects the dma-buf wrapper objects list. * @debugfs_list: node in debugfs list of contexts. * pending_cb_list: list of pending command buffers waiting to be sent upon * next user command submission context. * @hw_block_mem_list: list of HW block virtual mapped addresses. +* @dmabuf_list: list of dma-buf wrapper objects. * @cs_counters: context command submission counters. * @cb_va_pool: device VA pool for command buffers which are mapped to the * device's MMU.
@@ -1346,9 +1372,11 @@ struct hl_ctx {struct mutex mem_hash_lock;struct mutex mmu_lock;struct mutex hw_block_list_lock; +struct mutex dmabuf_list_lock;struct list_head debugfs_list;struct list_head pending_cb_list;struct list_head hw_block_mem_list; +struct list_head dmabuf_list;struct hl_cs_counters_atomic cs_counters;struct gen_pool *cb_va_pool;u64 cs_sequence;
@@ -1598,6 +1626,7 @@ struct hl_vm_hw_block_list_node {* @npages: num physical pages in the pack. * @total_size: total size of all the pages in this list. * @mapping_cnt: number of shared mappings. +* @exporting_cnt: number of dma-buf exporting. * @asid: the context related to this list. * @page_size: size of each page in the pack. * @flags: HL_MEM_* flags related to this list.
@@ -1612,6 +1641,7 @@ struct hl_vm_phys_pg_pack {u64 npages;u64 total_size;atomic_t mapping_cnt; +atomic_t exporting_cnt;u32 asid;u32 page_size;u32 flags;
@@ -2137,6 +2167,7 @@ struct hl_mmu_funcs {* the error will be ignored by the driver during * device initialization. Mainly used to debug and * workaround firmware bugs +* @dram_pci_bar_start: start bus address of PCIe bar towards DRAM. * @last_successful_open_jif: timestamp (jiffies) of the last successful * device open. * @last_open_session_duration_jif: duration (jiffies) of the last device open
@@ -2264,6 +2295,7 @@ struct hl_device {u64 max_power;u64 clock_gating_mask;u64 boot_error_status_mask; +u64 dram_pci_bar_start;u64 last_successful_open_jif;u64 last_open_session_duration_jif;u64 open_counter;
drivers/misc/habanalabs/common/memory.c +424 -3
469 lines not on this page · raw message
drivers/misc/habanalabs/gaudi/gaudi.c +1 -0
@@ -685,6 +685,7 @@ static int gaudi_early_init(struct hl_device *hdev) } prop->dram_pci_bar_size =pci_resource_len (pdev,HBM_BAR_ID ); + hdev->dram_pci_bar_start =pci_resource_start (pdev,HBM_BAR_ID );/* If FW security is enabled at this point it means no access to ELBI */ if (hdev->asic_prop.fw_security_enabled) {
drivers/misc/habanalabs/goya/goya.c +1 -0
@@ -617,6 +617,7 @@ static int goya_early_init(struct hl_device *hdev) } prop->dram_pci_bar_size =pci_resource_len (pdev,DDR_BAR_ID ); + hdev->dram_pci_bar_start =pci_resource_start (pdev,DDR_BAR_ID );/* If FW security is enabled at this point it means no access to ELBI */ if (hdev->asic_prop.fw_security_enabled) {
Signature · 1 line
2.25.1