From nobody Wed Feb 11 00:55:54 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=1682505918; cv=none; d=zohomail.com; s=zohoarc; b=H7lYt0aPWBIbBuUwdeMGCy9JJCakxZ6kJxg0O8cKQk7BBx4AIJQ+5dTDPtfA5TsmEc1iVNiDv8XaN3RKbuzMX7/a1d4l9cJ3s1eprTkbj/dR07w9Na2VTyE7UtQ0w16BP7th/Kmw3LqIIpwfEMqhv9tPVEqEJsMXTySK18AAzDs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682505918; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject; bh=KtUv0mGmA7OSWgIJyTpKTrAjxT7V/SfSD72W9CU2fMA=; b=F2AEV5F8Rh5nxZoMsTDhUeqEr8peZCxe0Z1lg2aUtrVwYdbkuXfm/azq5xRoiH7kqc62mvezOfqjqzRQTDTbpRb0ak3H2YXfDrHaJ+BzZIEAM5Ae81QC2vmN1FdgxD+3X/4Tb8rUWzedJkhR5dtgEXbSMBtkuzudRRpXn7EpEjI= 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 16825059185344.154636923213502; Wed, 26 Apr 2023 03:45:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1prcXv-0002jw-5D; Wed, 26 Apr 2023 06:38:47 -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 1prcXt-0002i8-0P for qemu-devel@nongnu.org; Wed, 26 Apr 2023 06:38:45 -0400 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1prcXr-0003Dw-Fy for qemu-devel@nongnu.org; Wed, 26 Apr 2023 06:38:44 -0400 Received: by mail-pj1-x102b.google.com with SMTP id 98e67ed59e1d1-24781e23c27so6210411a91.0 for ; Wed, 26 Apr 2023 03:38:43 -0700 (PDT) Received: from alarm.u-tokyo.ac.jp ([157.82.194.15]) by smtp.gmail.com with ESMTPSA id m11-20020a63580b000000b0051322a5aa64sm9317919pgb.3.2023.04.26.03.38.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Apr 2023 03:38:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20221208.gappssmtp.com; s=20221208; t=1682505522; x=1685097522; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KtUv0mGmA7OSWgIJyTpKTrAjxT7V/SfSD72W9CU2fMA=; b=MFy6i5CkM6ogUGITRMhjs40Asdz875poZMAZOrl2nTp23dJEYsTwIKkU+1sLzgDWTR js6Sq8fZNIen1cFRemvSD/e92Sp0m3/pWQWACCXvpPBUFGGDrCHseZOsmeCvakJ7bTC0 /NKem46gIweaJnsgZoCpS5/ZUoemwoIpC2l2X8Mn+yD3Pi5i6v56X9IKAFFNeio3Eyyt A7TA9Y9su3ih6uEF3l0syoG53OFkgEA6TxgeLMbZB9sB6MuO7NBFdupDWPbwfaxsCpgQ UpJYrc1jtsY31LTb9IhCoTG6F3mrWQ3w54Gsap8CmT24o9vPIKjgIdGrb4W26N5DcAZQ EdEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682505522; x=1685097522; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KtUv0mGmA7OSWgIJyTpKTrAjxT7V/SfSD72W9CU2fMA=; b=Qx/JYZ1kfjwWkQpE0ZLLTeTzfBCNYNmM8riox9yo0OxrBsWRZkhsp8Utjwr7BqamQp rswo/babGMBe2TpesfI0mvBNg7LRrE8Lyl0e7+NqS7kopNZ3wo8p7tszG2E5Q7dDECwp O0QPnwlEBrwj6x+V7WtP29m60rXaur+gyq8rsF7MInyhc8/JPDvDu6Ib9ErfkheLIUPT MO4pI6o1Th9CAGPwgljJ6DgYrBH4cr+VdVKQOYqhdWuNrD/MjlkMUPZFvRsee8sqFfcT cqEECM3aOOT8QicFJAScoI2KJOvcAOZ6bLklf25SPbas6sdaokf3pBGbok+0DtMNmCKl 8MDA== X-Gm-Message-State: AAQBX9eUYEpZFSHj9J/CGspAhvkLHCiUJulX61cQNq36GvZ2JaPV+K6E I0rEnf7JRhYTyO3OKnE6axxvCw== X-Google-Smtp-Source: AKy350Z/Efqzv5xLQEj4WpqB3ZylZNJSLTE6RJrJt2BqgKUIgdsYdkkZBfoUj7v2wyQW0IQh/m+pIA== X-Received: by 2002:a17:90b:1957:b0:23d:376a:c2bc with SMTP id nk23-20020a17090b195700b0023d376ac2bcmr18985318pjb.5.1682505522138; Wed, 26 Apr 2023 03:38:42 -0700 (PDT) From: Akihiko Odaki To: Cc: Sriram Yagnaraman , Jason Wang , Dmitry Fleytman , "Michael S . Tsirkin" , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , Cleber Rosa , Laurent Vivier , Paolo Bonzini , qemu-devel@nongnu.org, Tomasz Dzieciol , Akihiko Odaki Subject: [PATCH v4 22/48] e1000e: Reset packet state after emptying Tx queue Date: Wed, 26 Apr 2023 19:36:50 +0900 Message-Id: <20230426103716.26279-23-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230426103716.26279-1-akihiko.odaki@daynix.com> References: <20230426103716.26279-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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::102b; envelope-from=akihiko.odaki@daynix.com; helo=mail-pj1-x102b.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_HELO_NONE=0.001, SPF_NONE=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 @daynix-com.20221208.gappssmtp.com) X-ZM-MESSAGEID: 1682505920696100029 Content-Type: text/plain; charset="utf-8" Keeping Tx packet state after the transmit queue is emptied has some problems: - The datasheet says the descriptors can be reused after the transmit queue is emptied, but the Tx packet state may keep references to them. - The Tx packet state cannot be migrated so it can be reset anytime the migration happens. Always reset Tx packet state always after the queue is emptied. Signed-off-by: Akihiko Odaki --- hw/net/e1000e_core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index 6a213c0224..7dce448657 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -959,6 +959,8 @@ e1000e_start_xmit(E1000ECore *core, const E1000E_TxRing= *txr) if (!ide || !e1000e_intrmgr_delay_tx_causes(core, &cause)) { e1000e_set_interrupt_cause(core, cause); } + + net_tx_pkt_reset(txr->tx->tx_pkt, net_tx_pkt_unmap_frag_pci, core->own= er); } =20 static bool @@ -3389,8 +3391,6 @@ e1000e_core_pci_uninit(E1000ECore *core) qemu_del_vm_change_state_handler(core->vmstate); =20 for (i =3D 0; i < E1000E_NUM_QUEUES; i++) { - net_tx_pkt_reset(core->tx[i].tx_pkt, - net_tx_pkt_unmap_frag_pci, core->owner); net_tx_pkt_uninit(core->tx[i].tx_pkt); } =20 @@ -3515,8 +3515,6 @@ static void e1000e_reset(E1000ECore *core, bool sw) e1000x_reset_mac_addr(core->owner_nic, core->mac, core->permanent_mac); =20 for (i =3D 0; i < ARRAY_SIZE(core->tx); i++) { - net_tx_pkt_reset(core->tx[i].tx_pkt, - net_tx_pkt_unmap_frag_pci, core->owner); memset(&core->tx[i].props, 0, sizeof(core->tx[i].props)); core->tx[i].skip_cp =3D false; } --=20 2.40.0