lkml.org 
[lkml]   [2021]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 053/137] i40e: add correct exception tracing for XDP
    Date
    From: Magnus Karlsson <magnus.karlsson@intel.com>

    [ Upstream commit f6c10b48f8c8da44adaff730d8e700b6272add2b ]

    Add missing exception tracing to XDP when a number of different errors
    can occur. The support was only partial. Several errors where not
    logged which would confuse the user quite a lot not knowing where and
    why the packets disappeared.

    Fixes: 74608d17fe29 ("i40e: add support for XDP_TX action")
    Fixes: 0a714186d3c0 ("i40e: add AF_XDP zero-copy Rx support")
    Reported-by: Jesper Dangaard Brouer <brouer@redhat.com>
    Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com>
    Tested-by: Kiran Bhandare <kiranx.bhandare@intel.com>
    Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/intel/i40e/i40e_txrx.c | 7 ++++++-
    drivers/net/ethernet/intel/i40e/i40e_xsk.c | 8 ++++++--
    2 files changed, 12 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
    index 011f484606a3..c40ac82db863 100644
    --- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
    +++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
    @@ -2205,15 +2205,20 @@ static int i40e_run_xdp(struct i40e_ring *rx_ring, struct xdp_buff *xdp)
    case XDP_TX:
    xdp_ring = rx_ring->vsi->xdp_rings[rx_ring->queue_index];
    result = i40e_xmit_xdp_tx_ring(xdp, xdp_ring);
    + if (result == I40E_XDP_CONSUMED)
    + goto out_failure;
    break;
    case XDP_REDIRECT:
    err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);
    - result = !err ? I40E_XDP_REDIR : I40E_XDP_CONSUMED;
    + if (err)
    + goto out_failure;
    + result = I40E_XDP_REDIR;
    break;
    default:
    bpf_warn_invalid_xdp_action(act);
    fallthrough;
    case XDP_ABORTED:
    +out_failure:
    trace_xdp_exception(rx_ring->netdev, xdp_prog, act);
    fallthrough; /* handle aborts by dropping packet */
    case XDP_DROP:
    diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.c b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
    index 18e8d4e456d6..86c79f71c685 100644
    --- a/drivers/net/ethernet/intel/i40e/i40e_xsk.c
    +++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.c
    @@ -161,9 +161,10 @@ static int i40e_run_xdp_zc(struct i40e_ring *rx_ring, struct xdp_buff *xdp)

    if (likely(act == XDP_REDIRECT)) {
    err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);
    - result = !err ? I40E_XDP_REDIR : I40E_XDP_CONSUMED;
    + if (err)
    + goto out_failure;
    rcu_read_unlock();
    - return result;
    + return I40E_XDP_REDIR;
    }

    switch (act) {
    @@ -172,11 +173,14 @@ static int i40e_run_xdp_zc(struct i40e_ring *rx_ring, struct xdp_buff *xdp)
    case XDP_TX:
    xdp_ring = rx_ring->vsi->xdp_rings[rx_ring->queue_index];
    result = i40e_xmit_xdp_tx_ring(xdp, xdp_ring);
    + if (result == I40E_XDP_CONSUMED)
    + goto out_failure;
    break;
    default:
    bpf_warn_invalid_xdp_action(act);
    fallthrough;
    case XDP_ABORTED:
    +out_failure:
    trace_xdp_exception(rx_ring->netdev, xdp_prog, act);
    fallthrough; /* handle aborts by dropping packet */
    case XDP_DROP:
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-06-08 21:01    [W:4.086 / U:0.280 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site