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 BBCFF43CE7 for ; Mon, 18 Mar 2024 16:40:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B5F1A40A6E; Mon, 18 Mar 2024 16:40:57 +0100 (CET) Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) by mails.dpdk.org (Postfix) with ESMTP id E9E4E40289 for ; Mon, 18 Mar 2024 16:40:55 +0100 (CET) Received: by mail-lj1-f176.google.com with SMTP id 38308e7fff4ca-2d52e65d4a8so10016381fa.0 for ; Mon, 18 Mar 2024 08:40:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710776455; x=1711381255; 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=xtHbh4Fuv8lxZClfvyufWBhnfdoVMcpODZ1nKPbvxp0=; b=lceSVyK41B/oiYbKkr4Y4Hp7kkoSTIQ7iXBoPKRCxJ/YuFm+/Sixl5dRWVQdxSlm4U RLNNwWpUdO02yvto1rdITYzjvncNNy8QlRiRhGGgDQSIMWGTdL29JfbHp5kYFe33jg+9 zMjeRUzL41TN9mO6HLcGNH+wqNt+K1QoVRTTy6RhFDgP8JNQVNvLo0eABCjEOQlC5+lW 1IFFZH9Bx+3bhgEkkqQIGWTGi+84s2u6ap6UcYmSrZR+kiG0m5zVwFE618dwAj6XOur9 KYimz6+awRydZtuSpos4BCK5IIlkF/kU8XN9JbLJ/jAIspr2Sy0mdHhFBdXjZ/bKmlOH Tmaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710776455; x=1711381255; 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=xtHbh4Fuv8lxZClfvyufWBhnfdoVMcpODZ1nKPbvxp0=; b=AyU4gAQpGdxlxcNLSJq8Udfp+MKMv48LgKox5g9CGlgxYcFmphfYiD2uCwUVoHIJmO RBfHWbkqvozk9fjQ3NYwkS06VLg1DlgLoyCLjHryHrkcnu83kSXcb5kLgRAjRrK+eDYo 0G8CE29mA05Hbu9PHRLYF5N5H9FKxKZ5/oX0ifngIbirKtq/qTbr0fCpGRPW9i2bCqac ah/1AsxHGH+67KciCi2INQEUUEunYcdde6IugNO1yEl8khn5GQZrwo46vo51DK0BnHTP hiXnwcBNgANocwOUDdGZYkkKtqigD81X1SL1OFwHEtlpLcLhjep/svmKdh0/P2X6xZlD yoGw== X-Forwarded-Encrypted: i=1; AJvYcCWfPHtOvtS3zndbklk0UeTor5tCDX553WLAkXkZMdO3yrqsgEwFIFcfVuYsvMBwH7fd9adQlYIs0HRRaKbm6Dk= X-Gm-Message-State: AOJu0YwHBAzMTBVdsC87pHqSPe29e4i+y3nvgJAVr4sRAkuBN8Q3QDH8 4MqW7+CAwAP5jV8u1fiqc+Uvafba7BWIp1VcmXpJB8rhJMjKP0vj X-Google-Smtp-Source: AGHT+IETlxQFfPtWMxOTZjq4VW0mT586ci3anEy0w+Z0xLRY7JWenIBO24Lyopz5Rzx3dWAbOtdbyw== X-Received: by 2002:a05:6512:3da5:b0:513:d01f:b175 with SMTP id k37-20020a0565123da500b00513d01fb175mr11081883lfv.46.1710776455271; Mon, 18 Mar 2024 08:40:55 -0700 (PDT) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id hg13-20020a05600c538d00b004140b6625dcsm5820759wmb.13.2024.03.18.08.40.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Mar 2024 08:40:54 -0700 (PDT) From: luca.boccassi@gmail.com To: Shihong Wang Cc: Chaoyong He , Peng Zhang , dpdk stable Subject: patch 'examples/ipsec-secgw: fix Rx queue ID in Rx callback' has been queued to stable release 22.11.5 Date: Mon, 18 Mar 2024 15:39:18 +0000 Message-Id: <20240318153919.3407921-28-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240318153919.3407921-1-luca.boccassi@gmail.com> References: <20240314000957.2810803-61-luca.boccassi@gmail.com> <20240318153919.3407921-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/20/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/6a73ac3d7a5cd78efd3bde7bfb2624342c79799e Thanks. Luca Boccassi --- >From 6a73ac3d7a5cd78efd3bde7bfb2624342c79799e Mon Sep 17 00:00:00 2001 From: Shihong Wang Date: Mon, 11 Mar 2024 10:32:47 +0800 Subject: [PATCH] examples/ipsec-secgw: fix Rx queue ID in Rx callback [ upstream commit 179e9b44ac6d64dc10ee3116e44b66f12d43e7a8 ] The Rx queue ID on the core and on the port are not necessarily equal, for example, there are two RX queues on core0, queue0 and queue1, queue0 is the rx_queueid0 on port0 and queue1 is the rx_queueid0 on port1. The 'rte_eth_add_rx_callback()' function is based on the port registration callback function, so should be the RX queue ID on the port. Fixes: d04bb1c52647 ("examples/ipsec-secgw: use HW parsed packet type in poll mode") Signed-off-by: Shihong Wang Reviewed-by: Chaoyong He Reviewed-by: Peng Zhang --- examples/ipsec-secgw/ipsec-secgw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c index 86ad2b0ea5..e4c3482411 100644 --- a/examples/ipsec-secgw/ipsec-secgw.c +++ b/examples/ipsec-secgw/ipsec-secgw.c @@ -2056,10 +2056,10 @@ port_init(uint16_t portid, uint64_t req_rx_offloads, uint64_t req_tx_offloads, /* Register Rx callback if ptypes are not supported */ if (!ptype_supported && - !rte_eth_add_rx_callback(portid, queue, + !rte_eth_add_rx_callback(portid, rx_queueid, parse_ptype_cb, NULL)) { printf("Failed to add rx callback: port=%d, " - "queue=%d\n", portid, queue); + "rx_queueid=%d\n", portid, rx_queueid); } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-18 12:58:40.512402326 +0000 +++ 0028-examples-ipsec-secgw-fix-Rx-queue-ID-in-Rx-callback.patch 2024-03-18 12:58:39.275349175 +0000 @@ -1 +1 @@ -From 179e9b44ac6d64dc10ee3116e44b66f12d43e7a8 Mon Sep 17 00:00:00 2001 +From 6a73ac3d7a5cd78efd3bde7bfb2624342c79799e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 179e9b44ac6d64dc10ee3116e44b66f12d43e7a8 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index a61bea400a..45a303850d 100644 +index 86ad2b0ea5..e4c3482411 100644 @@ -29 +30 @@ -@@ -2093,10 +2093,10 @@ port_init(uint16_t portid, uint64_t req_rx_offloads, uint64_t req_tx_offloads, +@@ -2056,10 +2056,10 @@ port_init(uint16_t portid, uint64_t req_rx_offloads, uint64_t req_tx_offloads,