]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
i40e: Add programming descriptors to cleaned_count
authorAlexander Duyck <alexander.h.duyck@intel.com>
Sun, 22 Oct 2017 01:12:29 +0000 (18:12 -0700)
committerBrian Maly <brian.maly@oracle.com>
Tue, 30 Oct 2018 18:22:30 +0000 (14:22 -0400)
This patch updates the i40e driver to include programming descriptors in
the cleaned_count. Without this change it becomes possible for us to leak
memory as we don't trigger a large enough allocation when the time comes to
allocate new buffers and we end up overwriting a number of rx_buffers equal
to the number of programming descriptors we encountered.

Fixes: 0e626ff7ccbf ("i40e: Fix support for flow director programming status")
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Anders K. Pedersen <akp@cohaesio.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 62b4c6694dfd3821bd5ea5bed48238bbabd5fe8b)

Orabug: 28228724

Signed-off-by: Honglei Wang <honglei.wang@oracle.com>
Reviewed-by: Jack Vogel <jack.vogel@oracle.com>
Signed-off-by: Brian Maly <brian.maly@oracle.com>
drivers/net/ethernet/intel/i40e/i40e_txrx.c

index 433dc24a052e0c2a4765ced2ed0a9ce07f46754b..7a0e10dd4480fb77bc23b1d702def927fd0f0416 100644 (file)
@@ -1940,6 +1940,7 @@ static int i40e_clean_rx_irq(struct i40e_ring *rx_ring, int budget)
 
                if (unlikely(i40e_rx_is_programming_status(qword))) {
                        i40e_clean_programming_status(rx_ring, rx_desc, qword);
+                       cleaned_count++;
                        continue;
                }
                size = (qword & I40E_RXD_QW1_LENGTH_PBUF_MASK) >>