jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-04 05:58:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

introduce mbq_lock() and mbq_unlock() for the mbq,

Browse Source 
so it is easier to buil the same code on linux
(this generalizes the change in svn 267142)

MFC after:	3 days
This commit is contained in:
Luigi Rizzo 2014-06-06 18:02:32 +00:00
parent a845d42777
commit 997b054cf1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=267177
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/netmap/netmap.c
View File

@ -1050,7 +1050,7 @@ netmap_rxsync_from_host(struct netmap_adapter *na, struct thread *td, void *pwai
(void)pwait; /* disable unused warnings */
(void)td;
mtx_lock_spin(&q->lock);
mbq_lock(q);
/* First part: import newly received packets */
n = mbq_len(q);
@ -1092,7 +1092,7 @@ netmap_rxsync_from_host(struct netmap_adapter *na, struct thread *td, void *pwai
if (kring->rcur == kring->rtail && td) /* no bufs available */
selrecord(td, &kring->si);
mtx_unlock_spin(&q->lock);
mbq_unlock(q);
return ret;
}
@ -2459,7 +2459,7 @@ netmap_transmit(struct ifnet *ifp, struct mbuf *m)
* not possible on Linux).
* Also avoid overflowing the queue.
*/
mtx_lock_spin(&q->lock);
mbq_lock(q);
space = kring->nr_hwtail - kring->nr_hwcur;
if (space < 0)
@ -2476,7 +2476,7 @@ netmap_transmit(struct ifnet *ifp, struct mbuf *m)
m = NULL;
error = 0;
}
mtx_unlock_spin(&q->lock);
mbq_unlock(q);
done:
if (m)

8
sys/dev/netmap/netmap_mbq.c
View File

@ -76,9 +76,9 @@ static inline void __mbq_enqueue(struct mbq *q, struct mbuf *m)
void mbq_safe_enqueue(struct mbq *q, struct mbuf *m)
{
mtx_lock_spin(&q->lock);
mbq_lock(q);
__mbq_enqueue(q, m);
mtx_unlock_spin(&q->lock);
mbq_unlock(q);
}
@ -110,9 +110,9 @@ struct mbuf *mbq_safe_dequeue(struct mbq *q)
{
struct mbuf *ret;
mtx_lock_spin(&q->lock);
mbq_lock(q);
ret = __mbq_dequeue(q);
mtx_unlock_spin(&q->lock);
mbq_unlock(q);
return ret;
}

12
sys/dev/netmap/netmap_mbq.h
View File

@ -62,7 +62,17 @@ void mbq_enqueue(struct mbq *q, struct mbuf *m);
struct mbuf *mbq_dequeue(struct mbq *q);
void mbq_purge(struct mbq *q);
/* XXX missing mbq_lock() and mbq_unlock */
static inline void
mbq_lock(struct mbq *q)
{
mtx_lock_spin(&q->lock);
}
static inline void
mbq_unlock(struct mbq *q)
{
mtx_unlock_spin(&q->lock);
}
void mbq_safe_init(struct mbq *q);
void mbq_safe_destroy(struct mbq *q);