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 D6929A0C45 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 D13784118F; 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 81B1241177 for ; Tue, 30 Nov 2021 17:42:31 +0100 (CET) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (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 625293FFF1 for ; Tue, 30 Nov 2021 16:42:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290551; bh=LeoYyBodsIS+hqEmV3kU1KbVnZJmB95DD8oAEFJMSBc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=AJdmfwEepkRvgOGDHYvd1zvs46SrMcBL3A/+VRN9YssG+L7auNh39UHdkFvhF+dMM zKdRYIUYGPx/kUCkkFQlcsDiuwIY3RagWvTs5zglKlR5GfMA1EcxYWKUoNXjsG0Fgb 1Ofc2wK43iZfQFXOR5vNmm/RrHaSm+Ei7UZwc+KKUKIehJQ/FXXxU/LbWKWbiBpuLe i4Af7d+uELnfLR3x1kyjo1+43bPmM/F/omzlogVlkG0vQ165tJeXiviPpZsTxurPz1 6bKLl0YZYmtHazDuskIhDl69msJlcrzK9YiWC+e7ViZdLOYatANTErTiyBmOVUajE4 EoBdJkw8FPYhA== Received: by mail-ed1-f69.google.com with SMTP id m12-20020a056402430c00b003e9f10bbb7dso17445073edc.18 for ; Tue, 30 Nov 2021 08:42:31 -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=LeoYyBodsIS+hqEmV3kU1KbVnZJmB95DD8oAEFJMSBc=; b=5i2iDVOIm+6f4OQl/41t62mYvQ7zCe+W5QcVj0zWa2dBAhWhCalKrQNe+QKH/qL5zY nPLRQuynQ4Z11M2yKL7pS45vyWDctHI9uAp/1NKP7l64gRSKBKo//CKXpXwSytFBcWjM EelQSzlK9PFkGI0kOnbkKLxDIq2BE0v8oq7Dh/KlAYeAyd4iVfQezdLsKSaGLbVvrvqQ pXDd3fEb/LaMrPrc0hPP3bhHUQBgbFXOLU0u+7s3entoyPwhvQPZFzvyIIqoWq+DMPfz J11bl/784+trWPZgzpbrQKPrndEXaBcty+V9cLhVyc6oCS5C5vcfC+e+iIWBsczsl/Zu lmOA== X-Gm-Message-State: AOAM5328p4SVwU4k6WJyd+ZISmFH/C0j457F5W52/ckqQ+Uo+nOhWwvd zbP0UEFyD461TQL4ES5bf1E6c8PjjZFvulIrqucnVJEqSg1lsrTYbIp1qVByF5oiZCXwIIFxpS9 3dhp9QJxeYolJyKqnYdpBqcjP X-Received: by 2002:a17:906:7310:: with SMTP id di16mr282482ejc.92.1638290550750; Tue, 30 Nov 2021 08:42:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJxIGtxsplgUGzBxEvojQF2eSldyNtXpiJV7YPxbrJX7Ap1qw+LW5lZmAZLEijUl1nZzOamyBw== X-Received: by 2002:a17:906:7310:: with SMTP id di16mr282471ejc.92.1638290550605; Tue, 30 Nov 2021 08:42:30 -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.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:42:30 -0800 (PST) From: christian.ehrhardt@canonical.com To: Anatoly Burakov Cc: Chenbo Xia , dpdk stable Subject: patch 'vfio: fix FreeBSD documentation' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:35:29 +0100 Message-Id: <20211130163605.2460997-125-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/4c105c785cf833e8b9214fef69564ec64e0bcc5c Thanks. Christian Ehrhardt --- >From 4c105c785cf833e8b9214fef69564ec64e0bcc5c Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Thu, 28 Oct 2021 14:15:18 +0000 Subject: [PATCH] vfio: fix FreeBSD documentation [ upstream commit da6e4cdca1144e2cc6f9f495a34d3085e707b78a ] On FreeBSD, `rte_vfio_is_enabled()` and `rte_vfio_noiommu_is_enabled()` API calls will not return error, and will instead return 0. This is intentional, because the caller of this API does not care whether VFIO is supported at all, and will instead be interested in whether VFIO is enabled or not. However, the doxygen comments for these functions state that they will return an error on FreeBSD, which is incorrect. Fix the doxygen comment to call out the fact that these functions are only relevant on Linux, but remove the reference to returning errors. Fixes: 279b581c897d ("vfio: expose functions") Signed-off-by: Anatoly Burakov Acked-by: Chenbo Xia --- lib/librte_eal/common/include/rte_vfio.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/common/include/rte_vfio.h b/lib/librte_eal/common/include/rte_vfio.h index 2d90b36480..7bdb8932b2 100644 --- a/lib/librte_eal/common/include/rte_vfio.h +++ b/lib/librte_eal/common/include/rte_vfio.h @@ -150,8 +150,7 @@ int rte_vfio_enable(const char *modname); /** * Check whether a VFIO-related kmod is enabled. * - * This function is only relevant to linux and will return - * an error on BSD. + * This function is only relevant to Linux. * * @param modname * kernel module name. @@ -165,8 +164,7 @@ int rte_vfio_is_enabled(const char *modname); /** * Whether VFIO NOIOMMU mode is enabled. * - * This function is only relevant to linux and will return - * an error on BSD. + * This function is only relevant to Linux. * * @return * 1 if true. -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:13.241752101 +0100 +++ 0125-vfio-fix-FreeBSD-documentation.patch 2021-11-30 16:50:05.958874763 +0100 @@ -1 +1 @@ -From da6e4cdca1144e2cc6f9f495a34d3085e707b78a Mon Sep 17 00:00:00 2001 +From 4c105c785cf833e8b9214fef69564ec64e0bcc5c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit da6e4cdca1144e2cc6f9f495a34d3085e707b78a ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ - lib/eal/include/rte_vfio.h | 6 ++---- + lib/librte_eal/common/include/rte_vfio.h | 6 ++---- @@ -26 +27 @@ -diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h +diff --git a/lib/librte_eal/common/include/rte_vfio.h b/lib/librte_eal/common/include/rte_vfio.h @@ -28,2 +29,2 @@ ---- a/lib/eal/include/rte_vfio.h -+++ b/lib/eal/include/rte_vfio.h +--- a/lib/librte_eal/common/include/rte_vfio.h ++++ b/lib/librte_eal/common/include/rte_vfio.h