Merge pull request #130 from NVIDIA/v2_1

drossetti · web-flow · commit af1f77b36af9 · 2020-08-04T10:26:13.000-07:00
update meta-data for 2.1 release
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.1] - 2020-08-07
+- fix build problem on RHL8 kernels
+- relax checks in gdrdrv to support multi-threading use cases
+- fix fd leak in gdr_open()
+- introcuce new copylat test
+- remove CUDA RT dependency in tests
+- assorted cleanups
+
 ## [2.0] - 2019-09-16
 - Harden security in gdrdrv.
 - Enable cached mappings in POWER9.
@@ -24,6 +32,7 @@
 - Add a script for packaging gdrcopy in the rpm format.
 
 
+[2.1]: https://github.com/NVIDIA/gdrcopy/releases/tag/v2.1
 [2.0]: https://github.com/NVIDIA/gdrcopy/releases/tag/v2.0
 [1.3]: https://github.com/NVIDIA/gdrcopy/releases/tag/v1.3
 
diff --git a/include/gdrapi.h b/include/gdrapi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2014-2020, NVIDIA CORPORATION. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -30,7 +30,7 @@
 #define MINOR_VERSION_MASK      (((uint32_t)1 << MAJOR_VERSION_SHIFT) - 1)
 
 #define GDR_API_MAJOR_VERSION    2
-#define GDR_API_MINOR_VERSION    0
+#define GDR_API_MINOR_VERSION    1
 #define GDR_API_VERSION          ((GDR_API_MAJOR_VERSION << MAJOR_VERSION_SHIFT) | GDR_API_MINOR_VERSION)
 
 #define MINIMUM_GDRDRV_MAJOR_VERSION    2
diff --git a/insmod.sh b/insmod.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2014-2020, NVIDIA CORPORATION. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
diff --git a/packages/build-deb-packages.sh b/packages/build-deb-packages.sh
@@ -2,7 +2,7 @@
 
 # Restart this number at 1 if MAJOR_VERSION or MINOR_VERSION changes
 # See https://www.debian.org/doc/debian-policy/ch-controlfields.html#version
-DEBIAN_VERSION=2
+DEBIAN_VERSION=1
 
 SCRIPT_DIR_PATH="$(cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" && pwd)"
 TOP_DIR_PATH="${SCRIPT_DIR_PATH}/.."
diff --git a/packages/build-rpm-packages.sh b/packages/build-rpm-packages.sh
@@ -2,7 +2,7 @@
 
 # Restart this number at 1 if MAJOR_VERSION or MINOR_VERSION changes
 # See https://rpm-packaging-guide.github.io/#preamble-items
-RPM_VERSION=4
+RPM_VERSION=1
 
 SCRIPT_DIR_PATH="$(cd "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" && pwd)"
 TOP_DIR_PATH="${SCRIPT_DIR_PATH}/.."
diff --git a/packages/debian/changelog b/packages/debian/changelog
@@ -1,5 +1,8 @@
 gdrcopy (@VERSION@) unstable; urgency=low
 
+  * fix build problem on RHL8 kernels
+  * relax checks in gdrdrv to support multi-threading use cases
+  * fix fd leak in gdr_open()
   * Introduce copylat test application.
   * Introduce basic_with_tokens and invalidation_fork_child_gdr_pin_parent_with_tokens sub-tests in sanity.
   * Remove the dependency with libcudart.so.
diff --git a/packages/debian/copyright b/packages/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: gdrcopy
 Source: https://github.com/NVIDIA/gdrcopy
 
 Files: *
-Copyright: 2019 NVIDIA CORPORATION. All rights reserved.
+Copyright: 2019-2020 NVIDIA CORPORATION. All rights reserved.
 License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the "Software"),
diff --git a/packages/gdrcopy.spec b/packages/gdrcopy.spec
@@ -117,6 +117,10 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version}
 
 
 %changelog
+* Fri Jul 31 2020 Davide Rossetti <drossetti@nvidia.com> 2.1-1
+- fix build problem on RHL8 kernels
+- relax checks in gdrdrv to support multi-threading use cases
+- fix fd leak in gdr_open()
 * Mon Mar 02 2020 Davide Rossetti <drossetti@nvidia.com> 2.0-4
 - Introduce copylat test application.
 - Introduce basic_with_tokens and invalidation_fork_child_gdr_pin_parent_with_tokens sub-tests in sanity.
diff --git a/src/gdrapi.c b/src/gdrapi.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2014-2020, NVIDIA CORPORATION. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/src/gdrapi_internal.h b/src/gdrapi_internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2014-2020, NVIDIA CORPORATION. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/src/gdrdrv/Makefile b/src/gdrdrv/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2014-2020, NVIDIA CORPORATION. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
diff --git a/src/gdrdrv/gdrdrv.c b/src/gdrdrv/gdrdrv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2014-2020, NVIDIA CORPORATION. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/src/gdrdrv/gdrdrv.h b/src/gdrdrv/gdrdrv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2014-2020, NVIDIA CORPORATION. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -27,7 +27,7 @@
 #define GDRDRV_TOSTRING(s)            GDRDRV_STRINGIFY(s)
 
 #define GDRDRV_MAJOR_VERSION    2
-#define GDRDRV_MINOR_VERSION    0
+#define GDRDRV_MINOR_VERSION    1
 #define GDRDRV_VERSION          ((GDRDRV_MAJOR_VERSION << 16) | GDRDRV_MINOR_VERSION)
 #define GDRDRV_VERSION_STRING   GDRDRV_TOSTRING(GDRDRV_MAJOR_VERSION) "." GDRDRV_TOSTRING(GDRDRV_MINOR_VERSION)
 
diff --git a/src/gdrdrv/nv-p2p-dummy.c b/src/gdrdrv/nv-p2p-dummy.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2015-2020, NVIDIA CORPORATION. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/src/memcpy_avx.c b/src/memcpy_avx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2014-2020, NVIDIA CORPORATION. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/src/memcpy_sse.c b/src/memcpy_sse.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2014-2020, NVIDIA CORPORATION. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/src/memcpy_sse41.c b/src/memcpy_sse41.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2015-2020, NVIDIA CORPORATION. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/tests/common.cpp b/tests/common.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2019-2020, NVIDIA CORPORATION. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/tests/common.hpp b/tests/common.hpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2014-2020, NVIDIA CORPORATION. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/tests/copybw.cpp b/tests/copybw.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2014-2020, NVIDIA CORPORATION. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/tests/sanity.cpp b/tests/sanity.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
+ * Copyright (c) 2019-2020, NVIDIA CORPORATION. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#!/bin/bash`
`2`		`-# Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.`
	`2`	`+# Copyright (c) 2014-2020, NVIDIA CORPORATION. All rights reserved.`
`3`	`3`	`#`
`4`	`4`	`# Permission is hereby granted, free of charge, to any person obtaining a`
`5`	`5`	`# copy of this software and associated documentation files (the "Software"),`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.`
	`2`	`+ * Copyright (c) 2014-2020, NVIDIA CORPORATION. All rights reserved.`
`3`	`3`	`*`
`4`	`4`	`* Permission is hereby granted, free of charge, to any person obtaining a`
`5`	`5`	`* copy of this software and associated documentation files (the "Software"),`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.`
	`1`	`+# Copyright (c) 2014-2020, NVIDIA CORPORATION. All rights reserved.`
`2`	`2`	`#`
`3`	`3`	`# Permission is hereby granted, free of charge, to any person obtaining a`
`4`	`4`	`# copy of this software and associated documentation files (the "Software"),`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2015, NVIDIA CORPORATION. All rights reserved.`
	`2`	`+ * Copyright (c) 2015-2020, NVIDIA CORPORATION. All rights reserved.`
`3`	`3`	`*`
`4`	`4`	`* Permission is hereby granted, free of charge, to any person obtaining a`
`5`	`5`	`* copy of this software and associated documentation files (the "Software"),`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.`
	`2`	`+ * Copyright (c) 2019-2020, NVIDIA CORPORATION. All rights reserved.`
`3`	`3`	`*`
`4`	`4`	`* Permission is hereby granted, free of charge, to any person obtaining a`
`5`	`5`	`* copy of this software and associated documentation files (the "Software"),`