From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 102E9A0527 for ; Mon, 9 Nov 2020 19:42:04 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 042E669A4; Mon, 9 Nov 2020 19:42:03 +0100 (CET) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by dpdk.org (Postfix) with ESMTP id A64B76883 for ; Mon, 9 Nov 2020 19:42:00 +0100 (CET) Received: by mail-wm1-f42.google.com with SMTP id w24so452879wmi.0 for ; Mon, 09 Nov 2020 10:42:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=58XYjMlHTba/Fv4PblNYy3x1faeBWk5jjgplg2tCxFo=; b=J6C4DBriyRkz7QYoNISSgRFu+7jNDI5ntokkxo5cSpG0Vg3fTew9SpYwZL/DlKn4wH Qi7c2Hp76orpYgfKQuyU/fslZVgvjepoIpihUcv0VNyCFk2jQQBQmL5NMwK9l1baJs1n aYtRj6zBQaCo2KqPaANZsjuvhyXUBuhy3rkxD8NAuDrDM7OJeeC0VCCjvhy0nKVD68g3 QBHQR7l9+MeqDWekQNniFBbGpCXifXy+M5tTvsb60cjQiC1w3JG/iiQJ3bRB1W8u5CQG XR07H7KmWQah8ZMAxbE9r/04QRNQbEBzD72z6eYbnB7rAM+ZB4KXnU2kPbrJOuA9bEMN rQbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=58XYjMlHTba/Fv4PblNYy3x1faeBWk5jjgplg2tCxFo=; b=UoP1U4acbRZBujKNZFjYsPUaCLY23ivw7cWRh6f6a0ZgKFMkP2d9wLgKzRZGxULjRC ye6HVfti9z06tNxYN6JntCiVUnnyRbhMVT/oWzfQfnvbYhjYOy8vi8ZnlPLyCa9gNRAW KtL4AwGXoHvQhSCjS/y8kgRBbHa5lgxpkegf/6WFY31g1k+OqQfiTvE5lK+VruXjVOgJ 22igI5SeIQBc9lMHH7rKWnnLAw7ZfbK2/EaCDz2mTBA8DQwARjxjFrGXNXXCnBzTEcXD /UDbmKfSSHt7B+IbR4nKMvwrEes6cTA6txBqK4PUq8Mdieb+d9uB+icQfV4RZMbrG2Af NsWA== X-Gm-Message-State: AOAM532L6QFYTNo/qEinSLYP80WvOOjHTH4GsTj/wmvWQip1tI/i7TMm nPuJauk4Um9m6PCz7dC4aKt30sRljkKE3Q== X-Google-Smtp-Source: ABdhPJzZCgQOjCYpXjSY5MaKTPj6vhjcVFv4i/cOPZLrRJoTYQXXn7+rP8qvPMSvJnaPdUH2i/mXdg== X-Received: by 2002:a1c:9695:: with SMTP id y143mr572977wmd.70.1604947319428; Mon, 09 Nov 2020 10:41:59 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id h15sm2475276wrw.15.2020.11.09.10.41.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:41:58 -0800 (PST) From: luca.boccassi@gmail.com To: Thomas Monjalon Cc: David Marchand , dpdk stable Date: Mon, 9 Nov 2020 18:40:00 +0000 Message-Id: <20201109184111.3463090-12-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201109184111.3463090-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-207-luca.boccassi@gmail.com> <20201109184111.3463090-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/mbuf: skip field registration at busy offset' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/11/20. 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/edf74865b7b6cf9b92ab72772d1c297221fb91c6 Thanks. Luca Boccassi --- >From edf74865b7b6cf9b92ab72772d1c297221fb91c6 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Sat, 31 Oct 2020 15:27:03 +0100 Subject: [PATCH] test/mbuf: skip field registration at busy offset [ upstream commit 530de86a12079bc85a93ae505fba6d47e6f18bc1 ] There is a test for dynamic field registration at a specific offset. Depending on which driver is probed, some dynamic fields may be already registered at this offset. This failure is skipped with a warning. Fixes: 4958ca3a443a ("mbuf: support dynamic fields and flags") Reported-by: David Marchand Signed-off-by: Thomas Monjalon Reviewed-by: David Marchand --- app/test/test_mbuf.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/test/test_mbuf.c b/app/test/test_mbuf.c index bf04025a82..a5bd1693b2 100644 --- a/app/test/test_mbuf.c +++ b/app/test/test_mbuf.c @@ -2481,9 +2481,13 @@ test_mbuf_dyn(struct rte_mempool *pktmbuf_pool) offset3 = rte_mbuf_dynfield_register_offset(&dynfield3, offsetof(struct rte_mbuf, dynfield1[1])); - if (offset3 != offsetof(struct rte_mbuf, dynfield1[1])) - GOTO_FAIL("failed to register dynamic field 3, offset=%d: %s", - offset3, strerror(errno)); + if (offset3 != offsetof(struct rte_mbuf, dynfield1[1])) { + if (rte_errno == EBUSY) + printf("mbuf test error skipped: dynfield is busy\n"); + else + GOTO_FAIL("failed to register dynamic field 3, offset=" + "%d: %s", offset3, strerror(errno)); + } printf("dynfield: offset=%d, offset2=%d, offset3=%d\n", offset, offset2, offset3); -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:40:11.701363593 +0000 +++ 0012-test-mbuf-skip-field-registration-at-busy-offset.patch 2020-11-09 18:40:11.083310535 +0000 @@ -1 +1 @@ -From 530de86a12079bc85a93ae505fba6d47e6f18bc1 Mon Sep 17 00:00:00 2001 +From edf74865b7b6cf9b92ab72772d1c297221fb91c6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 530de86a12079bc85a93ae505fba6d47e6f18bc1 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 80d1850da9..3a13cf4e1f 100644 +index bf04025a82..a5bd1693b2 100644 @@ -25 +26 @@ -@@ -2608,9 +2608,13 @@ test_mbuf_dyn(struct rte_mempool *pktmbuf_pool) +@@ -2481,9 +2481,13 @@ test_mbuf_dyn(struct rte_mempool *pktmbuf_pool)