Use refcount_t to manage the refcount to the memory type specific buffer
videobuf2 buffer implementations. refcount_t is better suitable for the
purpose than atomic_t.
Signed-off-by: Elena Reshetova <elena.reshetova@intel.com>
Signed-off-by: Hans Liljestrand <ishkamiel@gmail.com>
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David Windsor <dwindsor@gmail.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
#include <linux/dma-buf.h>
#include <linux/module.h>
#include <linux/dma-buf.h>
#include <linux/module.h>
+#include <linux/refcount.h>
#include <linux/scatterlist.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/scatterlist.h>
#include <linux/sched.h>
#include <linux/slab.h>
/* MMAP related */
struct vb2_vmarea_handler handler;
/* MMAP related */
struct vb2_vmarea_handler handler;
struct sg_table *sgt_base;
/* DMABUF related */
struct sg_table *sgt_base;
/* DMABUF related */
{
struct vb2_dc_buf *buf = buf_priv;
{
struct vb2_dc_buf *buf = buf_priv;
- return atomic_read(&buf->refcount);
+ return refcount_read(&buf->refcount);
}
static void vb2_dc_prepare(void *buf_priv)
}
static void vb2_dc_prepare(void *buf_priv)
{
struct vb2_dc_buf *buf = buf_priv;
{
struct vb2_dc_buf *buf = buf_priv;
- if (!atomic_dec_and_test(&buf->refcount))
+ if (!refcount_dec_and_test(&buf->refcount))
return;
if (buf->sgt_base) {
return;
if (buf->sgt_base) {
buf->handler.put = vb2_dc_put;
buf->handler.arg = buf;
buf->handler.put = vb2_dc_put;
buf->handler.arg = buf;
- atomic_inc(&buf->refcount);
+ refcount_set(&buf->refcount, 1);
return NULL;
/* dmabuf keeps reference to vb2 buffer */
return NULL;
/* dmabuf keeps reference to vb2 buffer */
- atomic_inc(&buf->refcount);
+ refcount_inc(&buf->refcount);
#include <linux/module.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/mm.h>
+#include <linux/refcount.h>
#include <linux/scatterlist.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/scatterlist.h>
#include <linux/sched.h>
#include <linux/slab.h>
struct sg_table *dma_sgt;
size_t size;
unsigned int num_pages;
struct sg_table *dma_sgt;
size_t size;
unsigned int num_pages;
struct vb2_vmarea_handler handler;
struct dma_buf_attachment *db_attach;
struct vb2_vmarea_handler handler;
struct dma_buf_attachment *db_attach;
buf->handler.put = vb2_dma_sg_put;
buf->handler.arg = buf;
buf->handler.put = vb2_dma_sg_put;
buf->handler.arg = buf;
- atomic_inc(&buf->refcount);
+ refcount_set(&buf->refcount, 1);
dprintk(1, "%s: Allocated buffer of %d pages\n",
__func__, buf->num_pages);
dprintk(1, "%s: Allocated buffer of %d pages\n",
__func__, buf->num_pages);
struct sg_table *sgt = &buf->sg_table;
int i = buf->num_pages;
struct sg_table *sgt = &buf->sg_table;
int i = buf->num_pages;
- if (atomic_dec_and_test(&buf->refcount)) {
+ if (refcount_dec_and_test(&buf->refcount)) {
dprintk(1, "%s: Freeing buffer of %d pages\n", __func__,
buf->num_pages);
dma_unmap_sg_attrs(buf->dev, sgt->sgl, sgt->orig_nents,
dprintk(1, "%s: Freeing buffer of %d pages\n", __func__,
buf->num_pages);
dma_unmap_sg_attrs(buf->dev, sgt->sgl, sgt->orig_nents,
{
struct vb2_dma_sg_buf *buf = buf_priv;
{
struct vb2_dma_sg_buf *buf = buf_priv;
- return atomic_read(&buf->refcount);
+ return refcount_read(&buf->refcount);
}
static int vb2_dma_sg_mmap(void *buf_priv, struct vm_area_struct *vma)
}
static int vb2_dma_sg_mmap(void *buf_priv, struct vm_area_struct *vma)
return NULL;
/* dmabuf keeps reference to vb2 buffer */
return NULL;
/* dmabuf keeps reference to vb2 buffer */
- atomic_inc(&buf->refcount);
+ refcount_inc(&buf->refcount);
struct vb2_vmarea_handler *h = vma->vm_private_data;
pr_debug("%s: %p, refcount: %d, vma: %08lx-%08lx\n",
struct vb2_vmarea_handler *h = vma->vm_private_data;
pr_debug("%s: %p, refcount: %d, vma: %08lx-%08lx\n",
- __func__, h, atomic_read(h->refcount), vma->vm_start,
+ __func__, h, refcount_read(h->refcount), vma->vm_start,
- atomic_inc(h->refcount);
+ refcount_inc(h->refcount);
struct vb2_vmarea_handler *h = vma->vm_private_data;
pr_debug("%s: %p, refcount: %d, vma: %08lx-%08lx\n",
struct vb2_vmarea_handler *h = vma->vm_private_data;
pr_debug("%s: %p, refcount: %d, vma: %08lx-%08lx\n",
- __func__, h, atomic_read(h->refcount), vma->vm_start,
+ __func__, h, refcount_read(h->refcount), vma->vm_start,
vma->vm_end);
h->put(h->arg);
vma->vm_end);
h->put(h->arg);
#include <linux/io.h>
#include <linux/module.h>
#include <linux/mm.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/mm.h>
+#include <linux/refcount.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
struct frame_vector *vec;
enum dma_data_direction dma_dir;
unsigned long size;
struct frame_vector *vec;
enum dma_data_direction dma_dir;
unsigned long size;
struct vb2_vmarea_handler handler;
struct dma_buf *dbuf;
};
struct vb2_vmarea_handler handler;
struct dma_buf *dbuf;
};
return ERR_PTR(-ENOMEM);
}
return ERR_PTR(-ENOMEM);
}
- atomic_inc(&buf->refcount);
+ refcount_set(&buf->refcount, 1);
{
struct vb2_vmalloc_buf *buf = buf_priv;
{
struct vb2_vmalloc_buf *buf = buf_priv;
- if (atomic_dec_and_test(&buf->refcount)) {
+ if (refcount_dec_and_test(&buf->refcount)) {
vfree(buf->vaddr);
kfree(buf);
}
vfree(buf->vaddr);
kfree(buf);
}
static unsigned int vb2_vmalloc_num_users(void *buf_priv)
{
struct vb2_vmalloc_buf *buf = buf_priv;
static unsigned int vb2_vmalloc_num_users(void *buf_priv)
{
struct vb2_vmalloc_buf *buf = buf_priv;
- return atomic_read(&buf->refcount);
+ return refcount_read(&buf->refcount);
}
static int vb2_vmalloc_mmap(void *buf_priv, struct vm_area_struct *vma)
}
static int vb2_vmalloc_mmap(void *buf_priv, struct vm_area_struct *vma)
return NULL;
/* dmabuf keeps reference to vb2 buffer */
return NULL;
/* dmabuf keeps reference to vb2 buffer */
- atomic_inc(&buf->refcount);
+ refcount_inc(&buf->refcount);
#include <media/videobuf2-v4l2.h>
#include <linux/mm.h>
#include <media/videobuf2-v4l2.h>
#include <linux/mm.h>
+#include <linux/refcount.h>
/**
* struct vb2_vmarea_handler - common vma refcount tracking handler
/**
* struct vb2_vmarea_handler - common vma refcount tracking handler
* @arg: argument for @put callback
*/
struct vb2_vmarea_handler {
* @arg: argument for @put callback
*/
struct vb2_vmarea_handler {
void (*put)(void *arg);
void *arg;
};
void (*put)(void *arg);
void *arg;
};