diff options
| author |   David S. Miller <davem@davemloft.net> | 2017-08-24 11:59:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-24 11:59:37 -0700 |
| commit | e7d12ce121aa474ea6984ea1255a7bd85c09454f (patch) | |
| tree | bda1e6b0dc4649bdc45162c59b6d1df6e2ecdf2f /drivers | |
| parent | Merge branch 'mlxsw-ipv4-host-dpipe-table' (diff) | |
| parent | xdp: get tracepoints xdp_exception and xdp_redirect in sync (diff) | |
Merge branch 'xdp-more-work-on-xdp-tracepoints'
Jesper Dangaard Brouer says:
====================
xdp: more work on xdp tracepoints
More work on streamlining and performance optimizing the tracepoints
for XDP.
I've created a simple xdp_monitor application that uses this
tracepoint, and prints statistics. Available at github:
https://github.com/netoptimizer/prototype-kernel/blob/master/kernel/samples/bpf/xdp_monitor_kern.c
https://github.com/netoptimizer/prototype-kernel/blob/master/kernel/samples/bpf/xdp_monitor_user.c
The improvement over tracepoint with strcpy: 9810372 - 8428762 = +1381610 pps faster
- (1/9810372 - 1/8428762)*10^9 = -16.7 nanosec
- 100-(8428762/9810372*100) = strcpy-trace is 14.08% slower
- 981037/8428762*100 = removing strcpy made it 11.64% faster
V3: Fix merge conflict with commit e4a8e817d3cb ("bpf: misc xdp redirect cleanups")
V2: Change trace_xdp_redirect() to align with args of trace_xdp_exception()
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 8d3224ad6434..d962368d08d0 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -9849,14 +9849,14 @@ static int ixgbe_xdp_xmit(struct net_device *dev, struct xdp_buff *xdp) int err; if (unlikely(test_bit(__IXGBE_DOWN, &adapter->state))) - return -EINVAL; + return -ENETDOWN; /* During program transitions its possible adapter->xdp_prog is assigned * but ring has not been configured yet. In this case simply abort xmit. */ ring = adapter->xdp_prog ? adapter->xdp_ring[smp_processor_id()] : NULL; if (unlikely(!ring)) - return -EINVAL; + return -ENXIO; err = ixgbe_xmit_xdp_ring(adapter, xdp); if (err != IXGBE_XDP_TX) |