From nobody Thu Jun 25 09:39:33 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 A2FDEC433FE for ; Tue, 22 Feb 2022 12:02:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231892AbiBVMCg (ORCPT ); Tue, 22 Feb 2022 07:02:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49284 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232084AbiBVMCS (ORCPT ); Tue, 22 Feb 2022 07:02:18 -0500 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F2183A186 for ; Tue, 22 Feb 2022 04:01:34 -0800 (PST) Received: by mail-lf1-x131.google.com with SMTP id b9so24296891lfv.7 for ; Tue, 22 Feb 2022 04:01: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=n3UASRZlY1ToiL7j+vac0NlVXBZTlgkBMPexZZH8C6k=; b=jfaaQzt2S7n0OU7ynyl2Zhip7Vyr+DHnL9LJyepA4ZNXRE9resVnk0PfuPpiHwVgmv vc2LMRDDw7PXrFF+RwoHuL+N5XGRecNv6Xdg2nxH+WmG8dHpIOlsC7h/xjSmDqT0QYoN 7UedikiWkX28zzjYFTqfQz0kVkC/9ZWleFJq/VRgEkI0cuWLLa5npcR5eH3D+jBW7dn8 Dd2FqZpaSxA+qcvhd9TwDpaa64BxgJPmQ5Bpyl2JJKYpz7azy4CKTbT/wyDTFC98cQLt 8XwUZI/LOEiVm3Kq98P+TPakizi5Yu9yMEPTFVB4ObozltO0EN2e7if4eM8qYhMomM8D BS5w== 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=n3UASRZlY1ToiL7j+vac0NlVXBZTlgkBMPexZZH8C6k=; b=xQL9MaR5HOUCR2/RGf15RhTDCvyVnrsryLkqOP4oIHbKWZ4iB5y/CEnDThWDFmeNqJ r45HQGvO2uum7/6kaNaAWUMoLgsVIFWLTh2BCcTXHaeLt5UVtpQUCXXxVZzqpIdRVQqL BiDa2GnVxg1fijOAGPtDOFbZGlg9xkH10hba3olUy9/2wuQXFLO0cxd/YDc8XgI+6vj2 amVEVr/XxtLfVQIR/LTBw6gGQs64/LdzQn5PTD7ijr/djruRTVXlrP7e7qU3CyhDFMCj Cv1/947/xG8anYgbnZok8ftE4YlSt0dPxXAE/MrOQxnXGFjHPramCS6766ngApCgKB/+ XiDQ== X-Gm-Message-State: AOAM533dHNfK8KL4M1cDNNozOiJMGl+p+BGA4ufzXz26RhCHYUbrjLYh S4MIj4N5C/+fV+3qKEH2toYLOg== X-Google-Smtp-Source: ABdhPJxfECW7k15BXfCXRoSbeWdHBJQv9NiMF3cf/3Wxvkuewc/sFAJroFOpkeE7UPLyzzlXEZPF9Q== X-Received: by 2002:a05:6512:3698:b0:443:a348:d252 with SMTP id d24-20020a056512369800b00443a348d252mr16851784lfs.193.1645531292541; Tue, 22 Feb 2022 04:01:32 -0800 (PST) Received: from navi.cosmonova.net.ua ([95.67.24.131]) by smtp.gmail.com with ESMTPSA id v29sm1664024ljv.72.2022.02.22.04.01.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 04:01: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 v4 1/4] drivers/net/virtio_net: Fixed padded vheader to use v1 with hash. Date: Tue, 22 Feb 2022 14:00:51 +0200 Message-Id: <20220222120054.400208-2-andrew@daynix.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220222120054.400208-1-andrew@daynix.com> References: <20220222120054.400208-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 --- drivers/net/virtio_net.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index a801ea40908f..b9ed7c55d9a0 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) @@ -396,7 +396,7 @@ static struct sk_buff *page_to_skb(struct virtnet_info = *vi, =20 hdr_len =3D vi->hdr_len; if (vi->mergeable_rx_bufs) - hdr_padded_len =3D sizeof(*hdr); + hdr_padded_len =3D hdr_len; else hdr_padded_len =3D sizeof(struct padded_vnet_hdr); =20 @@ -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 Thu Jun 25 09:39:33 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 6B619C433FE for ; Tue, 22 Feb 2022 12:02:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232016AbiBVMCy (ORCPT ); Tue, 22 Feb 2022 07:02:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231882AbiBVMCU (ORCPT ); Tue, 22 Feb 2022 07:02:20 -0500 Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [IPv6:2a00:1450:4864:20::230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B14E1B3E53 for ; Tue, 22 Feb 2022 04:01:36 -0800 (PST) Received: by mail-lj1-x230.google.com with SMTP id e17so19135493ljk.5 for ; Tue, 22 Feb 2022 04:01:36 -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=+LI6xARs0GrLcf5j0VJKdVnOxdxf1Xkn/jSP2l3ydAw=; b=QmrkC8GlpVgLzWLaHRlZIhh90NbM30dH2De/9ZWgGWzdh5o5UzsPW/DLmCVQr3bSga dKTKp3/BRObfl5sQv6U9wHFE6sjnxt/Gy4cur/JUbAYMH7WZkOaIYWiaRQaE7hSkJiTr TUeRsKqwIwJJmmfErsXICrIh3yOWDJiTdBA5Fbex2xUl4QDMXfDEkCnCSOga5qMEKVP0 UHoin/QXkgXbkuueOh+qxjX2JsihFF2mtCERILnSdPco22xodHWYLg7pBPfGtL9amVPh KeL4gDibJwdVlM0BukH0yybxcI0eORxDKC/qKCi3+Za5h5LjvHJPe4wsgsVCJr856C3E qwlQ== 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=+LI6xARs0GrLcf5j0VJKdVnOxdxf1Xkn/jSP2l3ydAw=; b=RbUmOLEwZXPSgZWh7iUGNvJ5kvB4cZN2Eek1vXGMhx7F8j/GWl87+yQHRluqTGNzO0 Qa7hPIjpZG3gurgEf5BevqnYiHFii4+Ah726mmp0lKH9tVGISIJy4FhpJ9VFnRLa0uqi JRPk9tDhXTgckOH8R4n+hjXwKm/ecD2hXLWJdPU82KJJGlF7TywjzhBry8KTLU+PoTMO oUgHDfDx7HQJah6SEn1EB+xkwBZYsYI5fSIe4F0caK+O/1+9GwVjHnzTZ6o446ytYpxb 2goDGqvEpIzWAtQk4bI8oE3jgn/cYx8EZYlLCAWIRx8FucUGRHYAjRDSL4r1GKhwlDpi pdDw== X-Gm-Message-State: AOAM532fGdyjfw30TDwslR13WgUHbcuNuoUrbmyffyt96JM/Enq0u++7 TYdL1n2Y+5fY+iYMY0Aij/vnsA== X-Google-Smtp-Source: ABdhPJwELWqy+CcC2dFI3oixD62gY+DAATL9o39//sGM5gQ1Oy6Fu13GYMzjAm06g430U7yWymDjLQ== X-Received: by 2002:a2e:a16b:0:b0:246:860:9f7 with SMTP id u11-20020a2ea16b000000b00246086009f7mr16875627ljl.449.1645531293553; Tue, 22 Feb 2022 04:01:33 -0800 (PST) Received: from navi.cosmonova.net.ua ([95.67.24.131]) by smtp.gmail.com with ESMTPSA id v29sm1664024ljv.72.2022.02.22.04.01.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 04:01: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 v4 2/4] drivers/net/virtio_net: Added basic RSS support. Date: Tue, 22 Feb 2022 14:00:52 +0200 Message-Id: <20220222120054.400208-3-andrew@daynix.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220222120054.400208-1-andrew@daynix.com> References: <20220222120054.400208-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 | 192 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 186 insertions(+), 6 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index b9ed7c55d9a0..b5f2bb426a7b 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,57 @@ 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->ctrl->rss.indirection_table_mask = + 1); + 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 + ? vi->rss_indir_table_size - 1 : 0; + 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 +2488,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 +2568,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 +2825,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 +3229,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 +3271,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 1; + 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 +3366,23 @@ 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= )); + + 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 +3451,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 +3585,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 Thu Jun 25 09:39:33 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 3B42DC4332F for ; Tue, 22 Feb 2022 12:02:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231967AbiBVMCm (ORCPT ); Tue, 22 Feb 2022 07:02:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232088AbiBVMCT (ORCPT ); Tue, 22 Feb 2022 07:02:19 -0500 Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2EC56B239F for ; Tue, 22 Feb 2022 04:01:36 -0800 (PST) Received: by mail-lj1-x22c.google.com with SMTP id t14so19121159ljh.8 for ; Tue, 22 Feb 2022 04:01:36 -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=QmisMDrSSGPjd6k26IfvbT/yYcP9P6fSTHbqUG2ZH1c=; b=A85yfPysYfgKo+nOa2VAQ4WP5WQa1Q8L4CdNVIb/faqgDh+xvvfWFc1tQj21Nk/+eV SmnVglFNfrlq8/dNzKAX7uYaxm4KjBJJlrXaLlW4DPv93I1I3q/UeXTpgcT/I4JqAVA1 H4H/4KvHsueOLbalAG8JS46FIKWsKnkzCDJzAo9+5sxooDArEw5lsuuFbI/gVIY1XKks q40uAb4TNUGIKtz0UX1C0xt6MTspIfYiJr8c6gaWmy2mvmsq37mdourciUF5crLUeEjO i0nV1BLHX8VPEzLrralSMDu8oE5RQPx5tLgOFrL1IhXfz8tdN8nmCccyauncCagU2wEY uRrA== 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=QmisMDrSSGPjd6k26IfvbT/yYcP9P6fSTHbqUG2ZH1c=; b=PeFGXvqvQhkXBCSt+vvmYFseQ2FiWUMY4JzvMgXsvqpKoVFT4rBsRANc1b6D1MJNUl 2T2J9957i9kLf6O1N+ooJ/dtxeWwQ24W0EIEfD5u+cS6lYBB8ed74axHn2j7LpjK0zXH 1f8WVDrVs4ojoB+xYODj6RGdjV9lkJa6gUzToPwbf04THfXwUvT7GNikL7RitFCNqwv2 JoZx2WFXfNPgrmzugyP9/KZlBN2mrjZKcGzR+tkz4V9PVxgmxvIUEXJ3WeqLY39xji0l Jtv9ho5z5cUZjHqwp4r+KaOHQv4ZyuHIeOr9lOGw8Iv6dGmy2ddOSWtwM75NTIlK8caX uDeg== X-Gm-Message-State: AOAM532VwPFcvlodFyU00fyjF92IXlZH8kwesyH9hAvMQIM7TbqMyl7N 0lnDwKXecsHJDm1n0wD0Pid4C4jROI9tyA== X-Google-Smtp-Source: ABdhPJwNe9yz9JfMc9894rGsESCDBjJXEfxNKyt8Q5nKCXeAYJRDpxnyY3hGQ4KgT1TYBa+B3iEz0w== X-Received: by 2002:a2e:944e:0:b0:246:4a4f:c610 with SMTP id o14-20020a2e944e000000b002464a4fc610mr2391153ljh.458.1645531294502; Tue, 22 Feb 2022 04:01:34 -0800 (PST) Received: from navi.cosmonova.net.ua ([95.67.24.131]) by smtp.gmail.com with ESMTPSA id v29sm1664024ljv.72.2022.02.22.04.01.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 04:01:34 -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 v4 3/4] drivers/net/virtio_net: Added RSS hash report. Date: Tue, 22 Feb 2022 14:00:53 +0200 Message-Id: <20220222120054.400208-4-andrew@daynix.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220222120054.400208-1-andrew@daynix.com> References: <20220222120054.400208-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 Reported-by: kernel test robot --- drivers/net/virtio_net.c | 55 +++++++++++++++++++++++++++++++++++----- 1 file changed, 49 insertions(+), 6 deletions(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index b5f2bb426a7b..8b317b3ef5aa 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; @@ -1148,6 +1149,35 @@ static struct sk_buff *receive_mergeable(struct net_= device *dev, return NULL; } =20 +static void virtio_skb_set_hash(const struct virtio_net_hdr_v1_hash *hdr_h= ash, + struct sk_buff *skb) +{ + enum pkt_hash_types rss_hash_type; + + if (!hdr_hash || !skb) + return; + + 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); +} + static void receive_buf(struct virtnet_info *vi, struct receive_queue *rq, void *buf, unsigned int len, void **ctx, unsigned int *xdp_xmit, @@ -1182,6 +1212,8 @@ static void receive_buf(struct virtnet_info *vi, stru= ct receive_queue *rq, return; =20 hdr =3D skb_vnet_hdr(skb); + if (dev->features & NETIF_F_RXHASH && vi->has_rss_hash_report) + virtio_skb_set_hash((const struct virtio_net_hdr_v1_hash *)hdr, skb); =20 if (hdr->hdr.flags & VIRTIO_NET_HDR_F_DATA_VALID) skb->ip_summed =3D CHECKSUM_UNNECESSARY; @@ -2232,7 +2264,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; } @@ -3231,6 +3264,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; } @@ -3366,8 +3401,13 @@ 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)); @@ -3383,8 +3423,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); @@ -3451,7 +3494,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); @@ -3586,7 +3629,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 Thu Jun 25 09:39:33 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 1DF88C433EF for ; Tue, 22 Feb 2022 12:02:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231946AbiBVMCs (ORCPT ); Tue, 22 Feb 2022 07:02:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229720AbiBVMCU (ORCPT ); Tue, 22 Feb 2022 07:02:20 -0500 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 60BA2B3E74 for ; Tue, 22 Feb 2022 04:01:37 -0800 (PST) Received: by mail-lf1-x131.google.com with SMTP id b9so24297147lfv.7 for ; Tue, 22 Feb 2022 04:01: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=hz5CwWPpww2mgl2jAzZIrlUR/pgW56HDjUzMdL+mmdo=; b=Md849rszVg1C1RHhHOtVxzGPjafgabCmE/pGKyISdWKKpdQ7jG2sWljz8ZzuRx+YEH rY358eUwhjmspP23FafiK3m06a+o65FstXPOrBhSLAKuhtU1Gkfwum4/ZZxT9u4amJe4 R3al/ElZX99g+vZC92EUFUU3xWr9+XzjXASEHYqegsdQ6PsYP8f9ve16mdZD4bRDHL/q 9Igwh8AIOCAZ1Fixl9bXVPpNypZIYeSq2VBhc52P0Ctlw6fmGqCrZXhjhCqupX7r/FpO w+l7P122wH4go1LPCel8QrIkbZYiVFF9hnYM1F9uTraC+FUSWNsaeFjjlZdHTLHJKuTp +g0Q== 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=hz5CwWPpww2mgl2jAzZIrlUR/pgW56HDjUzMdL+mmdo=; b=7eKJhk1bT4iDEO/5DYFn/bZODEFjvOtFEzq94nJg8TQ4G/LxA5kFlwp/33H7sxeMcW 3NaM0o4ytBS7+Sl8OJxUU3BxMsGe3/fKe+Q/wS+OYTUeTuC2FmvKnjng+ZyyWRQoA2Hp iCui7UnCe4qA8gnoq4hufJco15lnuaYQWaNVnXzLXi5hE20JXRtlJbpOo9C1IO6MRvK+ BtgqxPkUypn5A4Twc5nYdoDRuK/05VoT5ka8Wn08x0MYT87C5gmG52riJV48iCZJglxL T/wAlvpnI49rPzw1GuHfIsQCgLuUnT3fe9G2my6BdqltyQ3cqaDekwkH8PySauLHRGrp VxRg== X-Gm-Message-State: AOAM533NVM6QCw0Dkyh/I7rYukFy5FikCsBAgVKadD32OXIhWCatPQZM LOx6yQ7XN5BS6XblRv4XSABLRA== X-Google-Smtp-Source: ABdhPJxdAj9p21StHiigmc9Jc3tOG5Kxrktxj6NBps6eqvpJ5SOEEDGtPYzB29bQdsA9OuxrFm3uSg== X-Received: by 2002:a05:6512:3b0f:b0:42d:1ebb:dcbf with SMTP id f15-20020a0565123b0f00b0042d1ebbdcbfmr16670378lfv.275.1645531295462; Tue, 22 Feb 2022 04:01:35 -0800 (PST) Received: from navi.cosmonova.net.ua ([95.67.24.131]) by smtp.gmail.com with ESMTPSA id v29sm1664024ljv.72.2022.02.22.04.01.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Feb 2022 04:01: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 v4 4/4] drivers/net/virtio_net: Added RSS hash report control. Date: Tue, 22 Feb 2022 14:00:54 +0200 Message-Id: <20220222120054.400208-5-andrew@daynix.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220222120054.400208-1-andrew@daynix.com> References: <20220222120054.400208-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 Disabling happens because VirtioNET hashtype for IP doesn't check L4 proto, it works for all IP packets(TCP, UDP, ICMP, etc.). For TCP and UDP, it's possible to set IP+PORT hashes. But disabling IP hashes will disable them for TCP and UDP simultaneously. It's possible to set IP+PORT for TCP/UDP and disable/enable IP for everything else(UDP, ICMP, etc.). 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 8b317b3ef5aa..83f9a36a5efb 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; @@ -2278,6 +2279,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 ? vi->rss_indir_table_size - 1 : 0; vi->ctrl->rss.unclassified_queue =3D 0; @@ -2293,6 +2295,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) @@ -2578,6 +2695,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; @@ -2606,6 +2744,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) @@ -2860,7 +2999,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