From patchwork Mon Dec 28 16:22:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Willem de Bruijn X-Patchwork-Id: 354195 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98424C4332B for ; Mon, 28 Dec 2020 16:23:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6CD5B208B6 for ; Mon, 28 Dec 2020 16:23:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2441027AbgL1QXV (ORCPT ); Mon, 28 Dec 2020 11:23:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2441018AbgL1QXT (ORCPT ); Mon, 28 Dec 2020 11:23:19 -0500 Received: from mail-qv1-xf2f.google.com (mail-qv1-xf2f.google.com [IPv6:2607:f8b0:4864:20::f2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 00E4EC061793 for ; Mon, 28 Dec 2020 08:22:39 -0800 (PST) Received: by mail-qv1-xf2f.google.com with SMTP id bd6so5130330qvb.9 for ; Mon, 28 Dec 2020 08:22:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=E+P5deBgMfEMNVf0vB1e6Pyaa3lRUXorz/FFexYbRww=; b=p+sxNA67eY0qGzrr2ZW6sQAHd9YD0jBivT9ziHSrGJMTY4UrjK4ppFohD1CVbPCzxZ WI/Ex9/QF5cywFlBBJ5ZPgKp58cgSI9ffH5PbjMk7oHXQMoN2sJf5IB5eAjUSsdAwDDo u3KQTI2/2KRBWvhoP5wVuJk9Np8K0XSbe1H2kBEKYScpCUsfuJgusA+9dX9oOuYNbaIj Nuxnf9A/oCB3j61hFK7ONtm78MzDSFseEGs2GkUOuRiHAE8whBocmAoezYr7C/ln+ObI d3fySF12MrE0fO3LrJfOY8sxx2RM+u18qN/5D1mMcWdrgxccRHvpFFlp5VU3EKApVs4w CBdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=E+P5deBgMfEMNVf0vB1e6Pyaa3lRUXorz/FFexYbRww=; b=O3NcwfJcmLc8rmWwLNv80u4YtGU8qck0DPeP6jSKwWT4JA8Ytk3IA2o1DasaXF+MZS 2ZNBA4Hl213VRB6qThKZu7AWPk4N2M9ek60QMgEp8l4BHv/rqZcqwHObbAElys+2Ld1D 6I4UIDijZEa7yA4MXfBW8xnSS7fXPas+RZy8woYmr2Boj1yS3ykjTnebvCkd23+GqOp+ dPIiY/QEBsBxEMzoRO8NbqWtyahu1zNdGWPZrRXBI8QkLeZTqSzQ28Oje7MufKxJ5Afa HQtRr/pzaMIaay1F7ryCxro3865EyizoKVDc7Wr+zVInJJpoMjtAJ5SENpYJ29/AYd7R WzRg== X-Gm-Message-State: AOAM532kZQUtNGNPfxx+S/WHQoB5D75Tm6u4DOAPUBBJTBZpatBoGQ09 QgblWXHDDvgv/FJ6OXpuSo0= X-Google-Smtp-Source: ABdhPJyzCEi17L8Bqx+W7irotxFVqlBZ0ufvsoQmL1pqrzYK2d80AdgiRcapqv28GPFkJFMeEo0uMA== X-Received: by 2002:a0c:fe90:: with SMTP id d16mr48310260qvs.13.1609172558271; Mon, 28 Dec 2020 08:22:38 -0800 (PST) Received: from willemb.nyc.corp.google.com ([2620:0:1003:312:f693:9fff:fef4:3e8a]) by smtp.gmail.com with ESMTPSA id u65sm24005556qkb.58.2020.12.28.08.22.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Dec 2020 08:22:37 -0800 (PST) From: Willem de Bruijn To: virtualization@lists.linux-foundation.org Cc: netdev@vger.kernel.org, mst@redhat.com, jasowang@redhat.com, Willem de Bruijn Subject: [PATCH rfc 1/3] virtio-net: support transmit hash report Date: Mon, 28 Dec 2020 11:22:31 -0500 Message-Id: <20201228162233.2032571-2-willemdebruijn.kernel@gmail.com> X-Mailer: git-send-email 2.29.2.729.g45daf8777d-goog In-Reply-To: <20201228162233.2032571-1-willemdebruijn.kernel@gmail.com> References: <20201228162233.2032571-1-willemdebruijn.kernel@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Willem de Bruijn Virtio-net supports sharing the flow hash from host to guest on rx. Do the same on transmit, to allow the host to infer connection state for more robust routing and telemetry. Linux derives ipv6 flowlabel and ECMP multipath from sk->sk_txhash, and updates these fields on error with sk_rethink_txhash. This feature allows the host to make similar decisions. Besides the raw hash, optionally also convey connection state for this hash. Specifically, the hash rotates on transmit timeout. To avoid having to keep a stateful table in the host to detect flow changes, explicitly notify when a hash changed due to timeout. Signed-off-by: Willem de Bruijn --- drivers/net/virtio_net.c | 24 +++++++++++++++++++++--- include/uapi/linux/virtio_net.h | 10 +++++++++- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 21b71148c532..b917b7333928 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -201,6 +201,9 @@ struct virtnet_info { /* Host will merge rx buffers for big packets (shake it! shake it!) */ bool mergeable_rx_bufs; + /* Guest will pass tx path info to the host */ + bool has_tx_hash; + /* Has control virtqueue */ bool has_cvq; @@ -394,9 +397,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 = sizeof(*hdr); + 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); /* hdr_valid means no XDP, so we can copy the vnet header */ if (hdr_valid) @@ -1534,6 +1537,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; @@ -1558,6 +1562,14 @@ 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) { + ht->hash_value = cpu_to_virtio32(vi->vdev, skb->hash); + ht->hash_report = skb->l4_hash ? VIRTIO_NET_HASH_REPORT_L4 : + VIRTIO_NET_HASH_REPORT_OTHER; + ht->hash_state = 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); @@ -3054,6 +3066,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; @@ -3243,7 +3260,8 @@ static struct virtio_device_id id_table[] = { VIRTIO_NET_F_GUEST_ANNOUNCE, VIRTIO_NET_F_MQ, \ VIRTIO_NET_F_CTRL_MAC_ADDR, \ VIRTIO_NET_F_MTU, VIRTIO_NET_F_CTRL_GUEST_OFFLOADS, \ - VIRTIO_NET_F_SPEED_DUPLEX, VIRTIO_NET_F_STANDBY + VIRTIO_NET_F_SPEED_DUPLEX, VIRTIO_NET_F_STANDBY, \ + 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 3f55a4215f11..f6881b5b77ee 100644 --- a/include/uapi/linux/virtio_net.h +++ b/include/uapi/linux/virtio_net.h @@ -57,6 +57,7 @@ * Steering */ #define VIRTIO_NET_F_CTRL_MAC_ADDR 23 /* Set MAC address */ +#define VIRTIO_NET_F_TX_HASH 56 /* Guest sends hash report */ #define VIRTIO_NET_F_HASH_REPORT 57 /* Supports hash report */ #define VIRTIO_NET_F_RSS 60 /* Supports RSS RX steering */ #define VIRTIO_NET_F_RSC_EXT 61 /* extended coalescing info */ @@ -170,8 +171,15 @@ 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 +#define VIRTIO_NET_HASH_STATE_TIMEOUT_BIT 0x1 + __le16 hash_state; + }; }; #ifndef VIRTIO_NET_NO_LEGACY From patchwork Mon Dec 28 16:22:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Willem de Bruijn X-Patchwork-Id: 352918 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84056C43381 for ; Mon, 28 Dec 2020 16:23:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 561DE2084D for ; Mon, 28 Dec 2020 16:23:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2633300AbgL1QXW (ORCPT ); Mon, 28 Dec 2020 11:23:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2440986AbgL1QXU (ORCPT ); Mon, 28 Dec 2020 11:23:20 -0500 Received: from mail-qv1-xf36.google.com (mail-qv1-xf36.google.com [IPv6:2607:f8b0:4864:20::f36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9D7AC061796 for ; Mon, 28 Dec 2020 08:22:39 -0800 (PST) Received: by mail-qv1-xf36.google.com with SMTP id p5so5146192qvs.7 for ; Mon, 28 Dec 2020 08:22:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vQsWqZSCnMr1x/EzF/kzhHSUUJGM29HYm08xu/2fjmE=; b=a7r3Z2CBMpz7h38KBUNrKg/8UT6W3Yw49Otjw8kRDRqEKPPT2nizEk67WHBHJwVcE6 57nPbkaGZbWsPM0WCmfWG4zFe11Dh5BdAhO5sKi7rASiHegTjP47BBQ1Y83GlhqQbs/3 lvRqNBJf1UK9H5ycT8FxGQAoX4uqT6qzXXvPL6UTcD4sgXm1XjT8FlcsHidRqBbx7F86 PPCDWa8bnXz1GUqNrRN+m1nh43xoqE8MdOqkloYFkR7Tpy3KBI55xSk6HUEDFbcymYvi UvMDDR3eem5RXpPiw8Lf6JQxDEmgJ/mco0chJSsU6ZoHXCRNjqcIart4OKSJyveMho3k w49Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vQsWqZSCnMr1x/EzF/kzhHSUUJGM29HYm08xu/2fjmE=; b=fsoUqR/BhN/p4+kBtExKfahiNFfi7JUc9UtCHJAGaMweMMtE4w10kCrmQRQigiKUOD 5cqb1DmTlBAVuy7XW4oz7ZaZSiAkcCzgS3DVaBO1WILy2MWwNBvSryR9Xcv3xVll8w/m 01ymXYNBvbCJhny0Cz3FnKcnfIVg0BfhzRzS4E7lUJW+BnKiW3bSZWgOe/qvpPZP6oYb ShDnljsGYyH2kWQvpZyQbHB1LlPqiKAS7z9R88pOTiELxFub9a8IqFsxmjn0txje0Fkj t4ghuTj6gVUvNRELlPm75vy3FJkgxLKbQ9CdlAcQoMufFQ79+3IQsiJ61Lm+eyUCPY6N 33mQ== X-Gm-Message-State: AOAM531W1LQ6GBWuxnUqI58GoXKc3pAYVX3QBZ2BJEi7Q3AvuX6uwUM0 Q7GVylZ2rHwuylk4psAo/5Y= X-Google-Smtp-Source: ABdhPJx3TAGUQMPRKMmT3Y9uUkxQtN1ZuRA6AKf8I+fo2yanHcrz4Nm9p6V5c4DvbopY8iekLMzsgw== X-Received: by 2002:ad4:4108:: with SMTP id i8mr47649560qvp.49.1609172559222; Mon, 28 Dec 2020 08:22:39 -0800 (PST) Received: from willemb.nyc.corp.google.com ([2620:0:1003:312:f693:9fff:fef4:3e8a]) by smtp.gmail.com with ESMTPSA id u65sm24005556qkb.58.2020.12.28.08.22.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Dec 2020 08:22:38 -0800 (PST) From: Willem de Bruijn To: virtualization@lists.linux-foundation.org Cc: netdev@vger.kernel.org, mst@redhat.com, jasowang@redhat.com, Willem de Bruijn Subject: [PATCH rfc 2/3] virtio-net: support receive timestamp Date: Mon, 28 Dec 2020 11:22:32 -0500 Message-Id: <20201228162233.2032571-3-willemdebruijn.kernel@gmail.com> X-Mailer: git-send-email 2.29.2.729.g45daf8777d-goog In-Reply-To: <20201228162233.2032571-1-willemdebruijn.kernel@gmail.com> References: <20201228162233.2032571-1-willemdebruijn.kernel@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Willem de Bruijn Add optional PTP hardware timestamp offload for virtio-net. Accurate RTT measurement requires timestamps close to the wire. Introduce virtio feature VIRTIO_NET_F_RX_TSTAMP. If negotiated, the virtio-net header is expanded with room for a timestamp. A host may pass receive timestamps for all or some packets. A timestamp is valid if non-zero. The timestamp straddles (virtual) hardware domains. Like PTP, use international atomic time (CLOCK_TAI) as global clock base. It is guest responsibility to sync with host, e.g., through kvm-clock. Signed-off-by: Willem de Bruijn Reported-by: kernel test robot --- drivers/net/virtio_net.c | 20 +++++++++++++++++++- include/uapi/linux/virtio_net.h | 12 ++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index b917b7333928..57744bb6a141 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -204,6 +204,9 @@ struct virtnet_info { /* Guest will pass tx path info to the host */ bool has_tx_hash; + /* Host will pass CLOCK_TAI receive time to the guest */ + bool has_rx_tstamp; + /* Has control virtqueue */ bool has_cvq; @@ -292,6 +295,13 @@ static inline struct virtio_net_hdr_mrg_rxbuf *skb_vnet_hdr(struct sk_buff *skb) return (struct virtio_net_hdr_mrg_rxbuf *)skb->cb; } +static inline struct virtio_net_hdr_v12 *skb_vnet_hdr_12(struct sk_buff *skb) +{ + BUILD_BUG_ON(sizeof(struct virtio_net_hdr_v12) > sizeof(skb->cb)); + + return (void *)skb->cb; +} + /* * private is used to chain pages for big packets, put the whole * most recent used list in the beginning for reuse @@ -1082,6 +1092,9 @@ static void receive_buf(struct virtnet_info *vi, struct receive_queue *rq, goto frame_err; } + if (vi->has_rx_tstamp) + skb_hwtstamps(skb)->hwtstamp = ns_to_ktime(skb_vnet_hdr_12(skb)->tstamp); + skb_record_rx_queue(skb, vq2rxq(rq->vq)); skb->protocol = eth_type_trans(skb, dev); pr_debug("Receiving skb proto 0x%04x len %i type %i\n", @@ -3071,6 +3084,11 @@ static int virtnet_probe(struct virtio_device *vdev) vi->hdr_len = sizeof(struct virtio_net_hdr_v1_hash); } + if (virtio_has_feature(vdev, VIRTIO_NET_F_RX_TSTAMP)) { + vi->has_rx_tstamp = true; + vi->hdr_len = sizeof(struct virtio_net_hdr_v12); + } + if (virtio_has_feature(vdev, VIRTIO_F_ANY_LAYOUT) || virtio_has_feature(vdev, VIRTIO_F_VERSION_1)) vi->any_header_sg = true; @@ -3261,7 +3279,7 @@ static struct virtio_device_id id_table[] = { VIRTIO_NET_F_CTRL_MAC_ADDR, \ VIRTIO_NET_F_MTU, VIRTIO_NET_F_CTRL_GUEST_OFFLOADS, \ VIRTIO_NET_F_SPEED_DUPLEX, VIRTIO_NET_F_STANDBY, \ - VIRTIO_NET_F_TX_HASH + VIRTIO_NET_F_TX_HASH, VIRTIO_NET_F_RX_TSTAMP static unsigned int features[] = { VIRTNET_FEATURES, diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_net.h index f6881b5b77ee..0ffe2eeebd4a 100644 --- a/include/uapi/linux/virtio_net.h +++ b/include/uapi/linux/virtio_net.h @@ -57,6 +57,7 @@ * Steering */ #define VIRTIO_NET_F_CTRL_MAC_ADDR 23 /* Set MAC address */ +#define VIRTIO_NET_F_RX_TSTAMP 55 /* Host sends TAI receive time */ #define VIRTIO_NET_F_TX_HASH 56 /* Guest sends hash report */ #define VIRTIO_NET_F_HASH_REPORT 57 /* Supports hash report */ #define VIRTIO_NET_F_RSS 60 /* Supports RSS RX steering */ @@ -182,6 +183,17 @@ struct virtio_net_hdr_v1_hash { }; }; +struct virtio_net_hdr_v12 { + struct virtio_net_hdr_v1 hdr; + struct { + __le32 value; + __le16 report; + __le16 flow_state; + } hash; + __virtio32 reserved; + __virtio64 tstamp; +}; + #ifndef VIRTIO_NET_NO_LEGACY /* This header comes first in the scatter-gather list. * For legacy virtio, if VIRTIO_F_ANY_LAYOUT is not negotiated, it must From patchwork Mon Dec 28 16:22:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Willem de Bruijn X-Patchwork-Id: 352917 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0FEEC4332D for ; Mon, 28 Dec 2020 16:23:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 87F8A20867 for ; Mon, 28 Dec 2020 16:23:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2633318AbgL1QX2 (ORCPT ); Mon, 28 Dec 2020 11:23:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2441017AbgL1QXV (ORCPT ); Mon, 28 Dec 2020 11:23:21 -0500 Received: from mail-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2906C061798 for ; Mon, 28 Dec 2020 08:22:40 -0800 (PST) Received: by mail-qk1-x734.google.com with SMTP id h4so9222957qkk.4 for ; Mon, 28 Dec 2020 08:22:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uPsSfUcgHKgBzIXc3fN7YUqB8K9nJMunTZsde3ErHn4=; b=Xf0U70enwHW9IE8UGZVUnVIVEA0/1QMa+Unw2Hvs5voiItNagr8wOqb3rTN6qtLyyM 2ADTZISRtDDTotVM/uwXgEPL23oP1/cusS33uE6wGl8QeZwRQ+3+JYlWuZb/zWAesI3m 7JfTQsiGGjhJIAqky4jzDVjlH1LoiEPLMvBLOGDiA2GWIV73XXw1pMnkufdYO6/wdk8Y qTPP9EorAaSNWuEhFKTcqkzidcQjWghsBc+WxyVA9O7ZUwvCJ1EIxyMSnJT5AJB+lARJ 4fq4yhWzH4y55tOWWNCjYFb6e0WCSqMHlb4GrIIbfgcqGBKfuYkK1kjW8BmsElawttUB k7aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uPsSfUcgHKgBzIXc3fN7YUqB8K9nJMunTZsde3ErHn4=; b=hq97Z0YfWlH0rcxw1l2sG+JYuLW3LFq813j/9+NRa56ltg4QyilFbdtHI4jIdDzRIi ufDDcXMoo33mZeEoc9Ch1026z8xOuTQsXSTNFs9i4FEplKNvQowyZjrgRjGGCpiYYlY3 acNydisOl4D++O+RKdQ9jOrtBWeHK3cxJVK0U3s9sy1PJqmBpuryF6khBz6VavLcHmiK hj1jY121sFy46T7JWPxtizz6iUa3ac5FFiGrGqZjAqjr8t+hCdMXlg/Qaz8eMWM4r25v jFfyFkgxPnUMcshGvN9N7xkOAmNVswuYlXS8j2GO26f4TV6TmjtrwJGNcRYRMf/GceKQ YXXA== X-Gm-Message-State: AOAM531Dbj20R3fPVBCxSzHxs+OXSfzdnqAt/vi0h+dw/dap3Z3av391 mnEohQlhMnp7gnXgAKZmXTQ= X-Google-Smtp-Source: ABdhPJxplx0oHVIyDzXmxBVOqgqLZvlzZAjkoslvEhIVjuqNIZ1evoBz2Od6TWBfCKaXMkzVsnsl/g== X-Received: by 2002:a37:8204:: with SMTP id e4mr40690939qkd.351.1609172560145; Mon, 28 Dec 2020 08:22:40 -0800 (PST) Received: from willemb.nyc.corp.google.com ([2620:0:1003:312:f693:9fff:fef4:3e8a]) by smtp.gmail.com with ESMTPSA id u65sm24005556qkb.58.2020.12.28.08.22.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Dec 2020 08:22:39 -0800 (PST) From: Willem de Bruijn To: virtualization@lists.linux-foundation.org Cc: netdev@vger.kernel.org, mst@redhat.com, jasowang@redhat.com, Willem de Bruijn Subject: [PATCH rfc 3/3] virtio-net: support transmit timestamp Date: Mon, 28 Dec 2020 11:22:33 -0500 Message-Id: <20201228162233.2032571-4-willemdebruijn.kernel@gmail.com> X-Mailer: git-send-email 2.29.2.729.g45daf8777d-goog In-Reply-To: <20201228162233.2032571-1-willemdebruijn.kernel@gmail.com> References: <20201228162233.2032571-1-willemdebruijn.kernel@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Willem de Bruijn Add optional delivery time (SO_TXTIME) offload for virtio-net. The Linux TCP/IP stack tries to avoid bursty transmission and network congestion through pacing: computing an skb delivery time based on congestion information. Userspace protocol implementations can achieve the same with SO_TXTIME. This may also reduce scheduling jitter and improve RTT estimation. Pacing can be implemented in ETF or FQ qdiscs or offloaded to NIC hardware. Allow guests to offload for the same reasons. The timestamp straddles (virtual) hardware domains. Like PTP, use international atomic time (CLOCK_TAI) as global clock base. It is guest responsibility to sync with host, e.g., through kvm-clock. Signed-off-by: Willem de Bruijn Reported-by: kernel test robot --- drivers/net/virtio_net.c | 24 +++++++++++++++++------- include/uapi/linux/virtio_net.h | 1 + 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 57744bb6a141..d40be688aed0 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -207,6 +207,9 @@ struct virtnet_info { /* Host will pass CLOCK_TAI receive time to the guest */ bool has_rx_tstamp; + /* Guest will pass CLOCK_TAI delivery time to the host */ + bool has_tx_tstamp; + /* Has control virtqueue */ bool has_cvq; @@ -1550,7 +1553,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; + struct virtio_net_hdr_v12 *h12; int num_sg; unsigned hdr_len = vi->hdr_len; bool can_push; @@ -1575,13 +1578,15 @@ static int xmit_skb(struct send_queue *sq, struct sk_buff *skb) if (vi->mergeable_rx_bufs) hdr->num_buffers = 0; - ht = (void *)hdr; + h12 = (void *)hdr; if (vi->has_tx_hash) { - ht->hash_value = cpu_to_virtio32(vi->vdev, skb->hash); - ht->hash_report = skb->l4_hash ? VIRTIO_NET_HASH_REPORT_L4 : - VIRTIO_NET_HASH_REPORT_OTHER; - ht->hash_state = VIRTIO_NET_HASH_STATE_DEFAULT; + h12->hash.value = cpu_to_virtio32(vi->vdev, skb->hash); + h12->hash.report = skb->l4_hash ? VIRTIO_NET_HASH_REPORT_L4 : + VIRTIO_NET_HASH_REPORT_OTHER; + h12->hash.flow_state = VIRTIO_NET_HASH_STATE_DEFAULT; } + if (vi->has_tx_tstamp) + h12->tstamp = cpu_to_virtio64(vi->vdev, skb->tstamp); sg_init_table(sq->sg, skb_shinfo(skb)->nr_frags + (can_push ? 1 : 2)); if (can_push) { @@ -3089,6 +3094,11 @@ static int virtnet_probe(struct virtio_device *vdev) vi->hdr_len = sizeof(struct virtio_net_hdr_v12); } + if (virtio_has_feature(vdev, VIRTIO_NET_F_TX_TSTAMP)) { + vi->has_tx_tstamp = true; + vi->hdr_len = sizeof(struct virtio_net_hdr_v12); + } + if (virtio_has_feature(vdev, VIRTIO_F_ANY_LAYOUT) || virtio_has_feature(vdev, VIRTIO_F_VERSION_1)) vi->any_header_sg = true; @@ -3279,7 +3289,7 @@ static struct virtio_device_id id_table[] = { VIRTIO_NET_F_CTRL_MAC_ADDR, \ VIRTIO_NET_F_MTU, VIRTIO_NET_F_CTRL_GUEST_OFFLOADS, \ VIRTIO_NET_F_SPEED_DUPLEX, VIRTIO_NET_F_STANDBY, \ - VIRTIO_NET_F_TX_HASH, VIRTIO_NET_F_RX_TSTAMP + VIRTIO_NET_F_TX_HASH, VIRTIO_NET_F_RX_TSTAMP, VIRTIO_NET_F_TX_TSTAMP static unsigned int features[] = { VIRTNET_FEATURES, diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_net.h index 0ffe2eeebd4a..da017a47791d 100644 --- a/include/uapi/linux/virtio_net.h +++ b/include/uapi/linux/virtio_net.h @@ -57,6 +57,7 @@ * Steering */ #define VIRTIO_NET_F_CTRL_MAC_ADDR 23 /* Set MAC address */ +#define VIRTIO_NET_F_TX_TSTAMP 54 /* Guest sets TAI delivery time */ #define VIRTIO_NET_F_RX_TSTAMP 55 /* Host sends TAI receive time */ #define VIRTIO_NET_F_TX_HASH 56 /* Guest sends hash report */ #define VIRTIO_NET_F_HASH_REPORT 57 /* Supports hash report */