From: Hemant Agrawal <hemant.agrawal@nxp.com>
To: dev@dpdk.org, matan@mellanox.com
Cc: stable@dpdk.org, Olivier Matz <olivier.matz@6wind.com>
Subject: [dpdk-dev] [PATCH BUG 335 3/3] net/virtio: fix compilation error with 0 headroom
Date: Thu, 25 Jul 2019 16:36:45 +0530 [thread overview]
Message-ID: <20190725110645.8817-3-hemant.agrawal@nxp.com> (raw)
In-Reply-To: <20190725110645.8817-1-hemant.agrawal@nxp.com>
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.
Reported as: https://bugs.dpdk.org/show_bug.cgi?id=335
Fixes: 198ab33677c9 ("net/virtio: move device initialization in a function")
Cc: stable@dpdk.org
Cc: Olivier Matz <olivier.matz@6wind.com>
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.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 62c827443..3e2e8bd2a 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1848,7 +1848,14 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)
struct virtio_hw *hw = eth_dev->data->dev_private;
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.17.1
next prev parent reply other threads:[~2019-07-25 11:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-25 11:06 [dpdk-dev] [PATCH BUG 335 1/3] net/dpaa: " Hemant Agrawal
2019-07-25 11:06 ` [dpdk-dev] [PATCH BUG 335 2/3] bus/fslmc: " Hemant Agrawal
2019-07-25 11:06 ` Hemant Agrawal [this message]
2019-07-26 12:25 ` [dpdk-dev] [PATCH BUG 335 3/3] net/virtio: " Olivier Matz
2019-07-30 13:35 ` Maxime Coquelin
2019-08-01 8:09 ` Hemant Agrawal
2019-08-05 13:07 ` Maxime Coquelin
2019-08-05 17:26 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190725110645.8817-3-hemant.agrawal@nxp.com \
--to=hemant.agrawal@nxp.com \
--cc=dev@dpdk.org \
--cc=matan@mellanox.com \
--cc=olivier.matz@6wind.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).