Skip to content

Commit 370704e

Browse files
Charan Teja KallaChristianKoenigAMD
authored andcommitted
dma-buf: ensure unique directory name for dmabuf stats
The dmabuf file uses get_next_ino()(through dma_buf_getfile() -> alloc_anon_inode()) to get an inode number and uses the same as a directory name under /sys/kernel/dmabuf/buffers/<ino>. This directory is used to collect the dmabuf stats and it is created through dma_buf_stats_setup(). At current, failure to create this directory entry can make the dma_buf_export() to fail. Now, as the get_next_ino() can definitely give a repetitive inode no causing the directory entry creation to fail with -EEXIST. This is a problem on the systems where dmabuf stats functionality is enabled on the production builds can make the dma_buf_export(), though the dmabuf memory is allocated successfully, to fail just because it couldn't create stats entry. This issue we are able to see on the snapdragon system within 13 days where there already exists a directory with inode no "122602" so dma_buf_stats_setup() failed with -EEXIST as it is trying to create the same directory entry. To make the dentry name as unique, use the dmabuf fs specific inode which is based on the simple atomic variable increment. There is tmpfs subsystem too which relies on its own inode generation rather than relying on the get_next_ino() for the same reason of avoiding the duplicate inodes[1]. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/patch/?id=e809d5f0b5c912fe981dce738f3283b2010665f0 Signed-off-by: Charan Teja Kalla <quic_charante@quicinc.com> Cc: <stable@vger.kernel.org> # 5.15.x+ Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Reviewed-by: Christian König <christian.koenig@amd.com> Link: https://patchwork.freedesktop.org/patch/msgid/1652441296-1986-1-git-send-email-quic_charante@quicinc.com Signed-off-by: Christian König <christian.koenig@amd.com>
1 parent 6fed53d commit 370704e

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

drivers/dma-buf/dma-buf.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,7 @@ static inline int is_dma_buf_file(struct file *file)
407407

408408
static struct file *dma_buf_getfile(struct dma_buf *dmabuf, int flags)
409409
{
410+
static atomic64_t dmabuf_inode = ATOMIC64_INIT(0);
410411
struct file *file;
411412
struct inode *inode = alloc_anon_inode(dma_buf_mnt->mnt_sb);
412413

@@ -416,6 +417,13 @@ static struct file *dma_buf_getfile(struct dma_buf *dmabuf, int flags)
416417
inode->i_size = dmabuf->size;
417418
inode_set_bytes(inode, dmabuf->size);
418419

420+
/*
421+
* The ->i_ino acquired from get_next_ino() is not unique thus
422+
* not suitable for using it as dentry name by dmabuf stats.
423+
* Override ->i_ino with the unique and dmabuffs specific
424+
* value.
425+
*/
426+
inode->i_ino = atomic64_add_return(1, &dmabuf_inode);
419427
file = alloc_file_pseudo(inode, dma_buf_mnt, "dmabuf",
420428
flags, &dma_buf_fops);
421429
if (IS_ERR(file))

0 commit comments

Comments
 (0)