xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FROMLIST: dma-buf: support users to change dma_buf.name

Browse Source 
User space user can call DMA_BUF_SET_NAME to set dma_buf.name,
but until now we can't set it at kernel side, it's difficult to debug
kernel dma_buf users.

There are some kernel users of dma_heap also need it at MTK,
such as camera, it's also have a allocator for other camera part,
unlike most case in userspace, it's in kernel.
For debug buffer owner, we need add it to let it can set debug name
for each dmabuf, so that we can know dmabuf owner by dma_buf.name.

Bug: 193623372
Link: https://lore.kernel.org/patchwork/patch/1459719/
Change-Id: Iac5c6b8838b9b4d976f4525d000e17a3abab94f6
Signed-off-by: Guangming Cao <Guangming.Cao@mediatek.com>
This commit is contained in:
Guangming Cao
2021-09-01 20:41:54 +08:00
committed by Hridya Valsaraju
parent 3b1f439841
commit 49af2e35d5
2 changed files with 40 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
drivers/dma-buf/dma-buf.c
View File

@@ -348,6 +348,25 @@ out:
return events; return events;
} }
static long _dma_buf_set_name(struct dma_buf *dmabuf, const char *name)
{
long ret = 0;
dma_resv_lock(dmabuf->resv, NULL);
if (!list_empty(&dmabuf->attachments)) {
ret = -EBUSY;
goto out_unlock;
}
spin_lock(&dmabuf->name_lock);
kfree(dmabuf->name);
dmabuf->name = name;
spin_unlock(&dmabuf->name_lock);
out_unlock:
dma_resv_unlock(dmabuf->resv);
return ret;
}
/** /**
* dma_buf_set_name - Set a name to a specific dma_buf to track the usage. * dma_buf_set_name - Set a name to a specific dma_buf to track the usage.
* The name of the dma-buf buffer can only be set when the dma-buf is not * The name of the dma-buf buffer can only be set when the dma-buf is not
@@ -363,7 +382,23 @@ out:
* devices, return -EBUSY. * devices, return -EBUSY.
* *
*/ */
static long dma_buf_set_name(struct dma_buf *dmabuf, const char __user *buf) long dma_buf_set_name(struct dma_buf *dmabuf, const char *name)
{
long ret = 0;
char *buf = kstrndup(name, DMA_BUF_NAME_LEN, GFP_KERNEL);
if (!buf)
return -ENOMEM;
ret = _dma_buf_set_name(dmabuf, buf);
if (ret)
kfree(buf);
return ret;
}
EXPORT_SYMBOL_GPL(dma_buf_set_name);
static long dma_buf_set_name_user(struct dma_buf *dmabuf, const char __user *buf)
{ {
char *name = strndup_user(buf, DMA_BUF_NAME_LEN); char *name = strndup_user(buf, DMA_BUF_NAME_LEN);
long ret = 0; long ret = 0;
@@ -371,19 +406,10 @@ static long dma_buf_set_name(struct dma_buf *dmabuf, const char __user *buf)
if (IS_ERR(name)) if (IS_ERR(name))
return PTR_ERR(name); return PTR_ERR(name);
dma_resv_lock(dmabuf->resv, NULL); ret = _dma_buf_set_name(dmabuf, name);
if (!list_empty(&dmabuf->attachments)) { if (ret)
ret = -EBUSY;
kfree(name); kfree(name);
goto out_unlock;
}
spin_lock(&dmabuf->name_lock);
kfree(dmabuf->name);
dmabuf->name = name;
spin_unlock(&dmabuf->name_lock);
out_unlock:
dma_resv_unlock(dmabuf->resv);
return ret; return ret;
} }
@@ -428,7 +454,7 @@ static long dma_buf_ioctl(struct file *file,
case DMA_BUF_SET_NAME_A: case DMA_BUF_SET_NAME_A:
case DMA_BUF_SET_NAME_B: case DMA_BUF_SET_NAME_B:
return dma_buf_set_name(dmabuf, (const char __user *)arg); return dma_buf_set_name_user(dmabuf, (const char __user *)arg);
default: default:
return -ENOTTY; return -ENOTTY;

1
include/linux/dma-buf.h
View File

@@ -623,6 +623,7 @@ int dma_buf_mmap(struct dma_buf *, struct vm_area_struct *,
unsigned long); unsigned long);
void *dma_buf_vmap(struct dma_buf *); void *dma_buf_vmap(struct dma_buf *);
void dma_buf_vunmap(struct dma_buf *, void *vaddr); void dma_buf_vunmap(struct dma_buf *, void *vaddr);
long dma_buf_set_name(struct dma_buf *dmabuf, const char *name);
int dma_buf_get_flags(struct dma_buf *dmabuf, unsigned long *flags); int dma_buf_get_flags(struct dma_buf *dmabuf, unsigned long *flags);
int dma_buf_get_uuid(struct dma_buf *dmabuf, uuid_t *uuid); int dma_buf_get_uuid(struct dma_buf *dmabuf, uuid_t *uuid);