[dpdk-stable] patch 'net/virtio: fix build with 0 headroom' has been queued to LTS release 18.11.3

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/12/19. 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.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/3a8c48fa93658afad461a86136f6c61c1a2b8024

Thanks.

Kevin Traynor

---
>From 3a8c48fa93658afad461a86136f6c61c1a2b8024 Mon Sep 17 00:00:00 2001
From: Hemant Agrawal <hemant.agrawal at nxp.com>
Date: Thu, 25 Jul 2019 16:36:45 +0530
Subject: [PATCH] net/virtio: fix build with 0 headroom
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit c1ada9b63b8309a99c6370ff50a24b7d6d238c9b ]

When using RTE_PKTMBUF_HEADROOM as 0, virito ethdev driver throws
compilation error
virtio_ethdev.c:1851:2: note: in expansion of macro ‘RTE_BUILD_BUG_ON’
RTE_BUILD_BUG_ON(RTE_PKTMBUF_HEADROOM
	< sizeof(struct virtio_net_hdr_mrg_rxbuf));

This patch change it into run-time check.

Bugzilla ID: 335
Fixes: dec08c28c0b3 ("virtio: check packet headroom at compile time")

Signed-off-by: Hemant Agrawal <hemant.agrawal at nxp.com>
Acked-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 drivers/net/virtio/virtio_ethdev.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index 9098cb6f4..8c54edc28 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1666,5 +1666,12 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
 	int ret;
 
-	RTE_BUILD_BUG_ON(RTE_PKTMBUF_HEADROOM < sizeof(struct virtio_net_hdr_mrg_rxbuf));
+	if (sizeof(struct virtio_net_hdr_mrg_rxbuf) > RTE_PKTMBUF_HEADROOM) {
+		PMD_INIT_LOG(ERR,
+			"Not sufficient headroom required = %d, avail = %d",
+			(int)sizeof(struct virtio_net_hdr_mrg_rxbuf),
+			RTE_PKTMBUF_HEADROOM);
+
+		return -1;
+	}
 
 	eth_dev->dev_ops = &virtio_eth_dev_ops;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-09-05 10:36:49.759872356 +0100
+++ 0037-net-virtio-fix-build-with-0-headroom.patch	2019-09-05 10:36:47.538699852 +0100
@@ -1 +1 @@
-From c1ada9b63b8309a99c6370ff50a24b7d6d238c9b Mon Sep 17 00:00:00 2001
+From 3a8c48fa93658afad461a86136f6c61c1a2b8024 Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit c1ada9b63b8309a99c6370ff50a24b7d6d238c9b ]
+
@@ -19 +20,0 @@
-Cc: stable at dpdk.org
@@ -28 +29 @@
-index 20840bf8a..f96588b9d 100644
+index 9098cb6f4..8c54edc28 100644
@@ -31 +32 @@
-@@ -1846,5 +1846,12 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
+@@ -1666,5 +1666,12 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)