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 2F09443C60 for ; Thu, 7 Mar 2024 02:36:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 26E8C42EE3; Thu, 7 Mar 2024 02:36:23 +0100 (CET) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id 6FE6542E64 for ; Thu, 7 Mar 2024 02:36:21 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-412f1fc5613so3656985e9.2 for ; Wed, 06 Mar 2024 17:36:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775381; x=1710380181; darn=dpdk.org; 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=LyejEBEbE58opaJZVxcC3GWo+ntSFTiFg4i7hTlcKBM=; b=mOtmgEnTyYV1kXHBlEuBIKVTdiWqw0Wp6dAupqH23aHIpRkCrYoB3bg6pY6R3mfx21 hLwSTW6D4Ybo76BPV4pueXP3NXdBYEX2ocHRbmQwFRGi9Pidd0ZG/PuOHZeLJ3GxKNzo din1jmuLGx2/GQTW+6YbO4ud5Cf81lecnCM7g45tOuUTqf0u46Lg24dYMNlttdw91xTG UOEZ5V2ulgGXg6P/acT1rl2QiuuW2Tp6cxnI2CZV1pdSliUVtPd1G9hbQlwWHw94u1Yd HdXlbpCc698yOC/wENpQlVqsEEno10i8czqn5CPU2muJh7ZD7ITj5hr4xk2tfulBnj8m wEIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775381; x=1710380181; 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=LyejEBEbE58opaJZVxcC3GWo+ntSFTiFg4i7hTlcKBM=; b=LqkvAsLPHxftISq3PHPtBhGY1QbGl9v3AY6f02nPrupf8rhvFIsVAt2V0cknuz6RUf CGZ045YpalUGJYqzw39bdfdudzDSUOhxIHb6wkgF9uMZpwb0C+kheB8ORI0LdOKbfNxS GEbeoJHTRpxSWR2Aa1IORex6DhKVpTsKPMIpyCaTdTCHD2yWtulfr0kWGyRi2q2RcXGc rPhNZ4fWcN7FE4E96ONM61hak0sQKUAlAKF+HTGU2xdPF1MzLPa/hxHktQVGuroi/HRY rKSY+CioB6RSn/55SqqQQvjdyB/POjQEqtzzXjkjqBlZUXUg+32bWa/cbgOFsAayIM8u JRsQ== X-Forwarded-Encrypted: i=1; AJvYcCWZ19g2G8tVe86XVbLuqjQxI/de94hc3tsfaIxyUjXH70Av8Xozd5M0nKjcLaTTiyQgzV+6ukFGydWowcDuIDo= X-Gm-Message-State: AOJu0YwsK45aYMrqCbKo6qwg3V0TJelDriwnEhNOvE3JEghwBb1bGTiJ qLpP6ghDI0wAPX2cSpHoKkovhNFok41Wmm/IWIuteKZdAKxXc+SSXO4ih5/LKM0= X-Google-Smtp-Source: AGHT+IHcunm1OU0R6prGl5BFGPnqWt+1ksXocKUpfTS+SyVwSOUAnkHnlZXhlV2pk2Mz5wolxlEI1Q== X-Received: by 2002:a05:600c:1f94:b0:412:e244:26fd with SMTP id je20-20020a05600c1f9400b00412e24426fdmr7352192wmb.16.1709775381110; Wed, 06 Mar 2024 17:36:21 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id j27-20020a05600c1c1b00b00412f83e0c11sm870593wms.22.2024.03.06.17.36.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:36:20 -0800 (PST) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Lewis Donzis , Ferruh Yigit , dpdk stable Subject: patch 'net/vmxnet3: fix initialization on FreeBSD' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:31:28 +0000 Message-Id: <20240307013159.1735343-71-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.5 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/09/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/ef5454bbaba90d752c56fdde49c40d2b240c6c87 Thanks. Luca Boccassi --- >From ef5454bbaba90d752c56fdde49c40d2b240c6c87 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 0af93036f2..841097364c 100644 --- a/.mailmap +++ b/.mailmap @@ -754,6 +754,7 @@ Leszek Zygo Levend Sayar Lev Faerman Lewei Yang +Lewis Donzis Leyi Rong Liang Ma Liang-Min Larry Wang diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index a0959b0c80..9f9d8473e0 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -257,6 +257,7 @@ vmxnet3_disable_all_intrs(struct vmxnet3_hw *hw) vmxnet3_disable_intr(hw, i); } +#ifndef RTE_EXEC_ENV_FREEBSD /* * Enable all intrs used by the device */ @@ -280,6 +281,7 @@ vmxnet3_enable_all_intrs(struct vmxnet3_hw *hw) vmxnet3_enable_intr(hw, i); } } +#endif /* * Gets tx data ring descriptor size. @@ -1036,6 +1038,7 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) /* Setting proper Rx Mode and issue Rx Mode Update command */ 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, vmxnet3_interrupt_handler, dev); @@ -1047,6 +1050,7 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) /* enable all intrs */ vmxnet3_enable_all_intrs(hw); +#endif vmxnet3_process_events(dev); -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:40.855423967 +0000 +++ 0071-net-vmxnet3-fix-initialization-on-FreeBSD.patch 2024-03-07 01:05:34.894942054 +0000 @@ -1 +1 @@ -From 40d5676ff1ea43cc2c121fd66d19a29a1c9107bb Mon Sep 17 00:00:00 2001 +From ef5454bbaba90d752c56fdde49c40d2b240c6c87 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 0af93036f2..841097364c 100644 @@ -27 +28 @@ -@@ -786,6 +786,7 @@ Leszek Zygo +@@ -754,6 +754,7 @@ Leszek Zygo @@ -36 +37 @@ -index b239ea3ede..1e6febb092 100644 +index a0959b0c80..9f9d8473e0 100644 @@ -39 +40 @@ -@@ -258,6 +258,7 @@ vmxnet3_disable_all_intrs(struct vmxnet3_hw *hw) +@@ -257,6 +257,7 @@ vmxnet3_disable_all_intrs(struct vmxnet3_hw *hw) @@ -47 +48 @@ -@@ -281,6 +282,7 @@ vmxnet3_enable_all_intrs(struct vmxnet3_hw *hw) +@@ -280,6 +281,7 @@ vmxnet3_enable_all_intrs(struct vmxnet3_hw *hw) @@ -55 +56 @@ -@@ -1130,6 +1132,7 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) +@@ -1036,6 +1038,7 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) @@ -63 +64 @@ -@@ -1141,6 +1144,7 @@ vmxnet3_dev_start(struct rte_eth_dev *dev) +@@ -1047,6 +1050,7 @@ vmxnet3_dev_start(struct rte_eth_dev *dev)