From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EDF2543345 for ; Thu, 16 Nov 2023 14:24:10 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E6F4F402DD; Thu, 16 Nov 2023 14:24:10 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id C5B9A402E0 for ; Thu, 16 Nov 2023 14:24:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141048; 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=jZVhK4hXmvBPqQOW/flhrWjxVb5gRifWkCAwRx8LNEc=; b=awKWa732daaKUpC/kdPz0BNT5PAwkxLRNNkJp5Xjzr7hMahm8a0YVkFu2GMi+fs8MiD98V n0itq+63RvR/pAxBqv3zyfFkPteFaiZPsHHzPyq03aj2ZX21blTjBGL0HFFKiXCDLJq0DJ b2/F5K1JpxOGOMsUausP03KX5jlMeu4= 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-148-x783t5eMPpKKccJ79BdDQw-1; Thu, 16 Nov 2023 08:24:04 -0500 X-MC-Unique: x783t5eMPpKKccJ79BdDQw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 4B6CE185A784; Thu, 16 Nov 2023 13:24:04 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id 41C7F2166B29; Thu, 16 Nov 2023 13:24:03 +0000 (UTC) From: Kevin Traynor To: Wenwu Ma Cc: Wei Ling , Maxime Coquelin , dpdk stable Subject: patch 'net/virtio: fix link state interrupt vector setting' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:22:46 +0000 Message-ID: <20231116132348.557257-4-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/21/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/98857c5b76557096397f802c72690a2235005b7c Thanks. Kevin --- >From 98857c5b76557096397f802c72690a2235005b7c Mon Sep 17 00:00:00 2001 From: Wenwu Ma Date: Mon, 23 Oct 2023 09:46:12 +0800 Subject: [PATCH] net/virtio: fix link state interrupt vector setting [ upstream commit efc3f842b3dd69c4e65dbdf6cdaccde8c759b5d9 ] Setting the vector for link state interrupts should be done before the device initialization is completed. Fixes: ee85024cf5f7 ("net/virtio: complete init stage at the right place") Signed-off-by: Wenwu Ma Tested-by: Wei Ling Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_ethdev.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index a23559850c..2a35024250 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -2356,4 +2356,12 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) } + if (eth_dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC) + /* Enable vector (0) for Link State Interrupt */ + if (VIRTIO_OPS(hw)->set_config_irq(hw, 0) == + VIRTIO_MSI_NO_VECTOR) { + PMD_DRV_LOG(ERR, "failed to set config vector"); + return -EBUSY; + } + virtio_reinit_complete(hw); @@ -2675,12 +2683,4 @@ virtio_dev_configure(struct rte_eth_dev *dev) hw->has_rx_offload = rx_offload_enabled(hw); - if (dev->data->dev_flags & RTE_ETH_DEV_INTR_LSC) - /* Enable vector (0) for Link State Interrupt */ - if (VIRTIO_OPS(hw)->set_config_irq(hw, 0) == - VIRTIO_MSI_NO_VECTOR) { - PMD_DRV_LOG(ERR, "failed to set config vector"); - return -EBUSY; - } - if (virtio_with_packed_queue(hw)) { #if defined(RTE_ARCH_X86_64) && defined(CC_AVX512_SUPPORT) -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:52.690300303 +0000 +++ 0004-net-virtio-fix-link-state-interrupt-vector-setting.patch 2023-11-16 13:21:52.396946218 +0000 @@ -1 +1 @@ -From efc3f842b3dd69c4e65dbdf6cdaccde8c759b5d9 Mon Sep 17 00:00:00 2001 +From 98857c5b76557096397f802c72690a2235005b7c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit efc3f842b3dd69c4e65dbdf6cdaccde8c759b5d9 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 3ab56ef769..c2c0a1a111 100644 +index a23559850c..2a35024250 100644 @@ -23 +24 @@ -@@ -1913,4 +1913,12 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) +@@ -2356,4 +2356,12 @@ virtio_init_device(struct rte_eth_dev *eth_dev, uint64_t req_features) @@ -36 +37 @@ -@@ -2238,12 +2246,4 @@ virtio_dev_configure(struct rte_eth_dev *dev) +@@ -2675,12 +2683,4 @@ virtio_dev_configure(struct rte_eth_dev *dev)