Changeset 78608 in vbox for trunk/src/VBox/Additions/WINNT/SharedFolders/driver/Makefile.kmk

Timestamp:

May 20, 2019 11:04:08 PM (6 years ago)

Author:

vboxsync

Message:

winnt/vboxsf: Don't flush and purge the cache twice on newer systems, instead do a library trick to redirect relevant imports from write.obj and read.obj to our wrappers that uses CcCoherencyFlushAndPurgeCache when possible to get better coherency between mmap regions and file content when writing and reading normally. This comes at a cost when the file has been mmapped at some point previously (or currently) and we may need to purge stuff. bugref:9172

File:

• trunk/src/VBox/Additions/WINNT/SharedFolders/driver/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/Makefile.kmk

@@ -46 +46 @@
 VBoxSF_LIBS.x86  = \
         $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/rxce.lib \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/rdbsslib.lib \
+        $(VBoxSF_0_OUTDIR)/rdbsslib.lib \
         $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/copysup.lib \
         $(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.x86)/ntoskrnl.lib \
@@ -55 +55 @@
 VBoxSF_LIBS.amd64  = \
         $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/rxce.lib \
-        $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/rdbsslib.lib \
+        $(VBoxSF_0_OUTDIR)/rdbsslib.lib \
         $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/copysup.lib \
         $(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.amd64)/ntoskrnl.lib \
@@ -66 +66 @@
         $(VBOX_LIB_IPRT_GUEST_R0)
 
+VBoxSF_CLEAN = \
+        $(VBoxSF_0_OUTDIR)/rdbsslib.lib
+
+
 include $(FILE_KBUILD_SUB_FOOTER)
 
+ifeq ($(KBUILD_TARGET_ARCH),x86)
+$(VBoxSF_0_OUTDIR)/rdbsslib.lib: $$(PATH_SDK_$(VBOX_WINDDK_GST_W2K3)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib | $$(dir $$@) $(VBOX_EDIT_COFF_LIB)
+        $(VBOX_EDIT_COFF_LIB) --input "$<" --output "$@" \
+                --select "write.obj" \
+               --redefine-sym "__imp__CcFlushCache@16=_g_pfnWrFlushCache" \
+               --redefine-sym "__imp__CcPurgeCacheSection@16=_g_pfnWrPurgeCacheSection" \
+                --select "read.obj" \
+               --redefine-sym "__imp__CcFlushCache@16=_g_pfnRdFlushCache"
+else
+$(VBoxSF_0_OUTDIR)/rdbsslib.lib: $$(PATH_SDK_$(VBOX_WINDDK_GST_WLH)_LIB.$(KBUILD_TARGET_ARCH))/rdbsslib.lib | $$(dir $$@) $(VBOX_EDIT_COFF_LIB)
+        $(VBOX_EDIT_COFF_LIB) --input "$<" --output "$@" -v -v -v -v -v -v \
+                --select "write.obj" \
+               --redefine-sym "__imp_CcFlushCache=g_pfnWrFlushCache" \
+               --redefine-sym "__imp_CcPurgeCacheSection=g_pfnWrPurgeCacheSection" \
+                --select "read.obj" \
+               --redefine-sym "__imp_CcFlushCache=g_pfnRdFlushCache"
+endif
+