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 DB30445BB6 for ; Wed, 23 Oct 2024 23:19:06 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D59BD432C6; Wed, 23 Oct 2024 23:19:06 +0200 (CEST) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mails.dpdk.org (Postfix) with ESMTP id 5D710432C6 for ; Wed, 23 Oct 2024 23:19:06 +0200 (CEST) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4314b316495so1976265e9.2 for ; Wed, 23 Oct 2024 14:19:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729718346; x=1730323146; 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=zOXGXHVMmUUzJtxMB3WVcb34P76aNy7O6s9pQ/wattI=; b=Wcmf15zWQEfuEqeXktnH9g0FMKVMchNs7TG8Lk0BeM9qi/nM/6GttKZiKIXtbhY+Cd qUk/14+mfZ4VHY/hHomkjwf0dMvkskNrHY46tY/WC0tWSCPkok3mWCZlSZhCDugYFcuk aG+rSmVRm9PpYyJ7hp3Zxbhcr4JFfPAd5dAbm7xpQdw3X3rUyfSEV2+mi4c/O1b+Lbxw bmlRHEfEmeuoGQ5+zB0pM85s7dcr+BTpb7M9A2GxLUMH/uVimFnfE1hlrzHDZb5XTcKB sEZXVjmjuaUK7y+93IAvMmQNDE/sby2hc8dsyw1jRMlcpLfHII2dVtfQJRW4pNFFHu3g RnsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718346; x=1730323146; 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=zOXGXHVMmUUzJtxMB3WVcb34P76aNy7O6s9pQ/wattI=; b=aOxulBSi/x7RunVoji1D92WamFQsUufjZKhjf6NZmeau8vBDYU2h+9F+TPXezKmpzc 2aVoOZeOfGNw1XJsEOoYHBmsDJAtTfq2MJcyKBbMex6qlZMUD6vaAsmVObcTHS27toYv R7Jq2xGQ8eQrrtSFO2K3PbJltzoBZwWXEm/5vj+86PgEDaZ+xMFAZqcZCqJH+t0kx9HQ zjOlHhFd2WG0WZ64gnsM5/q3jlMg8meCS8A/L+0I+ExJ+pdQYBjqQv0EXP8oMciTQmYT mUHVqP+E7WnqP2NUA/1tpkDay6mmrJhSjqdzFfqpRr6ZYNCoQcaUMFLP2OXtgjBC1QWI xcag== X-Forwarded-Encrypted: i=1; AJvYcCWjW1et76JXIzEp9PHMYbsKeTlFEdtrL7M860QNgXeJUkQxHLbg92wIOJNIT5kjM2RzOSxVQcQ=@dpdk.org X-Gm-Message-State: AOJu0YwEuhvzyPj3IWnPNBfwugdTcBUmmSb77RW1c/IwfCBk7eZE2UtB Gp9JRUof5kwgFxIRPFTX7A+hSbOUjnrDwkzs0yeqxJtXaEnprTzw X-Google-Smtp-Source: AGHT+IF7ZfdPEnI4GTS8CC/DK+c4UYAH953BRhJINvVHGbfh7ejTIGSmv0Bp/EK8942NG9Q782udgQ== X-Received: by 2002:a05:600c:354d:b0:431:4a83:2d80 with SMTP id 5b1f17b1804b1-43184088680mr35413105e9.0.1729718345783; Wed, 23 Oct 2024 14:19:05 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43186beffbcsm26775985e9.28.2024.10.23.14.19.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:19:04 -0700 (PDT) From: luca.boccassi@gmail.com 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 22.11.7 Date: Wed, 23 Oct 2024 22:16:13 +0100 Message-ID: <20241023211704.1216956-33-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241023211704.1216956-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-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.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 10/25/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/5780ca90f0f820157ee62013515d022646cece2c Thanks. Luca Boccassi --- >From 5780ca90f0f820157ee62013515d022646cece2c 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 18efa78ac3..efe3665cec 100644 --- a/drivers/net/e1000/em_ethdev.c +++ b/drivers/net/e1000/em_ethdev.c @@ -1121,6 +1121,9 @@ eth_em_link_update(struct rte_eth_dev *dev, int wait_to_complete) struct rte_eth_link link; int link_up, count; + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return -1; + link_up = 0; hw->mac.get_link_status = 1; -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-10-23 22:16:41.771895718 +0100 +++ 0033-net-e1000-fix-link-status-crash-in-secondary-process.patch 2024-10-23 22:16:40.471941652 +0100 @@ -1 +1 @@ -From 84506cfe07326fd6ddb158f3fa57bd678751561a Mon Sep 17 00:00:00 2001 +From 5780ca90f0f820157ee62013515d022646cece2c 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 18efa78ac3..efe3665cec 100644 @@ -26 +27 @@ -@@ -1136,6 +1136,9 @@ eth_em_link_update(struct rte_eth_dev *dev, int wait_to_complete) +@@ -1121,6 +1121,9 @@ eth_em_link_update(struct rte_eth_dev *dev, int wait_to_complete)