lkml.org 
[lkml]   [2021]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/16] habanalabs: save pid per userptr
    Date
    From: Yuri Nudelman <ynudelman@habana.ai>

    Currently userptr endpoint in debugfs prints out virtual addresses
    in the user process memory space, without specifying their owner process
    ID. User space virtual address is meaningless without knowing the owner
    process.

    Signed-off-by: Yuri Nudelman <ynudelman@habana.ai>
    Reviewed-by: Oded Gabbay <ogabbay@kernel.org>
    Signed-off-by: Oded Gabbay <ogabbay@kernel.org>
    ---
    drivers/misc/habanalabs/common/debugfs.c | 8 ++++----
    drivers/misc/habanalabs/common/habanalabs.h | 2 ++
    drivers/misc/habanalabs/common/memory.c | 1 +
    3 files changed, 7 insertions(+), 4 deletions(-)

    diff --git a/drivers/misc/habanalabs/common/debugfs.c b/drivers/misc/habanalabs/common/debugfs.c
    index 2c587af28f9b..264424c96959 100644
    --- a/drivers/misc/habanalabs/common/debugfs.c
    +++ b/drivers/misc/habanalabs/common/debugfs.c
    @@ -209,12 +209,12 @@ static int userptr_show(struct seq_file *s, void *data)
    if (first) {
    first = false;
    seq_puts(s, "\n");
    - seq_puts(s, " user virtual address size dma dir\n");
    + seq_puts(s, " pid user virtual address size dma dir\n");
    seq_puts(s, "----------------------------------------------------------\n");
    }
    - seq_printf(s,
    - " 0x%-14llx %-10llu %-30s\n",
    - userptr->addr, userptr->size, dma_dir[userptr->dir]);
    + seq_printf(s, " %-7d 0x%-14llx %-10llu %-30s\n",
    + userptr->pid, userptr->addr, userptr->size,
    + dma_dir[userptr->dir]);
    }

    spin_unlock(&dev_entry->userptr_spinlock);
    diff --git a/drivers/misc/habanalabs/common/habanalabs.h b/drivers/misc/habanalabs/common/habanalabs.h
    index d40778eccb14..b950b5140610 100644
    --- a/drivers/misc/habanalabs/common/habanalabs.h
    +++ b/drivers/misc/habanalabs/common/habanalabs.h
    @@ -1452,6 +1452,7 @@ struct hl_ctx_mgr {
    * @sgt: pointer to the scatter-gather table that holds the pages.
    * @dir: for DMA unmapping, the direction must be supplied, so save it.
    * @debugfs_list: node in debugfs list of command submissions.
    + * @pid: the pid of the user process owning the memory
    * @addr: user-space virtual address of the start of the memory area.
    * @size: size of the memory area to pin & map.
    * @dma_mapped: true if the SG was mapped to DMA addresses, false otherwise.
    @@ -1464,6 +1465,7 @@ struct hl_userptr {
    struct sg_table *sgt;
    enum dma_data_direction dir;
    struct list_head debugfs_list;
    + pid_t pid;
    u64 addr;
    u64 size;
    u8 dma_mapped;
    diff --git a/drivers/misc/habanalabs/common/memory.c b/drivers/misc/habanalabs/common/memory.c
    index a75207611b9b..2f990d185cfd 100644
    --- a/drivers/misc/habanalabs/common/memory.c
    +++ b/drivers/misc/habanalabs/common/memory.c
    @@ -2276,6 +2276,7 @@ int hl_pin_host_memory(struct hl_device *hdev, u64 addr, u64 size,
    return -EINVAL;
    }

    + userptr->pid = current->pid;
    userptr->sgt = kzalloc(sizeof(*userptr->sgt), GFP_KERNEL);
    if (!userptr->sgt)
    return -ENOMEM;
    --
    2.17.1
    \
     
     \ /
      Last update: 2021-08-18 15:41    [W:3.039 / U:0.324 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site