summaryrefslogtreecommitdiff
path: root/drivers/net/virtio/virtio_ethdev.c
diff options
context:
space:
mode:
authorJens Freimann <jfreimann@redhat.com>2019-02-05 12:17:02 +0100
committerFerruh Yigit <ferruh.yigit@intel.com>2019-02-08 19:27:07 +0100
commit8b90e4358112b9e41f8eaa1ba14c783570307fea (patch)
treec3af071c744b3ba23595fb2af8bd05ed4920263d /drivers/net/virtio/virtio_ethdev.c
parent4b058fdd27ceac277aa715df6f6bb0f7b37b150b (diff)
downloaddpdk-next-eventdev-8b90e4358112b9e41f8eaa1ba14c783570307fea.zip
dpdk-next-eventdev-8b90e4358112b9e41f8eaa1ba14c783570307fea.tar.gz
dpdk-next-eventdev-8b90e4358112b9e41f8eaa1ba14c783570307fea.tar.xz
net/virtio: set offload flag for jumbo frames
Port configuration fails because offload flags don't match the expected value when max-pkt-len is set to a value that should enable receive port offloading but doesn't. The .dev_infos_get callback can be called before the configure callback. At that time we don't know the maximum packet size yet because it is only set up when ports are started. So in virtio_dev_info_get() just always set the jumbo packet offload flag. Check the maximum packet length at device configure time, because then we have access to the max-pkt-len value provided by the user. If the max-pkt-len exceeds the maximum MTU supported by the device we remove the VIRTIO_NET_F_MTU flag from requested features. Fixes: a4996bd89c42 ("ethdev: new Rx/Tx offloads API") Cc: stable@dpdk.org Signed-off-by: Jens Freimann <jfreimann@redhat.com> Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
Diffstat (limited to 'drivers/net/virtio/virtio_ethdev.c')
-rw-r--r--drivers/net/virtio/virtio_ethdev.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c
index 7c4c1df..7c2fe76 100644
--- a/drivers/net/virtio/virtio_ethdev.c
+++ b/drivers/net/virtio/virtio_ethdev.c
@@ -1972,6 +1972,8 @@ virtio_dev_configure(struct rte_eth_dev *dev)
const struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
const struct rte_eth_txmode *txmode = &dev->data->dev_conf.txmode;
struct virtio_hw *hw = dev->data->dev_private;
+ uint32_t ether_hdr_len = ETHER_HDR_LEN + VLAN_TAG_LEN +
+ hw->vtnet_hdr_size;
uint64_t rx_offloads = rxmode->offloads;
uint64_t tx_offloads = txmode->offloads;
uint64_t req_features;
@@ -1986,6 +1988,9 @@ virtio_dev_configure(struct rte_eth_dev *dev)
return ret;
}
+ if (rxmode->max_rx_pkt_len > hw->max_mtu + ether_hdr_len)
+ req_features &= ~(1ULL << VIRTIO_NET_F_MTU);
+
if (rx_offloads & (DEV_RX_OFFLOAD_UDP_CKSUM |
DEV_RX_OFFLOAD_TCP_CKSUM))
req_features |= (1ULL << VIRTIO_NET_F_GUEST_CSUM);
@@ -2339,6 +2344,7 @@ virtio_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
host_features = VTPCI_OPS(hw)->get_features(hw);
dev_info->rx_offload_capa = DEV_RX_OFFLOAD_VLAN_STRIP;
+ dev_info->rx_offload_capa |= DEV_RX_OFFLOAD_JUMBO_FRAME;
if (host_features & (1ULL << VIRTIO_NET_F_GUEST_CSUM)) {
dev_info->rx_offload_capa |=
DEV_RX_OFFLOAD_TCP_CKSUM |