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 B6BC1A0C41 for ; Tue, 30 Nov 2021 17:38:37 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9E299410F7; Tue, 30 Nov 2021 17:38:37 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 10B2E410F7 for ; Tue, 30 Nov 2021 17:38:36 +0100 (CET) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id CF9E43F1B1 for ; Tue, 30 Nov 2021 16:38:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290315; bh=ASwk/L+rhVwVxn5R2BuAkld11acIUJ2MF2ddywhf2sE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tc9fWk/DiDQSZ6lkI+vkn79OfsOleUfOWzwZ/qxKXGNTVWj269A06tFGkJUV6JBZs hYLSXdi9kFidL7TONaq0JKRMqrcjGXq5ccRFjTErvd1u0wMOEwhiTF9NsCgcjTgxtc pAYZGTmGUxZ9yNLjS1YsKEWarVvYEiZjtMZgg1FSgfKJrM3k9pvftmC/2zAzhL1NBC uO9lmX0PSstHtSP7YeRpGX3T3jDk+SAYkFoD48m8gHg+txu/bm7OzPIFsiVQ9M1AEw 1UkZPDF1E8YlAuGG+5mXl8SjJr84/focHvpvabFmz6f+vV1ZOXVim3wC3VvTE9xan9 2jirq1S0YAUrA== Received: by mail-ed1-f70.google.com with SMTP id v10-20020aa7d9ca000000b003e7bed57968so17404967eds.23 for ; Tue, 30 Nov 2021 08:38:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ASwk/L+rhVwVxn5R2BuAkld11acIUJ2MF2ddywhf2sE=; b=xxE7mRI5F7F8NilG9lGTo/5f94B7Ui6pMnY7TtwSv/XcABpIY+iK5WWmJBtAnyzWa2 ug64PdHmN+CVxzXiuzUf1kUb/tmuv//YFJuj4bWJcCUYCx1+d60EklUPTW/CaCGaD7Tm hstv6uWkMq28DCJwYdQ7bjo7UEESiolQN/4V+ynPSws7/TqT/Y/JbeIhFzp/F/vPzUOW 02NHwXTBSTkJVyb4RIyuawfrNN6cbqtxPIDpmJuS2LB15zhY1tXUQxsDZ/1Twa8WXXKD 8d+x/++aVQ/EhFNuaYh5EcHO+CmsUDWUV/wRi0oGuOxID3EFgaqWp1FFjkmmWAJyz7fX tGww== X-Gm-Message-State: AOAM531ywgmX5aCzY4GdaOM7mATiyfugMP/MNhq/7nEgTutXRUryrHZZ WK3b6TeUEER4plFIf9p1ORe1jwUzDb4W0rN0wPdsmFw+dyZAnizvNGz/8iHGtslHQAUru2CWVV1 r2Z96nBTm+g5LYry5Cx45ZgSc X-Received: by 2002:a17:906:b01:: with SMTP id u1mr205722ejg.504.1638290315518; Tue, 30 Nov 2021 08:38:35 -0800 (PST) X-Google-Smtp-Source: ABdhPJwzjP0AxyQiXaVfbfKvloik4AtwrqrK0+ftuViC+S5D1aGhDpXXeOio1llDe1ks55OAeyC9Cg== X-Received: by 2002:a17:906:b01:: with SMTP id u1mr205706ejg.504.1638290315345; Tue, 30 Nov 2021 08:38:35 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id hd15sm9784708ejc.69.2021.11.30.08.38.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:38:34 -0800 (PST) From: christian.ehrhardt@canonical.com To: Bruce Richardson Cc: Brandon Lo , David Marchand , dpdk stable Subject: patch 'test/mem: fix memory autotests on FreeBSD' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:34:10 +0100 Message-Id: <20211130163605.2460997-46-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.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 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/c1e7394cc9713893ff8520e72eb80ef50b15e230 Thanks. Christian Ehrhardt --- >From c1e7394cc9713893ff8520e72eb80ef50b15e230 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 17 Sep 2021 16:09:17 +0100 Subject: [PATCH] test/mem: fix memory autotests on FreeBSD [ upstream commit 086d426406bd3f6fac96a15bbd871c7fe714bc2d ] The memory autotests were failing on FreeBSD, due to an incorrect errno variable being checked for ENOTSUP. The test checked "errno" while the DPDK API sets "rte_errno". Changing to check the right variable makes the test behave properly. Fixes: c3e35a0966b8 ("test/mem: check segment fd API") Reported-by: Brandon Lo Signed-off-by: Bruce Richardson Reviewed-by: David Marchand --- app/test/test_memory.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/test/test_memory.c b/app/test/test_memory.c index 7d5ae99bab..dbf6871e71 100644 --- a/app/test/test_memory.c +++ b/app/test/test_memory.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -53,7 +54,7 @@ check_seg_fds(const struct rte_memseg_list *msl, const struct rte_memseg *ms, /* ENOTSUP means segment is valid, but there is not support for * segment fd API (e.g. on FreeBSD). */ - if (errno == ENOTSUP) + if (rte_errno == ENOTSUP) return 1; /* all other errors are treated as failures */ return -1; -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:08.746254255 +0100 +++ 0046-test-mem-fix-memory-autotests-on-FreeBSD.patch 2021-11-30 16:50:05.662872591 +0100 @@ -1 +1 @@ -From 086d426406bd3f6fac96a15bbd871c7fe714bc2d Mon Sep 17 00:00:00 2001 +From c1e7394cc9713893ff8520e72eb80ef50b15e230 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,2 @@ + +[ upstream commit 086d426406bd3f6fac96a15bbd871c7fe714bc2d ]