From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 38B66A0C4C
for <public@inbox.dpdk.org>; Mon, 12 Jul 2021 15:11:33 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 325E441177;
Mon, 12 Jul 2021 15:11:32 +0200 (CEST)
Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com
[209.85.221.47]) by mails.dpdk.org (Postfix) with ESMTP id 6D7874119C
for <stable@dpdk.org>; Mon, 12 Jul 2021 15:11:31 +0200 (CEST)
Received: by mail-wr1-f47.google.com with SMTP id r11so20289575wro.9
for <stable@dpdk.org>; Mon, 12 Jul 2021 06:11:31 -0700 (PDT)
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=e0u4/kKPw19s+RWHBNRbJEeQ4C1oZMj4LfW/aVoc/qQ=;
b=TrzkCw156uZPhNEeNLmzxA3aUVW7nDzEJU/Sbl3/WSxb/0I0+106dKSMB4EdxAJA4a
E5V+9Qj74n1KRtTk8IKwwpM7ZFQCx3GcWIY2DS0IK0snsTfiY7XBaS2dXdI9fJraXeb5
RqQS/bPBcEji3bOnd9acQJZ7MpPfG4cT78sbjy/pi2X9TWv0YHY9dNgTizLyWqt0PPJB
WBB1BIR7RQCqgaGp1WisBtdkDY6DyCRlJZTv5FrySm4fP2MSxoyjktcrKk+z41a29kEU
em/fgIp0QhQUJKiBWe1dV2YhdXVmQ7zf7RKR3tUWCvr0xMfgNwhFXJnTBq3qOsaKdIwQ
82hA==
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=e0u4/kKPw19s+RWHBNRbJEeQ4C1oZMj4LfW/aVoc/qQ=;
b=Vq43T36FxHM5vufjMy9bJaTImqHrBey1/qf7Q87ebTk3GrVkyNEeOwFpFDuor0oR5P
v+Uxl8ez0fcBV6XI5B9SqDSDDRz56tzj9GcHZzxRLHbpB6HH8cmje801zWzAgR53t4tn
DbfJJSuo/Z5LZmO80/B4ePF1RLqeexE+BSfV0ACYFQtIn4Ddxhq9ILJ/Ij3iKJrLoZm5
jqrfjZzWHaOWzqt4SCR9oD8Ax++jbhTWPn/8iKVFCLbr8bNyEhz2onLyMiuREN29Li1D
o86II97h3hhF0+gapxNouxpHHG1wJZ7qb1D8PNxoysmRg6VxUrvbRHKA/4ySwklgMNg0
WUcA==
X-Gm-Message-State: AOAM532RfbMTiEVbJv+2taj1Jqw958/5gb/jcsJw4mJklR3uWNB3lWNs
e9k/Tt89P1ZqcqI3JBr+zVs=
X-Google-Smtp-Source: ABdhPJxHn0D+Zqb6W7gIsG8UO8seX/NvzkuQm89PLLW2+Bq5rX2KkPCzzi4FKXuxRpZm8IGLcbMitg==
X-Received: by 2002:a5d:4d01:: with SMTP id z1mr15689139wrt.34.1626095491210;
Mon, 12 Jul 2021 06:11:31 -0700 (PDT)
Received: from localhost ([137.220.125.106])
by smtp.gmail.com with ESMTPSA id n7sm19309684wmq.37.2021.07.12.06.11.30
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 12 Jul 2021 06:11:30 -0700 (PDT)
From: luca.boccassi@gmail.com
To: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Cc: Anatoly Burakov <anatoly.burakov@intel.com>, dpdk stable <stable@dpdk.org>
Date: Mon, 12 Jul 2021 14:04:23 +0100
Message-Id: <20210712130551.2462159-28-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com>
References: <20210712130551.2462159-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'vfio: add stdbool include' has been queued to
stable release 20.11.3
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to stable release 20.11.3
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/14/21. 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/e2f67db0c32ec74ae94e80347ed519b75aa70c64
Thanks.
Luca Boccassi
---
>From e2f67db0c32ec74ae94e80347ed519b75aa70c64 Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Tue, 1 Jun 2021 10:28:25 +0200
Subject: [PATCH] vfio: add stdbool include
[ upstream commit 31c5af644b1a209cb720dc62f70a51d84a4f979b ]
This became visible by backporting the following for the 19.11 stable tree:
c13ca4e8 "vfio: fix DMA mapping granularity for IOVA as VA"
The usage of type bool in the vfio code would require "#include
<stdbool.h>", but rte_vfio.h has no direct paths to stdbool.h.
It happens that in eal_vfio_mp_sync.c it comes after "#include
<rte_log.h>".
And rte_log.h since 20.05 includes stdbool since this change:
241e67bfe "log: add API to check if a logtype can log in a given level"
and thereby mitigates the issue.
It should be safe to include stdbool.h from rte_vfio.h itself
to be present exactly when needed for the struct it defines using that
type.
Fixes: c13ca4e81cac ("vfio: fix DMA mapping granularity for IOVA as VA")
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
lib/librte_eal/include/rte_vfio.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/librte_eal/include/rte_vfio.h b/lib/librte_eal/include/rte_vfio.h
index e7a87454be..2d90b36480 100644
--- a/lib/librte_eal/include/rte_vfio.h
+++ b/lib/librte_eal/include/rte_vfio.h
@@ -14,6 +14,7 @@
extern "C" {
#endif
+#include <stdbool.h>
#include <stdint.h>
/*
--
2.30.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2021-07-12 13:41:38.227612080 +0100
+++ 0028-vfio-add-stdbool-include.patch 2021-07-12 13:41:36.286118361 +0100
@@ -1 +1 @@
-From 31c5af644b1a209cb720dc62f70a51d84a4f979b Mon Sep 17 00:00:00 2001
+From e2f67db0c32ec74ae94e80347ed519b75aa70c64 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 31c5af644b1a209cb720dc62f70a51d84a4f979b ]
+
@@ -23 +24,0 @@
-Cc: stable@dpdk.org
@@ -28 +29 @@
- lib/eal/include/rte_vfio.h | 1 +
+ lib/librte_eal/include/rte_vfio.h | 1 +
@@ -31 +32 @@
-diff --git a/lib/eal/include/rte_vfio.h b/lib/eal/include/rte_vfio.h
+diff --git a/lib/librte_eal/include/rte_vfio.h b/lib/librte_eal/include/rte_vfio.h
@@ -33,2 +34,2 @@
---- a/lib/eal/include/rte_vfio.h
-+++ b/lib/eal/include/rte_vfio.h
+--- a/lib/librte_eal/include/rte_vfio.h
++++ b/lib/librte_eal/include/rte_vfio.h