Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c935bc5 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

locking/atomic, kref: Add kref_read() 



Since we need to change the implementation, stop exposing internals.

Provide kref_read() to read the current reference count; typically
used for debug messages.

Kills two anti-patterns:

	atomic_read(&kref->refcount)
	kref->refcount.counter

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 1e24edca

drivers/block/drbd/drbd_req.c

+1 −1
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ static void mod_rq_state(struct drbd_request *req, struct bio_and_error *m, 
		/* Completion does it's own kref_put.  If we are going to

		 * kref_sub below, we need req to be still around then. */

		int at_least = k_put + !!c_put;

		int refcount = atomic_read(&req->kref.refcount);

		int refcount = kref_read(&req->kref);

		if (refcount < at_least)

			drbd_err(device,

				"mod_rq_state: Logic BUG: %x -> %x: refcount = %d, should be >= %d\n",

drivers/block/rbd.c

+4 −4
Original line number Diff line number Diff line
@@ -1535,7 +1535,7 @@ static bool obj_request_overlaps_parent(struct rbd_obj_request *obj_request) 
static void rbd_obj_request_get(struct rbd_obj_request *obj_request)

{

	dout("%s: obj %p (was %d)\n", __func__, obj_request,

		atomic_read(&obj_request->kref.refcount));

		kref_read(&obj_request->kref));

	kref_get(&obj_request->kref);

}
@@ -1544,14 +1544,14 @@ static void rbd_obj_request_put(struct rbd_obj_request *obj_request) 
{

	rbd_assert(obj_request != NULL);

	dout("%s: obj %p (was %d)\n", __func__, obj_request,

		atomic_read(&obj_request->kref.refcount));

		kref_read(&obj_request->kref));

	kref_put(&obj_request->kref, rbd_obj_request_destroy);

}



static void rbd_img_request_get(struct rbd_img_request *img_request)

{

	dout("%s: img %p (was %d)\n", __func__, img_request,

	     atomic_read(&img_request->kref.refcount));

	     kref_read(&img_request->kref));

	kref_get(&img_request->kref);

}
@@ -1562,7 +1562,7 @@ static void rbd_img_request_put(struct rbd_img_request *img_request) 
{

	rbd_assert(img_request != NULL);

	dout("%s: img %p (was %d)\n", __func__, img_request,

		atomic_read(&img_request->kref.refcount));

		kref_read(&img_request->kref));

	if (img_request_child_test(img_request))

		kref_put(&img_request->kref, rbd_parent_request_destroy);

	else

drivers/block/virtio_blk.c

+1 −1
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ static void virtblk_remove(struct virtio_device *vdev) 
	/* Stop all the virtqueues. */

	vdev->config->reset(vdev);



	refc = atomic_read(&disk_to_dev(vblk->disk)->kobj.kref.refcount);

	refc = kref_read(&disk_to_dev(vblk->disk)->kobj.kref);

	put_disk(vblk->disk);

	vdev->config->del_vqs(vdev);

	kfree(vblk->vqs);

drivers/gpu/drm/drm_gem_cma_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ void drm_gem_cma_describe(struct drm_gem_cma_object *cma_obj, 
	off = drm_vma_node_start(&obj->vma_node);



	seq_printf(m, "%2d (%2d) %08llx %pad %p %zu",

			obj->name, obj->refcount.refcount.counter,

			obj->name, kref_read(&obj->refcount),

			off, &cma_obj->paddr, cma_obj->vaddr, obj->size);



	seq_printf(m, "\n");

drivers/gpu/drm/drm_info.c

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static int drm_gem_one_name_info(int id, void *ptr, void *data) 
	seq_printf(m, "%6d %8zd %7d %8d\n",

		   obj->name, obj->size,

		   obj->handle_count,

		   atomic_read(&obj->refcount.refcount));

		   kref_read(&obj->refcount));

	return 0;

}