From: Willem de Bruijn <willemb@xxxxxxxxxx>
Virtio-net supports sharing the flow hash from device to driver on rx.
Do the same in the other direction for robust routing and telemetry.
Linux derives ipv6 flowlabel and ECMP multipath from sk->sk_txhash,
and updates this field on error with sk_rethink_txhash. Allow the host
stack to do the same.
Concrete examples of error conditions that are resolved are
mentioned in the commits that add sk_rethink_txhash calls. Such as
commit 7788174e8726 ("tcp: change IPv6 flow-label upon receiving
spurious retransmission").
Experimental results mirror what the theory suggests: where IPv6
FlowLabel is included in path selection (e.g., LAG/ECMP), flowlabel
rotation on TCP timeout avoids the vast majority of TCP disconnects
that would otherwise have occurred during link failures in long-haul
backbones, when an alternative path is available.
Rotation can be applied to various bad connection signals, such as
timeouts and spurious retransmissions. In aggregate, such flow level
signals can help locate network issues. Reserve field hash_state to
share this info. For now, always set VIRTIO_NET_HASH_STATE_DEFAULT.
Passing information between TCP stack and driver is future work.
Changes RFC->RFCv2
- drop unused VIRTIO_NET_HASH_STATE_TIMEOUT_BIT
- convert from cpu_to_virtioXX to cpu_to_leXX
Signed-off-by: Willem de Bruijn <willemb@xxxxxxxxxx>
Signed-off-by: Steffen Trumtrar <s.trumtrar@xxxxxxxxxxxxxx>
---
drivers/net/virtio_net.c | 26 +++++++++++++++++++++++---
include/uapi/linux/virtio_net.h | 9 ++++++++-
2 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index d16f592c2061f..8c9de31af8942 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -271,6 +271,9 @@ struct virtnet_info {
u32 rss_hash_types_supported;
u32 rss_hash_types_saved;
+ /* Driver will pass tx path info to the device */
+ bool has_tx_hash;
+
/* Has control virtqueue */
bool has_cvq;
@@ -512,9 +515,9 @@ static struct sk_buff *page_to_skb(struct virtnet_info *vi,
hdr_len = vi->hdr_len;
if (vi->mergeable_rx_bufs)
- hdr_padded_len = hdr_len;
+ hdr_padded_len = max_t(unsigned int, hdr_len, sizeof(*hdr));
else
- hdr_padded_len = sizeof(struct padded_vnet_hdr);
+ hdr_padded_len = ALIGN(hdr_len, 16);
buf = p - headroom;
len -= hdr_len;
@@ -2282,6 +2285,7 @@ static int xmit_skb(struct send_queue *sq, struct sk_buff *skb)
struct virtio_net_hdr_mrg_rxbuf *hdr;
const unsigned char *dest = ((struct ethhdr *)skb->data)->h_dest;
struct virtnet_info *vi = sq->vq->vdev->priv;
+ struct virtio_net_hdr_v1_hash *ht;
int num_sg;
unsigned hdr_len = vi->hdr_len;
bool can_push;
@@ -2306,6 +2310,16 @@ static int xmit_skb(struct send_queue *sq, struct sk_buff *skb)
if (vi->mergeable_rx_bufs)
hdr->num_buffers = 0;
+ ht = (void *)hdr;
+ if (vi->has_tx_hash) {
+ u16 report = skb->l4_hash ? VIRTIO_NET_HASH_REPORT_L4 :
+ VIRTIO_NET_HASH_REPORT_OTHER;
+
+ ht->hash_value = cpu_to_le32(skb->hash);
+ ht->hash_report = cpu_to_le16(report);
+ ht->hash_state = cpu_to_le16(VIRTIO_NET_HASH_STATE_DEFAULT);
+ }
+
sg_init_table(sq->sg, skb_shinfo(skb)->nr_frags + (can_push ? 1 : 2));
if (can_push) {
__skb_push(skb, hdr_len);
@@ -4511,6 +4525,11 @@ static int virtnet_probe(struct virtio_device *vdev)
else
vi->hdr_len = sizeof(struct virtio_net_hdr);
+ if (virtio_has_feature(vi->vdev, VIRTIO_NET_F_TX_HASH)) {
+ vi->has_tx_hash = true;
+ vi->hdr_len = sizeof(struct virtio_net_hdr_v1_hash);
+ }
+
if (virtio_has_feature(vdev, VIRTIO_F_ANY_LAYOUT) ||
virtio_has_feature(vdev, VIRTIO_F_VERSION_1))
vi->any_header_sg = true;
@@ -4753,7 +4772,8 @@ static struct virtio_device_id id_table[] = {
VIRTIO_NET_F_SPEED_DUPLEX, VIRTIO_NET_F_STANDBY, \
VIRTIO_NET_F_RSS, VIRTIO_NET_F_HASH_REPORT, VIRTIO_NET_F_NOTF_COAL, \
VIRTIO_NET_F_VQ_NOTF_COAL, \
- VIRTIO_NET_F_GUEST_HDRLEN
+ VIRTIO_NET_F_GUEST_HDRLEN, \
+ VIRTIO_NET_F_TX_HASH
static unsigned int features[] = {
VIRTNET_FEATURES,
diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_net.h
index cc65ef0f3c3e2..698a11f8c6ab9 100644
--- a/include/uapi/linux/virtio_net.h
+++ b/include/uapi/linux/virtio_net.h
@@ -56,6 +56,7 @@
#define VIRTIO_NET_F_MQ 22 /* Device supports Receive Flow
* Steering */
#define VIRTIO_NET_F_CTRL_MAC_ADDR 23 /* Set MAC address */
+#define VIRTIO_NET_F_TX_HASH 51 /* Driver sends hash report */
#define VIRTIO_NET_F_VQ_NOTF_COAL 52 /* Device supports virtqueue notification coalescing */
#define VIRTIO_NET_F_NOTF_COAL 53 /* Device supports notifications coalescing */
#define VIRTIO_NET_F_GUEST_USO4 54 /* Guest can handle USOv4 in. */
@@ -176,8 +177,14 @@ struct virtio_net_hdr_v1_hash {
#define VIRTIO_NET_HASH_REPORT_IPv6_EX 7
#define VIRTIO_NET_HASH_REPORT_TCPv6_EX 8
#define VIRTIO_NET_HASH_REPORT_UDPv6_EX 9
+#define VIRTIO_NET_HASH_REPORT_L4 10
+#define VIRTIO_NET_HASH_REPORT_OTHER 11
__le16 hash_report;
- __le16 padding;
+ union {
+ __le16 padding;
+#define VIRTIO_NET_HASH_STATE_DEFAULT 0
+ __le16 hash_state;
+ };
};
#ifndef VIRTIO_NET_NO_LEGACY
--
2.42.0
