Release 8.7.1.K

Signed-off-by: Yunxiang Li <Yunxiang.Li@amd.com>

Author: yunxiali

gim/Makefile

@@ -28,6 +28,6 @@ all:
 	$(MAKE) -C $(KERNELDIR) M=$(SRC_PATH) modules
 
 clean:
-	cd $(SRC_PATH)/dkms; rm -rf autom4te.cache aclocal.m4 config.* configure .*.d
+	cd $(SRC_PATH)/dkms; rm -rf aclocal.m4 configure confdefs.h *.cache build_* config.* .*.d
 	$(MAKE) -C $(KERNELDIR) M=$(SRC_PATH) clean
 	find $(SRC_PATH)/../ \( -name '.*.cmd' -o -name '*.o' -o -name '*.ko' \) -delete

gim/amd-vfio-pci/amd-vfio.c

@@ -117,6 +117,18 @@ static struct vfio_migration_ops amd_vfio_migration_ops = {
 	.migration_get_data_size = amd_vfio_pci_migration_get_data_size,
 };
 
+#if defined(HAVE_VFIO_DMA_UNMAP)
+/*
+ * Dummy dma_unmap callback required by the new VFIO API.
+ * This replaces the old vfio_register_notifier mechanism.
+ */
+static void amd_vfio_pci_dma_unmap(struct vfio_device *vdev, u64 iova,
+				   u64 length)
+{
+	/* No action needed - this is a dummy handler to satisfy VFIO core */
+}
+#endif
+
 static int amd_vfio_pci_open_device(struct vfio_device *vdev)
 {
 	int ret;
@@ -172,6 +184,9 @@ static const struct vfio_device_ops amd_vfio_pci_ops = {
 	.mmap = vfio_pci_core_mmap,
 	.request = vfio_pci_core_request,
 	.match = vfio_pci_core_match,
+#if defined(HAVE_VFIO_DMA_UNMAP)
+	.dma_unmap = amd_vfio_pci_dma_unmap,
+#endif
 	.bind_iommufd = vfio_iommufd_physical_bind,
 	.unbind_iommufd = vfio_iommufd_physical_unbind,
 	.attach_ioas = vfio_iommufd_physical_attach_ioas,

gim/dkms/VERSION

@@ -1 +1 @@
-8.7.0.K
+8.7.1.K

gim/dkms/m4/ftrace.m4

@@ -25,16 +25,17 @@ dnl # commit v5.10-rc2-25-gd19ad0775dcd
 dnl # ftrace: Have the callbacks receive a struct ftrace_regs instead of pt_regs
 dnl #
 AC_DEFUN([AC_FTRACE_REGS_OPS], [
-                AC_KERNEL_TRY_COMPILE([
-                        #include <linux/ftrace.h>
-                ], [
-                        typedef void (*ftrace_func_t)(unsigned long ip, unsigned long parent_ip,
-                              struct ftrace_ops *op, struct ftrace_regs *fregs);
+	AC_KERNEL_DO_BACKGROUND([
+		AC_KERNEL_TRY_COMPILE([
+			#include <linux/ftrace.h>
+		], [
+			typedef void (*ftrace_func_t)(unsigned long ip, unsigned long parent_ip,
+				struct ftrace_ops *op, struct ftrace_regs *fregs);
 
-                        ftrace_func_t ftrace_ops_get_func(struct ftrace_ops *ops);
-                ], [
-
-                        AC_DEFINE(HAVE_FTRACE_REGS_OPS, 1,
-                                [struct ftrace_regs is available])
-                ])
-        ])
+			ftrace_func_t ftrace_ops_get_func(struct ftrace_ops *ops);
+		], [
+			AC_DEFINE(HAVE_FTRACE_REGS_OPS, 1,
+				[struct ftrace_regs is available])
+		])
+	])
+])

gim/dkms/m4/get_user_pages_remote.m4

@@ -68,7 +68,6 @@ dnl #
 dnl # commit v5.8-12463-g64019a2e467a
 dnl # mm/gup: remove task_struct pointer for all gup code
 dnl #
-
 AC_DEFUN([AC_GET_USER_PAGES_REMOTE_8_ARG], [
 	AC_KERNEL_DO_BACKGROUND([
                 AC_KERNEL_TRY_COMPILE([

gim/dkms/m4/kernel.m4

@@ -36,6 +36,7 @@ AC_DEFUN([AC_CONFIG_KERNEL], [
 	AC_SHASH_DESC_FLAGS
 	AC_DCORE_IOVA_VM_CTX_VFIO_DEVICE
 	AC_DCORE_IOVA_VM_CTX_PAGE_ARRAY
+	AC_VFIO_DMA_UNMAP
 	AC_VPRINTK_EMIT_5_ARG
 	AC_FTRACE_REGS_OPS
 	AC_DEVNODE_CONST
@@ -45,16 +46,12 @@ AC_DEFUN([AC_CONFIG_KERNEL], [
 	AC_KFREE_SENSITIVE
 	AC_GET_USER_PAGES_REMOTE_6_ARG
 	AC_GET_USER_PAGES_REMOTE_7_ARG
+	AC_GET_USER_PAGES_REMOTE_8_ARG
 	AC_UP_DOWN_READ
 	AC_MAX_PAGE_ORDER
 	AC_SUPPORT_LIVE_MIGRATION
 	AC_HRTIMER_SETUP
 	AC_KERNEL_WAIT
-	AS_IF([test "$LINUX_OBJ" != "$LINUX"], [
-		KERNEL_MAKE="$KERNEL_MAKE O=$LINUX_OBJ"
-	])
-
-	AC_SUBST(KERNEL_MAKE)
 ])
 
 dnl #
@@ -271,7 +268,14 @@ AC_DEFUN([AC_KERNEL_TMP_BUILD_DIR], [
 	cd $build_dir
 	$1
 	AS_IF([test -s confdefs.h], [
-		cat confdefs.h >>$build_dir_root/confdefs.h
+		# Multiple background jobs may try to append to the shared confdefs.h.
+		# Take a simple lock to avoid interleaved writes.
+		confdefs_lockdir="$build_dir_root/.confdefs.lockdir"
+		while ! mkdir "$confdefs_lockdir" 2>/dev/null; do
+			sleep 0.05
+		done
+		cat confdefs.h >>"$build_dir_root/confdefs.h"
+		rmdir "$confdefs_lockdir"
 	])
 	cd $build_dir_root
 	rm -rf $build_dir
@@ -293,23 +297,6 @@ AC_DEFUN([AC_KERNEL_TRY_COMPILE_MODULE],
 	[$3], [$4])
 ])
 
-dnl #
-dnl # AC_KERNEL_COMPILE_IFELSE / like AC_COMPILE_IFELSE
-dnl # $1: contents to be filled in conftest.c
-dnl # $2: user defined commands. It "AND" the make command to check the result. If true, expands to $4. Otherwise $5.
-dnl # $3: run it if make & $3 pass.
-dnl # $4: run it if make & $3 fail.
-dnl # $5: contents to be filled in conftest.h. Could be null.
-dnl #
-AC_DEFUN([AC_KERNEL_COMPILE_IFELSE], [
-	m4_ifvaln([$1], [AC_KERNEL_CONFTEST_C([$1])])
-	m4_ifvaln([$5], [AC_KERNEL_CONFTEST_H([$5])], [AC_KERNEL_CONFTEST_H([])])
-	AS_IF(
-		[AC_TRY_COMMAND(eval $CC $CFLAGS) > /dev/null && AC_TRY_COMMAND([$2])],
-		[$3],
-		[_AC_MSG_LOG_CONFTEST m4_ifvaln([$4],[$4])]
-	)
-])
 dnl #
 dnl # AC_KERNEL_TRY_COMPILE like AC_TRY_COMPILE
 dnl # $1: Prologue for conftest.c. including header files, extends, etc
@@ -318,8 +305,10 @@ dnl # $3: run it if compile pass.
 dnl # $4: run it if compile fail.
 dnl #
 AC_DEFUN([AC_KERNEL_TRY_COMPILE],
-	[AC_KERNEL_COMPILE_IFELSE(
+	target='conftest.o'
+	[AC_KERNEL_COMPILE_MODULE_IFELSE(
 	[AC_LANG_SOURCE([AC_KERNEL_LANG_PROGRAM([[$1]], [[$2]])])],
+	[$target],
 	[test -s conftest.o || test -s .tmp_conftest.o],
 	[$3], [$4])
 ])
@@ -423,15 +412,6 @@ AC_DEFUN([AC_KERNEL_TEST_HEADER_FILE_EXIST], [
 	])
 ])
 
-dnl #
-dnl # AC_KERNEL_CHECK_HEADERS
-dnl # check whether header file(s) is(are) present
-dnl # $1: header filei(s) to check
-dnl #
-AC_DEFUN([AC_KERNEL_CHECK_HEADERS], [
-	AC_CHECK_HEADERS([$1],[AS_TR_CPP([HAVE_$1])=1],,[-])
-])
-
 dnl #
 dnl # AC_KERNEL_DO_BACKGROUND
 dnl # $1: contents to be executed

gim/dkms/m4/kernel_single_target.m4

@@ -20,49 +20,6 @@ dnl * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 dnl * THE SOFTWARE
 dnl *
 
-dnl #
-dnl # extract cc, cflags, cppflags
-dnl #
-AC_DEFUN([AC_KERNEL_SINGLE_TARGET_CFLAGS], [
-	AS_IF([test -s .conftest.o.cmd], [
-		_conftest_cmd=$(head -1 .conftest.o.cmd)
-
-		CC=$(echo $_conftest_cmd | awk -F ' ' '{print $[3]}')
-
-		CFLAGS=$(echo $_conftest_cmd | \
-			 cut -d ' ' -f 4- | \
-			 sed -e "s|\./|${LINUX_OBJ}/|g" \
-			     -e "s|-I\([[[a-z]]]*\)|-I${LINUX_OBJ}/\1|g" \
-			     -e "s|-include \([[[a-z]]]*\)|-include ${LINUX_OBJ}/\1|g" \
-			     -e "s|$PWD|\${PWD}|g")
-
-		CPPFLAGS=$(echo $CFLAGS | \
-			   cut -d ';' -f 1 | \
-			   sed 's| -|\n&|g' | \
-			   sed -n -e '/conftest/d' \
-				  -e '/KBUILD/d' \
-				  -e '/-I/p; /-include/p; /-isystem/p; /-D/p' | \
-			   xargs)
-
-		AC_SUBST(CC)
-		AC_SUBST(CFLAGS)
-		AC_SUBST(CPPFLAGS)
-	], [
-		AC_MSG_ERROR([cannot detect CFLAGS...])
-	])
-])
-
-dnl #
-dnl # v5.3-rc4-54-g54b8ae66ae1a
-dnl # kbuild: change *FLAGS_<basetarget>.o to take the path relative to $(obj)
-dnl #
-AC_DEFUN([AC_KERNEL_FLAGS_TAKE_PATH], [
-	AS_IF([grep -qsm 1 "target-stem" ${LINUX}/scripts/Makefile.lib], [
-		AC_DEFINE(HAVE_AMDKCL_FLAGS_TAKE_PATH, 1,
-			[*FLAGS_<basetarget>.o support to take the path relative to $(obj)])
-	])
-])
-
 dnl #
 dnl # v4.20-rc2-10-ge07db28eea38
 dnl # kbuild: fix single target build for external module
@@ -77,7 +34,5 @@ AC_DEFUN([AC_KERNEL_SINGLE_TARGET], [
 				AC_MSG_WARN([compile single target fail expectedly])
 			])
 		])
-		AC_KERNEL_SINGLE_TARGET_CFLAGS
-		AC_KERNEL_FLAGS_TAKE_PATH
 	])
 ])

gim/dkms/m4/kfree_sensitive.m4

@@ -25,13 +25,14 @@ dnl # v5.8-9635-g453431a54934
 dnl # mm, treewide: rename kzfree() to kfree_sensitive()
 dnl #
 AC_DEFUN([AC_KFREE_SENSITIVE], [
-                AC_KERNEL_TRY_COMPILE([
-                        #include <linux/slab.h>
-                ], [
-                        kfree_sensitive(NULL);
-                ], [
-
-                        AC_DEFINE(HAVE_KFREE_SENSITIVE, 1,
-                                [kfree_sensitive is available])
-                ])
-        ])
+	AC_KERNEL_DO_BACKGROUND([
+		AC_KERNEL_TRY_COMPILE([
+			#include <linux/slab.h>
+		], [
+			kfree_sensitive(NULL);
+		], [
+			AC_DEFINE(HAVE_KFREE_SENSITIVE, 1,
+				[kfree_sensitive is available])
+		])
+	])
+])

gim/dkms/m4/linux-headers.m4

@@ -27,24 +27,36 @@ dnl #
 
 AC_DEFUN([AC_GIM_LINUX_HEADERS], [
 
-        AC_KERNEL_CHECK_HEADERS([asm/set_memory.h])
+        AC_KERNEL_TEST_HEADER_FILE_EXIST([asm/set_memory.h], [
+                AC_DEFINE(HAVE_ASM_SET_MEMORY_H, 1,
+                        [header <asm/set_memory.h> is available])
+        ])
 
         dnl #
         dnl # commit v5.17-14089-g63d12cc30574
         dnl # PCI: Remove the deprecated "pci-dma-compat.h" API
         dnl #
-        AC_KERNEL_CHECK_HEADERS([linux/pci-dma-compat.h])
+        AC_KERNEL_TEST_HEADER_FILE_EXIST([linux/pci-dma-compat.h], [
+                AC_DEFINE(HAVE_LINUX_PCI_DMA_COMPAT_H, 1,
+                        [header <linux/pci-dma-compat.h> is available])
+        ])
 
         dnl #
         dnl # v4.15-rc7-12-gea8c64ace866
         dnl # dma-mapping: move swiotlb arch helpers to a new header
         dnl #
-        AC_KERNEL_CHECK_HEADERS([linux/dma-direct.h])
+        AC_KERNEL_TEST_HEADER_FILE_EXIST([linux/dma-direct.h], [
+                AC_DEFINE(HAVE_LINUX_DMA_DIRECT_H, 1,
+                        [header <linux/dma-direct.h> is available])
+        ])
 
         dnl #
         dnl # v5.14-rc5-11-gc0891ac15f04
         dnl # isystem: ship and use stdarg.h
         dnl #
-        AC_KERNEL_CHECK_HEADERS([linux/stdarg.h])
+        AC_KERNEL_TEST_HEADER_FILE_EXIST([linux/stdarg.h], [
+                AC_DEFINE(HAVE_LINUX_STDARG_H, 1,
+                        [header <linux/stdarg.h> is available])
+        ])
 
 ])

gim/dkms/m4/loff_t_variable.m4

@@ -25,15 +25,16 @@ dnl # commit v4.13-rc7-5-gbdd1d2d3d251
 dnl # fs: fix kernel_read prototype
 dnl #
 AC_DEFUN([AC_LOFF_T_VARIABLE], [
-                AC_KERNEL_TRY_COMPILE([
-                        #include <linux/version.h>
-                        #include <linux/fs.h>
-                ], [
-                        loff_t loff_t;
-                        kernel_read(NULL, NULL, 0, &loff_t);
-                ], [
-
-                        AC_DEFINE(HAVE_LOFF_T_VARIABLE, 1,
-                                [variable loff_t is available])
-                ])
-        ])
+	AC_KERNEL_DO_BACKGROUND([
+		AC_KERNEL_TRY_COMPILE([
+			#include <linux/version.h>
+			#include <linux/fs.h>
+		], [
+			loff_t loff_t;
+			kernel_read(NULL, NULL, 0, &loff_t);
+		], [
+			AC_DEFINE(HAVE_LOFF_T_VARIABLE, 1,
+				[variable loff_t is available])
+		])
+	])
+])