bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport_igb_fixes' into 'stable-1.5' 

Fix resource leak in igb

See merge request etherlab.org/ethercat!125
This commit is contained in:
Florian Pose 2024-06-07 08:53:35 +00:00
parent 8b5a6ba004 e5d8adf7e5
commit c2b8e2ed50
7 changed files with 54 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
devices/igb/igb_main-3.18-ethercat.c
View File

@ -1047,10 +1047,7 @@ static void igb_reset_q_vector(struct igb_adapter *adapter, int v_idx)
if (q_vector->rx.ring)
adapter->tx_ring[q_vector->rx.ring->queue_index] = NULL;
if (!adapter->ecdev) {
netif_napi_del(&q_vector->napi);
}
netif_napi_del(&q_vector->napi);
}
static void igb_reset_interrupt_capability(struct igb_adapter *adapter)
@ -1221,11 +1218,9 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter,
if (!q_vector)
return -ENOMEM;
if (!adapter->ecdev) {
/* initialize NAPI */
netif_napi_add(adapter->netdev, &q_vector->napi,
igb_poll, 64);
}
/* initialize NAPI */
netif_napi_add(adapter->netdev, &q_vector->napi,
igb_poll, 64);
/* tie q_vector and adapter together */
adapter->q_vector[v_idx] = q_vector;
@ -6430,6 +6425,9 @@ static int igb_poll(struct napi_struct *napi, int budget)
napi);
bool clean_complete = true;
if (q_vector->adapter->ecdev)
return -EBUSY;
#ifdef CONFIG_IGB_DCA
if (q_vector->adapter->flags & IGB_FLAG_DCA_ENABLED)
igb_update_dca(q_vector);

16
devices/igb/igb_main-4.19-ethercat.c
View File

@ -1037,10 +1037,7 @@ static void igb_reset_q_vector(struct igb_adapter *adapter, int v_idx)
if (q_vector->rx.ring)
adapter->rx_ring[q_vector->rx.ring->queue_index] = NULL;
if (!adapter->ecdev) {
netif_napi_del(&q_vector->napi);
}
netif_napi_del(&q_vector->napi);
}
static void igb_reset_interrupt_capability(struct igb_adapter *adapter)
@ -1219,11 +1216,9 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter,
if (!q_vector)
return -ENOMEM;
if (!adapter->ecdev) {
/* initialize NAPI */
netif_napi_add(adapter->netdev, &q_vector->napi,
igb_poll, 64);
}
/* initialize NAPI */
netif_napi_add(adapter->netdev, &q_vector->napi,
igb_poll, 64);
/* tie q_vector and adapter together */
adapter->q_vector[v_idx] = q_vector;
@ -7858,6 +7853,9 @@ static int igb_poll(struct napi_struct *napi, int budget)
bool clean_complete = true;
int work_done = 0;
if (q_vector->adapter->ecdev)
return -EBUSY;
#ifdef CONFIG_IGB_DCA
if (q_vector->adapter->flags & IGB_FLAG_DCA_ENABLED)
igb_update_dca(q_vector);

16
devices/igb/igb_main-4.4-ethercat.c
View File

@ -1047,10 +1047,7 @@ static void igb_reset_q_vector(struct igb_adapter *adapter, int v_idx)
if (q_vector->rx.ring)
adapter->rx_ring[q_vector->rx.ring->queue_index] = NULL;
if (!adapter->ecdev) {
netif_napi_del(&q_vector->napi);
}
netif_napi_del(&q_vector->napi);
}
static void igb_reset_interrupt_capability(struct igb_adapter *adapter)
@ -1227,11 +1224,9 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter,
if (!q_vector)
return -ENOMEM;
if (!adapter->ecdev) {
/* initialize NAPI */
netif_napi_add(adapter->netdev, &q_vector->napi,
igb_poll, 64);
}
/* initialize NAPI */
netif_napi_add(adapter->netdev, &q_vector->napi,
igb_poll, 64);
/* tie q_vector and adapter together */
adapter->q_vector[v_idx] = q_vector;
@ -6492,6 +6487,9 @@ static int igb_poll(struct napi_struct *napi, int budget)
bool clean_complete = true;
int work_done = 0;
if (q_vector->adapter->ecdev)
return -EBUSY;
#ifdef CONFIG_IGB_DCA
if (q_vector->adapter->flags & IGB_FLAG_DCA_ENABLED)
igb_update_dca(q_vector);

20
devices/igb/igb_main-5.10-ethercat.c
View File

@ -1036,9 +1036,7 @@ static void igb_reset_q_vector(struct igb_adapter *adapter, int v_idx)
if (q_vector->rx.ring)
adapter->rx_ring[q_vector->rx.ring->queue_index] = NULL;
if (!adapter->ecdev)
netif_napi_del(&q_vector->napi);
netif_napi_del(&q_vector->napi);
}
static void igb_reset_interrupt_capability(struct igb_adapter *adapter)
@ -1218,10 +1216,8 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter,
return -ENOMEM;
/* initialize NAPI */
if (!adapter->ecdev) {
netif_napi_add(adapter->netdev, &q_vector->napi,
igb_poll, 64);
}
netif_napi_add(adapter->netdev, &q_vector->napi,
igb_poll, 64);
/* tie q_vector and adapter together */
adapter->q_vector[v_idx] = q_vector;
@ -6477,7 +6473,7 @@ netdev_tx_t igb_xmit_frame_ring(struct sk_buff *skb,
first->bytecount = skb->len;
first->gso_segs = 1;
if (unlikely(!adapter->ecdev &&
if (unlikely(!adapter->ecdev &&
skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
if (adapter->tstamp_config.tx_type == HWTSTAMP_TX_ON &&
@ -8119,6 +8115,10 @@ static int igb_poll(struct napi_struct *napi, int budget)
bool clean_complete = true;
int work_done = 0;
if (q_vector->adapter->ecdev) {
return -EBUSY;
}
#ifdef CONFIG_IGB_DCA
if (q_vector->adapter->flags & IGB_FLAG_DCA_ENABLED)
igb_update_dca(q_vector);
@ -8260,7 +8260,7 @@ static bool igb_clean_tx_irq(struct igb_q_vector *q_vector, int napi_budget)
q_vector->tx.total_bytes += total_bytes;
q_vector->tx.total_packets += total_packets;
if (!adapter->ecdev &&
if (!adapter->ecdev &&
test_bit(IGB_RING_FLAG_TX_DETECT_HANG, &tx_ring->flags)) {
struct e1000_hw *hw = &adapter->hw;
@ -8912,7 +8912,7 @@ static int igb_clean_rx_irq(struct igb_q_vector *q_vector, const int budget)
total_packets++;
continue;
}
/* verify the packet layout is correct */
if (igb_cleanup_headers(rx_ring, rx_desc, skb)) {
skb = NULL;

13
devices/igb/igb_main-5.14-ethercat.c
View File

@ -1047,8 +1047,7 @@ static void igb_reset_q_vector(struct igb_adapter *adapter, int v_idx)
if (q_vector->rx.ring)
adapter->rx_ring[q_vector->rx.ring->queue_index] = NULL;
if (!adapter->ecdev)
netif_napi_del(&q_vector->napi);
netif_napi_del(&q_vector->napi);
}
@ -1229,10 +1228,8 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter,
return -ENOMEM;
/* initialize NAPI */
if (!adapter->ecdev) {
netif_napi_add(adapter->netdev, &q_vector->napi,
igb_poll, 64);
}
netif_napi_add(adapter->netdev, &q_vector->napi,
igb_poll, 64);
/* tie q_vector and adapter together */
adapter->q_vector[v_idx] = q_vector;
@ -8125,6 +8122,10 @@ static int igb_poll(struct napi_struct *napi, int budget)
bool clean_complete = true;
int work_done = 0;
if (get_ecdev(q_vector->adapter)) {
return -EBUSY;
}
#ifdef CONFIG_IGB_DCA
if (q_vector->adapter->flags & IGB_FLAG_DCA_ENABLED)
igb_update_dca(q_vector);

19
devices/igb/igb_main-5.15-ethercat.c
View File

@ -1036,8 +1036,7 @@ static void igb_reset_q_vector(struct igb_adapter *adapter, int v_idx)
if (q_vector->rx.ring)
adapter->rx_ring[q_vector->rx.ring->queue_index] = NULL;
if (!adapter->ecdev)
netif_napi_del(&q_vector->napi);
netif_napi_del(&q_vector->napi);
}
@ -1218,10 +1217,8 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter,
return -ENOMEM;
/* initialize NAPI */
if (!adapter->ecdev) {
netif_napi_add(adapter->netdev, &q_vector->napi,
igb_poll, 64);
}
netif_napi_add(adapter->netdev, &q_vector->napi,
igb_poll, 64);
/* tie q_vector and adapter together */
adapter->q_vector[v_idx] = q_vector;
@ -6473,7 +6470,7 @@ netdev_tx_t igb_xmit_frame_ring(struct sk_buff *skb,
first->bytecount = skb->len;
first->gso_segs = 1;
if (unlikely(!adapter->ecdev &&
if (unlikely(!adapter->ecdev &&
skb_shinfo(skb)->tx_flags & SKBTX_HW_TSTAMP)) {
if (adapter->tstamp_config.tx_type == HWTSTAMP_TX_ON &&
@ -8115,6 +8112,10 @@ static int igb_poll(struct napi_struct *napi, int budget)
bool clean_complete = true;
int work_done = 0;
if (get_ecdev(q_vector->adapter)) {
return -EBUSY;
}
#ifdef CONFIG_IGB_DCA
if (q_vector->adapter->flags & IGB_FLAG_DCA_ENABLED)
igb_update_dca(q_vector);
@ -8256,7 +8257,7 @@ static bool igb_clean_tx_irq(struct igb_q_vector *q_vector, int napi_budget)
q_vector->tx.total_bytes += total_bytes;
q_vector->tx.total_packets += total_packets;
if (!adapter->ecdev &&
if (!adapter->ecdev &&
test_bit(IGB_RING_FLAG_TX_DETECT_HANG, &tx_ring->flags)) {
struct e1000_hw *hw = &adapter->hw;
@ -8907,7 +8908,7 @@ static int igb_clean_rx_irq(struct igb_q_vector *q_vector, const int budget)
total_packets++;
continue;
}
/* verify the packet layout is correct */
if (igb_cleanup_headers(rx_ring, rx_desc, skb)) {
skb = NULL;

11
devices/igb/igb_main-6.1-ethercat.c
View File

@ -1034,8 +1034,7 @@ static void igb_reset_q_vector(struct igb_adapter *adapter, int v_idx)
if (q_vector->rx.ring)
adapter->rx_ring[q_vector->rx.ring->queue_index] = NULL;
if (!adapter->ecdev)
netif_napi_del(&q_vector->napi);
netif_napi_del(&q_vector->napi);
}
@ -1220,9 +1219,7 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter,
return -ENOMEM;
/* initialize NAPI */
if (!adapter->ecdev) {
netif_napi_add(adapter->netdev, &q_vector->napi, igb_poll);
}
netif_napi_add(adapter->netdev, &q_vector->napi, igb_poll);
/* tie q_vector and adapter together */
adapter->q_vector[v_idx] = q_vector;
@ -8268,6 +8265,10 @@ static int igb_poll(struct napi_struct *napi, int budget)
bool clean_complete = true;
int work_done = 0;
if (get_ecdev(q_vector->adapter)) {
return -EBUSY;
}
#ifdef CONFIG_IGB_DCA
if (q_vector->adapter->flags & IGB_FLAG_DCA_ENABLED)
igb_update_dca(q_vector);