From nobody Mon Feb 9 11:51:15 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1714287745; cv=none; d=zohomail.com; s=zohoarc; b=jlK5j7Os6/20p+jgb+IsNcD1/5bQVJsh/M7N+a7bLewBWHP7Eh9whnu4E8IuK0Azp7DfvZ4fDPKHSmhatiYZwvZcXRYo6CsT0wrHZvmrrTPdQSM1vJI2VCcaNefSg3bLLjTp2ZLJ6lCHj+setFy9kJtfoTxz2azMZcN+avzqh+w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1714287745; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=bs9/gC6mUVYOY+Jx84jn4xmGiO1E5P8MHNmgW3YHydw=; b=InCphmlyjXCGCDnTG60DjZb/fVucb6Ol0bA46tnz1onSHtJuTv15i8OmQwajkzkKJA1p9AWBL3H7TsOBLU5Uh7Jmb15NBU1KR3A0OxeWOo/ElBVZM+VMoS6mjntVMS/2Hwsqxyht+iMHPwDPU09aQ/Exbp46aWOL3187FJOFKrs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1714287745189199.83096348688866; Sun, 28 Apr 2024 00:02:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s0yXw-0002tU-0F; Sun, 28 Apr 2024 03:02:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s0yXp-0002Wn-19 for qemu-devel@nongnu.org; Sun, 28 Apr 2024 03:01:53 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s0yXe-0005Tp-Cr for qemu-devel@nongnu.org; Sun, 28 Apr 2024 03:01:52 -0400 Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-2af800ff18dso2908302a91.1 for ; Sun, 28 Apr 2024 00:01:42 -0700 (PDT) Received: from localhost ([157.82.202.162]) by smtp.gmail.com with UTF8SMTPSA id nb16-20020a17090b35d000b002af8056917csm6256415pjb.29.2024.04.28.00.01.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 28 Apr 2024 00:01:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1714287701; x=1714892501; darn=nongnu.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=bs9/gC6mUVYOY+Jx84jn4xmGiO1E5P8MHNmgW3YHydw=; b=28/HrHljgvG3U+9byzTzDQw6aaU2oX3SYeA5hr46oCnLEtNMu25v73FQIz7kViY9Bw 9DvQX+biW0nd+6NIgPQDOqgm0V7ryMIKHSWeHoD/v+auZvi0lSb4Ps8d+ZMpl9qe20rM PEYzVpY+0MgHlIl0l6ibUoLGdJ7wr8jpWL8oeXjk47k9ceLEa31ZLUQtFHCwL8gv1Hih 3TaT/Xcf65Zl5a7enm61JxDn6qxX0nZ9e2zDR6zOsPFv3Ux5uCynW3CB5Za035gvcWpw xeJMhs2my0k+zo2h1KXjzP9IjgBXIu1hEYljHJTbZsY9Gx3eCRlfSVo6joM/9z9+PqQ8 iO+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714287701; x=1714892501; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bs9/gC6mUVYOY+Jx84jn4xmGiO1E5P8MHNmgW3YHydw=; b=sahhyUmt38OhWFOI75yH0DkOgF8X0VkG/cK5wfLQ/4bmZoLhQnIYoHun2cM7Gd9V2W ALST+6dF5CRp8mwqedP8UsyMCmBwsMZ8dFB1D/58FduThYx9Qe3EaKzgwX/kvzPg80sy 7ZhP9CbGjdOx1SStf/A2LCsXUmMFgLnBlsYhSYvj6MRqF335rOk81jylgnfAf8jVUrS9 XeM8xKw5mp4lf3ZE2OAJoR9XxGQ6OjCnujl/ONdvKbCV4cuKN9duFmYGYNzoizgUEDwE naMeQQ5c6oWqnWsln23ovbkRf9uCkWiL9VUdbq2QWSXpioGp7KyPQToUFcAXW2W/+s2d BeAA== X-Gm-Message-State: AOJu0YxmUfIVAYXJgWd51TldHQlYCibxhhgZwHdWmeP1HqGjxJBXFXvh G6WrdPO6lKMVtrv/Qmc2hTK+f9JfrloyILdNxWnqNHL2Stj+VVsk3S4t7HVPGo8= X-Google-Smtp-Source: AGHT+IFiI5TsBz0XEAiAZQs1n2097GLAfjgEbCiifcLHtcCOpOsYooMQy9y6ZXNYBLpqwBQcZnWZmw== X-Received: by 2002:a17:90a:e641:b0:2af:ff3:e14a with SMTP id ep1-20020a17090ae64100b002af0ff3e14amr6276031pjb.16.1714287701132; Sun, 28 Apr 2024 00:01:41 -0700 (PDT) From: Akihiko Odaki Date: Sun, 28 Apr 2024 16:00:55 +0900 Subject: [PATCH v10 12/18] virtio-net: Unify the logic to update NIC state for RSS MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240428-rss-v10-12-73cbaa91aeb6@daynix.com> References: <20240428-rss-v10-0-73cbaa91aeb6@daynix.com> In-Reply-To: <20240428-rss-v10-0-73cbaa91aeb6@daynix.com> To: Jason Wang , Dmitry Fleytman , Sriram Yagnaraman , "Michael S. Tsirkin" , Luigi Rizzo , Giuseppe Lettieri , Vincenzo Maffione , Andrew Melnychenko , Yuri Benditovich Cc: qemu-devel@nongnu.org, Akihiko Odaki X-Mailer: b4 0.14-dev Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::102a; envelope-from=akihiko.odaki@daynix.com; helo=mail-pj1-x102a.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_NONE=0.001, T_SPF_HELO_TEMPERROR=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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @daynix-com.20230601.gappssmtp.com) X-ZM-MESSAGEID: 1714287746168100003 The code to attach or detach the eBPF program to RSS were duplicated so unify them into one function to save some code. Signed-off-by: Akihiko Odaki --- hw/net/virtio-net.c | 90 +++++++++++++++++++++----------------------------= ---- 1 file changed, 36 insertions(+), 54 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 1ac9c06f6865..61b49e335dea 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -1232,18 +1232,6 @@ static int virtio_net_handle_announce(VirtIONet *n, = uint8_t cmd, } } =20 -static void virtio_net_detach_epbf_rss(VirtIONet *n); - -static void virtio_net_disable_rss(VirtIONet *n) -{ - if (n->rss_data.enabled) { - trace_virtio_net_rss_disable(); - } - n->rss_data.enabled =3D false; - - virtio_net_detach_epbf_rss(n); -} - static bool virtio_net_attach_ebpf_to_backend(NICState *nic, int prog_fd) { NetClientState *nc =3D qemu_get_peer(qemu_get_queue(nic), 0); @@ -1291,6 +1279,40 @@ static void virtio_net_detach_epbf_rss(VirtIONet *n) virtio_net_attach_ebpf_to_backend(n->nic, -1); } =20 +static void virtio_net_commit_rss_config(VirtIONet *n) +{ + if (n->rss_data.enabled) { + n->rss_data.enabled_software_rss =3D n->rss_data.populate_hash; + if (n->rss_data.populate_hash) { + virtio_net_detach_epbf_rss(n); + } else if (!virtio_net_attach_epbf_rss(n)) { + if (get_vhost_net(qemu_get_queue(n->nic)->peer)) { + warn_report("Can't load eBPF RSS for vhost"); + } else { + warn_report("Can't load eBPF RSS - fallback to software RS= S"); + n->rss_data.enabled_software_rss =3D true; + } + } + + trace_virtio_net_rss_enable(n->rss_data.hash_types, + n->rss_data.indirections_len, + sizeof(n->rss_data.key)); + } else { + virtio_net_detach_epbf_rss(n); + trace_virtio_net_rss_disable(); + } +} + +static void virtio_net_disable_rss(VirtIONet *n) +{ + if (!n->rss_data.enabled) { + return; + } + + n->rss_data.enabled =3D false; + virtio_net_commit_rss_config(n); +} + static bool virtio_net_load_ebpf_fds(VirtIONet *n) { int fds[EBPF_RSS_MAX_FDS] =3D { [0 ... EBPF_RSS_MAX_FDS - 1] =3D -1}; @@ -1455,28 +1477,7 @@ static uint16_t virtio_net_handle_rss(VirtIONet *n, goto error; } n->rss_data.enabled =3D 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; - } - /* fallback to software RSS */ - warn_report("Can't load eBPF RSS - fallback to software RSS"); - n->rss_data.enabled_software_rss =3D 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 =3D true; - } - - trace_virtio_net_rss_enable(n->rss_data.hash_types, - n->rss_data.indirections_len, - temp.b); + virtio_net_commit_rss_config(n); return queue_pairs; error: trace_virtio_net_rss_error(err_msg, err_value); @@ -3092,26 +3093,7 @@ static int virtio_net_post_load_device(void *opaque,= int version_id) } } =20 - if (n->rss_data.enabled) { - n->rss_data.enabled_software_rss =3D n->rss_data.populate_hash; - if (!n->rss_data.populate_hash) { - if (!virtio_net_attach_epbf_rss(n)) { - if (get_vhost_net(qemu_get_queue(n->nic)->peer)) { - warn_report("Can't post-load eBPF RSS for vhost"); - } else { - warn_report("Can't post-load eBPF RSS - " - "fallback to software RSS"); - n->rss_data.enabled_software_rss =3D true; - } - } - } - - trace_virtio_net_rss_enable(n->rss_data.hash_types, - n->rss_data.indirections_len, - sizeof(n->rss_data.key)); - } else { - trace_virtio_net_rss_disable(); - } + virtio_net_commit_rss_config(n); return 0; } =20 --=20 2.44.0