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 81EAB45BB6 for ; Wed, 23 Oct 2024 23:17:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7BA0F43248; Wed, 23 Oct 2024 23:17:13 +0200 (CEST) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id 7052A43248 for ; Wed, 23 Oct 2024 23:17:12 +0200 (CEST) Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-37d6ff1cbe1so107180f8f.3 for ; Wed, 23 Oct 2024 14:17:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729718232; x=1730323032; 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=b2A0Gspf/0nEKWOb4VfcyTKjvcBWj4yqLk5ZBPvgy4E=; b=lFZDzh/7Tq+NdHTYI+Zd2rz40Fphs6ZekGigUifjWGJnlMKql/Ut/t6V16eiP+hy08 FGvrrDx8lSrcqA26ua7UJKlByVtc9kDw6onOCs4wJPz1uTnXBrdZmlbZ9sinA7/P6o8f UTv2TOKZL39aThIjOQ1pR6Vekl45Oc340Bcun5yI7VlaAWuGJ+Y4q+UCgt9mIpzok3Hy VZPbjAbjtTL5O4KZzYWwnEo/++9VHbYv/FCQqfnnAD5W2Zq7MLnZiGW9t3s7Ab6fB3Rd HP9FDsvqNJIIVE+iTWOleAF1M+X7ulXBWQlFY/I3HaU2aeY90YjunjsS+6BDQgG/ZecO MRLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718232; x=1730323032; 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=b2A0Gspf/0nEKWOb4VfcyTKjvcBWj4yqLk5ZBPvgy4E=; b=wT7QoRjphy00arvZ1gTt56HeOIYY73Z6UG18x4Mo1ulG1I/df99qMRzIsybSNbv+p+ FiJVj/zyO2zg+cU0bRTd1AbEwK95h83aEVlZ5fE6x1ZtgL3+xPZ4XZ5xgt7a8RBcqHpI DQzhVb+4FCUE5y5cXXCWyaTmpBgpNp7Q7Yt/R4dF3+s0ZtYeMqTg1k837GscAIoyyaHc Yy51JlIKY5OH99uIpzAPtlIFbPej07Ygfor1HpbSK3xnFshSKfEanDpMKkPL5qo6ywYW RtTR4XLmGZV6fHbLykNjri5hxvIC2RQITnac//4fjRYRLekCi6GNPglZmdJdZHynVSaq 6giQ== X-Forwarded-Encrypted: i=1; AJvYcCXKMgLmzR/2qLm6evH1hkpbosvv2T+TCiMVjW+gqMbrRfvfFQuggMea6DdJsyFmSXxA0Wp8fiU=@dpdk.org X-Gm-Message-State: AOJu0Yw4INr+Qt5Q1EvzIhVzyYyb00DOdR0/1r684Re7OUjFGazH6iTa 0t9HnASSZ3VRyfVNX8Ku/uHcuQkimRqi4WG2TyOkNsFF9+SpgWec3hsRqQ== X-Google-Smtp-Source: AGHT+IF53s0Tzmy5/dCuHWBQxOeHucDUWfwoxa1Rbbc+arLqZ58h/Y6vz99SfWfLCT8Mpu95Q7Asyg== X-Received: by 2002:adf:e302:0:b0:37d:47f9:be8a with SMTP id ffacd0b85a97d-37efcc62ba7mr2782222f8f.0.1729718231824; Wed, 23 Oct 2024 14:17:11 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ee0a614d0sm9774613f8f.63.2024.10.23.14.17.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:17:11 -0700 (PDT) From: luca.boccassi@gmail.com To: Chengwen Feng Cc: Chenxingyu Wang , Pavan Nikhilesh , dpdk stable Subject: patch 'examples/eventdev: fix queue crash with generic pipeline' has been queued to stable release 22.11.7 Date: Wed, 23 Oct 2024 22:15:43 +0100 Message-ID: <20241023211704.1216956-3-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/44c20cfd7a3bd8e2a93ef7c772cd7afdda5433bd Thanks. Luca Boccassi --- >From 44c20cfd7a3bd8e2a93ef7c772cd7afdda5433bd Mon Sep 17 00:00:00 2001 From: Chengwen Feng Date: Wed, 18 Sep 2024 06:41:42 +0000 Subject: [PATCH] examples/eventdev: fix queue crash with generic pipeline [ upstream commit f6f2307931c90d924405ea44b0b4be9d3d01bd17 ] There was a segmentation fault when executing eventdev_pipeline with command [1] with ConnectX-5 NIC card: 0x000000000079208c in rte_eth_tx_buffer (tx_pkt=0x16f8ed300, buffer=0x100, queue_id=11, port_id=0) at ../lib/ethdev/rte_ethdev.h:6636 txa_service_tx (txa=0x17b19d080, ev=0xffffffffe500, n=4) at ../lib/eventdev/rte_event_eth_tx_adapter.c:631 0x0000000000792234 in txa_service_func (args=0x17b19d080) at ../lib/eventdev/rte_event_eth_tx_adapter.c:666 0x00000000008b0784 in service_runner_do_callback (s=0x17fffe100, cs=0x17ffb5f80, service_idx=2) at ../lib/eal/common/rte_service.c:405 0x00000000008b0ad8 in service_run (i=2, cs=0x17ffb5f80, service_mask=18446744073709551615, s=0x17fffe100, serialize_mt_unsafe=0) at ../lib/eal/common/rte_service.c:441 0x00000000008b0c68 in rte_service_run_iter_on_app_lcore (id=2, serialize_mt_unsafe=0) at ../lib/eal/common/rte_service.c:477 0x000000000057bcc4 in schedule_devices (lcore_id=0) at ../examples/eventdev_pipeline/pipeline_common.h:138 0x000000000057ca94 in worker_generic_burst (arg=0x17b131e80) at ../examples/eventdev_pipeline/ pipeline_worker_generic.c:83 0x00000000005794a8 in main (argc=11, argv=0xfffffffff470) at ../examples/eventdev_pipeline/main.c:449 The root cause is that the queue_id (11) is invalid, the queue_id comes from mbuf.hash.txadapter.txq which may pre-write by NIC driver when receiving packets (e.g. pre-write mbuf.hash.fdir.hi field). Because this example only enabled one ethdev queue, so fixes it by reset txq to zero in the first worker stage. [1] dpdk-eventdev_pipeline -l 0-48 --vdev event_sw0 -- -r1 -t1 -e1 -w ff0 -s5 -n0 -c32 -W1000 -D When launch eventdev_pipeline with command [1], event_sw Fixes: 81fb40f95c82 ("examples/eventdev: add generic worker pipeline") Signed-off-by: Chengwen Feng Signed-off-by: Chenxingyu Wang Acked-by: Pavan Nikhilesh --- .mailmap | 1 + examples/eventdev_pipeline/pipeline_worker_generic.c | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.mailmap b/.mailmap index b0d505e36d..0a91d70e4c 100644 --- a/.mailmap +++ b/.mailmap @@ -217,6 +217,7 @@ Cheng Peng Chengwen Feng Chenmin Sun Chenming Chang +Chenxingyu Wang Chenxu Di Cheryl Houser Chinh T Cao diff --git a/examples/eventdev_pipeline/pipeline_worker_generic.c b/examples/eventdev_pipeline/pipeline_worker_generic.c index 783f68c91e..831d7fd53d 100644 --- a/examples/eventdev_pipeline/pipeline_worker_generic.c +++ b/examples/eventdev_pipeline/pipeline_worker_generic.c @@ -38,10 +38,12 @@ worker_generic(void *arg) } received++; - /* The first worker stage does classification */ - if (ev.queue_id == cdata.qid[0]) + /* The first worker stage does classification and sets txq. */ + if (ev.queue_id == cdata.qid[0]) { ev.flow_id = ev.mbuf->hash.rss % cdata.num_fids; + rte_event_eth_tx_adapter_txq_set(ev.mbuf, 0); + } ev.queue_id = cdata.next_qid[ev.queue_id]; ev.op = RTE_EVENT_OP_FORWARD; @@ -96,10 +98,12 @@ worker_generic_burst(void *arg) for (i = 0; i < nb_rx; i++) { - /* The first worker stage does classification */ - if (events[i].queue_id == cdata.qid[0]) + /* The first worker stage does classification and sets txq. */ + if (events[i].queue_id == cdata.qid[0]) { events[i].flow_id = events[i].mbuf->hash.rss % cdata.num_fids; + rte_event_eth_tx_adapter_txq_set(events[i].mbuf, 0); + } events[i].queue_id = cdata.next_qid[events[i].queue_id]; events[i].op = RTE_EVENT_OP_FORWARD; -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-10-23 22:16:40.676359588 +0100 +++ 0003-examples-eventdev-fix-queue-crash-with-generic-pipel.patch 2024-10-23 22:16:40.431940095 +0100 @@ -1 +1 @@ -From f6f2307931c90d924405ea44b0b4be9d3d01bd17 Mon Sep 17 00:00:00 2001 +From 44c20cfd7a3bd8e2a93ef7c772cd7afdda5433bd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f6f2307931c90d924405ea44b0b4be9d3d01bd17 ] + @@ -46 +47,0 @@ -Cc: stable@dpdk.org @@ -57 +58 @@ -index 94fa73aa36..8a832ba4be 100644 +index b0d505e36d..0a91d70e4c 100644 @@ -60 +61 @@ -@@ -236,6 +236,7 @@ Cheng Peng +@@ -217,6 +217,7 @@ Cheng Peng @@ -66 +66,0 @@ - Chenyu Huang @@ -67,0 +68 @@ + Chinh T Cao