Diskadd 2.10

Makefile.in

@@ -1,9 +1,7 @@
-px-objs = pxd.o dev.o iov_iter.o px_version.o
+px-objs = pxd.o dev.o iov_iter.o px_version.o kiolib.o pxd_bio_makereq.o pxd_bio_blkmq.o pxd_fastpath.o
 obj-m = px.o
 
 KBUILD_CPPFLAGS := -D__KERNEL__
-PXDEFINES := -D__PXKERNEL__
-
 KVERSION=$(shell uname -r)
 
 ifndef KERNELPATH
@@ -29,9 +27,8 @@ $(error Kernel path: $(KERNELPATH)  directory does not exist.)
 endif
 
 MINKVER=3.10
-FPATH_MINKVER=4.0
 BLKMQ_MINKVER=4.18
-KERNELVER=$(shell echo $(KVERSION) | /bin/sed 's/\([0-9].[0-9]\+\).*/\1/g')
+KERNELVER=$(shell echo $(CHK_KVER) | /bin/sed 's/\([0-9].[0-9]\+\).*/\1/g')
 
 majorfn=$(shell echo "$1" | /bin/sed 's/\(.*\)\.\(.*\)/\1/g')
 minorfn=$(shell echo "$1" | /bin/sed 's/\(.*\)\.\(.*\)/\2/g')
@@ -46,11 +43,20 @@ minver_minor=$(call minorfn, ${MINKVER})
 blkmq_major=$(call majorfn, ${BLKMQ_MINKVER})
 blkmq_minor=$(call minorfn, ${BLKMQ_MINKVER})
 
+kmajor=$(call majorfn, ${KERNELVER})
+kminor=$(call minorfn, ${KERNELVER})
+
+#makereq interface supports fastpath in all version (not recommended)
+#PXDEFINES := -D__PXKERNEL__ -D__PXD_BIO_MAKEREQ__
+#FPATH_MINKVER=${kmajor}.${kminor}
+
+#blkmq mode has version check for fastpath (default, enabled)
+PXDEFINES := -D__PXKERNEL__ -D__PXD_BIO_BLKMQ__
+FPATH_MINKVER=4.12
+
 fp_major=$(call majorfn, ${FPATH_MINKVER})
 fp_minor=$(call minorfn, ${FPATH_MINKVER})
 
-kmajor=$(call majorfn, ${KERNELVER})
-kminor=$(call minorfn, ${KERNELVER})
 
 ## min kernel version checks
 ifeq ($(call verlater,${minver_major},${kmajor}),0)
@@ -63,15 +69,28 @@ endif
 endif
 endif
 
+## fastpath checks
+ifeq ($(call verlater,${kmajor},${fp_major}),0)
+PXDEFINES += -D__PX_FASTPATH__
+$(info Kernel version ${KERNELVER} supports fastpath.)
+else
+ifeq ($(call versame,${kmajor},${fp_major}),0)
+ifeq ($(call versameorlater,${kminor},${fp_minor}),0)
+PXDEFINES += -D__PX_FASTPATH__
+$(info Kernel version ${KERNELVER} supports fastpath.)
+endif
+endif
+endif
+
 ## blkmq checks
 ifeq ($(call verlater,${kmajor},${blkmq_major}),0)
 PXDEFINES += -D__PX_BLKMQ__
-$(warning Kernel version ${KERNELVER} supports blkmq driver model.")
+$(info Kernel version ${KERNELVER} supports blkmq driver model.)
 else
 ifeq ($(call versame,${kmajor},${blkmq_major}),0)
 ifeq ($(call versameorlater,${kminor},${blkmq_minor}),0)
 PXDEFINES += -D__PX_BLKMQ__
-$(warning Kernel version ${KERNELVER} supports blkmq driver model.")
+$(info Kernel version ${KERNELVER} supports blkmq driver model.)
 endif
 endif
 endif
@@ -81,28 +100,6 @@ ifeq ($(shell echo "$(CHK_KVER)" | grep -Eq '.*\.el8.*\.x86_64'; echo $$?),0)
 PXDEFINES += -D__PX_BLKMQ__ -D__EL8__
 endif
 
-## fastpath specific checks
-ifeq ($(call verlater,${kmajor},${fp_major}),0)
-PXDEFINES += -D__PX_FASTPATH__
-px-objs += pxd_fastpath.o
-$(warning kernel fast path enabled, current kernel version $(KVERSION) need minimum $(FPATH_MINKVER))
-else
-ifeq ($(call versame,${kmajor},${fp_major}),0)
-ifeq ($(call versameorlater,${kminor},${fp_minor}),0)
-PXDEFINES += -D__PX_FASTPATH__
-px-objs += pxd_fastpath.o
-$(warning kernel fast path enabled, current kernel version $(KVERSION) need minimum $(FPATH_MINKVER))
-else
-px-objs += pxd_fastpath_stub.o
-$(warning kernel fast path disabled, current kernel version $(KVERSION) need minimum $(FPATH_MINKVER))
-endif
-else
-px-objs += pxd_fastpath_stub.o
-$(warning kernel fast path disabled, current kernel version $(KVERSION) need minimum $(FPATH_MINKVER))
-endif
-endif
-
-
 ifdef KERNELOTHER
 KERNELOTHEROPT=O=$(KERNELOTHER)
 endif
@@ -126,12 +123,16 @@ PXDEFINES += -D__PX_BLKMQ__
 endif
 endif
 
+ifdef FORCE_CONTAINER_CC
+FORCE_CC=CC=$(FORCE_CONTAINER_CC)
+endif
+
 ccflags-y := $(ADDCCFLAGS) -Wframe-larger-than=2048 -Werror -I$(src) $(KBUILD_CPPFLAGS) $(PXDEFINES)
 
 .PHONY: rpm
 
 all: px_version.c
-	make -C $(KERNELPATH) $(KERNELOTHEROPT) M=$(CURDIR) modules
+	make $(FORCE_CC) -C $(KERNELPATH) $(KERNELOTHEROPT) M=$(CURDIR) modules
 
 insert: all
 	insmod px.ko $(PXD_NUM_CONTEXT_EXPORTED)
@@ -142,6 +143,13 @@ clean:
 install:
 	make V=1 -C $(KERNELPATH) $(KERNELOTHEROPT) M=$(CURDIR) modules_install
 
+test_clean:
+	@/bin/rm -f test/pxd_test
+
+pxd_test: pxd_test.cc
+	@echo "Building Test ..."
+	g++ -I. -std=c++11 test/pxd_test.cc -lgtest -lboost_iostreams -lpthread -o test/pxd_test
+
 rpm:
 	@cd rpm && ./buildrpm.sh
 
@@ -159,3 +167,4 @@ px_version.c:
 
 distclean: clean
 	@/bin/rm -f  config.* Makefile
+	@/bin/rm -f test/pxd_test

README.md

@@ -50,6 +50,24 @@ Requires kernel >= 3.10
 # rpm -Uvh /root/px-fuse/rpm/px/RPMS/x86_64/px-3.10.0-123.9.3.el7.x86_64.rpm
 ```
 
+### Building and running Tests 
+```
+A set of tests are included to test control operations attach and detach as well as I/O operations read and write.
+To build test:
+
+# cd px_fuse
+# ./configure
+# make pxd_test
+# make test_clean
+
+Make sure that px.ko can be built and sucessfully installed.
+To run test:
+
+# cd px_fuse
+# ./test/pxd_test --gtest_filter=PxdTest.write
+# ./test/pxd_test --gtest_filter=PxdTest.read
+```
+
 ### Verifying PX-FUSE will build on Ubuntu
 
 `kernel-tests.sh` is a script which can verify if headers from alternate kernels will build with PX-FUSE.  It can