Unified · Split
| @@ -157,15 +157,15 @@ static const char pkt_data[] = · 156 unmodified lines | ||
| 157 | 157 | |
| 158 | 158 | static inline u32 umem_nb_free(struct xdp_umem_uqueue *q, u32 nb) |
| 159 | 159 | { |
| 160 | − u32 free_entries = q->size - (q->cached_prod - q->cached_cons); | |
| 160 | + u32 free_entries = q->cached_cons - q->cached_prod; | |
| 161 | 161 | |
| 162 | 162 | if (free_entries >= nb) |
| 163 | 163 | return free_entries; |
| 164 | 164 | |
| 165 | 165 | /* Refresh the local tail pointer */ |
| 166 | − q->cached_cons = *q->consumer; | |
| 166 | + q->cached_cons = *q->consumer + q->size; | |
| 167 | 167 | |
| 168 | − return q->size - (q->cached_prod - q->cached_cons); | |
| 168 | + return q->cached_cons - q->cached_prod; | |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | 171 | static inline u32 xq_nb_free(struct xdp_uqueue *q, u32 ndescs) |
| @@ -439,6 +439,7 @@ static struct xdp_umem *xdp_umem_configure(int sfd) · 267 unmodified lines | ||
| 439 | 439 | umem->fq.producer = umem->fq.map + off.fr.producer; |
| 440 | 440 | umem->fq.consumer = umem->fq.map + off.fr.consumer; |
| 441 | 441 | umem->fq.ring = umem->fq.map + off.fr.desc; |
| 442 | + umem->fq.cached_cons = FQ_NUM_DESCS; | |
| 442 | 443 | |
| 443 | 444 | umem->cq.map = mmap(0, off.cr.desc + |
| 444 | 445 | CQ_NUM_DESCS * sizeof(u64), |
| @@ -535,6 +536,7 @@ static struct xdpsock *xsk_configure(struct xdp_umem *umem) · 90 unmodified lines | ||
| 535 | 536 | xsk->tx.producer = xsk->tx.map + off.tx.producer; |
| 536 | 537 | xsk->tx.consumer = xsk->tx.map + off.tx.consumer; |
| 537 | 538 | xsk->tx.ring = xsk->tx.map + off.tx.desc; |
| 539 | + xsk->tx.cached_cons = NUM_DESCS; | |
| 538 | 540 | |
| 539 | 541 | sxdp.sxdp_family = PF_XDP; |
| 540 | 542 | sxdp.sxdp_ifindex = opt_ifindex; |