| Message ID | 20240620152312.1032323-2-nnac123@linux.ibm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0983d288caf984de0202c66641577b739caad561 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ibmvnic: Fix TX skb leak after device reset | expand |
On Thu, 2024-06-20 at 10:23 -0500, Nick Child wrote: > Below is a summary of how the driver stores a reference to an skb during > transmit: > tx_buff[free_map[consumer_index]]->skb = new_skb; > free_map[consumer_index] = IBMVNIC_INVALID_MAP; > consumer_index ++; > Where variable data looks like this: > free_map == [4, IBMVNIC_INVALID_MAP, IBMVNIC_INVALID_MAP, 0, 3] > consumer_index^ > tx_buff == [skb=null, skb=<ptr>, skb=<ptr>, skb=null, skb=null] > > The driver has checks to ensure that free_map[consumer_index] pointed to > a valid index but there was no check to ensure that this index pointed > to an unused/null skb address. So, if, by some chance, our free_map and > tx_buff lists become out of sync then we were previously risking an > skb memory leak. This could then cause tcp congestion control to stop > sending packets, eventually leading to ETIMEDOUT. > > Therefore, add a conditional to ensure that the skb address is null. If > not then warn the user (because this is still a bug that should be > patched) and free the old pointer to prevent memleak/tcp problems. > > Signed-off-by: Nick Child <nnac123@linux.ibm.com> > --- > drivers/net/ethernet/ibm/ibmvnic.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c > index 5e9a93bdb518..887d92a88403 100644 For some reasons, this one was not applied together with patch 2/2. I'm applying it now. Cheers, Paolo
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 5e9a93bdb518..887d92a88403 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -2482,6 +2482,18 @@ static netdev_tx_t ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) (tx_pool->consumer_index + 1) % tx_pool->num_buffers; tx_buff = &tx_pool->tx_buff[bufidx]; + + /* Sanity checks on our free map to make sure it points to an index + * that is not being occupied by another skb. If skb memory is + * not freed then we see congestion control kick in and halt tx. + */ + if (unlikely(tx_buff->skb)) { + dev_warn_ratelimited(dev, "TX free map points to untracked skb (%s %d idx=%d)\n", + skb_is_gso(skb) ? "tso_pool" : "tx_pool", + queue_num, bufidx); + dev_kfree_skb_any(tx_buff->skb); + } + tx_buff->skb = skb; tx_buff->index = bufidx; tx_buff->pool_index = queue_num;
Below is a summary of how the driver stores a reference to an skb during transmit: tx_buff[free_map[consumer_index]]->skb = new_skb; free_map[consumer_index] = IBMVNIC_INVALID_MAP; consumer_index ++; Where variable data looks like this: free_map == [4, IBMVNIC_INVALID_MAP, IBMVNIC_INVALID_MAP, 0, 3] consumer_index^ tx_buff == [skb=null, skb=<ptr>, skb=<ptr>, skb=null, skb=null] The driver has checks to ensure that free_map[consumer_index] pointed to a valid index but there was no check to ensure that this index pointed to an unused/null skb address. So, if, by some chance, our free_map and tx_buff lists become out of sync then we were previously risking an skb memory leak. This could then cause tcp congestion control to stop sending packets, eventually leading to ETIMEDOUT. Therefore, add a conditional to ensure that the skb address is null. If not then warn the user (because this is still a bug that should be patched) and free the old pointer to prevent memleak/tcp problems. Signed-off-by: Nick Child <nnac123@linux.ibm.com> --- drivers/net/ethernet/ibm/ibmvnic.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)