Message ID | 50cf2bc622d81c8447713113c5c6a7d0fd4f5c95.1571315083.git.lorenzo@kernel.org |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
Series | [v2,net-next] net: socionext: netsec: fix xdp stats accounting | expand |
Thanks Lorenzo, On Thu, Oct 17, 2019 at 02:28:32PM +0200, Lorenzo Bianconi wrote: > Increment netdev rx counters even for XDP_DROP verdict. Report even > tx bytes for xdp buffers (TYPE_NETSEC_XDP_TX or TYPE_NETSEC_XDP_NDO). > Moreover account pending buffer length in netsec_xdp_queue_one as it is > done for skb counterpart > > Tested-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> > --- > Changes since v1: > - fix BQL accounting > - target the patch to next-next > --- > drivers/net/ethernet/socionext/netsec.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c > index f9e6744d8fd6..c40294470bfa 100644 > --- a/drivers/net/ethernet/socionext/netsec.c > +++ b/drivers/net/ethernet/socionext/netsec.c > @@ -252,7 +252,6 @@ > #define NETSEC_XDP_CONSUMED BIT(0) > #define NETSEC_XDP_TX BIT(1) > #define NETSEC_XDP_REDIR BIT(2) > -#define NETSEC_XDP_RX_OK (NETSEC_XDP_PASS | NETSEC_XDP_TX | NETSEC_XDP_REDIR) > > enum ring_id { > NETSEC_RING_TX = 0, > @@ -661,6 +660,7 @@ static bool netsec_clean_tx_dring(struct netsec_priv *priv) > bytes += desc->skb->len; > dev_kfree_skb(desc->skb); > } else { > + bytes += desc->xdpf->len; > xdp_return_frame(desc->xdpf); > } > next: > @@ -858,6 +858,7 @@ static u32 netsec_xdp_queue_one(struct netsec_priv *priv, > tx_desc.addr = xdpf->data; > tx_desc.len = xdpf->len; > > + netdev_sent_queue(priv->ndev, xdpf->len); > netsec_set_tx_de(priv, tx_ring, &tx_ctrl, &tx_desc, xdpf); > > return NETSEC_XDP_TX; > @@ -1030,7 +1031,7 @@ static int netsec_process_rx(struct netsec_priv *priv, int budget) > > next: > if ((skb && napi_gro_receive(&priv->napi, skb) != GRO_DROP) || > - xdp_result & NETSEC_XDP_RX_OK) { > + xdp_result) { > ndev->stats.rx_packets++; > ndev->stats.rx_bytes += xdp.data_end - xdp.data; > } > -- > 2.21.0 > Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
From: Lorenzo Bianconi <lorenzo@kernel.org> Date: Thu, 17 Oct 2019 14:28:32 +0200 > Increment netdev rx counters even for XDP_DROP verdict. Report even > tx bytes for xdp buffers (TYPE_NETSEC_XDP_TX or TYPE_NETSEC_XDP_NDO). > Moreover account pending buffer length in netsec_xdp_queue_one as it is > done for skb counterpart > > Tested-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> > Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> > --- > Changes since v1: > - fix BQL accounting > - target the patch to next-next Applied, thanks.
diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c index f9e6744d8fd6..c40294470bfa 100644 --- a/drivers/net/ethernet/socionext/netsec.c +++ b/drivers/net/ethernet/socionext/netsec.c @@ -252,7 +252,6 @@ #define NETSEC_XDP_CONSUMED BIT(0) #define NETSEC_XDP_TX BIT(1) #define NETSEC_XDP_REDIR BIT(2) -#define NETSEC_XDP_RX_OK (NETSEC_XDP_PASS | NETSEC_XDP_TX | NETSEC_XDP_REDIR) enum ring_id { NETSEC_RING_TX = 0, @@ -661,6 +660,7 @@ static bool netsec_clean_tx_dring(struct netsec_priv *priv) bytes += desc->skb->len; dev_kfree_skb(desc->skb); } else { + bytes += desc->xdpf->len; xdp_return_frame(desc->xdpf); } next: @@ -858,6 +858,7 @@ static u32 netsec_xdp_queue_one(struct netsec_priv *priv, tx_desc.addr = xdpf->data; tx_desc.len = xdpf->len; + netdev_sent_queue(priv->ndev, xdpf->len); netsec_set_tx_de(priv, tx_ring, &tx_ctrl, &tx_desc, xdpf); return NETSEC_XDP_TX; @@ -1030,7 +1031,7 @@ static int netsec_process_rx(struct netsec_priv *priv, int budget) next: if ((skb && napi_gro_receive(&priv->napi, skb) != GRO_DROP) || - xdp_result & NETSEC_XDP_RX_OK) { + xdp_result) { ndev->stats.rx_packets++; ndev->stats.rx_bytes += xdp.data_end - xdp.data; }