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 5AF8643D47 for ; Mon, 25 Mar 2024 13:08:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 510F440A4B; Mon, 25 Mar 2024 13:08:33 +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 E0E7140A4B for ; Mon, 25 Mar 2024 13:08:30 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4148b77cf1eso2457235e9.2 for ; Mon, 25 Mar 2024 05:08:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711368510; x=1711973310; 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=nMnBgdQePQM5lzOOBNXwz9ZvR+T9hoBM0lkuTphmZ8s=; b=GSYoy0FsjEBc/r7oz71Wt8la8kT6M5Pr2PwKY5Bp+AwsFjLUWdWcnbh4sjgNMDWRUi o2u+wMWfMOOwx5NR8ETmaUgl98TjoEpKUO47SCmYe+Rq5vBJ3O7vKAjT27F8OIK4ts1r uLNls0gg4Ixzagey3h0eqfEYph3xQVVtSxaUWtBd5SvG2OeCYXeFUj2JOJFiMNxFGhg7 97wKjr/Vf61vMxrrniH725aqg+yRkFtxrA+0H+SD4Va+scy57nidd7sZlMzJ9OCOwfc+ z5hZArpBJxZz0TQitdh7mbSmbXP3SkIHCEXMCNfdQMZ1jAiLPDiDKdRn3Xk5cI/qHAqv lg8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711368510; x=1711973310; 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=nMnBgdQePQM5lzOOBNXwz9ZvR+T9hoBM0lkuTphmZ8s=; b=gGxlv1G5d87cMN6/+dEyf9pbMtwPdtqFTMaWD+fmdhSEwmt2pEetAHqVtIRBTP8yeU iIKTXnGpnAExsYilJtvmL7zgBmVnrh/GVI31cQoZBUx0T5/WO2t108/ToTO08yZVpN5G ZQytav/22Zdu0kFtpE0j0OLxRfvsHZxpPIhjgJ5YpJ63aTpw5uDxIi3yrKuHnqzPPsNi Zh7n8Ic5Irf67LSJ/tyMVcN743BAp1TU7KQy5wqe4xQ6haF/T3qWbWbp2RvJsPijunO0 eVgRNiZKIa5s/R4unjiPkW9htY2YXA6CkyeeZklgXYeljjOlRJ+axsCDq0r9pAgvM06c WIVg== X-Forwarded-Encrypted: i=1; AJvYcCXAor3nyL3x/nij3fruNT4CuYxhYBvQ0ZDhD71bfpqnWhEei6dQTrPpSJoYV4R/VfrgYRV7nevxASILUQjlyD8= X-Gm-Message-State: AOJu0Yy9G5KM8TRKPIm8tMSm5QmlMVEc6pXReMIt7ImIHhhGK1fpnlPv gxBxTB5T6EKAKTzj0ZyV4ZsRhNr5LcEtZsphwugHpQtoEdv8m8HN9MwLqQlk X-Google-Smtp-Source: AGHT+IG5rrHWCG45iXl6lBqCUgSdd+Mt/TRCzHNpil/GuTaZa0GIhrbriAL4XtVTtjZYqxRu+LTwCA== X-Received: by 2002:adf:f6c2:0:b0:341:b9dc:eb03 with SMTP id y2-20020adff6c2000000b00341b9dceb03mr4880941wrp.3.1711368510316; Mon, 25 Mar 2024 05:08:30 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id ce3-20020a5d5e03000000b00341cc9c1871sm3164266wrb.0.2024.03.25.05.08.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 05:08:29 -0700 (PDT) From: luca.boccassi@gmail.com 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 22.11.5 Date: Mon, 25 Mar 2024 12:08:18 +0000 Message-Id: <20240325120824.1104729-3-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240325120824.1104729-1-luca.boccassi@gmail.com> References: <20240318153919.3407921-28-luca.boccassi@gmail.com> <20240325120824.1104729-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/27/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/6409b2655024518d7c4f389c0afec41694a5c1c9 Thanks. Luca Boccassi --- >From 6409b2655024518d7c4f389c0afec41694a5c1c9 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 2ad5489046..8979c462c7 100644 --- a/.mailmap +++ b/.mailmap @@ -1388,6 +1388,7 @@ Tomasz Kulasek Tomasz Zawadzki Tom Barbette Tom Crugnale +Tom Jones Tom Millington Tom Rix Tone Zhang diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index 9f9d8473e0..c1c7539fff 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -1826,11 +1826,13 @@ done: 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; vmxnet3_enable_intr(hw, rte_intr_vec_list_index_get(dev->intr_handle, queue_id)); +#endif return 0; } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-25 11:28:37.443985658 +0000 +++ 0003-net-vmxnet3-ignore-Rx-queue-interrupt-setup-on-FreeB.patch 2024-03-25 11:28:37.180388155 +0000 @@ -1 +1 @@ -From 19fede459e0d22f5ac891366465dce07e68196bc Mon Sep 17 00:00:00 2001 +From 6409b2655024518d7c4f389c0afec41694a5c1c9 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 2ad5489046..8979c462c7 100644 @@ -27 +28 @@ -@@ -1458,6 +1458,7 @@ Tomasz Kulasek +@@ -1388,6 +1388,7 @@ Tomasz Kulasek @@ -34 +35 @@ - Tomer Shmilovich + Tone Zhang @@ -36 +37 @@ -index 2707b25148..ce7c347254 100644 +index 9f9d8473e0..c1c7539fff 100644 @@ -39 +40 @@ -@@ -1936,11 +1936,13 @@ done: +@@ -1826,11 +1826,13 @@ done: