From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9C7C2A2E1B for ; Thu, 5 Sep 2019 12:19:20 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9227A1EF81; Thu, 5 Sep 2019 12:19:20 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id E1BB21EF6E for ; Thu, 5 Sep 2019 12:19:18 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 5CBB23001806; Thu, 5 Sep 2019 10:19:18 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id A9E3819C6A; Thu, 5 Sep 2019 10:19:14 +0000 (UTC) From: Kevin Traynor To: Hemant Agrawal Cc: Maxime Coquelin , dpdk stable Date: Thu, 5 Sep 2019 11:17:37 +0100 Message-Id: <20190905101754.21933-37-ktraynor@redhat.com> In-Reply-To: <20190905101754.21933-1-ktraynor@redhat.com> References: <20190905101754.21933-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Thu, 05 Sep 2019 10:19:18 +0000 (UTC) Subject: [dpdk-stable] patch 'net/virtio: fix build with 0 headroom' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Acked-by: Maxime Coquelin --- 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@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)