Introduce XDP to ena
Subsystems (3)
v2 cover Introduce XDP to ena
From: Sameeh Jubran <[email protected]>
This patchset includes 3 patches:
* XDP_DROP implementation
* XDP_TX implementation
* A fix for an issue which might occur due to the XDP_TX patch. I see fit to place it as a standalone patch for clarity.
Difference from RFC v1 (XDP_DROP patch):
* Initialized xdp.rxq pointer
* Updated max_mtu on attachment of xdp and removed the check from ena_change_mtu()
* Moved the xdp execution from ena_rx_skb() to ena_clean_rx_irq()
* Moved xdp buff (struct xdp_buff) from rx_ring to the local stack
* Started using netlink's extack mechanism to deliver error messages to the user
Sameeh Jubran (3):
net: ena: implement XDP drop support
net: ena: Implement XDP_TX action
net: ena: Add first_interrupt field to napi struct
drivers/net/ethernet/amazon/ena/ena_ethtool.c | 4 +- drivers/net/ethernet/amazon/ena/ena_netdev.c | 930 +++++++++++++++--- drivers/net/ethernet/amazon/ena/ena_netdev.h | 72 ++ 3 files changed, 867 insertions(+), 139 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/3 net: ena: implement XDP drop support
From: Sameeh Jubran <[email protected]>
This commit implements the basic functionality of drop/pass logic in the ena driver.
--- drivers/net/ethernet/amazon/ena/ena_netdev.c | 148 +++++++++++++++++-- drivers/net/ethernet/amazon/ena/ena_netdev.h | 30 ++++ 2 files changed, 168 insertions(+), 10 deletions(-)
drivers/net/ethernet/amazon/ena/ena_netdev.c +138 -10
@@ -35,8 +35,8 @@#ifdef CONFIG_RFS_ACCEL #include <linux/cpu_rmap.h> #endif /* CONFIG_RFS_ACCEL */ +#include <linux/bpf_trace.h> #include <linux/ethtool.h> -#include <linux/if_vlan.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/numa.h>
@@ -123,6 +123,80 @@ static int ena_change_mtu(struct net_device *dev, int new_mtu)return ret; } +static int ena_xdp_execute (struct ena_ring *rx_ring,struct xdp_buff *xdp) +{ +struct bpf_prog *xdp_prog; +u32 verdict =XDP_PASS ; + +rcu_read_lock (); + xdp_prog =READ_ONCE (rx_ring->xdp_bpf_prog); + +if (!xdp_prog) + goto out; + + verdict =bpf_prog_run_xdp (xdp_prog, xdp); + +if (unlikely (verdict ==XDP_ABORTED )) +trace_xdp_exception (rx_ring->netdev, xdp_prog, verdict); +else if (unlikely (verdict >=XDP_TX )) +bpf_warn_invalid_xdp_action (verdict); +out: +rcu_read_unlock (); +return verdict; +} + +static int ena_xdp_set (struct net_device *netdev,struct netdev_bpf *bpf) +{ +struct ena_adapter *adapter =netdev_priv (netdev); +struct bpf_prog *prog = bpf->prog; +struct bpf_prog *old_bpf_prog; +int i, prev_mtu; + +if (ena_xdp_allowed (adapter)) { + old_bpf_prog =xchg (&adapter->xdp_bpf_prog, prog); + +for (i =0 ; i < adapter->num_io_queues; i++) +xchg (&adapter->rx_ring[i].xdp_bpf_prog, prog); + +if (old_bpf_prog) +bpf_prog_put (old_bpf_prog); + + prev_mtu = netdev->max_mtu; + netdev->max_mtu = prog ?ENA_XDP_MAX_MTU : adapter->max_mtu; +netif_info (adapter, drv, adapter->netdev,"xdp program set, changging the max_mtu from %d to %d" , + prev_mtu, netdev->max_mtu); + + }else { +netif_err (adapter, drv, adapter->netdev,"Failed to set xdp program, the current MTU (%d) is larger than the maximum allowed MTU (%lu) while xdp is on" , + netdev->mtu,ENA_XDP_MAX_MTU ); +NL_SET_ERR_MSG_MOD (bpf->extack,"Failed to set xdp program, the current MTU is larger than the maximum allowed MTU. Check the dmesg for more info" ); +return -EINVAL ; + } + +return 0 ; +} + +/* This is the main xdp callback, it's used by the kernel to set/unset the xdp +* program as well as to query the current xdp program id. +*/ +static int ena_xdp (struct net_device *netdev,struct netdev_bpf *bpf) +{ +struct ena_adapter *adapter =netdev_priv (netdev); + +switch (bpf->command) { +case XDP_SETUP_PROG : +return ena_xdp_set (netdev, bpf); +case XDP_QUERY_PROG : + bpf->prog_id = adapter->xdp_bpf_prog ? + adapter->xdp_bpf_prog->aux->id :0 ; +break ; +default : +NL_SET_ERR_MSG_MOD (bpf->extack,"Unsupported XDP command" ); +return -EINVAL ; + } +return 0 ; +} +static int ena_init_rx_cpu_rmap (struct ena_adapter *adapter) {#ifdef CONFIG_RFS_ACCEL
@@ -417,6 +491,9 @@ static void ena_free_rx_resources(struct ena_adapter *adapter,vfree (rx_ring->free_ids); rx_ring->free_ids =NULL ; + +xdp_rxq_info_unreg_mem_model (&rx_ring->xdp_rxq); +xdp_rxq_info_unreg (&rx_ring->xdp_rxq); }/* ena_setup_all_rx_resources - allocate I/O Rx queues resources for all queues
@@ -1037,6 +1114,23 @@ static void ena_set_rx_hash(struct ena_ring *rx_ring, } } +int ena_xdp_handle_buff (struct ena_ring *rx_ring,struct xdp_buff *xdp) +{ +struct ena_rx_buffer *rx_info = + &rx_ring->rx_buffer_info[rx_ring->ena_bufs[0 ].req_id]; + xdp->data =page_address (rx_info->page) + + rx_info->page_offset; + xdp->data_meta = xdp->data; + xdp->data_hard_start =page_address (rx_info->page); + xdp->data_end = xdp->data + rx_ring->ena_bufs[0 ].len; +/* If for some reason we received a bigger packet than +* we expect, then we simply drop it +*/ +if (unlikely (rx_ring->ena_bufs[0 ].len >ENA_XDP_MAX_MTU )) +return XDP_DROP ; +else +return ena_xdp_execute (rx_ring, xdp); +}/* ena_clean_rx_irq - Cleanup RX irq * @rx_ring: RX ring to clean * @napi: napi handler
@@ -1052,19 +1146,23 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi,struct ena_com_rx_ctx ena_rx_ctx;struct ena_adapter *adapter; +int rx_copybreak_pkt =0 ; +int refill_threshold;struct sk_buff *skb;int refill_required; -int refill_threshold; -int rc =0 ; +struct xdp_buff xdp;int total_len =0 ; -int rx_copybreak_pkt =0 ; +int xdp_verdict; +int rc =0 ;int i;netif_dbg (rx_ring->adapter, rx_status, rx_ring->netdev,"%s qid %d\n" , __func__, rx_ring->qid); res_budget = budget; - + xdp.rxq = &rx_ring->xdp_rxq; do { + xdp_verdict = XDP_PASS; + skb = NULL; ena_rx_ctx.ena_bufs = rx_ring->ena_bufs; ena_rx_ctx.max_bufs = rx_ring->sgl_size; ena_rx_ctx.descs = 0;
@@ -1082,11 +1180,16 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi, rx_ring->qid, ena_rx_ctx.descs, ena_rx_ctx.l3_proto, ena_rx_ctx.l4_proto, ena_rx_ctx.hash); +if (ena_xdp_present_ring (rx_ring)) + xdp_verdict =ena_xdp_handle_buff (rx_ring, &xdp); +/* allocate skb and fill it */ - skb =ena_rx_skb (rx_ring, rx_ring->ena_bufs, ena_rx_ctx.descs, - &next_to_clean); +if (xdp_verdict ==XDP_PASS ) + skb =ena_rx_skb (rx_ring, + rx_ring->ena_bufs, + ena_rx_ctx.descs, + &next_to_clean); -/* exit if we failed to retrieve a buffer */ if (unlikely (!skb)) {for (i =0 ; i < ena_rx_ctx.descs; i++) { rx_ring->free_ids[next_to_clean] =
@@ -1095,6 +1198,8 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi,ENA_RX_RING_IDX_NEXT (next_to_clean, rx_ring->ring_size); } +if (xdp_verdict ==XDP_DROP ) +continue ;break ; }
@@ -1727,12 +1832,34 @@ static int ena_create_io_rx_queue(struct ena_adapter *adapter, int qid)netif_err (adapter, ifup, adapter->netdev,"Failed to get RX queue handlers. RX queue num %d rc: %d\n" , qid, rc); -ena_com_destroy_io_queue (ena_dev, ena_qid); -return rc; + goto err; }ena_com_update_numa_node (rx_ring->ena_com_io_cq, ctx.numa_node); + rc =xdp_rxq_info_reg (&rx_ring->xdp_rxq, adapter->netdev, qid); + +if (rc) { +netif_err (adapter, ifup, adapter->netdev, +"Failed to register xdp rx queue info. RX queue num %d rc: %d\n" , + qid, rc); + goto err; + } + + rc =xdp_rxq_info_reg_mem_model (&rx_ring->xdp_rxq,MEM_TYPE_PAGE_SHARED , +NULL ); + +if (rc) { +netif_err (adapter, ifup, adapter->netdev, +"Failed to register xdp rx queue info memory model. RX queue num %d rc: %d\n" , + qid, rc); +xdp_rxq_info_unreg (&rx_ring->xdp_rxq); + goto err; + } + +return rc; +err: +ena_com_destroy_io_queue (ena_dev, ena_qid);return rc; }
@@ -2568,6 +2695,7 @@ static const struct net_device_ops ena_netdev_ops = { .ndo_change_mtu = ena_change_mtu, .ndo_set_mac_address = NULL, .ndo_validate_addr = eth_validate_addr, + .ndo_bpf = ena_xdp, }; static int ena_device_validate_params(struct ena_adapter *adapter,
drivers/net/ethernet/amazon/ena/ena_netdev.h +30 -0
@@ -36,6 +36,7 @@#include <linux/bitops.h> #include <linux/dim.h> #include <linux/etherdevice.h> +#include <linux/if_vlan.h> #include <linux/inetdevice.h> #include <linux/interrupt.h> #include <linux/netdevice.h>
@@ -142,6 +143,15 @@#define ENA_MMIO_DISABLE_REG_READ BIT(0) +/* The max MTU size is configured to be the ethernet frame size without +* the overhead of the ethernet header, which can have a VLAN header, and +* a frame check sequence (FCS). +* The buffer size we share with the device is defined to be ENA_PAGE_SIZE +*/ + +#define ENA_XDP_MAX_MTU (ENA_PAGE_SIZE - ETH_HLEN - ETH_FCS_LEN - \ + VLAN_HLEN - XDP_PACKET_HEADROOM) +struct ena_irq {irq_handler_t handler;void *data;
@@ -258,6 +268,8 @@ struct ena_ring {struct ena_adapter *adapter;struct ena_com_io_cq *ena_com_io_cq;struct ena_com_io_sq *ena_com_io_sq; +struct bpf_prog *xdp_bpf_prog; +struct xdp_rxq_info xdp_rxq;u16 next_to_use;u16 next_to_clean;
@@ -379,6 +391,8 @@ struct ena_adapter {u32 last_monitored_tx_qid;enum ena_regs_reset_reason_types reset_reason; + +struct bpf_prog *xdp_bpf_prog; };void ena_set_ethtool_ops (struct net_device *netdev);
@@ -390,8 +404,24 @@ void ena_dump_stats_to_buf(struct ena_adapter *adapter, u8 *buf);int ena_update_queue_sizes (struct ena_adapter *adapter,u32 new_tx_size,u32 new_rx_size); +int ena_update_queue_count (struct ena_adapter *adapter,u32 new_channel_count);int ena_get_sset_count (struct net_device *netdev,int sset); +static inline bool ena_xdp_present (struct ena_adapter *adapter) +{ +return !!adapter->xdp_bpf_prog; +} + +static inline bool ena_xdp_present_ring (struct ena_ring *ring) +{ +return !!ring->xdp_bpf_prog; +} + +static inline bool ena_xdp_allowed (struct ena_adapter *adapter) +{ +return adapter->netdev->mtu <=ENA_XDP_MAX_MTU ; +} +#endif /* !(ENA_H) */
Signature · 1 line
2.17.1
Re: [PATCH V2 net-next v2 1/3] net: ena: implement XDP drop support
Quoted 88 lines · On Tue, 19 Nov 2019 15:34:17 +0200, [email protected] wrote:
From: Sameeh Jubran <[email protected]>
This commit implements the basic functionality of drop/pass logic in the ena driver.
Signed-off-by Sameeh Jubran <[email protected]>--- drivers/net/ethernet/amazon/ena/ena_netdev.c | 148 +++++++++++++++++-- drivers/net/ethernet/amazon/ena/ena_netdev.h | 30 ++++ 2 files changed, 168 insertions(+), 10 deletions(-)drivers/net/ethernet/amazon/ena/ena_netdev.c +60
-1@@ -35,8 +35,8 @@#ifdef CONFIG_RFS_ACCEL #include <linux/cpu_rmap.h> #endif /* CONFIG_RFS_ACCEL */ +#include <linux/bpf_trace.h> #include <linux/ethtool.h> -#include <linux/if_vlan.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/numa.h> @@ -123,6 +123,80 @@ static int ena_change_mtu(struct net_device *dev, int new_mtu)return ret; } +static int ena_xdp_execute (struct ena_ring *rx_ring,struct xdp_buff *xdp) +{ +struct bpf_prog *xdp_prog; +u32 verdict =XDP_PASS ; + +rcu_read_lock (); + xdp_prog =READ_ONCE (rx_ring->xdp_bpf_prog); + +if (!xdp_prog) + goto out; + + verdict =bpf_prog_run_xdp (xdp_prog, xdp); + +if (unlikely (verdict ==XDP_ABORTED )) +trace_xdp_exception (rx_ring->netdev, xdp_prog, verdict); +else if (unlikely (verdict >=XDP_TX )) +bpf_warn_invalid_xdp_action (verdict); +out: +rcu_read_unlock (); +return verdict; +} + +static int ena_xdp_set (struct net_device *netdev,struct netdev_bpf *bpf) +{ +struct ena_adapter *adapter =netdev_priv (netdev); +struct bpf_prog *prog = bpf->prog; +struct bpf_prog *old_bpf_prog; +int i, prev_mtu; + +if (ena_xdp_allowed (adapter)) { + old_bpf_prog =xchg (&adapter->xdp_bpf_prog, prog); + +for (i =0 ; i < adapter->num_io_queues; i++) +xchg (&adapter->rx_ring[i].xdp_bpf_prog, prog); + +if (old_bpf_prog) +bpf_prog_put (old_bpf_prog); + + prev_mtu = netdev->max_mtu; + netdev->max_mtu = prog ?ENA_XDP_MAX_MTU : adapter->max_mtu; +netif_info (adapter, drv, adapter->netdev,"xdp program set, changging the max_mtu from %d to %d" , + prev_mtu, netdev->max_mtu); + + }else { +netif_err (adapter, drv, adapter->netdev,"Failed to set xdp program, the current MTU (%d) is larger than the maximum allowed MTU (%lu) while xdp is on" , + netdev->mtu,ENA_XDP_MAX_MTU ); +NL_SET_ERR_MSG_MOD (bpf->extack,"Failed to set xdp program, the current MTU is larger than the maximum allowed MTU. Check the dmesg for more info" ); +return -EINVAL ; + } + +return 0 ; +} + +/* This is the main xdp callback, it's used by the kernel to set/unset the xdp +* program as well as to query the current xdp program id. +*/ +static int ena_xdp (struct net_device *netdev,struct netdev_bpf *bpf) +{ +struct ena_adapter *adapter =netdev_priv (netdev);
drivers/net/ethernet/amazon/ena/ena_netdev.c static int ena_change_mtu(struct net_device *dev, int new_mtu) · line 194
Quoted 10 lines
drivers/net/ethernet/amazon/ena/ena_netdev.c +10
-0+ +switch (bpf->command) { +case XDP_SETUP_PROG : +return ena_xdp_set (netdev, bpf); +case XDP_QUERY_PROG : + bpf->prog_id = adapter->xdp_bpf_prog ? + adapter->xdp_bpf_prog->aux->id :0 ; +break ; +default : +NL_SET_ERR_MSG_MOD (bpf->extack,"Unsupported XDP command" );
Please remove this and silently ignore unsupported commands.
Quoted 19 lines
drivers/net/ethernet/amazon/ena/ena_netdev.c +8
-0+return -EINVAL ; + } +return 0 ; +} +static int ena_init_rx_cpu_rmap (struct ena_adapter *adapter) {#ifdef CONFIG_RFS_ACCEL @@ -417,6 +491,9 @@ static void ena_free_rx_resources(struct ena_adapter *adapter,vfree (rx_ring->free_ids); rx_ring->free_ids =NULL ; + +xdp_rxq_info_unreg_mem_model (&rx_ring->xdp_rxq); +xdp_rxq_info_unreg (&rx_ring->xdp_rxq); }/* ena_setup_all_rx_resources - allocate I/O Rx queues resources for all queues
drivers/net/ethernet/amazon/ena/ena_netdev.c static void ena_set_rx_hash(struct ena_ring *rx_ring, · line 1120
Quoted 7 lines
drivers/net/ethernet/amazon/ena/ena_netdev.c +4
-0@@ -1037,6 +1114,23 @@ static void ena_set_rx_hash(struct ena_ring *rx_ring, } } +int ena_xdp_handle_buff (struct ena_ring *rx_ring,struct xdp_buff *xdp) +{ +struct ena_rx_buffer *rx_info = + &rx_ring->rx_buffer_info[rx_ring->ena_bufs[0 ].req_id];
empty line between variables and code.
Also what's the point of the inline init of this variable if you have to break it over mutliple lines anyway?
drivers/net/ethernet/amazon/ena/ena_netdev.c static void ena_set_rx_hash(struct ena_ring *rx_ring, · line 1122
Quoted 2 lines
drivers/net/ethernet/amazon/ena/ena_netdev.c +2
-0+ xdp->data =page_address (rx_info->page) + + rx_info->page_offset;
How much space does this guarantee? From a quick grep looks like page_offset is always 0? We'd like to have 256 bytes of space for the frame to grow for XDP. I see you subtract XDP_PACKET_HEADROOM from the MTU but I don't see it used otherwise..
Quoted 14 lines
drivers/net/ethernet/amazon/ena/ena_netdev.c +11
-0+ xdp->data_meta = xdp->data; + xdp->data_hard_start =page_address (rx_info->page); + xdp->data_end = xdp->data + rx_ring->ena_bufs[0 ].len; +/* If for some reason we received a bigger packet than +* we expect, then we simply drop it +*/ +if (unlikely (rx_ring->ena_bufs[0 ].len >ENA_XDP_MAX_MTU )) +return XDP_DROP ; +else +return ena_xdp_execute (rx_ring, xdp); +}/* ena_clean_rx_irq - Cleanup RX irq * @rx_ring: RX ring to clean * @napi: napi handler
Re: [PATCH V2 net-next v2 1/3] net: ena: implement XDP drop support
In reply to [email protected]Quoted 5 lines · On Tue, 19 Nov 2019 15:34:17 +0200, [email protected] wrote:
drivers/net/ethernet/amazon/ena/ena_netdev.c +1
-0@@ -1082,11 +1180,16 @@ static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi, rx_ring->qid, ena_rx_ctx.descs, ena_rx_ctx.l3_proto, ena_rx_ctx.l4_proto, ena_rx_ctx.hash); +if (ena_xdp_present_ring (rx_ring))
drivers/net/ethernet/amazon/ena/ena_netdev.c static int ena_clean_rx_irq(struct ena_ring *rx_ring, struct napi_struct *napi, · line 1191
Quoted 10 lines
drivers/net/ethernet/amazon/ena/ena_netdev.c +7
-2+ xdp_verdict =ena_xdp_handle_buff (rx_ring, &xdp); +/* allocate skb and fill it */ - skb =ena_rx_skb (rx_ring, rx_ring->ena_bufs, ena_rx_ctx.descs, - &next_to_clean); +if (xdp_verdict ==XDP_PASS ) + skb =ena_rx_skb (rx_ring, + rx_ring->ena_bufs, + ena_rx_ctx.descs, + &next_to_clean);
XDP may move the start of frame (consume or add headers), the start of frame used when constructing the skb must reflect the changes made by XDP.
Quoted 5 lines
drivers/net/ethernet/amazon/ena/ena_netdev.c +0
-1-/* exit if we failed to retrieve a buffer */ if (unlikely (!skb)) {for (i =0 ; i < ena_rx_ctx.descs; i++) { rx_ring->free_ids[next_to_clean] =
PATCH v2 2/3 net: ena: Implement XDP_TX action
In reply to [email protected]From: Sameeh Jubran <[email protected]>
This commit implements the XDP_TX action in the ena driver. We allocate separate tx queues for the XDP_TX. We currently allow xdp only when there is enough queues to allocate for xdp.
--- drivers/net/ethernet/amazon/ena/ena_ethtool.c | 4 +- drivers/net/ethernet/amazon/ena/ena_netdev.c | 865 ++++++++++++++---- drivers/net/ethernet/amazon/ena/ena_netdev.h | 45 +- 3 files changed, 740 insertions(+), 174 deletions(-)
drivers/net/ethernet/amazon/ena/ena_ethtool.c +3 -1
@@ -744,7 +744,9 @@ static int ena_set_channels(struct net_device *netdev,struct ena_adapter *adapter =netdev_priv (netdev);u32 count = channels->combined_count;/* The check for max value is already done in ethtool */ -if (count <ENA_MIN_NUM_IO_QUEUES ) +if (count <ENA_MIN_NUM_IO_QUEUES || + (ena_xdp_present (adapter) && + !ena_xdp_legal_queue_count (adapter, channels->combined_count)))return -EINVAL ;return ena_update_queue_count (adapter, count);
drivers/net/ethernet/amazon/ena/ena_netdev.c +694 -171
1,286 lines not on this page · raw message
drivers/net/ethernet/amazon/ena/ena_netdev.h +43 -2
82 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH V2 net-next v2 2/3] net: ena: Implement XDP_TX action
Quoted 13 lines · On Tue, 19 Nov 2019 15:34:18 +0200, [email protected] wrote:
drivers/net/ethernet/amazon/ena/ena_netdev.c +0
-1@@ -35,7 +35,6 @@#ifdef CONFIG_RFS_ACCEL #include <linux/cpu_rmap.h> #endif /* CONFIG_RFS_ACCEL */ -#include <linux/bpf_trace.h> #include <linux/ethtool.h> #include <linux/kernel.h> #include <linux/module.h>
drivers/net/ethernet/amazon/ena/ena_netdev.c line 50
Quoted 5 lines
drivers/net/ethernet/amazon/ena/ena_netdev.c +1
-0@@ -47,6 +46,7 @@#include <net/ip.h> #include "ena_netdev.h" +#include <linux/bpf_trace.h> #include "ena_pci_id_tbl.h"
Perhaps just add this header include where you want it in the first patch? :/
drivers/net/ethernet/amazon/ena/ena_netdev.c struct ena_tx_buffer { · line 200
Quoted 8 lines
drivers/net/ethernet/amazon/ena/ena_netdev.c +4
-0@@ -190,6 +194,17 @@ struct ena_tx_buffer {/* num of buffers used by this skb */ u32 num_of_bufs; +/* XDP buffer structure which is used for sending packets in +* the xdp queues +*/ +struct xdp_buff *xdp;
Isn't this structure declared on the stack of ena_clean_rx_irq()? Perhaps you should consider using xdp_frame..
Quoted 10 lines
drivers/net/ethernet/amazon/ena/ena_netdev.c +7
-0+/* The rx page for the rx buffer that was received in rx and +* re transmitted on xdp tx queues as a result of XDP_TX action. +* We need to free the page once we finished cleaning the buffer in +* clean_xdp_irq() +*/ +struct page *xdp_rx_page; +/* Indicate if bufs[0] map the linear data of the skb. */ u8 map_linear_data;
PATCH v2 3/3 net: ena: Add first_interrupt field to napi struct
In reply to [email protected]From: Sameeh Jubran <[email protected]>
The first_interrupt field is accessed in ena_intr_msix_io() upon receiving an interrupt.The rx_ring and tx_ring fields of napi can be NULL when receiving interrupt for xdp queues. This patch fixes the issue by moving the field to the ena_napi struct.
--- drivers/net/ethernet/amazon/ena/ena_netdev.c | 7 +++++-- drivers/net/ethernet/amazon/ena/ena_netdev.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-)
drivers/net/ethernet/amazon/ena/ena_netdev.c +5 -2
@@ -219,6 +219,7 @@ static int ena_xdp_io_poll(struct napi_struct *napi, int budget)int ret; xdp_ring = ena_napi->xdp_ring; + xdp_ring->first_interrupt = ena_napi->first_interrupt; xdp_budget = budget;
@@ -1858,6 +1859,9 @@ static int ena_io_poll(struct napi_struct *napi, int budget) tx_ring = ena_napi->tx_ring; rx_ring = ena_napi->rx_ring; + tx_ring->first_interrupt = ena_napi->first_interrupt; + rx_ring->first_interrupt = ena_napi->first_interrupt; + tx_budget = tx_ring->ring_size /ENA_TX_POLL_BUDGET_DIVIDER ; if (!test_bit(ENA_FLAG_DEV_UP, &tx_ring->adapter->flags) ||
@@ -1929,8 +1933,7 @@ static irqreturn_t ena_intr_msix_io(int irq, void *data) {struct ena_napi *ena_napi = data; - ena_napi->tx_ring->first_interrupt = true; - ena_napi->rx_ring->first_interrupt = true; + ena_napi->first_interrupt = true;napi_schedule_irqoff (&ena_napi->napi);
drivers/net/ethernet/amazon/ena/ena_netdev.h +1 -0
@@ -169,6 +169,7 @@ struct ena_napi {struct ena_ring *tx_ring;struct ena_ring *rx_ring;struct ena_ring *xdp_ring; +bool first_interrupt;u32 qid;struct dim dim; };
Signature · 1 line
2.17.1