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 92CDE43829 for ; Tue, 5 Mar 2024 16:36:05 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8D4FE42E32; Tue, 5 Mar 2024 16:36:05 +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 A915242E32 for ; Tue, 5 Mar 2024 16:36:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652964; 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=ZTpQBMGuuB37QtugAiYJ8qAmYICN9OgiMEn3zVMrO7o=; b=G7/O+nfFZ8K3ah0HYvDdsOhky5HL7dwIM/y0wkIcPWIA/ufxelqlWJWwNzlaU5Q4QwHcYX Qck+sQhUarS6zFaIx2P0LwkbaCPdTWJ8pLbSp4EubgojM1e5smEhmAB8m5AemzEPSF+FlB y6pKA3uh3u7ztcziwERuONUb7uD/qmc= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-474-I7i9dbw-NXSNSRaz1r2Kxg-1; Tue, 05 Mar 2024 10:36:01 -0500 X-MC-Unique: I7i9dbw-NXSNSRaz1r2Kxg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 5B3123C025B8; Tue, 5 Mar 2024 15:36:01 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F7C7200AE7F; Tue, 5 Mar 2024 15:36:00 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Lewis Donzis , Ferruh Yigit , dpdk stable Subject: patch 'net/vmxnet3: fix initialization on FreeBSD' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:34:22 +0000 Message-ID: <20240305153449.263666-49-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 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.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/11/24. 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/be2dc69e862528861874f84e21604504ddfe3011 Thanks. Kevin --- >From be2dc69e862528861874f84e21604504ddfe3011 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 9 Jan 2024 14:23:43 +0000 Subject: [PATCH] net/vmxnet3: fix initialization on FreeBSD [ upstream commit 40d5676ff1ea43cc2c121fd66d19a29a1c9107bb ] DPDK does not support interrupts on FreeBSD, so the vmxnet3 driver returns error when enabling interrupts as it initializes. We can fix this by #ifdef'ing out the interrupt calls when building for FreeBSD, allowing the driver to initialize correctly. Fixes: 046f11619567 ("net/vmxnet3: support MSI-X interrupt") Reported-by: Lewis Donzis Signed-off-by: Bruce Richardson Tested-by: Lewis Donzis Acked-by: Ferruh Yigit --- .mailmap | 1 + drivers/net/vmxnet3/vmxnet3_ethdev.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.mailmap b/.mailmap index fe94cbe1ff..813e42b2d5 100644 --- a/.mailmap +++ b/.mailmap @@ -755,4 +755,5 @@ Levend Sayar Lev Faerman Lewei Yang +Lewis Donzis Leyi Rong Liang Ma diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index a48a355d39..da9635507e 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -207,4 +207,5 @@ vmxnet3_disable_intr(struct vmxnet3_hw *hw, unsigned int intr_idx) } +#ifndef RTE_EXEC_ENV_FREEBSD /* * Enable all intrs used by the device @@ -228,4 +229,5 @@ vmxnet3_enable_all_intrs(struct vmxnet3_hw *hw) } } +#endif /* @@ -964,4 +966,5 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) vmxnet3_dev_set_rxmode(hw, VMXNET3_RXM_UCAST | VMXNET3_RXM_BCAST, 1); +#ifndef RTE_EXEC_ENV_FREEBSD /* Setup interrupt callback */ rte_intr_callback_register(dev->intr_handle, @@ -975,4 +978,5 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) /* enable all intrs */ vmxnet3_enable_all_intrs(hw); +#endif vmxnet3_process_events(dev); -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:55.814921386 +0000 +++ 0049-net-vmxnet3-fix-initialization-on-FreeBSD.patch 2024-03-05 14:08:54.677520837 +0000 @@ -1 +1 @@ -From 40d5676ff1ea43cc2c121fd66d19a29a1c9107bb Mon Sep 17 00:00:00 2001 +From be2dc69e862528861874f84e21604504ddfe3011 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 40d5676ff1ea43cc2c121fd66d19a29a1c9107bb ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index d85e074fbd..32ff4ceb4b 100644 +index fe94cbe1ff..813e42b2d5 100644 @@ -27 +28 @@ -@@ -787,4 +787,5 @@ Levend Sayar +@@ -755,4 +755,5 @@ Levend Sayar @@ -34 +35 @@ -index b239ea3ede..1e6febb092 100644 +index a48a355d39..da9635507e 100644 @@ -37 +38 @@ -@@ -259,4 +259,5 @@ vmxnet3_disable_all_intrs(struct vmxnet3_hw *hw) +@@ -207,4 +207,5 @@ vmxnet3_disable_intr(struct vmxnet3_hw *hw, unsigned int intr_idx) @@ -43 +44 @@ -@@ -282,4 +283,5 @@ vmxnet3_enable_all_intrs(struct vmxnet3_hw *hw) +@@ -228,4 +229,5 @@ vmxnet3_enable_all_intrs(struct vmxnet3_hw *hw) @@ -49 +50 @@ -@@ -1131,4 +1133,5 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) +@@ -964,4 +966,5 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) @@ -55 +56 @@ -@@ -1142,4 +1145,5 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) +@@ -975,4 +978,5 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)