From nobody Tue Jun 30 13:04:27 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34F35C43219 for ; Mon, 17 Jan 2022 08:00:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237861AbiAQIAl (ORCPT ); Mon, 17 Jan 2022 03:00:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33512 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235362AbiAQIAe (ORCPT ); Mon, 17 Jan 2022 03:00:34 -0500 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [IPv6:2a00:1450:4864:20::130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4C89C06161C for ; Mon, 17 Jan 2022 00:00:33 -0800 (PST) Received: by mail-lf1-x130.google.com with SMTP id x7so54411701lfu.8 for ; Mon, 17 Jan 2022 00:00:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aE+gOvLd3VLDh4TGDkR9cJ5k95oZ+26Kjnw0rS0ttNo=; b=DfxL1QWHgUjqNAn2Tt/PAep9IT/Qnv557uZrmdj0BN53Xo5Io9ZI7yokDnufroR+Gt 6FtLF5vHW56MO7SdFiNf0PaJUpsODk/DhzUYWL0Tyk468Ia42X9GQIBnrnft5iYDX7aH kvQvZSU4hBYcJ/1X2JIUK9/1Om8cDfM3cznV/wGAQc5Hx/EG4T0/fon8y0FqN3LOBydD P/yRPNP3bBGreriRG/a5SPq3HViPHa2YZOzM1iDlgGVnXYwNyfhU8SPnPxOv3VBe8cT0 NDDJ7868yppWnb4L3rKfxpb+GJOKMVM8stVJQEK05PAEExxbzf7m7uIlBnwvxfO+Pqbt F8Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aE+gOvLd3VLDh4TGDkR9cJ5k95oZ+26Kjnw0rS0ttNo=; b=EjAUPRM2Z7pDYPXC183r9muzZDhX0mRzX3wng7hh2YErigc+icQmOHeLdcDl5TQkQu aliuL99B2pGyaoVxmMNgkg3KT3ByhWx7vS7TbGo9X97QujOmhyhJBtnsiQItiOI890TR Ip5Arc0F3UMGvVorAxmddRO6KQzsjosIHFjP1aaNLofpg9zIGxOFMiZkUkPVzSywuKV4 KrKqum6itHnIIcBWzgkMtefwOzIAv8rQjhxmAFLK/aPGne+SYB8FaM5uKjW5Phmq+kMP rjd/orYMZnp4MNgE9G7h6H3UZBnZ7mNF1jdwu1Fe9RHVz8h6Ugh/BuWYLgcjGOi5PxWV EzrA== X-Gm-Message-State: AOAM531CWlfSwWRS2YnhwKt0FZUSGbjvRy6SXvuBB3+bsWRfmeybFqbs +eOnFBdfkn+JYhDbTrFgm4ONz7lmcmPXmfxcTek= X-Google-Smtp-Source: ABdhPJxOzAx74592F+FW3dwVZjqGCvoIwq/B+TmrOWzKFWTocF/luxu/JYeT4FVVLUDrrilZMYcc7A== X-Received: by 2002:a05:6512:3184:: with SMTP id i4mr15831976lfe.673.1642406432060; Mon, 17 Jan 2022 00:00:32 -0800 (PST) Received: from navi.cosmonova.net.ua ([95.67.24.131]) by smtp.gmail.com with ESMTPSA id x18sm1279423ljd.105.2022.01.17.00.00.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jan 2022 00:00:31 -0800 (PST) From: Andrew Melnychenko To: netdev@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, davem@davemloft.net, kuba@kernel.org, jasowang@redhat.com, mst@redhat.com Cc: yan@daynix.com, yuri.benditovich@daynix.com Subject: [PATCH v2 1/4] drivers/net/virtio_net: Fixed padded vheader to use v1 with hash. Date: Mon, 17 Jan 2022 10:00:06 +0200 Message-Id: <20220117080009.3055012-2-andrew@daynix.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220117080009.3055012-1-andrew@daynix.com> References: <20220117080009.3055012-1-andrew@daynix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The header v1 provides additional info about RSS. Added changes to computing proper header length. In the next patches, the header may contain RSS hash info for the hash population. Signed-off-by: Andrew Melnychenko Acked-by: Jason Wang --- drivers/net/virtio_net.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 569eecfbc2cd..05fe5ba32187 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -242,13 +242,13 @@ struct virtnet_info { }; =20 struct padded_vnet_hdr { - struct virtio_net_hdr_mrg_rxbuf hdr; + struct virtio_net_hdr_v1_hash hdr; /* * hdr is in a separate sg buffer, and data sg buffer shares same page * with this header sg. This padding makes next sg 16 byte aligned * after the header. */ - char padding[4]; + char padding[12]; }; =20 static bool is_xdp_frame(void *ptr) @@ -1266,7 +1266,8 @@ static unsigned int get_mergeable_buf_len(struct rece= ive_queue *rq, struct ewma_pkt_len *avg_pkt_len, unsigned int room) { - const size_t hdr_len =3D sizeof(struct virtio_net_hdr_mrg_rxbuf); + struct virtnet_info *vi =3D rq->vq->vdev->priv; + const size_t hdr_len =3D vi->hdr_len; unsigned int len; =20 if (room) @@ -2851,7 +2852,7 @@ static void virtnet_del_vqs(struct virtnet_info *vi) */ static unsigned int mergeable_min_buf_len(struct virtnet_info *vi, struct = virtqueue *vq) { - const unsigned int hdr_len =3D sizeof(struct virtio_net_hdr_mrg_rxbuf); + const unsigned int hdr_len =3D vi->hdr_len; unsigned int rq_size =3D virtqueue_get_vring_size(vq); unsigned int packet_len =3D vi->big_packets ? IP_MAX_MTU : vi->dev->max_m= tu; unsigned int buf_len =3D hdr_len + ETH_HLEN + VLAN_HLEN + packet_len; --=20 2.34.1 From nobody Tue Jun 30 13:04:27 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B60F4C433EF for ; Mon, 17 Jan 2022 08:00:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237890AbiAQIAq (ORCPT ); Mon, 17 Jan 2022 03:00:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235402AbiAQIAf (ORCPT ); Mon, 17 Jan 2022 03:00:35 -0500 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7DB2C061401 for ; Mon, 17 Jan 2022 00:00:34 -0800 (PST) Received: by mail-lf1-x12d.google.com with SMTP id o12so37718755lfu.12 for ; Mon, 17 Jan 2022 00:00:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=R1cCJbepPDyM0CLWOcZl19Ml7ugID4kuXQjq583AIRg=; b=b5h4dDWr5c4eQpt/l/PcE92naBY/e7zcYoBpndsOmxmruCuE7fejaMG/9xwKAga7zH Yh34XHocsgns18USWmM7NYJuGFxZwcQu4CqKFqWhx596R2kXexitObd182toeCuAP59N aZOmof36fIXkmtZ5Vd1PWHOyQGF64bwG0Wd1JYt4J882ny26w4l/ZY7R9rsDf1ygEVGh k5pLGuM+zQ+HQCk+OhA86C0nG5PqenAiLpEjB3PtW0eLOipmVYI3iXX2I5oL1+d0BuVr YDnz9je/km1+k371ZCBnXZ4P0rXP/h4kgSqJQfEiNMasil0RJhDR7yClEK9ilqQVFNrj q8Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=R1cCJbepPDyM0CLWOcZl19Ml7ugID4kuXQjq583AIRg=; b=gnrPBXgFis6GQAuGVifQSSpqq/YeWoFAmOEV/HuqWmMXkIyloMOvFDSznGbE9w+jTt b8lhg+lNwaa8PD/ypZatVHRmX4VtONqeGY44UcO54Jj18RODYFjaFjtBewOyQG2jF1Do 2JuSIYxfKOb1q3ZIk1+1J00CPfvhDVEMr7TWFFlPq22k/g/75d++xmKaNtoAm0mi9o5L naG4Y2zkqJj5P8u4xIE8sE9xsc1DKxlraiN52Cf4zncRDmtzSOHKFeB4k1GBz+hkJCHg LDybR7jQ8ySIShsRkaU6IbWN/N0wwqYXxqWUQDDq2WBwgAkVe2E9I2cl9hOrY8ATen95 pjQQ== X-Gm-Message-State: AOAM532TFSPK0bvb4m672DLoX3Z7tlaw7m1SJ8Az/6Mx2PIec2WJd0t+ oXU+si1T42CU8jdzvGuZR943QQ== X-Google-Smtp-Source: ABdhPJwLipLdiI0ZSapdPWRN2THYFsk76L7WH0KFo7vu0oh7xcoQ/rnPLhntvCp01oscehVANZoiOQ== X-Received: by 2002:a05:651c:170c:: with SMTP id be12mr2566016ljb.522.1642406433192; Mon, 17 Jan 2022 00:00:33 -0800 (PST) Received: from navi.cosmonova.net.ua ([95.67.24.131]) by smtp.gmail.com with ESMTPSA id x18sm1279423ljd.105.2022.01.17.00.00.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jan 2022 00:00:32 -0800 (PST) From: Andrew Melnychenko To: netdev@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, davem@davemloft.net, kuba@kernel.org, jasowang@redhat.com, mst@redhat.com Cc: yan@daynix.com, yuri.benditovich@daynix.com Subject: [PATCH v2 2/4] drivers/net/virtio_net: Added basic RSS support. Date: Mon, 17 Jan 2022 10:00:07 +0200 Message-Id: <20220117080009.3055012-3-andrew@daynix.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220117080009.3055012-1-andrew@daynix.com> References: <20220117080009.3055012-1-andrew@daynix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Added features for RSS. Added initialization, RXHASH feature and ethtool ops. By default RSS/RXHASH is disabled. Virtio RSS "IPv6 extensions" hashes disabled. Added ethtools ops to set key and indirection table. Signed-off-by: Andrew Melnychenko --- drivers/net/virtio_net.c | 193 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 187 insertions(+), 6 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 05fe5ba32187..9aae11cb568e 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -169,6 +169,24 @@ struct receive_queue { struct xdp_rxq_info xdp_rxq; }; =20 +/* This structure can contain rss message with maximum settings for indire= ction table and keysize + * Note, that default structure that describes RSS configuration virtio_ne= t_rss_config + * contains same info but can't handle table values. + * In any case, structure would be passed to virtio hw through sg_buf spli= t by parts + * because table sizes may be differ according to the device configuration. + */ +#define VIRTIO_NET_RSS_MAX_KEY_SIZE 40 +#define VIRTIO_NET_RSS_MAX_TABLE_LEN 128 +struct virtio_net_ctrl_rss { + u32 hash_types; + u16 indirection_table_mask; + u16 unclassified_queue; + u16 indirection_table[VIRTIO_NET_RSS_MAX_TABLE_LEN]; + u16 max_tx_vq; + u8 hash_key_length; + u8 key[VIRTIO_NET_RSS_MAX_KEY_SIZE]; +}; + /* Control VQ buffers: protected by the rtnl lock */ struct control_buf { struct virtio_net_ctrl_hdr hdr; @@ -178,6 +196,7 @@ struct control_buf { u8 allmulti; __virtio16 vid; __virtio64 offloads; + struct virtio_net_ctrl_rss rss; }; =20 struct virtnet_info { @@ -206,6 +225,12 @@ struct virtnet_info { /* Host will merge rx buffers for big packets (shake it! shake it!) */ bool mergeable_rx_bufs; =20 + /* Host supports rss and/or hash report */ + bool has_rss; + u8 rss_key_size; + u16 rss_indir_table_size; + u32 rss_hash_types_supported; + /* Has control virtqueue */ bool has_cvq; =20 @@ -2184,6 +2209,56 @@ static void virtnet_get_ringparam(struct net_device = *dev, ring->tx_pending =3D ring->tx_max_pending; } =20 +static bool virtnet_commit_rss_command(struct virtnet_info *vi) +{ + struct net_device *dev =3D vi->dev; + struct scatterlist sgs[4]; + unsigned int sg_buf_size; + + /* prepare sgs */ + sg_init_table(sgs, 4); + + sg_buf_size =3D offsetof(struct virtio_net_ctrl_rss, indirection_table); + sg_set_buf(&sgs[0], &vi->ctrl->rss, sg_buf_size); + + sg_buf_size =3D sizeof(uint16_t) * vi->rss_indir_table_size; + sg_set_buf(&sgs[1], vi->ctrl->rss.indirection_table, sg_buf_size); + + sg_buf_size =3D offsetof(struct virtio_net_ctrl_rss, key) + - offsetof(struct virtio_net_ctrl_rss, max_tx_vq); + sg_set_buf(&sgs[2], &vi->ctrl->rss.max_tx_vq, sg_buf_size); + + sg_buf_size =3D vi->rss_key_size; + sg_set_buf(&sgs[3], vi->ctrl->rss.key, sg_buf_size); + + if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_MQ, + VIRTIO_NET_CTRL_MQ_RSS_CONFIG, sgs)) { + dev_warn(&dev->dev, "VIRTIONET issue with committing RSS sgs\n"); + return false; + } + return true; +} + +static void virtnet_init_default_rss(struct virtnet_info *vi) +{ + u32 indir_val =3D 0; + int i =3D 0; + + vi->ctrl->rss.hash_types =3D vi->rss_hash_types_supported; + vi->ctrl->rss.indirection_table_mask =3D vi->rss_indir_table_size - 1; + vi->ctrl->rss.unclassified_queue =3D 0; + + for (; i < vi->rss_indir_table_size; ++i) { + indir_val =3D ethtool_rxfh_indir_default(i, vi->curr_queue_pairs); + vi->ctrl->rss.indirection_table[i] =3D indir_val; + } + + vi->ctrl->rss.max_tx_vq =3D vi->curr_queue_pairs; + vi->ctrl->rss.hash_key_length =3D vi->rss_key_size; + + netdev_rss_key_fill(vi->ctrl->rss.key, vi->rss_key_size); +} + =20 static void virtnet_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) @@ -2412,6 +2487,71 @@ static void virtnet_update_settings(struct virtnet_i= nfo *vi) vi->duplex =3D duplex; } =20 +static u32 virtnet_get_rxfh_key_size(struct net_device *dev) +{ + return ((struct virtnet_info *)netdev_priv(dev))->rss_key_size; +} + +static u32 virtnet_get_rxfh_indir_size(struct net_device *dev) +{ + return ((struct virtnet_info *)netdev_priv(dev))->rss_indir_table_size; +} + +static int virtnet_get_rxfh(struct net_device *dev, u32 *indir, u8 *key, u= 8 *hfunc) +{ + struct virtnet_info *vi =3D netdev_priv(dev); + int i; + + if (indir) { + for (i =3D 0; i < vi->rss_indir_table_size; ++i) + indir[i] =3D vi->ctrl->rss.indirection_table[i]; + } + + if (key) + memcpy(key, vi->ctrl->rss.key, vi->rss_key_size); + + if (hfunc) + *hfunc =3D ETH_RSS_HASH_TOP; + + return 0; +} + +static int virtnet_set_rxfh(struct net_device *dev, const u32 *indir, cons= t u8 *key, const u8 hfunc) +{ + struct virtnet_info *vi =3D netdev_priv(dev); + int i; + + if (hfunc !=3D ETH_RSS_HASH_NO_CHANGE && hfunc !=3D ETH_RSS_HASH_TOP) + return -EOPNOTSUPP; + + if (indir) { + for (i =3D 0; i < vi->rss_indir_table_size; ++i) + vi->ctrl->rss.indirection_table[i] =3D indir[i]; + } + if (key) + memcpy(vi->ctrl->rss.key, key, vi->rss_key_size); + + virtnet_commit_rss_command(vi); + + return 0; +} + +static int virtnet_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc = *info, u32 *rule_locs) +{ + struct virtnet_info *vi =3D netdev_priv(dev); + int rc =3D 0; + + switch (info->cmd) { + case ETHTOOL_GRXRINGS: + info->data =3D vi->curr_queue_pairs; + break; + default: + rc =3D -EOPNOTSUPP; + } + + return rc; +} + static const struct ethtool_ops virtnet_ethtool_ops =3D { .supported_coalesce_params =3D ETHTOOL_COALESCE_MAX_FRAMES, .get_drvinfo =3D virtnet_get_drvinfo, @@ -2427,6 +2567,11 @@ static const struct ethtool_ops virtnet_ethtool_ops = =3D { .set_link_ksettings =3D virtnet_set_link_ksettings, .set_coalesce =3D virtnet_set_coalesce, .get_coalesce =3D virtnet_get_coalesce, + .get_rxfh_key_size =3D virtnet_get_rxfh_key_size, + .get_rxfh_indir_size =3D virtnet_get_rxfh_indir_size, + .get_rxfh =3D virtnet_get_rxfh, + .set_rxfh =3D virtnet_set_rxfh, + .get_rxnfc =3D virtnet_get_rxnfc, }; =20 static void virtnet_freeze_down(struct virtio_device *vdev) @@ -2679,6 +2824,16 @@ static int virtnet_set_features(struct net_device *d= ev, vi->guest_offloads =3D offloads; } =20 + if ((dev->features ^ features) & NETIF_F_RXHASH) { + if (features & NETIF_F_RXHASH) + vi->ctrl->rss.hash_types =3D vi->rss_hash_types_supported; + else + vi->ctrl->rss.hash_types =3D VIRTIO_NET_HASH_REPORT_NONE; + + if (!virtnet_commit_rss_command(vi)) + return -EINVAL; + } + return 0; } =20 @@ -3073,6 +3228,8 @@ static bool virtnet_validate_features(struct virtio_d= evice *vdev) "VIRTIO_NET_F_CTRL_VQ") || VIRTNET_FAIL_ON(vdev, VIRTIO_NET_F_MQ, "VIRTIO_NET_F_CTRL_VQ") || VIRTNET_FAIL_ON(vdev, VIRTIO_NET_F_CTRL_MAC_ADDR, + "VIRTIO_NET_F_CTRL_VQ") || + VIRTNET_FAIL_ON(vdev, VIRTIO_NET_F_RSS, "VIRTIO_NET_F_CTRL_VQ"))) { return false; } @@ -3113,13 +3270,14 @@ static int virtnet_probe(struct virtio_device *vdev) u16 max_queue_pairs; int mtu; =20 - /* Find if host supports multiqueue virtio_net device */ - err =3D virtio_cread_feature(vdev, VIRTIO_NET_F_MQ, - struct virtio_net_config, - max_virtqueue_pairs, &max_queue_pairs); + /* Find if host supports multiqueue/rss virtio_net device */ + max_queue_pairs =3D 0; + if (virtio_has_feature(vdev, VIRTIO_NET_F_MQ) || virtio_has_feature(vdev,= VIRTIO_NET_F_RSS)) + max_queue_pairs =3D + virtio_cread16(vdev, offsetof(struct virtio_net_config, max_virtque= ue_pairs)); =20 /* We need at least 2 queue's */ - if (err || max_queue_pairs < VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN || + if (max_queue_pairs < VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN || max_queue_pairs > VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX || !virtio_has_feature(vdev, VIRTIO_NET_F_CTRL_VQ)) max_queue_pairs =3D 1; @@ -3207,6 +3365,25 @@ static int virtnet_probe(struct virtio_device *vdev) if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF)) vi->mergeable_rx_bufs =3D true; =20 + if (virtio_has_feature(vdev, VIRTIO_NET_F_RSS)) { + vi->has_rss =3D true; + vi->rss_indir_table_size =3D + virtio_cread16(vdev, offsetof(struct virtio_net_config, + rss_max_indirection_table_length)); + vi->rss_key_size =3D + virtio_cread8(vdev, offsetof(struct virtio_net_config, rss_max_key_size= )); + } + + if (vi->has_rss) { + vi->rss_hash_types_supported =3D + virtio_cread32(vdev, offsetof(struct virtio_net_config, supported_ha= sh_types)); + vi->rss_hash_types_supported &=3D + ~(VIRTIO_NET_RSS_HASH_TYPE_IP_EX | + VIRTIO_NET_RSS_HASH_TYPE_TCP_EX | + VIRTIO_NET_RSS_HASH_TYPE_UDP_EX); + + dev->hw_features |=3D NETIF_F_RXHASH; + } if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF) || virtio_has_feature(vdev, VIRTIO_F_VERSION_1)) vi->hdr_len =3D sizeof(struct virtio_net_hdr_mrg_rxbuf); @@ -3275,6 +3452,9 @@ static int virtnet_probe(struct virtio_device *vdev) } } =20 + if (vi->has_rss) + virtnet_init_default_rss(vi); + err =3D register_netdev(dev); if (err) { pr_debug("virtio_net: registering device failed\n"); @@ -3406,7 +3586,8 @@ static struct virtio_device_id id_table[] =3D { 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_RSS =20 static unsigned int features[] =3D { VIRTNET_FEATURES, --=20 2.34.1 From nobody Tue Jun 30 13:04:27 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0AD2C433EF for ; Mon, 17 Jan 2022 08:00:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237909AbiAQIAs (ORCPT ); Mon, 17 Jan 2022 03:00:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235339AbiAQIAg (ORCPT ); Mon, 17 Jan 2022 03:00:36 -0500 Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFA35C061747 for ; Mon, 17 Jan 2022 00:00:35 -0800 (PST) Received: by mail-lf1-x12b.google.com with SMTP id x7so54412118lfu.8 for ; Mon, 17 Jan 2022 00:00:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=o//IbTH215uTRxD5sxKW6X3QC5cqZD8DwHxz9/rse7k=; b=aMcpopkKOXGy+N4zaHU4fwC683S96p/WCr4X0v9i0QD+DZe5D25PAjANQotNk/nh8E bUcTgxfnHzqUoeajz+r8fK3GR/05gq3QV32fMMSJVLRgZnQmS47CHdbehzLQ5pH4H+am yRSNyuBbOHaCHaknon37pSbM1qaEo8HknING/OKVaT5+ajadNqFECMTRdfIngErcl+AI ix5EKIY68OXZy64SQdOG5pHkES/O8s6BUO6u/7jpGWhty6AtwKGDCWZMgI1ufrYnbcPQ 0il8MiTN3NBYF+bEs+B/dHQFldc9YTePRLiSLme7DY0S98j+uNo4c42LWq1aostu1F83 uUPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o//IbTH215uTRxD5sxKW6X3QC5cqZD8DwHxz9/rse7k=; b=GrD0geysLl05UUE21cOq8z0NPESIxghUjXFbVRY0JPcy/RaYCXfcDtwht0+gMo5fqB gDt7wAbmBp8dIX3FiMyDU6q5+I4lW5ZED/SdNWy0S2i9YmDbYKeVAHVhIiwn1E+3G6VS 48hLIvHlIxb8fLsdfwyDq2G6NvJpBdoqVzqRZl/Cn46a6bvMJM0VUE9yWNC0+r/ho441 DyK02LqEDeXMpwWQy48aE2Q1/mtLFyNE1kmSoNHIf/015JvyKOK1Kw2oUoJoIgD5X0Re QD/CqeNrVUeHPhU8jujRZLTUWztFfN0g+qd+MhijqylDeKlVQGtf0pa98Zx7y2EVSsrx k9uA== X-Gm-Message-State: AOAM531HXnFkSUUmlvzAnrJgwbRmrZdZsZheAb53HOTDLeXW0G7CcngQ 7PEWvxbXb1q9bUSAo5meWm2wXA== X-Google-Smtp-Source: ABdhPJztWIKFVe9SovCV6OXubU9yRHijgjxJcTwXc0Q5JyQNZNm+M2ALokCStPcp//pSiTmEKtRruA== X-Received: by 2002:a19:ae1a:: with SMTP id f26mr15719595lfc.270.1642406434270; Mon, 17 Jan 2022 00:00:34 -0800 (PST) Received: from navi.cosmonova.net.ua ([95.67.24.131]) by smtp.gmail.com with ESMTPSA id x18sm1279423ljd.105.2022.01.17.00.00.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jan 2022 00:00:33 -0800 (PST) From: Andrew Melnychenko To: netdev@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, davem@davemloft.net, kuba@kernel.org, jasowang@redhat.com, mst@redhat.com Cc: yan@daynix.com, yuri.benditovich@daynix.com Subject: [PATCH v2 3/4] drivers/net/virtio_net: Added RSS hash report. Date: Mon, 17 Jan 2022 10:00:08 +0200 Message-Id: <20220117080009.3055012-4-andrew@daynix.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220117080009.3055012-1-andrew@daynix.com> References: <20220117080009.3055012-1-andrew@daynix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Added features for RSS hash report. If hash is provided - it sets to skb. Added checks if rss and/or hash are enabled together. Signed-off-by: Andrew Melnychenko --- drivers/net/virtio_net.c | 58 ++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 11 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 9aae11cb568e..2c61f96ce3e6 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -227,6 +227,7 @@ struct virtnet_info { =20 /* Host supports rss and/or hash report */ bool has_rss; + bool has_rss_hash_report; u8 rss_key_size; u16 rss_indir_table_size; u32 rss_hash_types_supported; @@ -420,7 +421,9 @@ static struct sk_buff *page_to_skb(struct virtnet_info = *vi, hdr_p =3D p; =20 hdr_len =3D vi->hdr_len; - if (vi->mergeable_rx_bufs) + if (vi->has_rss_hash_report) + hdr_padded_len =3D sizeof(struct virtio_net_hdr_v1_hash); + else if (vi->mergeable_rx_bufs) hdr_padded_len =3D sizeof(*hdr); else hdr_padded_len =3D sizeof(struct padded_vnet_hdr); @@ -1156,6 +1159,8 @@ static void receive_buf(struct virtnet_info *vi, stru= ct receive_queue *rq, struct net_device *dev =3D vi->dev; struct sk_buff *skb; struct virtio_net_hdr_mrg_rxbuf *hdr; + struct virtio_net_hdr_v1_hash *hdr_hash; + enum pkt_hash_types rss_hash_type; =20 if (unlikely(len < vi->hdr_len + ETH_HLEN)) { pr_debug("%s: short packet %i\n", dev->name, len); @@ -1182,6 +1187,29 @@ static void receive_buf(struct virtnet_info *vi, str= uct receive_queue *rq, return; =20 hdr =3D skb_vnet_hdr(skb); + if (dev->features & NETIF_F_RXHASH && vi->has_rss_hash_report) { + hdr_hash =3D (struct virtio_net_hdr_v1_hash *)(hdr); + + switch (hdr_hash->hash_report) { + case VIRTIO_NET_HASH_REPORT_TCPv4: + case VIRTIO_NET_HASH_REPORT_UDPv4: + case VIRTIO_NET_HASH_REPORT_TCPv6: + case VIRTIO_NET_HASH_REPORT_UDPv6: + case VIRTIO_NET_HASH_REPORT_TCPv6_EX: + case VIRTIO_NET_HASH_REPORT_UDPv6_EX: + rss_hash_type =3D PKT_HASH_TYPE_L4; + break; + case VIRTIO_NET_HASH_REPORT_IPv4: + case VIRTIO_NET_HASH_REPORT_IPv6: + case VIRTIO_NET_HASH_REPORT_IPv6_EX: + rss_hash_type =3D PKT_HASH_TYPE_L3; + break; + case VIRTIO_NET_HASH_REPORT_NONE: + default: + rss_hash_type =3D PKT_HASH_TYPE_NONE; + } + skb_set_hash(skb, hdr_hash->hash_value, rss_hash_type); + } =20 if (hdr->hdr.flags & VIRTIO_NET_HDR_F_DATA_VALID) skb->ip_summed =3D CHECKSUM_UNNECESSARY; @@ -2232,7 +2260,8 @@ static bool virtnet_commit_rss_command(struct virtnet= _info *vi) sg_set_buf(&sgs[3], vi->ctrl->rss.key, sg_buf_size); =20 if (!virtnet_send_command(vi, VIRTIO_NET_CTRL_MQ, - VIRTIO_NET_CTRL_MQ_RSS_CONFIG, sgs)) { + vi->has_rss ? VIRTIO_NET_CTRL_MQ_RSS_CONFIG + : VIRTIO_NET_CTRL_MQ_HASH_CONFIG, sgs)) { dev_warn(&dev->dev, "VIRTIONET issue with committing RSS sgs\n"); return false; } @@ -3230,6 +3259,8 @@ static bool virtnet_validate_features(struct virtio_d= evice *vdev) VIRTNET_FAIL_ON(vdev, VIRTIO_NET_F_CTRL_MAC_ADDR, "VIRTIO_NET_F_CTRL_VQ") || VIRTNET_FAIL_ON(vdev, VIRTIO_NET_F_RSS, + "VIRTIO_NET_F_CTRL_VQ") || + VIRTNET_FAIL_ON(vdev, VIRTIO_NET_F_HASH_REPORT, "VIRTIO_NET_F_CTRL_VQ"))) { return false; } @@ -3365,16 +3396,18 @@ static int virtnet_probe(struct virtio_device *vdev) if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF)) vi->mergeable_rx_bufs =3D true; =20 - if (virtio_has_feature(vdev, VIRTIO_NET_F_RSS)) { + if (virtio_has_feature(vdev, VIRTIO_NET_F_HASH_REPORT)) + vi->has_rss_hash_report =3D true; + + if (virtio_has_feature(vdev, VIRTIO_NET_F_RSS)) vi->has_rss =3D true; + + if (vi->has_rss || vi->has_rss_hash_report) { vi->rss_indir_table_size =3D virtio_cread16(vdev, offsetof(struct virtio_net_config, - rss_max_indirection_table_length)); + rss_max_indirection_table_length)); vi->rss_key_size =3D virtio_cread8(vdev, offsetof(struct virtio_net_config, rss_max_key_size= )); - } - - if (vi->has_rss) { vi->rss_hash_types_supported =3D virtio_cread32(vdev, offsetof(struct virtio_net_config, supported_ha= sh_types)); vi->rss_hash_types_supported &=3D @@ -3384,8 +3417,11 @@ static int virtnet_probe(struct virtio_device *vdev) =20 dev->hw_features |=3D NETIF_F_RXHASH; } - if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF) || - virtio_has_feature(vdev, VIRTIO_F_VERSION_1)) + + if (vi->has_rss_hash_report) + vi->hdr_len =3D sizeof(struct virtio_net_hdr_v1_hash); + else if (virtio_has_feature(vdev, VIRTIO_NET_F_MRG_RXBUF) || + virtio_has_feature(vdev, VIRTIO_F_VERSION_1)) vi->hdr_len =3D sizeof(struct virtio_net_hdr_mrg_rxbuf); else vi->hdr_len =3D sizeof(struct virtio_net_hdr); @@ -3452,7 +3488,7 @@ static int virtnet_probe(struct virtio_device *vdev) } } =20 - if (vi->has_rss) + if (vi->has_rss || vi->has_rss_hash_report) virtnet_init_default_rss(vi); =20 err =3D register_netdev(dev); @@ -3587,7 +3623,7 @@ static struct virtio_device_id id_table[] =3D { 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_RSS + VIRTIO_NET_F_RSS, VIRTIO_NET_F_HASH_REPORT =20 static unsigned int features[] =3D { VIRTNET_FEATURES, --=20 2.34.1 From nobody Tue Jun 30 13:04:27 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D830BC433FE for ; Mon, 17 Jan 2022 08:00:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237923AbiAQIAu (ORCPT ); Mon, 17 Jan 2022 03:00:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237833AbiAQIAh (ORCPT ); Mon, 17 Jan 2022 03:00:37 -0500 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B041C061748 for ; Mon, 17 Jan 2022 00:00:37 -0800 (PST) Received: by mail-lf1-x12d.google.com with SMTP id x11so28678900lfa.2 for ; Mon, 17 Jan 2022 00:00:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=isjIc+0C9xvJeTrRGm18+RtyF1fo44MItnulgKDzOAY=; b=MYldvUofIISE1bhf/10lSn3V8firW6Nx61gqNRpFHgJFyboObtHvUTxsWs1poO02b6 9ZHa3OPOwgbhWh+HTfevStvHeADg8tnZJGcN39Ua7fgYMMz5nYy/QtM8QX9W2rKz1Wh4 PwFEpi3Vv9E0HD5k8U39Mcw6Oe3Z3IlEEKsrBZkZjoK3W5R2X0ImTX5IqFUWg7HyiCUn v8LDvcymFF+asRFmp0XWelCClpYpaJjK0isZQFt4p7zmoYbk6YJNeBEQ4csoAprpB8+d ycgABRrrcDZWE7gF/Q8S6tNGCxYq2FdScjFsJ9/CKlLBWVy4AI+2eTwh68r70uAnFpf/ mKHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=isjIc+0C9xvJeTrRGm18+RtyF1fo44MItnulgKDzOAY=; b=xTbKz4u58kh09Fodr+5G7bPsGaoywIH3dBA8W5KHkuTPxk9tb/YkjPETO8/TMFP+Cq DU6qqMHinMH7F8P/5lAXwTqiyZrhgRhFetWSZAbTkYGf5vsMTVUv65DENK4U3eSU2JNU hyRNVlbuxKWEElc5RlTStqFCk5oVTTQZXQIBVVTZfsh6EB5qlXUvHs/I6E6jEZb165ik cWdv2fevTIlUQ//d1XyBdkm/pYJCG6irW1k1koeoLBULpOe8ehNvZ/yJm2k/oR33qErg zxcanLRSFce48DKSEAEQfGJovXFD8BPg5utA8T+Hb7/V6LR+SLqI6RIX6e3tyYihZLaC 1lFg== X-Gm-Message-State: AOAM530Whoq5FneDKnKlCHAeG/kOKZzqMidpnXXWAiQNFmtXLCJmzd2F k4OXj3fBhLNM+FyBlaB/zXR1KQ== X-Google-Smtp-Source: ABdhPJwIAVbYzxcemNsZG6H5+1mMtVhzD+sYPdwBvI8/op9A4e/gdn8r+pROgU7tffmbExzUNSbo/w== X-Received: by 2002:a05:6512:448:: with SMTP id y8mr15686584lfk.652.1642406435485; Mon, 17 Jan 2022 00:00:35 -0800 (PST) Received: from navi.cosmonova.net.ua ([95.67.24.131]) by smtp.gmail.com with ESMTPSA id x18sm1279423ljd.105.2022.01.17.00.00.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Jan 2022 00:00:35 -0800 (PST) From: Andrew Melnychenko To: netdev@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, davem@davemloft.net, kuba@kernel.org, jasowang@redhat.com, mst@redhat.com Cc: yan@daynix.com, yuri.benditovich@daynix.com Subject: [PATCH v2 4/4] drivers/net/virtio_net: Added RSS hash report control. Date: Mon, 17 Jan 2022 10:00:09 +0200 Message-Id: <20220117080009.3055012-5-andrew@daynix.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220117080009.3055012-1-andrew@daynix.com> References: <20220117080009.3055012-1-andrew@daynix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Now it's possible to control supported hashflows. Added hashflow set/get callbacks. Also, disabling RXH_IP_SRC/DST for TCP would disable then for UDP. TCP and UDP supports only: ethtool -U eth0 rx-flow-hash tcp4 sd RXH_IP_SRC + RXH_IP_DST ethtool -U eth0 rx-flow-hash tcp4 sdfn RXH_IP_SRC + RXH_IP_DST + RXH_L4_B_0_1 + RXH_L4_B_2_3 Signed-off-by: Andrew Melnychenko --- drivers/net/virtio_net.c | 141 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 140 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 2c61f96ce3e6..f837d3257eb6 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -231,6 +231,7 @@ struct virtnet_info { u8 rss_key_size; u16 rss_indir_table_size; u32 rss_hash_types_supported; + u32 rss_hash_types_saved; =20 /* Has control virtqueue */ bool has_cvq; @@ -2274,6 +2275,7 @@ static void virtnet_init_default_rss(struct virtnet_i= nfo *vi) int i =3D 0; =20 vi->ctrl->rss.hash_types =3D vi->rss_hash_types_supported; + vi->rss_hash_types_saved =3D vi->rss_hash_types_supported; vi->ctrl->rss.indirection_table_mask =3D vi->rss_indir_table_size - 1; vi->ctrl->rss.unclassified_queue =3D 0; =20 @@ -2288,6 +2290,121 @@ static void virtnet_init_default_rss(struct virtnet= _info *vi) netdev_rss_key_fill(vi->ctrl->rss.key, vi->rss_key_size); } =20 +static void virtnet_get_hashflow(const struct virtnet_info *vi, struct eth= tool_rxnfc *info) +{ + info->data =3D 0; + switch (info->flow_type) { + case TCP_V4_FLOW: + if (vi->rss_hash_types_saved & VIRTIO_NET_RSS_HASH_TYPE_TCPv4) { + info->data =3D RXH_IP_SRC | RXH_IP_DST | + RXH_L4_B_0_1 | RXH_L4_B_2_3; + } else if (vi->rss_hash_types_saved & VIRTIO_NET_RSS_HASH_TYPE_IPv4) { + info->data =3D RXH_IP_SRC | RXH_IP_DST; + } + break; + case TCP_V6_FLOW: + if (vi->rss_hash_types_saved & VIRTIO_NET_RSS_HASH_TYPE_TCPv6) { + info->data =3D RXH_IP_SRC | RXH_IP_DST | + RXH_L4_B_0_1 | RXH_L4_B_2_3; + } else if (vi->rss_hash_types_saved & VIRTIO_NET_RSS_HASH_TYPE_IPv6) { + info->data =3D RXH_IP_SRC | RXH_IP_DST; + } + break; + case UDP_V4_FLOW: + if (vi->rss_hash_types_saved & VIRTIO_NET_RSS_HASH_TYPE_UDPv4) { + info->data =3D RXH_IP_SRC | RXH_IP_DST | + RXH_L4_B_0_1 | RXH_L4_B_2_3; + } else if (vi->rss_hash_types_saved & VIRTIO_NET_RSS_HASH_TYPE_IPv4) { + info->data =3D RXH_IP_SRC | RXH_IP_DST; + } + break; + case UDP_V6_FLOW: + if (vi->rss_hash_types_saved & VIRTIO_NET_RSS_HASH_TYPE_UDPv6) { + info->data =3D RXH_IP_SRC | RXH_IP_DST | + RXH_L4_B_0_1 | RXH_L4_B_2_3; + } else if (vi->rss_hash_types_saved & VIRTIO_NET_RSS_HASH_TYPE_IPv6) { + info->data =3D RXH_IP_SRC | RXH_IP_DST; + } + break; + case IPV4_FLOW: + if (vi->rss_hash_types_saved & VIRTIO_NET_RSS_HASH_TYPE_IPv4) + info->data =3D RXH_IP_SRC | RXH_IP_DST; + + break; + case IPV6_FLOW: + if (vi->rss_hash_types_saved & VIRTIO_NET_RSS_HASH_TYPE_IPv6) + info->data =3D RXH_IP_SRC | RXH_IP_DST; + + break; + default: + info->data =3D 0; + break; + } +} + +static bool virtnet_set_hashflow(struct virtnet_info *vi, struct ethtool_r= xnfc *info) +{ + u32 new_hashtypes =3D vi->rss_hash_types_saved; + bool is_disable =3D info->data & RXH_DISCARD; + bool is_l4 =3D info->data =3D=3D (RXH_IP_SRC | RXH_IP_DST | RXH_L4_B_0_1 = | RXH_L4_B_2_3); + + /* supports only 'sd', 'sdfn' and 'r' */ + if (!((info->data =3D=3D (RXH_IP_SRC | RXH_IP_DST)) | is_l4 | is_disable)) + return false; + + switch (info->flow_type) { + case TCP_V4_FLOW: + new_hashtypes &=3D ~(VIRTIO_NET_RSS_HASH_TYPE_IPv4 | VIRTIO_NET_RSS_HASH= _TYPE_TCPv4); + if (!is_disable) + new_hashtypes |=3D VIRTIO_NET_RSS_HASH_TYPE_IPv4 + | (is_l4 ? VIRTIO_NET_RSS_HASH_TYPE_TCPv4 : 0); + break; + case UDP_V4_FLOW: + new_hashtypes &=3D ~(VIRTIO_NET_RSS_HASH_TYPE_IPv4 | VIRTIO_NET_RSS_HASH= _TYPE_UDPv4); + if (!is_disable) + new_hashtypes |=3D VIRTIO_NET_RSS_HASH_TYPE_IPv4 + | (is_l4 ? VIRTIO_NET_RSS_HASH_TYPE_UDPv4 : 0); + break; + case IPV4_FLOW: + new_hashtypes &=3D ~VIRTIO_NET_RSS_HASH_TYPE_IPv4; + if (!is_disable) + new_hashtypes =3D VIRTIO_NET_RSS_HASH_TYPE_IPv4; + break; + case TCP_V6_FLOW: + new_hashtypes &=3D ~(VIRTIO_NET_RSS_HASH_TYPE_IPv6 | VIRTIO_NET_RSS_HASH= _TYPE_TCPv6); + if (!is_disable) + new_hashtypes |=3D VIRTIO_NET_RSS_HASH_TYPE_IPv6 + | (is_l4 ? VIRTIO_NET_RSS_HASH_TYPE_TCPv6 : 0); + break; + case UDP_V6_FLOW: + new_hashtypes &=3D ~(VIRTIO_NET_RSS_HASH_TYPE_IPv6 | VIRTIO_NET_RSS_HASH= _TYPE_UDPv6); + if (!is_disable) + new_hashtypes |=3D VIRTIO_NET_RSS_HASH_TYPE_IPv6 + | (is_l4 ? VIRTIO_NET_RSS_HASH_TYPE_UDPv6 : 0); + break; + case IPV6_FLOW: + new_hashtypes &=3D ~VIRTIO_NET_RSS_HASH_TYPE_IPv6; + if (!is_disable) + new_hashtypes =3D VIRTIO_NET_RSS_HASH_TYPE_IPv6; + break; + default: + /* unsupported flow */ + return false; + } + + /* if unsupported hashtype was set */ + if (new_hashtypes !=3D (new_hashtypes & vi->rss_hash_types_supported)) + return false; + + if (new_hashtypes !=3D vi->rss_hash_types_saved) { + vi->rss_hash_types_saved =3D new_hashtypes; + vi->ctrl->rss.hash_types =3D vi->rss_hash_types_saved; + if (vi->dev->features & NETIF_F_RXHASH) + return virtnet_commit_rss_command(vi); + } + + return true; +} =20 static void virtnet_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) @@ -2573,6 +2690,27 @@ static int virtnet_get_rxnfc(struct net_device *dev,= struct ethtool_rxnfc *info, switch (info->cmd) { case ETHTOOL_GRXRINGS: info->data =3D vi->curr_queue_pairs; + break; + case ETHTOOL_GRXFH: + virtnet_get_hashflow(vi, info); + break; + default: + rc =3D -EOPNOTSUPP; + } + + return rc; +} + +static int virtnet_set_rxnfc(struct net_device *dev, struct ethtool_rxnfc = *info) +{ + struct virtnet_info *vi =3D netdev_priv(dev); + int rc =3D 0; + + switch (info->cmd) { + case ETHTOOL_SRXFH: + if (!virtnet_set_hashflow(vi, info)) + rc =3D -EINVAL; + break; default: rc =3D -EOPNOTSUPP; @@ -2601,6 +2739,7 @@ static const struct ethtool_ops virtnet_ethtool_ops = =3D { .get_rxfh =3D virtnet_get_rxfh, .set_rxfh =3D virtnet_set_rxfh, .get_rxnfc =3D virtnet_get_rxnfc, + .set_rxnfc =3D virtnet_set_rxnfc, }; =20 static void virtnet_freeze_down(struct virtio_device *vdev) @@ -2855,7 +2994,7 @@ static int virtnet_set_features(struct net_device *de= v, =20 if ((dev->features ^ features) & NETIF_F_RXHASH) { if (features & NETIF_F_RXHASH) - vi->ctrl->rss.hash_types =3D vi->rss_hash_types_supported; + vi->ctrl->rss.hash_types =3D vi->rss_hash_types_saved; else vi->ctrl->rss.hash_types =3D VIRTIO_NET_HASH_REPORT_NONE; =20 --=20 2.34.1