Skip to content

Commit 26efaef

Browse files
TaeheeYoodavem330
authored andcommitted
net: atlantic: Implement xdp data plane
It supports XDP_PASS, XDP_DROP and multi buffer. The new function aq_nic_xmit_xdpf() is used to send packet with xdp_frame and internally it calls aq_nic_map_xdp(). AQC chip supports 32 multi-queues and 8 vectors(irq). there are two option 1. under 8 cores and 4 tx queues per core. 2. under 4 cores and 8 tx queues per core. Like ixgbe, these tx queues can be used only for XDP_TX, XDP_REDIRECT queue. If so, no tx_lock is needed. But this patchset doesn't use this strategy because getting hardware tx queue index cost is too high. So, tx_lock is used in the aq_nic_xmit_xdpf(). single-core, single queue, 80% cpu utilization. 30.75% bpf_prog_xxx_xdp_prog_tx [k] bpf_prog_xxx_xdp_prog_tx 10.35% [kernel] [k] aq_hw_read_reg <---------- here 4.38% [kernel] [k] get_page_from_freelist single-core, 8 queues, 100% cpu utilization, half PPS. 45.56% [kernel] [k] aq_hw_read_reg <---------- here 17.58% bpf_prog_xxx_xdp_prog_tx [k] bpf_prog_xxx_xdp_prog_tx 4.72% [kernel] [k] hw_atl_b0_hw_ring_rx_receive The new function __aq_ring_xdp_clean() is a xdp rx handler and this is called only when XDP is attached. Signed-off-by: Taehee Yoo <ap420073@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 0d14657 commit 26efaef

File tree

6 files changed

+468
-9
lines changed

6 files changed

+468
-9
lines changed

drivers/net/ethernet/aquantia/atlantic/aq_ethtool.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,15 @@ static const char * const aq_ethtool_queue_rx_stat_names[] = {
9797
"%sQueue[%d] AllocFails",
9898
"%sQueue[%d] SkbAllocFails",
9999
"%sQueue[%d] Polls",
100+
"%sQueue[%d] PageFlips",
101+
"%sQueue[%d] PageReuses",
102+
"%sQueue[%d] PageFrees",
103+
"%sQueue[%d] XdpAbort",
104+
"%sQueue[%d] XdpDrop",
105+
"%sQueue[%d] XdpPass",
106+
"%sQueue[%d] XdpTx",
107+
"%sQueue[%d] XdpInvalid",
108+
"%sQueue[%d] XdpRedirect",
100109
};
101110

102111
static const char * const aq_ethtool_queue_tx_stat_names[] = {

drivers/net/ethernet/aquantia/atlantic/aq_nic.c

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -569,6 +569,103 @@ int aq_nic_start(struct aq_nic_s *self)
569569
return err;
570570
}
571571

572+
static unsigned int aq_nic_map_xdp(struct aq_nic_s *self,
573+
struct xdp_frame *xdpf,
574+
struct aq_ring_s *ring)
575+
{
576+
struct device *dev = aq_nic_get_dev(self);
577+
struct aq_ring_buff_s *first = NULL;
578+
unsigned int dx = ring->sw_tail;
579+
struct aq_ring_buff_s *dx_buff;
580+
struct skb_shared_info *sinfo;
581+
unsigned int frag_count = 0U;
582+
unsigned int nr_frags = 0U;
583+
unsigned int ret = 0U;
584+
u16 total_len;
585+
586+
dx_buff = &ring->buff_ring[dx];
587+
dx_buff->flags = 0U;
588+
589+
sinfo = xdp_get_shared_info_from_frame(xdpf);
590+
total_len = xdpf->len;
591+
dx_buff->len = total_len;
592+
if (xdp_frame_has_frags(xdpf)) {
593+
nr_frags = sinfo->nr_frags;
594+
total_len += sinfo->xdp_frags_size;
595+
}
596+
dx_buff->pa = dma_map_single(dev, xdpf->data, dx_buff->len,
597+
DMA_TO_DEVICE);
598+
599+
if (unlikely(dma_mapping_error(dev, dx_buff->pa)))
600+
goto exit;
601+
602+
first = dx_buff;
603+
dx_buff->len_pkt = total_len;
604+
dx_buff->is_sop = 1U;
605+
dx_buff->is_mapped = 1U;
606+
++ret;
607+
608+
for (; nr_frags--; ++frag_count) {
609+
skb_frag_t *frag = &sinfo->frags[frag_count];
610+
unsigned int frag_len = skb_frag_size(frag);
611+
unsigned int buff_offset = 0U;
612+
unsigned int buff_size = 0U;
613+
dma_addr_t frag_pa;
614+
615+
while (frag_len) {
616+
if (frag_len > AQ_CFG_TX_FRAME_MAX)
617+
buff_size = AQ_CFG_TX_FRAME_MAX;
618+
else
619+
buff_size = frag_len;
620+
621+
frag_pa = skb_frag_dma_map(dev, frag, buff_offset,
622+
buff_size, DMA_TO_DEVICE);
623+
624+
if (unlikely(dma_mapping_error(dev, frag_pa)))
625+
goto mapping_error;
626+
627+
dx = aq_ring_next_dx(ring, dx);
628+
dx_buff = &ring->buff_ring[dx];
629+
630+
dx_buff->flags = 0U;
631+
dx_buff->len = buff_size;
632+
dx_buff->pa = frag_pa;
633+
dx_buff->is_mapped = 1U;
634+
dx_buff->eop_index = 0xffffU;
635+
636+
frag_len -= buff_size;
637+
buff_offset += buff_size;
638+
639+
++ret;
640+
}
641+
}
642+
643+
first->eop_index = dx;
644+
dx_buff->is_eop = 1U;
645+
dx_buff->skb = NULL;
646+
dx_buff->xdpf = xdpf;
647+
goto exit;
648+
649+
mapping_error:
650+
for (dx = ring->sw_tail;
651+
ret > 0;
652+
--ret, dx = aq_ring_next_dx(ring, dx)) {
653+
dx_buff = &ring->buff_ring[dx];
654+
655+
if (!dx_buff->pa)
656+
continue;
657+
if (unlikely(dx_buff->is_sop))
658+
dma_unmap_single(dev, dx_buff->pa, dx_buff->len,
659+
DMA_TO_DEVICE);
660+
else
661+
dma_unmap_page(dev, dx_buff->pa, dx_buff->len,
662+
DMA_TO_DEVICE);
663+
}
664+
665+
exit:
666+
return ret;
667+
}
668+
572669
unsigned int aq_nic_map_skb(struct aq_nic_s *self, struct sk_buff *skb,
573670
struct aq_ring_s *ring)
574671
{
@@ -697,6 +794,7 @@ unsigned int aq_nic_map_skb(struct aq_nic_s *self, struct sk_buff *skb,
697794
first->eop_index = dx;
698795
dx_buff->is_eop = 1U;
699796
dx_buff->skb = skb;
797+
dx_buff->xdpf = NULL;
700798
goto exit;
701799

702800
mapping_error:
@@ -725,6 +823,44 @@ unsigned int aq_nic_map_skb(struct aq_nic_s *self, struct sk_buff *skb,
725823
return ret;
726824
}
727825

826+
int aq_nic_xmit_xdpf(struct aq_nic_s *aq_nic, struct aq_ring_s *tx_ring,
827+
struct xdp_frame *xdpf)
828+
{
829+
u16 queue_index = AQ_NIC_RING2QMAP(aq_nic, tx_ring->idx);
830+
struct net_device *ndev = aq_nic_get_ndev(aq_nic);
831+
struct skb_shared_info *sinfo;
832+
int cpu = smp_processor_id();
833+
int err = NETDEV_TX_BUSY;
834+
struct netdev_queue *nq;
835+
unsigned int frags = 1;
836+
837+
if (xdp_frame_has_frags(xdpf)) {
838+
sinfo = xdp_get_shared_info_from_frame(xdpf);
839+
frags += sinfo->nr_frags;
840+
}
841+
842+
if (frags > AQ_CFG_SKB_FRAGS_MAX)
843+
return err;
844+
845+
nq = netdev_get_tx_queue(ndev, tx_ring->idx);
846+
__netif_tx_lock(nq, cpu);
847+
848+
aq_ring_update_queue_state(tx_ring);
849+
850+
/* Above status update may stop the queue. Check this. */
851+
if (__netif_subqueue_stopped(aq_nic_get_ndev(aq_nic), queue_index))
852+
goto out;
853+
854+
frags = aq_nic_map_xdp(aq_nic, xdpf, tx_ring);
855+
if (likely(frags))
856+
err = aq_nic->aq_hw_ops->hw_ring_tx_xmit(aq_nic->aq_hw, tx_ring,
857+
frags);
858+
out:
859+
__netif_tx_unlock(nq);
860+
861+
return err;
862+
}
863+
728864
int aq_nic_xmit(struct aq_nic_s *self, struct sk_buff *skb)
729865
{
730866
struct aq_nic_cfg_s *cfg = aq_nic_get_cfg(self);

drivers/net/ethernet/aquantia/atlantic/aq_nic.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,8 @@ void aq_nic_ndev_free(struct aq_nic_s *self);
180180
int aq_nic_start(struct aq_nic_s *self);
181181
unsigned int aq_nic_map_skb(struct aq_nic_s *self, struct sk_buff *skb,
182182
struct aq_ring_s *ring);
183+
int aq_nic_xmit_xdpf(struct aq_nic_s *aq_nic, struct aq_ring_s *tx_ring,
184+
struct xdp_frame *xdpf);
183185
int aq_nic_xmit(struct aq_nic_s *self, struct sk_buff *skb);
184186
int aq_nic_get_regs(struct aq_nic_s *self, struct ethtool_regs *regs, void *p);
185187
int aq_nic_get_regs_count(struct aq_nic_s *self);

0 commit comments

Comments
 (0)