patch 'gpu/cuda: fix build with external GDRCopy' has been queued to stable release 22.11.4
Xueming Li
xuemingl at nvidia.com
Sun Oct 22 16:20:50 CEST 2023
Hi,
FYI, your patch has been queued to stable release 22.11.4
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/15/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging
This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=01d3e3c456c9665b9e511bcebd849e85073f7c6b
Thanks.
Xueming Li <xuemingl at nvidia.com>
---
>From 01d3e3c456c9665b9e511bcebd849e85073f7c6b Mon Sep 17 00:00:00 2001
From: Levend Sayar <levendsayar at gmail.com>
Date: Thu, 3 Aug 2023 19:25:12 +0300
Subject: [PATCH] gpu/cuda: fix build with external GDRCopy
Cc: Xueming Li <xuemingl at nvidia.com>
[ upstream commit cda3d17609c2cb81af67d5babbd0c1702b503fca ]
If gdrapi.h is available, meson sets DRIVERS_GPU_CUDA_GDRCOPY_H as 1.
This causes gdrcopy.c build to give an error;
because compiler can not find signature of getenv.
stdlib.h is included for the definition of getenv function.
Bugzilla ID: 1133
Fixes: ca12f5e8a7db ("gpu/cuda: mark unused GDRCopy functions parameters")
Reported-by: John Romein <romein at astron.nl>
Signed-off-by: Levend Sayar <levendsayar at gmail.com>
Acked-by: Elena Agostini <eagostini at nvidia.com>
---
.mailmap | 1 +
drivers/gpu/cuda/gdrcopy.c | 2 ++
2 files changed, 3 insertions(+)
diff --git a/.mailmap b/.mailmap
index bde21e6e3c..e2855454c2 100644
--- a/.mailmap
+++ b/.mailmap
@@ -646,6 +646,7 @@ John McNamara <john.mcnamara at intel.com>
John Miller <john.miller at atomicrules.com>
John OLoughlin <john.oloughlin at intel.com>
John Ousterhout <ouster at cs.stanford.edu>
+John Romein <romein at astron.nl>
John W. Linville <linville at tuxdriver.com>
Jonas Pfefferle <jpf at zurich.ibm.com> <pepperjo at japf.ch>
Jonathan Erb <jonathan.erb at banduracyber.com>
diff --git a/drivers/gpu/cuda/gdrcopy.c b/drivers/gpu/cuda/gdrcopy.c
index 322a5dbeb2..bd56b73ce4 100644
--- a/drivers/gpu/cuda/gdrcopy.c
+++ b/drivers/gpu/cuda/gdrcopy.c
@@ -6,6 +6,8 @@
#ifdef DRIVERS_GPU_CUDA_GDRCOPY_H
+#include <stdlib.h>
+
static void *gdrclib;
static gdr_t (*sym_gdr_open)(void);
static int (*sym_gdr_pin_buffer)(gdr_t g, unsigned long addr, size_t size,
--
2.25.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2023-10-22 22:17:35.219703500 +0800
+++ 0021-gpu-cuda-fix-build-with-external-GDRCopy.patch 2023-10-22 22:17:34.156723700 +0800
@@ -1 +1 @@
-From cda3d17609c2cb81af67d5babbd0c1702b503fca Mon Sep 17 00:00:00 2001
+From 01d3e3c456c9665b9e511bcebd849e85073f7c6b Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit cda3d17609c2cb81af67d5babbd0c1702b503fca ]
@@ -13 +15,0 @@
-Cc: stable at dpdk.org
@@ -24 +26 @@
-index 1620455ef2..755a4da2cd 100644
+index bde21e6e3c..e2855454c2 100644
@@ -27 +29 @@
-@@ -664,6 +664,7 @@ John McNamara <john.mcnamara at intel.com>
+@@ -646,6 +646,7 @@ John McNamara <john.mcnamara at intel.com>
More information about the stable
mailing list