d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix "received NULL mbuf" bug in VNIC

Browse Source 
Do not modify NIC_QSET_CQ_0_7_HEAD manually, especially
in non-atomic context.
It doesn't seem to be necessary to recreate CQ head after
interrupt clearing too.

Reviewed by:   wma
Obtained from: Semihalf
Sponsored by:  Cavium
Differential Revision: https://reviews.freebsd.org/D5533
This commit is contained in:
zbb 2016-03-10 05:23:46 +00:00
parent 30f0441902
commit 927ab02b03
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/vnic/nicvf_queues.c
View File

@ -889,7 +889,6 @@ nicvf_qs_err_task(void *arg, int pending)
static void static void
nicvf_cmp_task(void *arg, int pending) nicvf_cmp_task(void *arg, int pending)
{ {
uint64_t cq_head;
struct cmp_queue *cq; struct cmp_queue *cq;
struct nicvf *nic; struct nicvf *nic;
int cmp_err; int cmp_err;
@ -899,11 +898,6 @@ nicvf_cmp_task(void *arg, int pending)
/* Handle CQ descriptors */ /* Handle CQ descriptors */
cmp_err = nicvf_cq_intr_handler(nic, cq->idx); cmp_err = nicvf_cq_intr_handler(nic, cq->idx);
/* Re-enable interrupts */
cq_head = nicvf_queue_reg_read(nic, NIC_QSET_CQ_0_7_HEAD, cq->idx);
nicvf_clear_intr(nic, NICVF_INTR_CQ, cq->idx);
nicvf_queue_reg_write(nic, NIC_QSET_CQ_0_7_HEAD, cq->idx, cq_head);
if (__predict_false(cmp_err != 0)) { if (__predict_false(cmp_err != 0)) {
/* /*
* Schedule another thread here since we did not * Schedule another thread here since we did not
@ -913,6 +907,7 @@ nicvf_cmp_task(void *arg, int pending)
} }
nicvf_clear_intr(nic, NICVF_INTR_CQ, cq->idx);
/* Reenable interrupt (previously disabled in nicvf_intr_handler() */ /* Reenable interrupt (previously disabled in nicvf_intr_handler() */
nicvf_enable_intr(nic, NICVF_INTR_CQ, cq->idx); nicvf_enable_intr(nic, NICVF_INTR_CQ, cq->idx);