From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 A0FA2C3F2D1 for ; Sun, 1 Mar 2020 14:33:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6F335214DB for ; Sun, 1 Mar 2020 14:33:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=daynix-com.20150623.gappssmtp.com header.i=@daynix-com.20150623.gappssmtp.com header.b="UvHfkOtD" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726688AbgCAOdO (ORCPT ); Sun, 1 Mar 2020 09:33:14 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:46772 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725887AbgCAOdN (ORCPT ); Sun, 1 Mar 2020 09:33:13 -0500 Received: by mail-wr1-f65.google.com with SMTP id j7so9127381wrp.13 for ; Sun, 01 Mar 2020 06:33:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=AkhjaV2U386xal/zszLDOfObdUkcke5EWewGOR3a+d0=; b=UvHfkOtDekecdk3VJ2I7QAi9fjYkrUv4I17dIOSjDXGGEe1hycXWsiuiYCQk27rk88 WpHq5VNnOa3DknUvS+iMD0f8Qb4tnkNwWO1xAYEK6fjcEX2qXxc53CfxHDbobXuc4rcW N7kPls2/dmiviJ4Jygx2BfuGW39rOhv6VpGwCLP7PzCHU1c75hzcG27WU76JVlmo2xyV iMnuL+ZCB3926BLg0l49KcTQ8tbcuO6iPHFUlQlZO9t0h2DhSlF99cTAOqK3WbnxHc4A iOJe71fd9tCn5WF47vWqt9KXtZdHhDEeREMTIOFbNGP0buwDKQLC/L/rrxfHsDhzuk1j p22A== 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; bh=AkhjaV2U386xal/zszLDOfObdUkcke5EWewGOR3a+d0=; b=m7mEtfe9alrpXRpv2cRZW6wE7e4gp9a2A9wC+LT1oXd2ZlMbRwMUMjatgDDnx61o0d JjkLpXSoJc/dsEusMUaSh7+qEhfmeBK3llprRMEwNHjAMkMIvV+75xa/QfFojkowHQZZ r+HNlBODlr0HoicI1BlUXh+XRWXgo5ojylYUcOxZIrO3/Vteww+h1BUFw37IynVxq+Aj IpRV1cylue5whora1NsrZkidC/2jtTp8tNJWJg3ZGw25HArOpt7xPCk8B2SdbvNRUJbT oP0fjuUXRNRUAVANIxpCzfqiffhhqbdw5udpbxBmB+CnrB24GgQQ/cWXiL7hkiU84B35 NH1A== X-Gm-Message-State: ANhLgQ0s0ESr9GZ+2oW2D7c7uPsOWKmekNh/ibsnB4mBNP/SGChxUEcj UkhgecqV8LLNvX+fDcIS5Vi82Q== X-Google-Smtp-Source: ADFU+vuAv02/b5EHJnyIlUzx4EDC9EjhCbPqKC+IElKUQwfRdUMU541qOT+J2y86saa3RAORVOneOg== X-Received: by 2002:adf:cf0d:: with SMTP id o13mr1476179wrj.74.1583073191242; Sun, 01 Mar 2020 06:33:11 -0800 (PST) Received: from f2.redhat.com (bzq-79-177-42-131.red.bezeqint.net. [79.177.42.131]) by smtp.gmail.com with ESMTPSA id l4sm23617241wrv.22.2020.03.01.06.33.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 01 Mar 2020 06:33:10 -0800 (PST) From: Yuri Benditovich To: mst@redhat.com, jasowang@redhat.com, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org Cc: yan@daynix.com, virtio-dev@lists.oasis-open.org Subject: [PATCH v3 2/3] virtio-net: Introduce RSS receive steering feature Date: Sun, 1 Mar 2020 16:33:01 +0200 Message-Id: <20200301143302.8556-3-yuri.benditovich@daynix.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200301143302.8556-1-yuri.benditovich@daynix.com> References: <20200301143302.8556-1-yuri.benditovich@daynix.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org RSS (Receive-side scaling) defines hash calculation rules and decision on receive virtqueue according to the calculated hash, provided mask to apply and provided indirection table containing indices of receive virqueues. The driver sends the control command to enable multiqueue and provide parameters for receive steering. Signed-off-by: Yuri Benditovich --- include/uapi/linux/virtio_net.h | 42 +++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_net.h index 19e76b3e3a64..188ad3eecdc8 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_RSS 60 /* Supports RSS RX steering */ #define VIRTIO_NET_F_RSC_EXT 61 /* extended coalescing info */ #define VIRTIO_NET_F_STANDBY 62 /* Act as standby for another device * with the same MAC. @@ -70,6 +71,17 @@ #define VIRTIO_NET_S_LINK_UP 1 /* Link is up */ #define VIRTIO_NET_S_ANNOUNCE 2 /* Announcement is needed */ +/* supported/enabled hash types */ +#define VIRTIO_NET_RSS_HASH_TYPE_IPv4 (1 << 0) +#define VIRTIO_NET_RSS_HASH_TYPE_TCPv4 (1 << 1) +#define VIRTIO_NET_RSS_HASH_TYPE_UDPv4 (1 << 2) +#define VIRTIO_NET_RSS_HASH_TYPE_IPv6 (1 << 3) +#define VIRTIO_NET_RSS_HASH_TYPE_TCPv6 (1 << 4) +#define VIRTIO_NET_RSS_HASH_TYPE_UDPv6 (1 << 5) +#define VIRTIO_NET_RSS_HASH_TYPE_IP_EX (1 << 6) +#define VIRTIO_NET_RSS_HASH_TYPE_TCP_EX (1 << 7) +#define VIRTIO_NET_RSS_HASH_TYPE_UDP_EX (1 << 8) + struct virtio_net_config { /* The config defining mac address (if VIRTIO_NET_F_MAC) */ __u8 mac[ETH_ALEN]; @@ -93,6 +105,12 @@ struct virtio_net_config { * Any other value stands for unknown. */ __u8 duplex; + /* maximum size of RSS key */ + __u8 rss_max_key_size; + /* maximum number of indirection table entries */ + __le16 rss_max_indirection_table_length; + /* bitmask of supported VIRTIO_NET_RSS_HASH_ types */ + __le32 supported_hash_types; } __attribute__((packed)); /* @@ -246,7 +264,9 @@ struct virtio_net_ctrl_mac { /* * Control Receive Flow Steering - * + */ +#define VIRTIO_NET_CTRL_MQ 4 +/* * The command VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET * enables Receive Flow Steering, specifying the number of the transmit and * receive queues that will be used. After the command is consumed and acked by @@ -259,11 +279,29 @@ struct virtio_net_ctrl_mq { __virtio16 virtqueue_pairs; }; -#define VIRTIO_NET_CTRL_MQ 4 #define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET 0 #define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN 1 #define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX 0x8000 +/* + * The command VIRTIO_NET_CTRL_MQ_RSS_CONFIG has the same effect as + * VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET does and additionally configures + * the receive steering to use a hash calculated for incoming packet + * to decide on receive virtqueue to place the packet. The command + * also provides parameters to calculate a hash and receive virtqueue. + */ +struct virtio_net_rss_config { + __le32 hash_types; + __le16 indirection_table_mask; + __le16 unclassified_queue; + __le16 indirection_table[1/* + indirection_table_mask */]; + __le16 max_tx_vq; + __u8 hash_key_length; + __u8 hash_key_data[/* hash_key_length */]; +}; + + #define VIRTIO_NET_CTRL_MQ_RSS_CONFIG 1 + /* * Control network offloads * -- 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: virtio-dev-return-6824-cohuck=redhat.com@lists.oasis-open.org Sender: List-Post: List-Help: List-Unsubscribe: List-Subscribe: Received: from lists.oasis-open.org (oasis-open.org [10.110.1.242]) by lists.oasis-open.org (Postfix) with ESMTP id 1A80C9849F5 for ; Sun, 1 Mar 2020 14:33:15 +0000 (UTC) From: Yuri Benditovich Date: Sun, 1 Mar 2020 16:33:01 +0200 Message-Id: <20200301143302.8556-3-yuri.benditovich@daynix.com> In-Reply-To: <20200301143302.8556-1-yuri.benditovich@daynix.com> References: <20200301143302.8556-1-yuri.benditovich@daynix.com> Subject: [virtio-dev] [PATCH v3 2/3] virtio-net: Introduce RSS receive steering feature Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable To: mst@redhat.com, jasowang@redhat.com, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org Cc: yan@daynix.com, virtio-dev@lists.oasis-open.org List-ID: RSS (Receive-side scaling) defines hash calculation rules and decision on receive virtqueue according to the calculated hash, provided mask to apply and provided indirection table containing indices of receive virqueues. The driver sends the control command to enable multiqueue and provide parameters for receive steering. Signed-off-by: Yuri Benditovich --- include/uapi/linux/virtio_net.h | 42 +++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/virtio_net.h b/include/uapi/linux/virtio_ne= t.h index 19e76b3e3a64..188ad3eecdc8 100644 --- a/include/uapi/linux/virtio_net.h +++ b/include/uapi/linux/virtio_net.h @@ -57,6 +57,7 @@ =09=09=09=09=09 * Steering */ #define VIRTIO_NET_F_CTRL_MAC_ADDR 23=09/* Set MAC address */ =20 +#define VIRTIO_NET_F_RSS=09 60=09/* Supports RSS RX steering */ #define VIRTIO_NET_F_RSC_EXT=09 61=09/* extended coalescing info */ #define VIRTIO_NET_F_STANDBY=09 62=09/* Act as standby for another device =09=09=09=09=09 * with the same MAC. @@ -70,6 +71,17 @@ #define VIRTIO_NET_S_LINK_UP=091=09/* Link is up */ #define VIRTIO_NET_S_ANNOUNCE=092=09/* Announcement is needed */ =20 +/* supported/enabled hash types */ +#define VIRTIO_NET_RSS_HASH_TYPE_IPv4 (1 << 0) +#define VIRTIO_NET_RSS_HASH_TYPE_TCPv4 (1 << 1) +#define VIRTIO_NET_RSS_HASH_TYPE_UDPv4 (1 << 2) +#define VIRTIO_NET_RSS_HASH_TYPE_IPv6 (1 << 3) +#define VIRTIO_NET_RSS_HASH_TYPE_TCPv6 (1 << 4) +#define VIRTIO_NET_RSS_HASH_TYPE_UDPv6 (1 << 5) +#define VIRTIO_NET_RSS_HASH_TYPE_IP_EX (1 << 6) +#define VIRTIO_NET_RSS_HASH_TYPE_TCP_EX (1 << 7) +#define VIRTIO_NET_RSS_HASH_TYPE_UDP_EX (1 << 8) + struct virtio_net_config { =09/* The config defining mac address (if VIRTIO_NET_F_MAC) */ =09__u8 mac[ETH_ALEN]; @@ -93,6 +105,12 @@ struct virtio_net_config { =09 * Any other value stands for unknown. =09 */ =09__u8 duplex; +=09/* maximum size of RSS key */ +=09__u8 rss_max_key_size; +=09/* maximum number of indirection table entries */ +=09__le16 rss_max_indirection_table_length; +=09/* bitmask of supported VIRTIO_NET_RSS_HASH_ types */ +=09__le32 supported_hash_types; } __attribute__((packed)); =20 /* @@ -246,7 +264,9 @@ struct virtio_net_ctrl_mac { =20 /* * Control Receive Flow Steering - * + */ +#define VIRTIO_NET_CTRL_MQ 4 +/* * The command VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET * enables Receive Flow Steering, specifying the number of the transmit an= d * receive queues that will be used. After the command is consumed and ack= ed by @@ -259,11 +279,29 @@ struct virtio_net_ctrl_mq { =09__virtio16 virtqueue_pairs; }; =20 -#define VIRTIO_NET_CTRL_MQ 4 #define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET 0 #define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MIN 1 #define VIRTIO_NET_CTRL_MQ_VQ_PAIRS_MAX 0x8000 =20 +/* + * The command VIRTIO_NET_CTRL_MQ_RSS_CONFIG has the same effect as + * VIRTIO_NET_CTRL_MQ_VQ_PAIRS_SET does and additionally configures + * the receive steering to use a hash calculated for incoming packet + * to decide on receive virtqueue to place the packet. The command + * also provides parameters to calculate a hash and receive virtqueue. + */ +struct virtio_net_rss_config { +=09__le32 hash_types; +=09__le16 indirection_table_mask; +=09__le16 unclassified_queue; +=09__le16 indirection_table[1/* + indirection_table_mask */]; +=09__le16 max_tx_vq; +=09__u8 hash_key_length; +=09__u8 hash_key_data[/* hash_key_length */]; +}; + + #define VIRTIO_NET_CTRL_MQ_RSS_CONFIG 1 + /* * Control network offloads * --=20 2.17.1 --------------------------------------------------------------------- To unsubscribe, e-mail: virtio-dev-unsubscribe@lists.oasis-open.org For additional commands, e-mail: virtio-dev-help@lists.oasis-open.org