lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <20220415210546.11294-1-jeff.evanson@qsc.com> Date: Fri, 15 Apr 2022 15:05:46 -0600 From: Jeff Evanson <jeff.evanson@...il.com> To: Jesse Brandeburg <jesse.brandeburg@...el.com>, Tony Nguyen <anthony.l.nguyen@...el.com>, "David S. Miller" <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>, intel-wired-lan@...ts.osuosl.org, netdev@...r.kernel.org, linux-kernel@...r.kernel.org Cc: jeff.evanson@....com, jeff.evanson@...il.com Subject: [PATCH 2/2] Trigger proper interrupts in igc_xsk_wakeup in igc_xsk_wakeup, trigger the proper interrupt based on whether flags contains XDP_WAKEUP_RX and/or XDP_WAKEUP_TX Signed-off-by: Jeff Evanson <jeff.evanson@....com> --- drivers/net/ethernet/intel/igc/igc_main.c | 36 +++++++++++++++++------ 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c index a36a18c84aeb..d706de95dc06 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -6073,7 +6073,7 @@ static void igc_trigger_rxtxq_interrupt(struct igc_adapter *adapter, int igc_xsk_wakeup(struct net_device *dev, u32 queue_id, u32 flags) { struct igc_adapter *adapter = netdev_priv(dev); - struct igc_q_vector *q_vector; + struct igc_q_vector *txq_vector = 0, *rxq_vector = 0; struct igc_ring *ring; if (test_bit(__IGC_DOWN, &adapter->state)) @@ -6082,17 +6082,35 @@ int igc_xsk_wakeup(struct net_device *dev, u32 queue_id, u32 flags) if (!igc_xdp_is_enabled(adapter)) return -ENXIO; - if (queue_id >= adapter->num_rx_queues) - return -EINVAL; + if (flags & XDP_WAKEUP_RX) { + if (queue_id >= adapter->num_rx_queues) + return -EINVAL; - ring = adapter->rx_ring[queue_id]; + ring = adapter->rx_ring[queue_id]; + if (!ring->xsk_pool) + return -ENXIO; - if (!ring->xsk_pool) - return -ENXIO; + rxq_vector = ring->q_vector; + } + + if (flags & XDP_WAKEUP_TX) { + if (queue_id >= adapter->num_tx_queues) + return -EINVAL; + + ring = adapter->tx_ring[queue_id]; + if (!ring->xsk_pool) + return -ENXIO; + + txq_vector = ring->q_vector; + } + + if (rxq_vector && + !napi_if_scheduled_mark_missed(&rxq_vector->napi)) + igc_trigger_rxtxq_interrupt(adapter, rxq_vector); - q_vector = adapter->q_vector[queue_id]; - if (!napi_if_scheduled_mark_missed(&q_vector->napi)) - igc_trigger_rxtxq_interrupt(adapter, q_vector); + if (txq_vector && txq_vector != rxq_vector && + !napi_if_scheduled_mark_missed(&txq_vector->napi)) + igc_trigger_rxtxq_interrupt(adapter, txq_vector); return 0; } -- 2.17.1
Powered by blists - more mailing lists