From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DF678433AF for ; Wed, 15 Nov 2023 19:37:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="FjazhqTC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8ED7BC433C9; Wed, 15 Nov 2023 19:37:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1700077077; bh=pTu4SxXQ7+i9h9yCRw8i7okjr/WwrqR/wspSWk9yI0Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FjazhqTCh7riqAOQZFs6B3A4s9SH49TxnChA5IMI92D4nHMd48GclwlkPoAkcuGAx zY55V73cZ6uM1Q/w4ahFrdXFWzqFmjoeCp/jIKADBaP8d6XU7tWBhsyei5nW7hsFk0 +QV9MXR7ZCkiETyuHT/E52G7R4Ffec4u2lz4JWIo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Gavin Li , Heng Qi , Jason Wang , "David S. Miller" , Sasha Levin Subject: [PATCH 6.6 117/603] virtio-net: fix mismatch of getting tx-frames Date: Wed, 15 Nov 2023 14:11:02 -0500 Message-ID: <20231115191621.341053202@linuxfoundation.org> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231115191613.097702445@linuxfoundation.org> References: <20231115191613.097702445@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Heng Qi [ Upstream commit 134674c1877be5e35e35802517c67a9ecce21153 ] Since virtio-net allows switching napi_tx for per txq, we have to get the specific txq's result now. Fixes: 394bd87764b6 ("virtio_net: support per queue interrupt coalesce command") Cc: Gavin Li Signed-off-by: Heng Qi Acked-by: Jason Wang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/virtio_net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index d67f742fbd4c5..b218c2bafddcc 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c @@ -3453,7 +3453,7 @@ static int virtnet_get_per_queue_coalesce(struct net_device *dev, } else { ec->rx_max_coalesced_frames = 1; - if (vi->sq[0].napi.weight) + if (vi->sq[queue].napi.weight) ec->tx_max_coalesced_frames = 1; } -- 2.42.0