[dpdk-stable] patch 'net/af_xdp: fix umem frame size and headroom' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/19/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From 4f343be652008ae7b7006c4a9b916668c186de00 Mon Sep 17 00:00:00 2001
From: Ciara Loftus <ciara.loftus at intel.com>
Date: Thu, 13 Feb 2020 08:49:12 +0000
Subject: [PATCH] net/af_xdp: fix umem frame size and headroom

[ upstream commit b79ae90c78a143605610ed5c7d59d42c0846847f ]

The previous frame size calculation incorrectly used
mb_pool->private_data_size and didn't include mb_pool->header_size.
Instead of performing a manual calculation, use the
rte_mempool_calc_obj_size API to determine the frame size.

The previous frame headroom calculation also incorrectly used
mb_pool->private_data_size and didn't include mb_pool->header_size or
the mbuf priv size. Fix this.

Fixes: d8a210774e1d ("net/af_xdp: support unaligned umem chunks")

Signed-off-by: Ciara Loftus <ciara.loftus at intel.com>
Reviewed-by: Xiaolong Ye <xiaolong.ye at intel.com>
---
 drivers/net/af_xdp/rte_eth_af_xdp.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c
index d903e6c28a..348dbde5e6 100644
--- a/drivers/net/af_xdp/rte_eth_af_xdp.c
+++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
@@ -34,6 +34,7 @@
 #include <rte_log.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>
+#include <rte_mempool.h>
 #include <rte_mbuf.h>
 #include <rte_malloc.h>
 #include <rte_ring.h>
@@ -755,11 +756,13 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals __rte_unused,
 	void *base_addr = NULL;
 	struct rte_mempool *mb_pool = rxq->mb_pool;
 
-	usr_config.frame_size = rte_pktmbuf_data_room_size(mb_pool) +
-					ETH_AF_XDP_MBUF_OVERHEAD +
-					mb_pool->private_data_size;
-	usr_config.frame_headroom = ETH_AF_XDP_DATA_HEADROOM +
-					mb_pool->private_data_size;
+	usr_config.frame_size = rte_mempool_calc_obj_size(mb_pool->elt_size,
+								mb_pool->flags,
+								NULL);
+	usr_config.frame_headroom = mb_pool->header_size +
+					sizeof(struct rte_mbuf) +
+					rte_pktmbuf_priv_size(mb_pool) +
+					RTE_PKTMBUF_HEADROOM;
 
 	umem = rte_zmalloc_socket("umem", sizeof(*umem), 0, rte_socket_id());
 	if (umem == NULL) {
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-17 17:00:16.169058692 +0000
+++ 0030-net-af_xdp-fix-umem-frame-size-and-headroom.patch	2020-02-17 17:00:15.347951022 +0000
@@ -1,8 +1,10 @@
-From b79ae90c78a143605610ed5c7d59d42c0846847f Mon Sep 17 00:00:00 2001
+From 4f343be652008ae7b7006c4a9b916668c186de00 Mon Sep 17 00:00:00 2001
 From: Ciara Loftus <ciara.loftus at intel.com>
 Date: Thu, 13 Feb 2020 08:49:12 +0000
 Subject: [PATCH] net/af_xdp: fix umem frame size and headroom
 
+[ upstream commit b79ae90c78a143605610ed5c7d59d42c0846847f ]
+
 The previous frame size calculation incorrectly used
 mb_pool->private_data_size and didn't include mb_pool->header_size.
 Instead of performing a manual calculation, use the
@@ -13,7 +15,6 @@
 the mbuf priv size. Fix this.
 
 Fixes: d8a210774e1d ("net/af_xdp: support unaligned umem chunks")
-Cc: stable at dpdk.org
 
 Signed-off-by: Ciara Loftus <ciara.loftus at intel.com>
 Reviewed-by: Xiaolong Ye <xiaolong.ye at intel.com>
@@ -22,10 +23,10 @@
  1 file changed, 8 insertions(+), 5 deletions(-)
 
 diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c b/drivers/net/af_xdp/rte_eth_af_xdp.c
-index ed784dff19..111ab000cc 100644
+index d903e6c28a..348dbde5e6 100644
 --- a/drivers/net/af_xdp/rte_eth_af_xdp.c
 +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
-@@ -33,6 +33,7 @@
+@@ -34,6 +34,7 @@
  #include <rte_log.h>
  #include <rte_memory.h>
  #include <rte_memzone.h>
@@ -33,7 +34,7 @@
  #include <rte_mbuf.h>
  #include <rte_malloc.h>
  #include <rte_ring.h>
-@@ -754,11 +755,13 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals __rte_unused,
+@@ -755,11 +756,13 @@ xsk_umem_info *xdp_umem_configure(struct pmd_internals *internals __rte_unused,
  	void *base_addr = NULL;
  	struct rte_mempool *mb_pool = rxq->mb_pool;