samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: fixup dma_buf struct to avoid ABI breakage"

Browse Source 
Revert submission 3680024

Reason for revert: replacing with a fixed version

Reverted changes: /q/submissionid:3680024

Bug: 430499939
Change-Id: I994b93b56b734441b6ecebf90b777a7a6f54f1ab
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
This commit is contained in:
Suren Baghdasaryan
2025-07-09 16:52:30 -07:00
parent 1f02134847
commit b26826e8ff
3 changed files with 13 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,7 +93,6 @@ static char *dmabuffs_dname(struct dentry *dentry, char *buffer, int buflen)
static void dma_buf_release(struct dentry *dentry)
{
struct dma_buf_ext *dmabuf_ext;
struct dma_buf *dmabuf;
dmabuf = dentry->d_fsdata;
@@ -116,13 +115,13 @@ static void dma_buf_release(struct dentry *dentry)
if (dmabuf->resv == (struct dma_resv *)&dmabuf[1])
dma_resv_fini(dmabuf->resv);
dmabuf_ext = get_dmabuf_ext(dmabuf);
if (atomic64_read(&dmabuf_ext->num_unique_refs))
if (atomic64_read(&dmabuf->num_unique_refs))
pr_err("destroying dmabuf with non-zero task refs\n");
WARN_ON(!list_empty(&dmabuf->attachments));
module_put(dmabuf->owner);
kfree(dmabuf->name);
kfree(dmabuf_ext);
kfree(dmabuf);
}
static int dma_buf_file_release(struct inode *inode, struct file *file)
@@ -222,7 +221,8 @@ static int new_task_dmabuf_record(struct task_struct *task, struct dma_buf *dmab
rec->dmabuf = dmabuf;
rec->refcnt = 1;
list_add(&rec->node, &dmabuf_info->dmabufs);
atomic64_inc(&get_dmabuf_ext(dmabuf)->num_unique_refs);
atomic64_inc(&dmabuf->num_unique_refs);
return 0;
}
@@ -312,7 +312,7 @@ void dma_buf_unaccount_task(struct dma_buf *dmabuf, struct task_struct *task)
list_del(&rec->node);
kfree(rec);
dmabuf_info->rss -= dmabuf->size;
atomic64_dec(&get_dmabuf_ext(dmabuf)->num_unique_refs);
atomic64_dec(&dmabuf->num_unique_refs);
}
err:
spin_unlock(&dmabuf_info->lock);
@@ -831,11 +831,10 @@ err_alloc_file:
*/
struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info)
{
struct dma_buf_ext *dmabuf_ext;
struct dma_buf *dmabuf;
struct dma_resv *resv = exp_info->resv;
struct file *file;
size_t alloc_size = sizeof(struct dma_buf_ext);
size_t alloc_size = sizeof(struct dma_buf);
int ret;
if (WARN_ON(!exp_info->priv || !exp_info->ops
@@ -865,13 +864,12 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info)
else
/* prevent &dma_buf[1] == dma_buf->resv */
alloc_size += 1;
dmabuf_ext = kzalloc(alloc_size, GFP_KERNEL);
if (!dmabuf_ext) {
dmabuf = kzalloc(alloc_size, GFP_KERNEL);
if (!dmabuf) {
ret = -ENOMEM;
goto err_file;
}
dmabuf = &dmabuf_ext->dmabuf;
dmabuf->priv = exp_info->priv;
dmabuf->ops = exp_info->ops;
dmabuf->size = exp_info->size;
@@ -890,7 +888,7 @@ struct dma_buf *dma_buf_export(const struct dma_buf_export_info *exp_info)
dmabuf->resv = resv;
}
atomic64_set(&dmabuf_ext->num_unique_refs, 0);
atomic64_set(&dmabuf->num_unique_refs, 0);
file->private_data = dmabuf;
file->f_path.dentry->d_fsdata = dmabuf;

2
fs/proc/base.c
View File

@@ -3437,7 +3437,7 @@ static int proc_dmabuf_pss_show(struct seq_file *m, struct pid_namespace *ns,
spin_lock(&dmabuf_info->lock);
list_for_each_entry(rec, &dmabuf_info->dmabufs, node) {
s64 refs = atomic64_read(&get_dmabuf_ext(rec->dmabuf)->num_unique_refs);
s64 refs = atomic64_read(&rec->dmabuf->num_unique_refs);
if (refs <= 0) {
pr_err("dmabuf has <= refs %lld\n", refs);

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

@@ -535,11 +535,6 @@ struct dma_buf {
} *sysfs_entry;
#endif
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
};
struct dma_buf_ext {
/**
* @num_unique_refs:
*
@@ -547,18 +542,10 @@ struct dma_buf_ext {
*/
atomic64_t num_unique_refs;
/*
* dma_buf can have a reservation object after it, so keep this member
* at the end of this structure.
*/
struct dma_buf dmabuf;
ANDROID_KABI_RESERVE(1);
ANDROID_KABI_RESERVE(2);
};
static inline struct dma_buf_ext *get_dmabuf_ext(struct dma_buf *dmabuf)
{
return container_of(dmabuf, struct dma_buf_ext, dmabuf);
}
/**
* struct dma_buf_attach_ops - importer operations for an attachment
*