From patchwork Fri Apr 8 12:28:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 1614815 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=CfN61seh; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KZcyP5zWCz9sFv for ; Fri, 8 Apr 2022 22:29:49 +1000 (AEST) Received: from localhost ([::1]:40080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncnkJ-0001sP-Hr for incoming@patchwork.ozlabs.org; Fri, 08 Apr 2022 08:29:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncnj1-0001mS-Ip for qemu-devel@nongnu.org; Fri, 08 Apr 2022 08:28:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:20519) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncniy-0008Ux-Ck for qemu-devel@nongnu.org; Fri, 08 Apr 2022 08:28:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649420903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UO+6m6+bvL4NnBQUt3xV0JjXFasAc5ztT/ZTtrObPko=; b=CfN61sehuIracEiGvYWnUCCwtbpk4dACCVx/duGZwNZjxlicvRWq4+Lj9iCZVh/R11Ug57 cfDKH8sDDf9EM81HAG42QUNnaocO/Msap+hw4+wJNZs12aQ+7ndRweasqqFE+gd2di4mD5 aV3KoT3ZdIf/NiUviFFsJVbNPZFFa4I= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-41-R8cS1ghsO_OxQfqbcvkJZg-1; Fri, 08 Apr 2022 08:28:19 -0400 X-MC-Unique: R8cS1ghsO_OxQfqbcvkJZg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 32CA838149A3; Fri, 8 Apr 2022 12:28:19 +0000 (UTC) Received: from max-t490s.redhat.com (unknown [10.39.208.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 61CF71402642; Fri, 8 Apr 2022 12:28:17 +0000 (UTC) From: Maxime Coquelin To: qemu-devel@nongnu.org, mst@redhat.com, jasowang@redhat.com, andrew@daynix.com, yuri.benditovich@daynix.com, dgilbert@redhat.com, quintela@redhat.com Subject: [PATCH 1/5] ebpf: pass and check RSS key length to the loader Date: Fri, 8 Apr 2022 14:28:09 +0200 Message-Id: <20220408122813.1357045-2-maxime.coquelin@redhat.com> In-Reply-To: <20220408122813.1357045-1-maxime.coquelin@redhat.com> References: <20220408122813.1357045-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=170.10.129.124; envelope-from=maxime.coquelin@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: chenbo.xia@intel.com, Maxime Coquelin , dmarchan@redhat.com, ktraynor@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This patch is preliminary rework to support RSS with Vhost-user backends. The Vhost-user implementation will allow RSS hash key of 40 bytes or more as allowed by the Virtio specification, whereas the eBPF-based Vhost-kernel solution only supports 40 bytes keys. This patch adds the RSS key length to the loader, and validate it is 40 bytes before copying it. Signed-off-by: Maxime Coquelin --- ebpf/ebpf_rss-stub.c | 3 ++- ebpf/ebpf_rss.c | 11 +++++++---- ebpf/ebpf_rss.h | 3 ++- hw/net/virtio-net.c | 3 ++- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ebpf/ebpf_rss-stub.c b/ebpf/ebpf_rss-stub.c index e71e229190..ffc5c5574f 100644 --- a/ebpf/ebpf_rss-stub.c +++ b/ebpf/ebpf_rss-stub.c @@ -29,7 +29,8 @@ bool ebpf_rss_load(struct EBPFRSSContext *ctx) } bool ebpf_rss_set_all(struct EBPFRSSContext *ctx, struct EBPFRSSConfig *config, - uint16_t *indirections_table, uint8_t *toeplitz_key) + uint16_t *indirections_table, uint8_t *toeplitz_key, + uint8_t key_len) { return false; } diff --git a/ebpf/ebpf_rss.c b/ebpf/ebpf_rss.c index 118c68da83..4a63854175 100644 --- a/ebpf/ebpf_rss.c +++ b/ebpf/ebpf_rss.c @@ -110,14 +110,16 @@ static bool ebpf_rss_set_indirections_table(struct EBPFRSSContext *ctx, } static bool ebpf_rss_set_toepliz_key(struct EBPFRSSContext *ctx, - uint8_t *toeplitz_key) + uint8_t *toeplitz_key, + size_t len) { uint32_t map_key = 0; /* prepare toeplitz key */ uint8_t toe[VIRTIO_NET_RSS_MAX_KEY_SIZE] = {}; - if (!ebpf_rss_is_loaded(ctx) || toeplitz_key == NULL) { + if (!ebpf_rss_is_loaded(ctx) || toeplitz_key == NULL || + len != VIRTIO_NET_RSS_MAX_KEY_SIZE) { return false; } memcpy(toe, toeplitz_key, VIRTIO_NET_RSS_MAX_KEY_SIZE); @@ -131,7 +133,8 @@ static bool ebpf_rss_set_toepliz_key(struct EBPFRSSContext *ctx, } bool ebpf_rss_set_all(struct EBPFRSSContext *ctx, struct EBPFRSSConfig *config, - uint16_t *indirections_table, uint8_t *toeplitz_key) + uint16_t *indirections_table, uint8_t *toeplitz_key, + uint8_t key_len) { if (!ebpf_rss_is_loaded(ctx) || config == NULL || indirections_table == NULL || toeplitz_key == NULL) { @@ -147,7 +150,7 @@ bool ebpf_rss_set_all(struct EBPFRSSContext *ctx, struct EBPFRSSConfig *config, return false; } - if (!ebpf_rss_set_toepliz_key(ctx, toeplitz_key)) { + if (!ebpf_rss_set_toepliz_key(ctx, toeplitz_key, key_len)) { return false; } diff --git a/ebpf/ebpf_rss.h b/ebpf/ebpf_rss.h index bf3f2572c7..db23ccd25f 100644 --- a/ebpf/ebpf_rss.h +++ b/ebpf/ebpf_rss.h @@ -37,7 +37,8 @@ bool ebpf_rss_is_loaded(struct EBPFRSSContext *ctx); bool ebpf_rss_load(struct EBPFRSSContext *ctx); bool ebpf_rss_set_all(struct EBPFRSSContext *ctx, struct EBPFRSSConfig *config, - uint16_t *indirections_table, uint8_t *toeplitz_key); + uint16_t *indirections_table, uint8_t *toeplitz_key, + uint8_t key_len); void ebpf_rss_unload(struct EBPFRSSContext *ctx); diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 1067e72b39..73145d6390 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -1201,7 +1201,8 @@ static bool virtio_net_attach_epbf_rss(VirtIONet *n) rss_data_to_rss_config(&n->rss_data, &config); if (!ebpf_rss_set_all(&n->ebpf_rss, &config, - n->rss_data.indirections_table, n->rss_data.key)) { + n->rss_data.indirections_table, n->rss_data.key, + VIRTIO_NET_RSS_MAX_KEY_SIZE)) { return false; } From patchwork Fri Apr 8 12:28:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 1614820 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=QCfb/Fq7; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KZdCG1QPkz9sFy for ; Fri, 8 Apr 2022 22:40:58 +1000 (AEST) Received: from localhost ([::1]:52726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncnv5-0002m6-M0 for incoming@patchwork.ozlabs.org; Fri, 08 Apr 2022 08:40:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45832) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncnj1-0001mZ-Ug for qemu-devel@nongnu.org; Fri, 08 Apr 2022 08:28:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:58016) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncniy-0008Up-97 for qemu-devel@nongnu.org; Fri, 08 Apr 2022 08:28:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649420902; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5smCSkaboZl8eyodIt0FiMg38uJfFg5OCU6LtrTUS1o=; b=QCfb/Fq7OofwoyuWoVD5VB38nhBht/LbEXLxRfch4hjJhEz2iCM1sKGXKAvFIX27RTOSiP w5OAuuT06O1/SXaKvCTnNgpCoHFZywHtaF50SItvmRJ5/OQ1ktkRxAE4t6/FH4SiTsjcxA 6SKEEercY+r3NFMDxU+maJXDI+Tmu00= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-507-DcwxC2f-Onmt1TPy4aR7Cw-1; Fri, 08 Apr 2022 08:28:21 -0400 X-MC-Unique: DcwxC2f-Onmt1TPy4aR7Cw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4128E1C08DC5; Fri, 8 Apr 2022 12:28:21 +0000 (UTC) Received: from max-t490s.redhat.com (unknown [10.39.208.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 70E94145B97F; Fri, 8 Apr 2022 12:28:19 +0000 (UTC) From: Maxime Coquelin To: qemu-devel@nongnu.org, mst@redhat.com, jasowang@redhat.com, andrew@daynix.com, yuri.benditovich@daynix.com, dgilbert@redhat.com, quintela@redhat.com Subject: [PATCH 2/5] virtio-net: prepare for variable RSS key and indir table lengths Date: Fri, 8 Apr 2022 14:28:10 +0200 Message-Id: <20220408122813.1357045-3-maxime.coquelin@redhat.com> In-Reply-To: <20220408122813.1357045-1-maxime.coquelin@redhat.com> References: <20220408122813.1357045-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=170.10.129.124; envelope-from=maxime.coquelin@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: chenbo.xia@intel.com, Maxime Coquelin , dmarchan@redhat.com, ktraynor@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This patch is a preliminary rework to support RSS with Vhost-user backends. It enables supporting different types of hashes, key lengths and indirection table lengths. This patch does not introduces behavioral changes. Signed-off-by: Maxime Coquelin --- ebpf/ebpf_rss.c | 8 ++++---- hw/net/virtio-net.c | 35 +++++++++++++++++++++++++--------- include/hw/virtio/virtio-net.h | 16 +++++++++++++--- include/migration/vmstate.h | 10 ++++++++++ 4 files changed, 53 insertions(+), 16 deletions(-) diff --git a/ebpf/ebpf_rss.c b/ebpf/ebpf_rss.c index 4a63854175..f03be5f919 100644 --- a/ebpf/ebpf_rss.c +++ b/ebpf/ebpf_rss.c @@ -96,7 +96,7 @@ static bool ebpf_rss_set_indirections_table(struct EBPFRSSContext *ctx, uint32_t i = 0; if (!ebpf_rss_is_loaded(ctx) || indirections_table == NULL || - len > VIRTIO_NET_RSS_MAX_TABLE_LEN) { + len > VIRTIO_NET_RSS_DEFAULT_TABLE_LEN) { return false; } @@ -116,13 +116,13 @@ static bool ebpf_rss_set_toepliz_key(struct EBPFRSSContext *ctx, uint32_t map_key = 0; /* prepare toeplitz key */ - uint8_t toe[VIRTIO_NET_RSS_MAX_KEY_SIZE] = {}; + uint8_t toe[VIRTIO_NET_RSS_DEFAULT_KEY_SIZE] = {}; if (!ebpf_rss_is_loaded(ctx) || toeplitz_key == NULL || - len != VIRTIO_NET_RSS_MAX_KEY_SIZE) { + len != VIRTIO_NET_RSS_DEFAULT_KEY_SIZE) { return false; } - memcpy(toe, toeplitz_key, VIRTIO_NET_RSS_MAX_KEY_SIZE); + memcpy(toe, toeplitz_key, VIRTIO_NET_RSS_DEFAULT_KEY_SIZE); *(uint32_t *)toe = ntohl(*(uint32_t *)toe); if (bpf_map_update_elem(ctx->map_toeplitz_key, &map_key, toe, diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 73145d6390..38436e472b 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -137,12 +137,11 @@ static void virtio_net_get_config(VirtIODevice *vdev, uint8_t *config) memcpy(netcfg.mac, n->mac, ETH_ALEN); virtio_stl_p(vdev, &netcfg.speed, n->net_conf.speed); netcfg.duplex = n->net_conf.duplex; - netcfg.rss_max_key_size = VIRTIO_NET_RSS_MAX_KEY_SIZE; + netcfg.rss_max_key_size = n->rss_capa.max_key_size; virtio_stw_p(vdev, &netcfg.rss_max_indirection_table_length, - virtio_host_has_feature(vdev, VIRTIO_NET_F_RSS) ? - VIRTIO_NET_RSS_MAX_TABLE_LEN : 1); + n->rss_capa.max_indirection_len); virtio_stl_p(vdev, &netcfg.supported_hash_types, - VIRTIO_NET_RSS_SUPPORTED_HASHES); + n->rss_capa.supported_hashes); memcpy(config, &netcfg, n->config_size); /* @@ -1202,7 +1201,7 @@ static bool virtio_net_attach_epbf_rss(VirtIONet *n) if (!ebpf_rss_set_all(&n->ebpf_rss, &config, n->rss_data.indirections_table, n->rss_data.key, - VIRTIO_NET_RSS_MAX_KEY_SIZE)) { + n->rss_data.key_len)) { return false; } @@ -1277,7 +1276,7 @@ static uint16_t virtio_net_handle_rss(VirtIONet *n, err_value = n->rss_data.indirections_len; goto error; } - if (n->rss_data.indirections_len > VIRTIO_NET_RSS_MAX_TABLE_LEN) { + if (n->rss_data.indirections_len > n->rss_capa.max_indirection_len) { err_msg = "Too large indirection table"; err_value = n->rss_data.indirections_len; goto error; @@ -1323,7 +1322,7 @@ static uint16_t virtio_net_handle_rss(VirtIONet *n, err_value = queue_pairs; goto error; } - if (temp.b > VIRTIO_NET_RSS_MAX_KEY_SIZE) { + if (temp.b > n->rss_capa.max_key_size) { err_msg = "Invalid key size"; err_value = temp.b; goto error; @@ -1339,6 +1338,14 @@ static uint16_t virtio_net_handle_rss(VirtIONet *n, } offset += size_get; size_get = temp.b; + n->rss_data.key_len = temp.b; + g_free(n->rss_data.key); + n->rss_data.key = g_malloc(size_get); + if (!n->rss_data.key) { + err_msg = "Can't allocate key"; + err_value = n->rss_data.key_len; + goto error; + } s = iov_to_buf(iov, iov_cnt, offset, n->rss_data.key, size_get); if (s != size_get) { err_msg = "Can get key buffer"; @@ -3093,8 +3100,9 @@ static const VMStateDescription vmstate_virtio_net_rss = { VMSTATE_UINT32(rss_data.hash_types, VirtIONet), VMSTATE_UINT16(rss_data.indirections_len, VirtIONet), VMSTATE_UINT16(rss_data.default_queue, VirtIONet), - VMSTATE_UINT8_ARRAY(rss_data.key, VirtIONet, - VIRTIO_NET_RSS_MAX_KEY_SIZE), + VMSTATE_VARRAY_UINT8_ALLOC(rss_data.key, VirtIONet, + rss_data.key_len, 0, + vmstate_info_uint8, uint8_t), VMSTATE_VARRAY_UINT16_ALLOC(rss_data.indirections_table, VirtIONet, rss_data.indirections_len, 0, vmstate_info_uint16, uint16_t), @@ -3523,8 +3531,16 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp) net_rx_pkt_init(&n->rx_pkt, false); if (virtio_has_feature(n->host_features, VIRTIO_NET_F_RSS)) { + n->rss_capa.max_key_size = VIRTIO_NET_RSS_DEFAULT_KEY_SIZE; + n->rss_capa.max_indirection_len = VIRTIO_NET_RSS_DEFAULT_TABLE_LEN; + n->rss_capa.supported_hashes = VIRTIO_NET_RSS_SUPPORTED_HASHES; + virtio_net_load_ebpf(n); + } else { + n->rss_capa.max_indirection_len = 1; } + + } static void virtio_net_device_unrealize(DeviceState *dev) @@ -3567,6 +3583,7 @@ static void virtio_net_device_unrealize(DeviceState *dev) qemu_del_nic(n->nic); virtio_net_rsc_cleanup(n); g_free(n->rss_data.indirections_table); + g_free(n->rss_data.key); net_rx_pkt_uninit(n->rx_pkt); virtio_cleanup(vdev); } diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h index eb87032627..6794b354ad 100644 --- a/include/hw/virtio/virtio-net.h +++ b/include/hw/virtio/virtio-net.h @@ -127,8 +127,16 @@ typedef struct VirtioNetRscChain { /* Maximum packet size we can receive from tap device: header + 64k */ #define VIRTIO_NET_MAX_BUFSIZE (sizeof(struct virtio_net_hdr) + (64 * KiB)) -#define VIRTIO_NET_RSS_MAX_KEY_SIZE 40 -#define VIRTIO_NET_RSS_MAX_TABLE_LEN 128 +typedef struct VirtioNetRssCapa { + uint8_t max_key_size; + uint16_t max_indirection_len; + uint32_t supported_hashes; +} VirtioNetRssCapa; + +#define VIRTIO_NET_RSS_MIN_KEY_SIZE 40 +#define VIRTIO_NET_RSS_DEFAULT_KEY_SIZE 40 +#define VIRTIO_NET_RSS_MIN_TABLE_LEN 128 +#define VIRTIO_NET_RSS_DEFAULT_TABLE_LEN 128 typedef struct VirtioNetRssData { bool enabled; @@ -136,7 +144,8 @@ typedef struct VirtioNetRssData { bool redirect; bool populate_hash; uint32_t hash_types; - uint8_t key[VIRTIO_NET_RSS_MAX_KEY_SIZE]; + uint8_t key_len; + uint8_t *key; uint16_t indirections_len; uint16_t *indirections_table; uint16_t default_queue; @@ -213,6 +222,7 @@ struct VirtIONet { QDict *primary_opts; bool primary_opts_from_json; Notifier migration_state; + VirtioNetRssCapa rss_capa; VirtioNetRssData rss_data; struct NetRxPkt *rx_pkt; struct EBPFRSSContext ebpf_rss; diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index ad24aa1934..9398cdf803 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -448,6 +448,16 @@ extern const VMStateInfo vmstate_info_qlist; .offset = vmstate_offset_varray(_state, _field, _type), \ } +#define VMSTATE_VARRAY_UINT8_ALLOC(_field, _state, _field_num, _version, _info, _type) {\ + .name = (stringify(_field)), \ + .version_id = (_version), \ + .num_offset = vmstate_offset_value(_state, _field_num, uint8_t),\ + .info = &(_info), \ + .size = sizeof(_type), \ + .flags = VMS_VARRAY_UINT8 | VMS_POINTER | VMS_ALLOC, \ + .offset = vmstate_offset_pointer(_state, _field, _type), \ +} + #define VMSTATE_VSTRUCT_TEST(_field, _state, _test, _version, _vmsd, _type, _struct_version) { \ .name = (stringify(_field)), \ .version_id = (_version), \ From patchwork Fri Apr 8 12:28:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 1614819 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=VUO5/KHp; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KZd6k3Gnbz9sFy for ; Fri, 8 Apr 2022 22:37:01 +1000 (AEST) Received: from localhost ([::1]:48718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncnrF-0007vy-Ov for incoming@patchwork.ozlabs.org; Fri, 08 Apr 2022 08:36:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncnj6-0001mh-Ge for qemu-devel@nongnu.org; Fri, 08 Apr 2022 08:28:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:40439) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncnj2-0008W5-6c for qemu-devel@nongnu.org; Fri, 08 Apr 2022 08:28:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649420907; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h7+8x56jA+0uvCY0ztzTVqj03ZGqnHkOnJgFZ4RnLC0=; b=VUO5/KHpHIXWC7V0uBgrdaC2EINzK71bd0Gf8G/XDA6oCTWmQlKrie5UNvsEAUbrIopYSG VeAeJU/dRn5Yc12GDc+dclkFUB2kTLileWIxRG4ajVKZwzaPge2GFmlKKhyB4PDVUIdSNs /qRGpjK84noF09jgLwHe/f219y4taNo= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-589-v7cupeYsOVmy_8bGbRwiog-1; Fri, 08 Apr 2022 08:28:23 -0400 X-MC-Unique: v7cupeYsOVmy_8bGbRwiog-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 525B438149B7; Fri, 8 Apr 2022 12:28:23 +0000 (UTC) Received: from max-t490s.redhat.com (unknown [10.39.208.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80103145B97F; Fri, 8 Apr 2022 12:28:21 +0000 (UTC) From: Maxime Coquelin To: qemu-devel@nongnu.org, mst@redhat.com, jasowang@redhat.com, andrew@daynix.com, yuri.benditovich@daynix.com, dgilbert@redhat.com, quintela@redhat.com Subject: [PATCH 3/5] virtio-net: add RSS support for Vhost backends Date: Fri, 8 Apr 2022 14:28:11 +0200 Message-Id: <20220408122813.1357045-4-maxime.coquelin@redhat.com> In-Reply-To: <20220408122813.1357045-1-maxime.coquelin@redhat.com> References: <20220408122813.1357045-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=170.10.129.124; envelope-from=maxime.coquelin@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: chenbo.xia@intel.com, Maxime Coquelin , dmarchan@redhat.com, ktraynor@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This patch introduces new Vhost backend callbacks to support RSS, and makes them called in Virtio-net device. It will be used by Vhost-user backend implementation to support RSS feature. Signed-off-by: Maxime Coquelin --- hw/net/vhost_net-stub.c | 10 ++++++ hw/net/vhost_net.c | 22 +++++++++++++ hw/net/virtio-net.c | 53 +++++++++++++++++++++---------- include/hw/virtio/vhost-backend.h | 7 ++++ include/net/vhost_net.h | 4 +++ 5 files changed, 79 insertions(+), 17 deletions(-) diff --git a/hw/net/vhost_net-stub.c b/hw/net/vhost_net-stub.c index 89d71cfb8e..cc05e07c1f 100644 --- a/hw/net/vhost_net-stub.c +++ b/hw/net/vhost_net-stub.c @@ -101,3 +101,13 @@ int vhost_net_set_mtu(struct vhost_net *net, uint16_t mtu) { return 0; } + +int vhost_net_get_rss(struct vhost_net *net, VirtioNetRssCapa *rss_capa) +{ + return 0; +} + +int vhost_net_set_rss(struct vhost_net *net, VirtioNetRssData *rss_data) +{ + return 0; +} diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c index 30379d2ca4..aa2a1e8e5f 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -512,3 +512,25 @@ int vhost_net_set_mtu(struct vhost_net *net, uint16_t mtu) return vhost_ops->vhost_net_set_mtu(&net->dev, mtu); } + +int vhost_net_get_rss(struct vhost_net *net, VirtioNetRssCapa *rss_capa) +{ + const VhostOps *vhost_ops = net->dev.vhost_ops; + + if (!vhost_ops->vhost_net_get_rss) { + return 0; + } + + return vhost_ops->vhost_net_get_rss(&net->dev, rss_capa); +} + +int vhost_net_set_rss(struct vhost_net *net, VirtioNetRssData *rss_data) +{ + const VhostOps *vhost_ops = net->dev.vhost_ops; + + if (!vhost_ops->vhost_net_set_rss) { + return 0; + } + + return vhost_ops->vhost_net_set_rss(&net->dev, rss_data); +} diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 38436e472b..237bbdb1b3 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -741,8 +741,10 @@ static uint64_t virtio_net_get_features(VirtIODevice *vdev, uint64_t features, return features; } - if (!ebpf_rss_is_loaded(&n->ebpf_rss)) { - virtio_clear_feature(&features, VIRTIO_NET_F_RSS); + if (nc->peer->info->type == NET_CLIENT_DRIVER_TAP) { + if (!ebpf_rss_is_loaded(&n->ebpf_rss)) { + virtio_clear_feature(&features, VIRTIO_NET_F_RSS); + } } features = vhost_net_get_features(get_vhost_net(nc->peer), features); vdev->backend_features = features; @@ -1161,11 +1163,17 @@ static void virtio_net_detach_epbf_rss(VirtIONet *n); static void virtio_net_disable_rss(VirtIONet *n) { + NetClientState *nc = qemu_get_queue(n->nic); + if (n->rss_data.enabled) { trace_virtio_net_rss_disable(); } n->rss_data.enabled = false; + if (nc->peer && nc->peer->info->type == NET_CLIENT_DRIVER_VHOST_USER) { + vhost_net_set_rss(get_vhost_net(nc->peer), &n->rss_data); + } + virtio_net_detach_epbf_rss(n); } @@ -1239,6 +1247,7 @@ static uint16_t virtio_net_handle_rss(VirtIONet *n, bool do_rss) { VirtIODevice *vdev = VIRTIO_DEVICE(n); + NetClientState *nc = qemu_get_queue(n->nic); struct virtio_net_rss_config cfg; size_t s, offset = 0, size_get; uint16_t queue_pairs, i; @@ -1354,22 +1363,29 @@ static uint16_t virtio_net_handle_rss(VirtIONet *n, } n->rss_data.enabled = true; - if (!n->rss_data.populate_hash) { - if (!virtio_net_attach_epbf_rss(n)) { - /* EBPF must be loaded for vhost */ - if (get_vhost_net(qemu_get_queue(n->nic)->peer)) { - warn_report("Can't load eBPF RSS for vhost"); - goto error; + if (nc->peer && nc->peer->info->type == NET_CLIENT_DRIVER_VHOST_USER) { + if (vhost_net_set_rss(get_vhost_net(nc->peer), &n->rss_data)) { + warn_report("Failed to configure RSS for vhost-user"); + goto error; + } + } else { + if (!n->rss_data.populate_hash) { + if (!virtio_net_attach_epbf_rss(n)) { + /* EBPF must be loaded for vhost */ + if (get_vhost_net(nc->peer)) { + warn_report("Can't load eBPF RSS for vhost"); + goto error; + } + /* fallback to software RSS */ + warn_report("Can't load eBPF RSS - fallback to software RSS"); + n->rss_data.enabled_software_rss = true; } - /* fallback to software RSS */ - warn_report("Can't load eBPF RSS - fallback to software RSS"); + } else { + /* use software RSS for hash populating */ + /* and detach eBPF if was loaded before */ + virtio_net_detach_epbf_rss(n); n->rss_data.enabled_software_rss = true; } - } else { - /* use software RSS for hash populating */ - /* and detach eBPF if was loaded before */ - virtio_net_detach_epbf_rss(n); - n->rss_data.enabled_software_rss = true; } trace_virtio_net_rss_enable(n->rss_data.hash_types, @@ -3534,8 +3550,11 @@ static void virtio_net_device_realize(DeviceState *dev, Error **errp) n->rss_capa.max_key_size = VIRTIO_NET_RSS_DEFAULT_KEY_SIZE; n->rss_capa.max_indirection_len = VIRTIO_NET_RSS_DEFAULT_TABLE_LEN; n->rss_capa.supported_hashes = VIRTIO_NET_RSS_SUPPORTED_HASHES; - - virtio_net_load_ebpf(n); + if (nc->peer && nc->peer->info->type == NET_CLIENT_DRIVER_VHOST_USER) { + vhost_net_get_rss(get_vhost_net(nc->peer), &n->rss_capa); + } else { + virtio_net_load_ebpf(n); + } } else { n->rss_capa.max_indirection_len = 1; } diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-backend.h index 81bf3109f8..0b9e2ea26e 100644 --- a/include/hw/virtio/vhost-backend.h +++ b/include/hw/virtio/vhost-backend.h @@ -12,6 +12,7 @@ #define VHOST_BACKEND_H #include "exec/memory.h" +#include "hw/virtio/virtio-net.h" typedef enum VhostBackendType { VHOST_BACKEND_TYPE_NONE = 0, @@ -45,6 +46,10 @@ typedef int (*vhost_backend_memslots_limit)(struct vhost_dev *dev); typedef int (*vhost_net_set_backend_op)(struct vhost_dev *dev, struct vhost_vring_file *file); typedef int (*vhost_net_set_mtu_op)(struct vhost_dev *dev, uint16_t mtu); +typedef int (*vhost_net_get_rss_op)(struct vhost_dev *dev, + VirtioNetRssCapa *rss_capa); +typedef int (*vhost_net_set_rss_op)(struct vhost_dev *dev, + VirtioNetRssData *rss_data); typedef int (*vhost_scsi_set_endpoint_op)(struct vhost_dev *dev, struct vhost_scsi_target *target); typedef int (*vhost_scsi_clear_endpoint_op)(struct vhost_dev *dev, @@ -133,6 +138,8 @@ typedef struct VhostOps { vhost_backend_memslots_limit vhost_backend_memslots_limit; vhost_net_set_backend_op vhost_net_set_backend; vhost_net_set_mtu_op vhost_net_set_mtu; + vhost_net_get_rss_op vhost_net_get_rss; + vhost_net_set_rss_op vhost_net_set_rss; vhost_scsi_set_endpoint_op vhost_scsi_set_endpoint; vhost_scsi_clear_endpoint_op vhost_scsi_clear_endpoint; vhost_scsi_get_abi_version_op vhost_scsi_get_abi_version; diff --git a/include/net/vhost_net.h b/include/net/vhost_net.h index 387e913e4e..9cf702e7e3 100644 --- a/include/net/vhost_net.h +++ b/include/net/vhost_net.h @@ -48,4 +48,8 @@ uint64_t vhost_net_get_acked_features(VHostNetState *net); int vhost_net_set_mtu(struct vhost_net *net, uint16_t mtu); +int vhost_net_get_rss(struct vhost_net *net, VirtioNetRssCapa *rss_capa); + +int vhost_net_set_rss(struct vhost_net *net, VirtioNetRssData *rss_data); + #endif From patchwork Fri Apr 8 12:28:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 1614817 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=cBUuaCME; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KZcyP6ddrz9sFy for ; Fri, 8 Apr 2022 22:29:48 +1000 (AEST) Received: from localhost ([::1]:40016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncnkI-0001p9-Ew for incoming@patchwork.ozlabs.org; Fri, 08 Apr 2022 08:29:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45866) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncnj6-0001mf-HV for qemu-devel@nongnu.org; Fri, 08 Apr 2022 08:28:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:25241) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncnj1-0008Vv-Bw for qemu-devel@nongnu.org; Fri, 08 Apr 2022 08:28:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649420906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3c7FxJxiS1SvJJ8iCEzFEJXlV1pVaPOUGzMgzGYcfYk=; b=cBUuaCMERxksfPXc/8tvOqWvUUCNFYHBhqJKna6UsygJbN7ovR1mopSN0Oey66gTzEyg63 hhwExtHAjYZwTMmdDiEhHXL8XmIam7XSjXiKTI5keeC8+sTceybu09GlJfz2r3DJefjlVO AitmhwTS1SA+g8b2CqnjztOCvfhXGn0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-425-0Y8LdFdlPMagTLKdSIKaIQ-1; Fri, 08 Apr 2022 08:28:25 -0400 X-MC-Unique: 0Y8LdFdlPMagTLKdSIKaIQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 611D0803524; Fri, 8 Apr 2022 12:28:25 +0000 (UTC) Received: from max-t490s.redhat.com (unknown [10.39.208.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8FDA8145BA41; Fri, 8 Apr 2022 12:28:23 +0000 (UTC) From: Maxime Coquelin To: qemu-devel@nongnu.org, mst@redhat.com, jasowang@redhat.com, andrew@daynix.com, yuri.benditovich@daynix.com, dgilbert@redhat.com, quintela@redhat.com Subject: [PATCH 4/5] docs: introduce RSS support in Vhost-user specification Date: Fri, 8 Apr 2022 14:28:12 +0200 Message-Id: <20220408122813.1357045-5-maxime.coquelin@redhat.com> In-Reply-To: <20220408122813.1357045-1-maxime.coquelin@redhat.com> References: <20220408122813.1357045-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=170.10.129.124; envelope-from=maxime.coquelin@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: chenbo.xia@intel.com, Maxime Coquelin , dmarchan@redhat.com, ktraynor@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This patch documents RSS feature in Vhost-user specification. Two new requests are introduced backed by a dedicated protocol feature. First one is to query the Vhost-user slave RSS capabilities such as supported hash types, maximum key length and indirection table size. The second one is to provide the slave with driver's RSS configuration. Signed-off-by: Maxime Coquelin --- docs/interop/vhost-user.rst | 57 +++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/docs/interop/vhost-user.rst b/docs/interop/vhost-user.rst index 4dbc84fd00..9de6297568 100644 --- a/docs/interop/vhost-user.rst +++ b/docs/interop/vhost-user.rst @@ -258,6 +258,42 @@ Inflight description :queue size: a 16-bit size of virtqueues +RSS capabilities description +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ++----------------------+-------------+---------------+ +| supported hash types | max key len | max indir len | ++----------------------+-------------+---------------+ + +:supported hash types: a 32-bit bitfield of supported hash types as defined + in the Virtio specification + +:max key len: a 8-bit maximum size of the RSS key + +:max indir len: a 16-bits maximum size of the RSS indirection table + +RSS data description +^^^^^^^^^^^^^^^^^^^^ + ++------------+---------+-----+-----------+-------------+---------------+ +| hash types | key len | key | indir len | indir table | default queue | ++------------+---------+-----+-----------+-------------+---------------+ + +:hash types: a 32-bit bitfield of supported hash types as defined in the + Virtio specification + +:key len: 8-bit size of the RSS key + +:key: a 8-bit array of 52 elements containing the RSS key + +:indir len: a 16-bit size of the RSS indirection table + +:indir table: a 16-bit array of 512 elements containing the hash indirection + table + +:default queue: the default queue index for flows not matching requested hash + types + C structure ----------- @@ -858,6 +894,7 @@ Protocol features #define VHOST_USER_PROTOCOL_F_INBAND_NOTIFICATIONS 14 #define VHOST_USER_PROTOCOL_F_CONFIGURE_MEM_SLOTS 15 #define VHOST_USER_PROTOCOL_F_STATUS 16 + #define VHOST_USER_PROTOCOL_F_NET_RSS 17 Master message types -------------------- @@ -1371,6 +1408,26 @@ Master message types query the backend for its device status as defined in the Virtio specification. +``VHOST_USER_NET_GET_RSS`` + :id: 41 + :equivalent ioctl: N/A + :slave payload: RSS capabilities description + :master payload: N/A + + When the ``VHOST_USER_PROTOCOL_F_NET_RSS`` protocol has been successfully + negotiated, this message is submitted by the master to get the RSS + capabilities of the slave. + +``VHOST_USER_NET_SET_RSS`` + :id: 42 + :equivalent ioctl: N/A + :slave payload: N/A + :master payload: RSS data description + + When the ``VHOST_USER_PROTOCOL_F_NET_RSS`` protocol has been successfully + negotiated, this message is submitted by the master to set the RSS + configuration defined by the Virtio driver. + Slave message types ------------------- From patchwork Fri Apr 8 12:28:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 1614818 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=DFFutrZZ; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KZd3M0XYPz9sFy for ; Fri, 8 Apr 2022 22:34:07 +1000 (AEST) Received: from localhost ([::1]:46520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ncnoT-0006MD-5W for incoming@patchwork.ozlabs.org; Fri, 08 Apr 2022 08:34:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncnj8-0001mk-0G for qemu-devel@nongnu.org; Fri, 08 Apr 2022 08:28:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:43699) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ncnj6-0008WH-7p for qemu-devel@nongnu.org; Fri, 08 Apr 2022 08:28:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649420910; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zleluUqSDZ2kUtluqs0feIxnpU+msTT2TSh4UAgP4fg=; b=DFFutrZZAq9LzZqvcgA+TM4Bp3roVJPHYyJic9yEqHosSbx6EpSyny7/ZuVwip/f2eNdcs 8iIkeJ2IJz84QRVasBfhRyfO9JqtBdkZJR5jX3/ATlCtxAvib0DlqY6agMLYfnXG9grSHP hIazEXNI/MpJCwCe67UxXghBUhGYpHI= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-660-aGnCSZFBNQSQy_8Zkur1xg-1; Fri, 08 Apr 2022 08:28:27 -0400 X-MC-Unique: aGnCSZFBNQSQy_8Zkur1xg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 71E4738149A7; Fri, 8 Apr 2022 12:28:27 +0000 (UTC) Received: from max-t490s.redhat.com (unknown [10.39.208.25]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9FD25145B97F; Fri, 8 Apr 2022 12:28:25 +0000 (UTC) From: Maxime Coquelin To: qemu-devel@nongnu.org, mst@redhat.com, jasowang@redhat.com, andrew@daynix.com, yuri.benditovich@daynix.com, dgilbert@redhat.com, quintela@redhat.com Subject: [PATCH 5/5] vhost-user: add RSS support Date: Fri, 8 Apr 2022 14:28:13 +0200 Message-Id: <20220408122813.1357045-6-maxime.coquelin@redhat.com> In-Reply-To: <20220408122813.1357045-1-maxime.coquelin@redhat.com> References: <20220408122813.1357045-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=170.10.133.124; envelope-from=maxime.coquelin@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: chenbo.xia@intel.com, Maxime Coquelin , dmarchan@redhat.com, ktraynor@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This patch implements the RSS feature to the Vhost-user backend. The implementation supports up to 52 bytes RSS key length, and 512 indirection table entries. Signed-off-by: Maxime Coquelin --- hw/virtio/vhost-user.c | 146 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 145 insertions(+), 1 deletion(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 6abbc9da32..d047da81ba 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -81,6 +81,8 @@ enum VhostUserProtocolFeature { VHOST_USER_PROTOCOL_F_RESET_DEVICE = 13, /* Feature 14 reserved for VHOST_USER_PROTOCOL_F_INBAND_NOTIFICATIONS. */ VHOST_USER_PROTOCOL_F_CONFIGURE_MEM_SLOTS = 15, + /* Feature 16 reserved for VHOST_USER_PROTOCOL_F_STATUS. */ + VHOST_USER_PROTOCOL_F_NET_RSS = 17, VHOST_USER_PROTOCOL_F_MAX }; @@ -126,6 +128,10 @@ typedef enum VhostUserRequest { VHOST_USER_GET_MAX_MEM_SLOTS = 36, VHOST_USER_ADD_MEM_REG = 37, VHOST_USER_REM_MEM_REG = 38, + /* Message number 39 reserved for VHOST_USER_SET_STATUS. */ + /* Message number 40 reserved for VHOST_USER_GET_STATUS. */ + VHOST_USER_NET_GET_RSS = 41, + VHOST_USER_NET_SET_RSS = 42, VHOST_USER_MAX } VhostUserRequest; @@ -196,6 +202,24 @@ typedef struct VhostUserInflight { uint16_t queue_size; } VhostUserInflight; +typedef struct VhostUserRSSCapa { + uint32_t supported_hash_types; + uint8_t max_key_len; + uint16_t max_indir_len; +} VhostUserRSSCapa; + +#define VHOST_USER_RSS_MAX_KEY_LEN 52 +#define VHOST_USER_RSS_MAX_INDIR_LEN 512 + +typedef struct VhostUserRSSData { + uint32_t hash_types; + uint8_t key_len; + uint8_t key[VHOST_USER_RSS_MAX_KEY_LEN]; + uint16_t indir_len; + uint16_t indir_table[VHOST_USER_RSS_MAX_INDIR_LEN]; + uint16_t default_queue; +} VhostUserRSSData; + typedef struct { VhostUserRequest request; @@ -220,6 +244,8 @@ typedef union { VhostUserCryptoSession session; VhostUserVringArea area; VhostUserInflight inflight; + VhostUserRSSCapa rss_capa; + VhostUserRSSData rss_data; } VhostUserPayload; typedef struct VhostUserMsg { @@ -2178,7 +2204,123 @@ static int vhost_user_net_set_mtu(struct vhost_dev *dev, uint16_t mtu) return ret; } - /* If reply_ack supported, slave has to ack specified MTU is valid */ + if (reply_supported) { + return process_message_reply(dev, &msg); + } + + return 0; +} + +static int vhost_user_net_get_rss(struct vhost_dev *dev, + VirtioNetRssCapa *rss_capa) +{ + int ret; + VhostUserMsg msg = { + .hdr.request = VHOST_USER_NET_GET_RSS, + .hdr.flags = VHOST_USER_VERSION, + }; + + if (!(dev->protocol_features & (1ULL << VHOST_USER_PROTOCOL_F_NET_RSS))) { + return -EPROTO; + } + + ret = vhost_user_write(dev, &msg, NULL, 0); + if (ret < 0) { + return ret; + } + + ret = vhost_user_read(dev, &msg); + if (ret < 0) { + return ret; + } + + if (msg.hdr.request != VHOST_USER_NET_GET_RSS) { + error_report("Received unexpected msg type. Expected %d received %d", + VHOST_USER_NET_GET_RSS, msg.hdr.request); + return -EPROTO; + } + + if (msg.hdr.size != sizeof(msg.payload.rss_capa)) { + error_report("Received bad msg size."); + return -EPROTO; + } + + if (msg.payload.rss_capa.max_key_len < VIRTIO_NET_RSS_MIN_KEY_SIZE) { + error_report("Invalid max RSS key len (%uB, minimum %uB).", + msg.payload.rss_capa.max_key_len, + VIRTIO_NET_RSS_MIN_KEY_SIZE); + return -EINVAL; + } + + if (msg.payload.rss_capa.max_indir_len < VIRTIO_NET_RSS_MIN_TABLE_LEN) { + error_report("Invalid max RSS indir table entries (%u, minimum %u).", + msg.payload.rss_capa.max_indir_len, + VIRTIO_NET_RSS_MIN_TABLE_LEN); + return -EINVAL; + } + + rss_capa->supported_hashes = msg.payload.rss_capa.supported_hash_types; + rss_capa->max_key_size = MIN(msg.payload.rss_capa.max_key_len, + VHOST_USER_RSS_MAX_KEY_LEN); + rss_capa->max_indirection_len = MIN(msg.payload.rss_capa.max_indir_len, + VHOST_USER_RSS_MAX_INDIR_LEN); + + return 0; +} + +static int vhost_user_net_set_rss(struct vhost_dev *dev, + VirtioNetRssData *rss_data) +{ + VhostUserMsg msg; + bool reply_supported = virtio_has_feature(dev->protocol_features, + VHOST_USER_PROTOCOL_F_REPLY_ACK); + int ret; + + if (!(dev->protocol_features & (1ULL << VHOST_USER_PROTOCOL_F_NET_RSS))) { + return -EPROTO; + } + + msg.hdr.request = VHOST_USER_NET_SET_RSS; + msg.hdr.size = sizeof(msg.payload.rss_data); + msg.hdr.flags = VHOST_USER_VERSION; + if (reply_supported) { + msg.hdr.flags |= VHOST_USER_NEED_REPLY_MASK; + } + + msg.payload.rss_data.hash_types = rss_data->hash_types; + + if (rss_data->key_len > VHOST_USER_RSS_MAX_KEY_LEN) { + error_report("RSS key length too long (%uB, max %uB).", + rss_data->key_len, VHOST_USER_RSS_MAX_KEY_LEN); + return -EINVAL; + } + + msg.payload.rss_data.key_len = rss_data->key_len; + memset(msg.payload.rss_data.key, 0, VHOST_USER_RSS_MAX_KEY_LEN); + memcpy(msg.payload.rss_data.key, rss_data->key, rss_data->key_len); + + if (rss_data->indirections_len > VHOST_USER_RSS_MAX_INDIR_LEN) { + error_report("RSS indirection table too large (%u, max %u).", + rss_data->indirections_len, VHOST_USER_RSS_MAX_INDIR_LEN); + return -EINVAL; + } + + msg.payload.rss_data.indir_len = rss_data->indirections_len; + memset(msg.payload.rss_data.indir_table, 0, + VHOST_USER_RSS_MAX_INDIR_LEN * + sizeof(*msg.payload.rss_data.indir_table)); + memcpy(msg.payload.rss_data.indir_table, rss_data->indirections_table, + msg.payload.rss_data.indir_len * + sizeof(*msg.payload.rss_data.indir_table)); + + msg.payload.rss_data.default_queue = rss_data->default_queue; + + ret = vhost_user_write(dev, &msg, NULL, 0); + if (ret < 0) { + return ret; + } + + /* If reply_ack supported, slave has to ack specified RSS conf is valid */ if (reply_supported) { return process_message_reply(dev, &msg); } @@ -2555,6 +2697,8 @@ const VhostOps user_ops = { .vhost_migration_done = vhost_user_migration_done, .vhost_backend_can_merge = vhost_user_can_merge, .vhost_net_set_mtu = vhost_user_net_set_mtu, + .vhost_net_get_rss = vhost_user_net_get_rss, + .vhost_net_set_rss = vhost_user_net_set_rss, .vhost_set_iotlb_callback = vhost_user_set_iotlb_callback, .vhost_send_device_iotlb_msg = vhost_user_send_device_iotlb_msg, .vhost_get_config = vhost_user_get_config,