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 B95B7A0C41 for ; Tue, 30 Nov 2021 17:42:32 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B3ED3410F7; Tue, 30 Nov 2021 17:42:32 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 9524D4118F for ; Tue, 30 Nov 2021 17:42:30 +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-1.canonical.com (Postfix) with ESMTPS id 606FC4000A for ; Tue, 30 Nov 2021 16:42:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290550; bh=04l8bPrGCibTYHWtOMDCRisNdUV2ikD8dZJ0QnucAFM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jQYqJXkQlxIVggJkjkbodeGta+pqQ45zdan/3zcy3KNvW5omVFu/b24xXEGMIFudp w7+pdDzNB65T8rQV6H0BfllzlbPG6jAmJdnZh1OXF5VrYPpvsfqT5BPb/hkxNErOJz Ho9NSEBhqCRW6LQMo6+Upp3upIQkEgGFe0bJCV+d1OW86aRJ11lkQbxHe+hn8Rytnk IY0lQ02lW2ve5Lgv9HZcoi0QZvhKkkLe8AwjJ7z+iPtE0PkaZrdM4Gaoav7QHUFseY 64/O5tdHVUOK5X8VOcS6SZ8AtMg0/dbJd+GHvamWQj2MGWc5jWYB9bw8Av6T4v2PQp cYYStfwsJUfUg== Received: by mail-ed1-f70.google.com with SMTP id p4-20020aa7d304000000b003e7ef120a37so17408437edq.16 for ; Tue, 30 Nov 2021 08:42:30 -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=04l8bPrGCibTYHWtOMDCRisNdUV2ikD8dZJ0QnucAFM=; b=1mI90Y53fSpqVdTGvIhbqd2wgh4Am+Srlirmd+NC+QVutPBpgpBnKnXyrPPseDaAYG zkGDy659b1Y51x0hGhzmSx/HE373bl0LK7Bz2mDNia26U+MbOdQsz2FLIgX0YV697s1d 40Iq2eBhvN1FPLRrVIqpCdw0ubFrl8YgAR4BPdGyYQORmx3kTtNr7eRWpV34at8uqApo CozHGmvgrG5uqfBOajZ0qWhYNGs0115Q6MByJuuh3rmzp99iCqUDAQHp9XwTX9ecWfcY 6Jqd1BW5G1FdRv1EmiUaMFTKpC4e6wsUmSP6zmRgpQEcNmoSr7L4pZMpcx/7V45Ymyz/ a0eg== X-Gm-Message-State: AOAM533cYOX7qyc9Vs7Q5NBx0wMwHYnh6x9CmTgxqqw5+whJfqmLxmOA eUih+AfhkivxUidK4PeUicKq8loWoc25pfvPxVmGufqDAB0pG5U49bb9Nt87jXshX3vQEz7qGVa FeLaR/Pl/4bE0WIGPLEQszq8h X-Received: by 2002:a17:906:4fc4:: with SMTP id i4mr229431ejw.81.1638290549925; Tue, 30 Nov 2021 08:42:29 -0800 (PST) X-Google-Smtp-Source: ABdhPJxx+CxqLy8WaoZgEYo8X8exdzdv2WWTXkO+EsUUwhZPhr3vi3plx62VGfd6e4k6zZdv8GqZEw== X-Received: by 2002:a17:906:4fc4:: with SMTP id i4mr229419ejw.81.1638290549776; Tue, 30 Nov 2021 08:42:29 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id r25sm11515299edt.21.2021.11.30.08.42.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:42:29 -0800 (PST) From: christian.ehrhardt@canonical.com To: Anatoly Burakov Cc: dpdk stable Subject: patch 'vfio: fix FreeBSD clear group stub' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:35:28 +0100 Message-Id: <20211130163605.2460997-124-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/8bcb2f48523b78d6963a8f3be3e912841b4afd89 Thanks. Christian Ehrhardt --- >From 8bcb2f48523b78d6963a8f3be3e912841b4afd89 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Thu, 28 Oct 2021 14:15:17 +0000 Subject: [PATCH] vfio: fix FreeBSD clear group stub [ upstream commit bf8b792f3b8519fecf3585ffac15da6f7bca2de9 ] On FreeBSD, `rte_vfio_clear_group()` was returning 0 even though this function is not valid for FreeBSD, and is called out to return error in doxygen comments. Fix the return value to match documentation. Fixes: c564a2a20093 ("vfio: expose clear group function for internal usages") Signed-off-by: Anatoly Burakov --- lib/librte_eal/freebsd/eal/eal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c index d97651725b..e148d431c1 100644 --- a/lib/librte_eal/freebsd/eal/eal.c +++ b/lib/librte_eal/freebsd/eal/eal.c @@ -1028,7 +1028,7 @@ int rte_vfio_noiommu_is_enabled(void) int rte_vfio_clear_group(__rte_unused int vfio_group_fd) { - return 0; + return -1; } int -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:13.191862541 +0100 +++ 0124-vfio-fix-FreeBSD-clear-group-stub.patch 2021-11-30 16:50:05.958874763 +0100 @@ -1 +1 @@ -From bf8b792f3b8519fecf3585ffac15da6f7bca2de9 Mon Sep 17 00:00:00 2001 +From 8bcb2f48523b78d6963a8f3be3e912841b4afd89 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bf8b792f3b8519fecf3585ffac15da6f7bca2de9 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -16 +17 @@ - lib/eal/freebsd/eal.c | 2 +- + lib/librte_eal/freebsd/eal/eal.c | 2 +- @@ -19,5 +20,5 @@ -diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c -index 2c2baaa691..5cea368efe 100644 ---- a/lib/eal/freebsd/eal.c -+++ b/lib/eal/freebsd/eal.c -@@ -1045,7 +1045,7 @@ int rte_vfio_noiommu_is_enabled(void) +diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c +index d97651725b..e148d431c1 100644 +--- a/lib/librte_eal/freebsd/eal/eal.c ++++ b/lib/librte_eal/freebsd/eal/eal.c +@@ -1028,7 +1028,7 @@ int rte_vfio_noiommu_is_enabled(void)