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

Commit 0de6a003 authored by Sean Tranchetti's avatar Sean Tranchetti Committed by Gerrit - the friendly Code Review server
Browse files

net: qualcomm: rmnet: use stronger locking primitive for descriptor pool 



Upgrade locking primitive to IRQ save/restore version to prevent
concurrent access by multiple CPUs of the descriptor pool.

Change-Id: I14d13cd23339b3210a9310881a4495a8b90ce9f5
Signed-off-by: default avatarSean Tranchetti <stranche@codeaurora.org>
parent 70fe4cf2

drivers/net/ethernet/qualcomm/rmnet/rmnet_descriptor.c

+6 −4
Original line number Diff line number Diff line
@@ -34,8 +34,9 @@ rmnet_get_frag_descriptor(struct rmnet_port *port) 
{

	struct rmnet_frag_descriptor_pool *pool = port->frag_desc_pool;

	struct rmnet_frag_descriptor *frag_desc;

	unsigned long flags;



	spin_lock(&port->desc_pool_lock);

	spin_lock_irqsave(&port->desc_pool_lock, flags);

	if (!list_empty(&pool->free_list)) {

		frag_desc = list_first_entry(&pool->free_list,

					     struct rmnet_frag_descriptor,
@@ -52,7 +53,7 @@ rmnet_get_frag_descriptor(struct rmnet_port *port) 
	}



out:

	spin_unlock(&port->desc_pool_lock);

	spin_unlock_irqrestore(&port->desc_pool_lock, flags);

	return frag_desc;

}

EXPORT_SYMBOL(rmnet_get_frag_descriptor);
@@ -62,6 +63,7 @@ void rmnet_recycle_frag_descriptor(struct rmnet_frag_descriptor *frag_desc, 
{

	struct rmnet_frag_descriptor_pool *pool = port->frag_desc_pool;

	struct page *page = skb_frag_page(&frag_desc->frag);

	unsigned long flags;



	list_del(&frag_desc->list);

	if (page)
@@ -70,9 +72,9 @@ void rmnet_recycle_frag_descriptor(struct rmnet_frag_descriptor *frag_desc, 
	memset(frag_desc, 0, sizeof(*frag_desc));

	INIT_LIST_HEAD(&frag_desc->list);

	INIT_LIST_HEAD(&frag_desc->sub_frags);

	spin_lock(&port->desc_pool_lock);

	spin_lock_irqsave(&port->desc_pool_lock, flags);

	list_add_tail(&frag_desc->list, &pool->free_list);

	spin_unlock(&port->desc_pool_lock);

	spin_unlock_irqrestore(&port->desc_pool_lock, flags);

}

EXPORT_SYMBOL(rmnet_recycle_frag_descriptor);