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 C92F045DB9 for ; Wed, 27 Nov 2024 18:20:32 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C5734402E1; Wed, 27 Nov 2024 18:20:32 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 3975A402E4 for ; Wed, 27 Nov 2024 18:20:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728030; 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=chAHbAcxvJ0G6EGeAGajdWXHzSzcxFxfrUOsN7+I4RQ=; b=i/Voq3ORenqI4M3XUlyjlsAIXnunXnDih0I6MHfkQ1UM9mdASw95bBGrZzw5GM1tLnYcss xNYFMmO4Ntg0+MdNr2Ox2gN+yZKTAWEKDILnDwUREu7i/1GW+jFgT/3KMyQ/bi48UjXZak 8UkjW0AUt9InsRqhexN3P1Gkev3JtQ4= Received: from mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-631-6tTWmQ1xOZCThyeBhRFo9w-1; Wed, 27 Nov 2024 12:20:29 -0500 X-MC-Unique: 6tTWmQ1xOZCThyeBhRFo9w-1 X-Mimecast-MFC-AGG-ID: 6tTWmQ1xOZCThyeBhRFo9w Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.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 mx-prod-mc-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1FAFA1955DC1; Wed, 27 Nov 2024 17:20:28 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B0B1B300019E; Wed, 27 Nov 2024 17:20:26 +0000 (UTC) From: Kevin Traynor To: Jun Wang Cc: Bruce Richardson , dpdk stable Subject: patch 'net/e1000: fix link status crash in secondary process' has been queued to stable release 21.11.9 Date: Wed, 27 Nov 2024 17:17:34 +0000 Message-ID: <20241127171916.690404-27-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: SWdhpgvJd6xncIvhlSTHQ1ceNWx9sCBmdndg8z6_FI8_1732728028 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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/02/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/0fd960684c3b972884001672d3018a781cb45d07 Thanks. Kevin --- >From 0fd960684c3b972884001672d3018a781cb45d07 Mon Sep 17 00:00:00 2001 From: Jun Wang Date: Fri, 12 Jul 2024 19:30:47 +0800 Subject: [PATCH] net/e1000: fix link status crash in secondary process [ upstream commit 84506cfe07326fd6ddb158f3fa57bd678751561a ] The code to update link status is not safe in secondary process. If called from secondary it will crash, example from dumpcap: /dpdk/app/dpdk-dumpcap -i 0000:00:04.0 File: /tmp/dpdk-dumpcap_0_0000:00:04.0_20240723020203.pcapng Segmentation fault (core dumped) Fixes: 805803445a02 ("e1000: support EM devices (also known as e1000/e1000e)") Signed-off-by: Jun Wang Acked-by: Bruce Richardson --- drivers/net/e1000/em_ethdev.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c index e983d5682a..619e1d4e2e 100644 --- a/drivers/net/e1000/em_ethdev.c +++ b/drivers/net/e1000/em_ethdev.c @@ -1122,4 +1122,7 @@ eth_em_link_update(struct rte_eth_dev *dev, int wait_to_complete) int link_up, count; + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -1; + link_up = 0; hw->mac.get_link_status = 1; -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:39.151369233 +0000 +++ 0027-net-e1000-fix-link-status-crash-in-secondary-process.patch 2024-11-27 17:17:38.182269150 +0000 @@ -1 +1 @@ -From 84506cfe07326fd6ddb158f3fa57bd678751561a Mon Sep 17 00:00:00 2001 +From 0fd960684c3b972884001672d3018a781cb45d07 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 84506cfe07326fd6ddb158f3fa57bd678751561a ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index c5a4dec693..f6875b0762 100644 +index e983d5682a..619e1d4e2e 100644 @@ -26 +27 @@ -@@ -1137,4 +1137,7 @@ eth_em_link_update(struct rte_eth_dev *dev, int wait_to_complete) +@@ -1122,4 +1122,7 @@ eth_em_link_update(struct rte_eth_dev *dev, int wait_to_complete)