From nobody Mon Nov 25 06:37:22 2024 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1717486835; cv=none; d=zohomail.com; s=zohoarc; b=PP0vt1srKrHmCVZigy7HjLka93jUqR2C190uCrw3k35Y3TsmOs0R1oOK5Ys51GZaS+QKVnNo8QD8GWhxpo7G9UVZ9tYU7b7EOBHkcDllKv5yOgi1b3jNplAeat3rbtFt+wLHdZ4yU/TgIDbatEEOD4YV2ZMCium3Am7Xr+Ajip4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1717486835; 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=q1ttNlpkGjRm9gkjWwachgprEr1Q5k/7ixU8FnT48Vc=; b=nY8b0by7EHJCCMl2vY35xQ3kxOQJjDNVpVTu6WdazvMf2JLxLE9s4YTXkJqZWfK028/czRgOpGpiAgZIkjHjfDb7gMl1dSV4vS1VYMVe5va9phXIW719d6JryctAI5vHrMikgVb3Q/onXCzwYqRZsVHF14o8Yd/ljaMy1YaoZOE= 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1717486835050944.5041397937533; Tue, 4 Jun 2024 00:40:35 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sEOks-0000Ti-Da; Tue, 04 Jun 2024 03:38:50 -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 1sEOkh-0000Cf-LD for qemu-devel@nongnu.org; Tue, 04 Jun 2024 03:38:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sEOkg-0006Mt-4f for qemu-devel@nongnu.org; Tue, 04 Jun 2024 03:38:39 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-606-2etyuYxuN_u1egUCoKBYSw-1; Tue, 04 Jun 2024 03:38:34 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C468D80027F; Tue, 4 Jun 2024 07:38:33 +0000 (UTC) Received: from localhost.localdomain (unknown [10.72.112.238]) by smtp.corp.redhat.com (Postfix) with ESMTP id B429C492BD4; Tue, 4 Jun 2024 07:38:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1717486717; 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=q1ttNlpkGjRm9gkjWwachgprEr1Q5k/7ixU8FnT48Vc=; b=E4nGnQxqt4gGo/vE+NKdIIai92H0JiBCMAUYVg5s/S7i5UnOuBu5M1rG3NC8aCvKsG7jg7 0P7+FyR+qThyoUZB8TPhJyt24TftOVkPDgMNobFG8NGEbgPnRdzGXLUZ84VG0GdcPNv5OF JTZaTb/VEvgirfLEHwuqfhS84apCLas= X-MC-Unique: 2etyuYxuN_u1egUCoKBYSw-1 From: Jason Wang To: peter.maydell@linaro.org, qemu-devel@nongnu.org Cc: Akihiko Odaki , Michael Tokarev , Jason Wang Subject: [PULL 11/20] virtio-net: Disable RSS on reset Date: Tue, 4 Jun 2024 15:37:46 +0800 Message-ID: <20240604073755.1859-12-jasowang@redhat.com> In-Reply-To: <20240604073755.1859-1-jasowang@redhat.com> References: <20240604073755.1859-1-jasowang@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 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: pass client-ip=170.10.133.124; envelope-from=jasowang@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1717486836402100005 Content-Type: text/plain; charset="utf-8" From: Akihiko Odaki RSS is disabled by default. Fixes: 590790297c ("virtio-net: implement RSS configuration command") Signed-off-by: Akihiko Odaki Reviewed-by: Michael Tokarev Signed-off-by: Jason Wang --- hw/net/virtio-net.c | 70 +++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index dabfa6e7d7..345ef9a8fd 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -600,40 +600,6 @@ static void virtio_net_queue_enable(VirtIODevice *vdev= , uint32_t queue_index) } } =20 -static void virtio_net_reset(VirtIODevice *vdev) -{ - VirtIONet *n =3D VIRTIO_NET(vdev); - int i; - - /* Reset back to compatibility mode */ - n->promisc =3D 1; - n->allmulti =3D 0; - n->alluni =3D 0; - n->nomulti =3D 0; - n->nouni =3D 0; - n->nobcast =3D 0; - /* multiqueue is disabled by default */ - n->curr_queue_pairs =3D 1; - timer_del(n->announce_timer.tm); - n->announce_timer.round =3D 0; - n->status &=3D ~VIRTIO_NET_S_ANNOUNCE; - - /* Flush any MAC and VLAN filter table state */ - n->mac_table.in_use =3D 0; - n->mac_table.first_multi =3D 0; - n->mac_table.multi_overflow =3D 0; - n->mac_table.uni_overflow =3D 0; - memset(n->mac_table.macs, 0, MAC_TABLE_ENTRIES * ETH_ALEN); - memcpy(&n->mac[0], &n->nic->conf->macaddr, sizeof(n->mac)); - qemu_format_nic_info_str(qemu_get_queue(n->nic), n->mac); - memset(n->vlans, 0, MAX_VLAN >> 3); - - /* Flush any async TX */ - for (i =3D 0; i < n->max_queue_pairs; i++) { - flush_or_purge_queued_packets(qemu_get_subqueue(n->nic, i)); - } -} - static void peer_test_vnet_hdr(VirtIONet *n) { NetClientState *nc =3D qemu_get_queue(n->nic); @@ -3845,6 +3811,42 @@ static void virtio_net_device_unrealize(DeviceState = *dev) virtio_cleanup(vdev); } =20 +static void virtio_net_reset(VirtIODevice *vdev) +{ + VirtIONet *n =3D VIRTIO_NET(vdev); + int i; + + /* Reset back to compatibility mode */ + n->promisc =3D 1; + n->allmulti =3D 0; + n->alluni =3D 0; + n->nomulti =3D 0; + n->nouni =3D 0; + n->nobcast =3D 0; + /* multiqueue is disabled by default */ + n->curr_queue_pairs =3D 1; + timer_del(n->announce_timer.tm); + n->announce_timer.round =3D 0; + n->status &=3D ~VIRTIO_NET_S_ANNOUNCE; + + /* Flush any MAC and VLAN filter table state */ + n->mac_table.in_use =3D 0; + n->mac_table.first_multi =3D 0; + n->mac_table.multi_overflow =3D 0; + n->mac_table.uni_overflow =3D 0; + memset(n->mac_table.macs, 0, MAC_TABLE_ENTRIES * ETH_ALEN); + memcpy(&n->mac[0], &n->nic->conf->macaddr, sizeof(n->mac)); + qemu_format_nic_info_str(qemu_get_queue(n->nic), n->mac); + memset(n->vlans, 0, MAX_VLAN >> 3); + + /* Flush any async TX */ + for (i =3D 0; i < n->max_queue_pairs; i++) { + flush_or_purge_queued_packets(qemu_get_subqueue(n->nic, i)); + } + + virtio_net_disable_rss(n); +} + static void virtio_net_instance_init(Object *obj) { VirtIONet *n =3D VIRTIO_NET(obj); --=20 2.42.0