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 056/137] ice: add correct exception tracing for XDP
    Date
    From: Magnus Karlsson <magnus.karlsson@intel.com>

    [ Upstream commit 89d65df024c59988291f643b4e45d1528c51aef9 ]

    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: efc2214b6047 ("ice: Add support for XDP")
    Fixes: 2d4238f55697 ("ice: Add support for AF_XDP")
    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/ice/ice_txrx.c | 12 +++++++++---
    drivers/net/ethernet/intel/ice/ice_xsk.c | 8 ++++++--
    2 files changed, 15 insertions(+), 5 deletions(-)

    diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c
    index 5cc2854a5d48..442a9bcbf60a 100644
    --- a/drivers/net/ethernet/intel/ice/ice_txrx.c
    +++ b/drivers/net/ethernet/intel/ice/ice_txrx.c
    @@ -538,7 +538,7 @@ ice_run_xdp(struct ice_ring *rx_ring, struct xdp_buff *xdp,
    struct bpf_prog *xdp_prog)
    {
    struct ice_ring *xdp_ring;
    - int err;
    + int err, result;
    u32 act;

    act = bpf_prog_run_xdp(xdp_prog, xdp);
    @@ -547,14 +547,20 @@ ice_run_xdp(struct ice_ring *rx_ring, struct xdp_buff *xdp,
    return ICE_XDP_PASS;
    case XDP_TX:
    xdp_ring = rx_ring->vsi->xdp_rings[smp_processor_id()];
    - return ice_xmit_xdp_buff(xdp, xdp_ring);
    + result = ice_xmit_xdp_buff(xdp, xdp_ring);
    + if (result == ICE_XDP_CONSUMED)
    + goto out_failure;
    + return result;
    case XDP_REDIRECT:
    err = xdp_do_redirect(rx_ring->netdev, xdp, xdp_prog);
    - return !err ? ICE_XDP_REDIR : ICE_XDP_CONSUMED;
    + if (err)
    + goto out_failure;
    + return ICE_XDP_REDIR;
    default:
    bpf_warn_invalid_xdp_action(act);
    fallthrough;
    case XDP_ABORTED:
    +out_failure:
    trace_xdp_exception(rx_ring->netdev, xdp_prog, act);
    fallthrough;
    case XDP_DROP:
    diff --git a/drivers/net/ethernet/intel/ice/ice_xsk.c b/drivers/net/ethernet/intel/ice/ice_xsk.c
    index 952148eede30..9f36f8d7a985 100644
    --- a/drivers/net/ethernet/intel/ice/ice_xsk.c
    +++ b/drivers/net/ethernet/intel/ice/ice_xsk.c
    @@ -527,9 +527,10 @@ ice_run_xdp_zc(struct ice_ring *rx_ring, struct xdp_buff *xdp)

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

    switch (act) {
    @@ -538,11 +539,14 @@ ice_run_xdp_zc(struct ice_ring *rx_ring, struct xdp_buff *xdp)
    case XDP_TX:
    xdp_ring = rx_ring->vsi->xdp_rings[rx_ring->q_index];
    result = ice_xmit_xdp_buff(xdp, xdp_ring);
    + if (result == ICE_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;
    case XDP_DROP:
    --
    2.30.2


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