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 C87E743DF8 for ; Thu, 4 Apr 2024 11:52:47 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C257A40696; Thu, 4 Apr 2024 11:52:47 +0200 (CEST) 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 909D3402E9 for ; Thu, 4 Apr 2024 11:52:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712224365; 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=sB5bS7EgZRG3D0Yn9/DY0nTQ02j8HRtaz7hpTYtymw8=; b=a1Ed1o/5KXx0q5x7yHiSmOUx6GLugTl51oIln+wOpNL70Rv3aXIr5O43HGMYtR6SaXnvqM Rp7euztDYxjoJ+r02IGkc1rp+uRwyE+aOec466/mMrk2j9k5SdzlWoRiCkerz2T7/7/6Nq q88SJzF0Du1ztdeBVvz9FXlJHjvekQU= 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-302-XgF0hQx1OvmoWBiz_hLd1A-1; Thu, 04 Apr 2024 05:52:40 -0400 X-MC-Unique: XgF0hQx1OvmoWBiz_hLd1A-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 B37843C0ED58; Thu, 4 Apr 2024 09:52:39 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0705D3C21; Thu, 4 Apr 2024 09:52:38 +0000 (UTC) From: Kevin Traynor To: Tom Jones Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/vmxnet3: ignore Rx queue interrupt setup on FreeBSD' has been queued to stable release 21.11.7 Date: Thu, 4 Apr 2024 10:51:45 +0100 Message-ID: <20240404095155.155427-15-ktraynor@redhat.com> In-Reply-To: <20240404095155.155427-1-ktraynor@redhat.com> References: <20240404095155.155427-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 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 04/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/2ee1c5556735ef6f2021a5357a72f8ab23a8c227 Thanks. Kevin --- >From 2ee1c5556735ef6f2021a5357a72f8ab23a8c227 Mon Sep 17 00:00:00 2001 From: Tom Jones Date: Thu, 21 Mar 2024 10:31:33 +0000 Subject: [PATCH] net/vmxnet3: ignore Rx queue interrupt setup on FreeBSD [ upstream commit 19fede459e0d22f5ac891366465dce07e68196bc ] Interrupts disabled on FreeBSD for the vmxnet3 driver as they are not supported. Rx queue interrupts were missed by this change, don't attempt to enable them on FreeBSD. Without this change applications enabling interrupts encounter an immediate abort on FreeBSD. Fixes: 40d5676ff1ea ("net/vmxnet3: fix initialization on FreeBSD") Signed-off-by: Tom Jones Acked-by: Ferruh Yigit --- .mailmap | 1 + drivers/net/vmxnet3/vmxnet3_ethdev.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.mailmap b/.mailmap index 2e60e2b813..d7ac5b5247 100644 --- a/.mailmap +++ b/.mailmap @@ -1390,4 +1390,5 @@ Tomasz Zawadzki Tom Barbette Tom Crugnale +Tom Jones Tom Millington Tom Rix diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index da9635507e..32d1036c4f 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -1690,4 +1690,5 @@ static int vmxnet3_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id) { +#ifndef RTE_EXEC_ENV_FREEBSD struct vmxnet3_hw *hw = dev->data->dev_private; @@ -1695,4 +1696,5 @@ vmxnet3_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id) rte_intr_vec_list_index_get(dev->intr_handle, queue_id)); +#endif return 0; -- 2.44.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-04 10:49:34.393440246 +0100 +++ 0015-net-vmxnet3-ignore-Rx-queue-interrupt-setup-on-FreeB.patch 2024-04-04 10:49:33.756457753 +0100 @@ -1 +1 @@ -From 19fede459e0d22f5ac891366465dce07e68196bc Mon Sep 17 00:00:00 2001 +From 2ee1c5556735ef6f2021a5357a72f8ab23a8c227 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 19fede459e0d22f5ac891366465dce07e68196bc ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index a0b19832b5..491af1f6ff 100644 +index 2e60e2b813..d7ac5b5247 100644 @@ -27 +28 @@ -@@ -1459,4 +1459,5 @@ Tomasz Zawadzki +@@ -1390,4 +1390,5 @@ Tomasz Zawadzki @@ -34 +35 @@ -index 2707b25148..ce7c347254 100644 +index da9635507e..32d1036c4f 100644 @@ -37 +38 @@ -@@ -1937,4 +1937,5 @@ static int +@@ -1690,4 +1690,5 @@ static int @@ -43 +44 @@ -@@ -1942,4 +1943,5 @@ vmxnet3_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id) +@@ -1695,4 +1696,5 @@ vmxnet3_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id)