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 A7D8643CAD for ; Thu, 14 Mar 2024 01:12:52 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9FB2A42E7C; Thu, 14 Mar 2024 01:12:52 +0100 (CET) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mails.dpdk.org (Postfix) with ESMTP id 9659742E6F for ; Thu, 14 Mar 2024 01:12:51 +0100 (CET) Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-413ef8f77e1so2408755e9.3 for ; Wed, 13 Mar 2024 17:12:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710375171; x=1710979971; 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=SMzBFH2Gr4ZUXPMn38M6PMQH9ccWMxkH3ewEc4IRlDk=; b=QgGDClv1Dv1rIvpQaV1SSIq0OP/xd96Hwna1uKxcF7bDHFhwlZAnWYl3HPVwt7afda wSVrmQ5RYzsMEIPp/v97yu+3CBT2Ht6okYfaDDMnMYjrxFJx65lIEiUboQZZuEFCERkg xmoej9iWxqVgqOTNysz2UEZ1PUuNLXVUARqBuVhNKbuYcXjuZjld5hpFVE4mbbyQd8Cz hKkUbSEX9sz9ZC9xUlqy5s7SrdL6r2MS8xRkDsk1gwhsZg/ftidx3YdaZJMWx/4EqubB zSHne9rJnUlaDVRfGwFQLnwn29CJjIEfO2dcz+7W5AZhP6Q9jNhggPvw55UjLrlQRIka SNvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710375171; x=1710979971; 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=SMzBFH2Gr4ZUXPMn38M6PMQH9ccWMxkH3ewEc4IRlDk=; b=t45zrf8Bf9qK0XrAhA1pk2Ljhs0MnNBy8CqvU59qmxxixUPdFOKn0GRufn+SQc+drL NdDOAzJLUaqeaPfwI4+/awM6mVHWhe3zQRHtL9PCglsEuaO/lhpFOySiQc6zxAdhSiar N9BFYf+6jz8TTX7yKHYZbMkiG/KiuGuhgjOv8O9JkM0vzkrMLJ0J88y372pHTfaaLaVO F+DSMhePl3I5cACo3lrJvHfqn4dR4Ujbi1+MWqw9kuJwGAZMgQvyHTVpXPCWBG6RyKep r0t9FSdECEWkQUc2W4VUuC27TujtcaXVN0JPxRZ1reDtrpLtViGBE1+kd0SN8Tys2gzc 21GQ== X-Forwarded-Encrypted: i=1; AJvYcCUfH/y8H1JfLpJ7gtExCcs1bqeu0rK/T6QKfF1MZvlI/fp3eaNTr28XvAsZ2QPNiPwcVXafvAykVpq/OZ42Uk8= X-Gm-Message-State: AOJu0YxL6w9w97mwPPsBkTDS+BaFMsKqFCbMaz1X3O0BPm8baG2v5D/M RNE+aezyRCIUngR0TClTUTY8IacCwhthQFM6zzDVjtzTZBQjZv2WsQA1OhkUQO0= X-Google-Smtp-Source: AGHT+IEMF7TU5500jtiIy0tTZ8XAwGw9RFjugOSE9kEwxPudYxWk1+8RCUOpTG9HC2kh8qP7AGSMLg== X-Received: by 2002:a05:600c:4e8c:b0:413:1788:3a51 with SMTP id f12-20020a05600c4e8c00b0041317883a51mr202023wmq.15.1710375171234; Wed, 13 Mar 2024 17:12:51 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id l5-20020a05600c1d0500b00412ea52b102sm3884040wms.34.2024.03.13.17.12.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 17:12:50 -0700 (PDT) From: luca.boccassi@gmail.com To: Rakesh Kudurumalla Cc: Olivier Matz , dpdk stable Subject: patch 'test/mbuf: fix external mbuf case with assert enabled' has been queued to stable release 22.11.5 Date: Thu, 14 Mar 2024 00:09:50 +0000 Message-Id: <20240314000957.2810803-54-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240314000957.2810803-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-102-luca.boccassi@gmail.com> <20240314000957.2810803-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/16/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/af4304e8c4e97e339c989c52214e0bc047441438 Thanks. Luca Boccassi --- >From af4304e8c4e97e339c989c52214e0bc047441438 Mon Sep 17 00:00:00 2001 From: Rakesh Kudurumalla Date: Thu, 23 Nov 2023 12:12:21 +0530 Subject: [PATCH] test/mbuf: fix external mbuf case with assert enabled [ upstream commit 6dbaa4ee67135ac6ff8ef35fa98a93e0f08af494 ] when RTE_ENABLE_ASSERT is defined test_mbuf application is failing because we are trying to attach extbuf to a cloned buffer to which external mbuf is already attached. To make test_mbuf pass CI we have updated ol_flags. This patch fixes the same. Fixes: 7b295dceea07 ("test/mbuf: add unit test cases") Signed-off-by: Rakesh Kudurumalla Acked-by: Olivier Matz --- app/test/test_mbuf.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c index 7a2f8a9980..7444be9399 100644 --- a/app/test/test_mbuf.c +++ b/app/test/test_mbuf.c @@ -2345,16 +2345,13 @@ test_pktmbuf_ext_shinfo_init_helper(struct rte_mempool *pktmbuf_pool) GOTO_FAIL("%s: External buffer is not attached to mbuf\n", __func__); - /* allocate one more mbuf */ + /* allocate one more mbuf, it is attached to the same external buffer */ clone = rte_pktmbuf_clone(m, pktmbuf_pool); if (clone == NULL) GOTO_FAIL("%s: mbuf clone allocation failed!\n", __func__); if (rte_pktmbuf_pkt_len(clone) != 0) GOTO_FAIL("%s: Bad packet length\n", __func__); - /* attach the same external buffer to the cloned mbuf */ - rte_pktmbuf_attach_extbuf(clone, ext_buf_addr, buf_iova, buf_len, - ret_shinfo); if (clone->ol_flags != RTE_MBUF_F_EXTERNAL) GOTO_FAIL("%s: External buffer is not attached to mbuf\n", __func__); -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-14 00:09:23.163274618 +0000 +++ 0054-test-mbuf-fix-external-mbuf-case-with-assert-enabled.patch 2024-03-14 00:09:20.709617127 +0000 @@ -1 +1 @@ -From 6dbaa4ee67135ac6ff8ef35fa98a93e0f08af494 Mon Sep 17 00:00:00 2001 +From af4304e8c4e97e339c989c52214e0bc047441438 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6dbaa4ee67135ac6ff8ef35fa98a93e0f08af494 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 51ea6ef1c4..17be977f31 100644 +index 7a2f8a9980..7444be9399 100644 @@ -25 +26 @@ -@@ -2346,16 +2346,13 @@ test_pktmbuf_ext_shinfo_init_helper(struct rte_mempool *pktmbuf_pool) +@@ -2345,16 +2345,13 @@ test_pktmbuf_ext_shinfo_init_helper(struct rte_mempool *pktmbuf_pool)