Hi Vlad. I cleaned up the tree a bit, and checked that my changes build against 2.6.38. I also verified that NFS connectathon tests work. These will be the basis for upcoming backports. Please apply the attached patches (numbered) to OFED 1.6. Thanks.
-jeff P.S. Sorry about the silly file names. They were picked by git format-patch.
>From bc76477a624ad0551b4fca0b87931f0a70f1d92f Mon Sep 17 00:00:00 2001 From: Jeff Becker <[email protected]> Date: Thu, 12 May 2011 14:59:37 -0700 Subject: [PATCH 1/3] Initial NFSRDMA cleanup. We don't need to checkout all of nfs, only xprtrdma. Committed-by: Jeff Becker <[email protected]> --- ofed_scripts/checkout_files | 7 +------ ofed_scripts/nfs_header_checkout_files | 22 ---------------------- ofed_scripts/ofed_checkout.sh | 10 ---------- 3 files changed, 1 insertions(+), 38 deletions(-) delete mode 100644 ofed_scripts/nfs_header_checkout_files diff --git a/ofed_scripts/checkout_files b/ofed_scripts/checkout_files index 15de37f..232e030 100644 --- a/ofed_scripts/checkout_files +++ b/ofed_scripts/checkout_files @@ -9,11 +9,6 @@ drivers/scsi/iscsi_tcp.c drivers/scsi/iscsi_tcp.h drivers/scsi/libiscsi.c drivers/scsi/scsi_transport_iscsi.c -fs/exportfs/ -fs/lockd/ -fs/nfs/ -fs/nfs_common/ -fs/nfsd/ include/linux/mlx4/ include/rdma/ include/scsi/iscsi_if.h @@ -28,5 +23,5 @@ lib/klist.c net/rds/ include/linux/rds.h include/linux/socket.h -net/sunrpc/ +net/sunrpc/xprtrdma ofed_scripts/ diff --git a/ofed_scripts/nfs_header_checkout_files b/ofed_scripts/nfs_header_checkout_files deleted file mode 100644 index 29dd7ff..0000000 --- a/ofed_scripts/nfs_header_checkout_files +++ /dev/null @@ -1,22 +0,0 @@ -include/linux/exportfs.h -include/linux/lockd/ -include/linux/nfs.h -include/linux/nfs2.h -include/linux/nfs3.h -include/linux/nfs4.h -include/linux/nfs4_acl.h -include/linux/nfs4_mount.h -include/linux/nfs_fs.h -include/linux/nfs_fs_i.h -include/linux/nfs_fs_sb.h -include/linux/nfs_idmap.h -include/linux/nfs_iostat.h -include/linux/nfs_mount.h -include/linux/nfs_page.h -include/linux/nfs_xdr.h -include/linux/nfsacl.h -include/linux/nfsd/ -include/linux/nfsd_idmap.h -include/linux/pipe_fs_i.h -include/linux/splice.h -include/linux/sunrpc/ diff --git a/ofed_scripts/ofed_checkout.sh b/ofed_scripts/ofed_checkout.sh index 7766f98..fa91d08 100755 --- a/ofed_scripts/ofed_checkout.sh +++ b/ofed_scripts/ofed_checkout.sh @@ -29,16 +29,6 @@ xex() # branch defaults to ofed_kernel branch=${1:-ofed_kernel} -#checkout nfs headerfiles and put them in their new location -if [ ! -e ofed_scripts/nfs_header_checkout_files ]; then - ex git checkout ${branch} ofed_scripts/nfs_header_checkout_files -fi - -xex xargs -rt git ls-tree -r --name-only ${branch} <ofed_scripts/nfs_header_checkout_files | - xex xargs -rt git checkout ${branch} - -ex mv include include-nfs - # make sure we have the list of all the other files and dirs if [ ! -e ofed_scripts/checkout_files ]; then ex git checkout ${branch} ofed_scripts/checkout_files -- 1.7.3.4
>From a975e42fa7bc043e2490088a4f3b0b1410762403 Mon Sep 17 00:00:00 2001 From: Jeff Becker <[email protected]> Date: Thu, 12 May 2011 16:10:22 -0700 Subject: [PATCH 2/3] NFSRDMA: forgot a few headers Signed-off-by: Jeff Becker <[email protected]> --- ofed_scripts/checkout_files | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ofed_scripts/checkout_files b/ofed_scripts/checkout_files index 232e030..54e76ef 100644 --- a/ofed_scripts/checkout_files +++ b/ofed_scripts/checkout_files @@ -10,6 +10,9 @@ drivers/scsi/iscsi_tcp.h drivers/scsi/libiscsi.c drivers/scsi/scsi_transport_iscsi.c include/linux/mlx4/ +include/linux/sunrpc/rpc_rdma.h +include/linux/sunrpc/svc_rdma.h +include/linux/sunrpc/xprtrdma.h include/rdma/ include/scsi/iscsi_if.h include/scsi/iscsi_proto.h -- 1.7.3.4
>From 1bbe0ae80e6efbbb781412ed0d60acb108461709 Mon Sep 17 00:00:00 2001 From: Jeff Becker <[email protected]> Date: Thu, 12 May 2011 16:54:14 -0700 Subject: [PATCH 3/3] NFSRDMA: only need xprtrdma modules - remove stuff to build rest of nfs Signed-off-by: Jeff Becker <[email protected]> --- ofed_scripts/Makefile | 7 ------- ofed_scripts/configure | 36 ------------------------------------ ofed_scripts/makefile | 10 ++-------- 3 files changed, 2 insertions(+), 51 deletions(-) diff --git a/ofed_scripts/Makefile b/ofed_scripts/Makefile index f86eb61..9ec90a9 100644 --- a/ofed_scripts/Makefile +++ b/ofed_scripts/Makefile @@ -16,11 +16,4 @@ obj-$(CONFIG_CHELSIO_T4) += drivers/net/cxgb4/ obj-$(CONFIG_MLX4_CORE) += drivers/net/mlx4/ obj-$(CONFIG_RDS) += net/rds/ obj-$(CONFIG_MEMTRACK) += drivers/infiniband/debug/ -obj-$(CONFIG_SUNRPC_XPRT_RDMA) += net/sunrpc/ -obj-$(CONFIG_SUNRPC_XPRT_RDMA) += net/sunrpc/auth_gss/ obj-$(CONFIG_SUNRPC_XPRT_RDMA) += net/sunrpc/xprtrdma/ -obj-$(CONFIG_SUNRPC_XPRT_RDMA) += fs/nfs/ -obj-$(CONFIG_SUNRPC_XPRT_RDMA) += fs/lockd/ -obj-$(CONFIG_SUNRPC_XPRT_RDMA) += fs/exportfs/ -obj-$(CONFIG_SUNRPC_XPRT_RDMA) += fs/nfs_common/ -obj-$(CONFIG_SUNRPC_XPRT_RDMA) += fs/nfsd/ diff --git a/ofed_scripts/configure b/ofed_scripts/configure index 9239eaa..72fa10a 100755 --- a/ofed_scripts/configure +++ b/ofed_scripts/configure @@ -533,47 +533,11 @@ main() CONFIG_INFINIBAND_NES_DEBUG= ;; --with-nfsrdma-mod) - CONFIG_SUNRPC="m" - CONFIG_SUNRPC_GSS="m" - CONFIG_RPCSEC_GSS_KRB5="m" - CONFIG_RPCSEC_GSS_SPKM3="m" CONFIG_SUNRPC_XPRT_RDMA="m" - CONFIG_NFS_FS="m" - CONFIG_NFS_V3="y" - CONFIG_NFS_V3_ACL="y" - CONFIG_NFS_V4="y" - CONFIG_NFS_ACL_SUPPORT="m" - CONFIG_NFS_DIRECTIO="y" - CONFIG_EXPORTFS="m" - CONFIG_LOCKD="m" - CONFIG_LOCKD_V4="y" - CONFIG_NFSD="m" - CONFIG_NFSD_V2_ACL="y" - CONFIG_NFSD_V3="y" - CONFIG_NFSD_V3_ACL="y" - CONFIG_NFSD_V4="y" CONFIG_NFSD_RDMA="y" ;; --without-nfsrdma-mod) - CONFIG_SUNRPC= - CONFIG_SUNRPC_GSS= - CONFIG_RPCSEC_GSS_KRB5= - CONFIG_RPCSEC_GSS_SPKM3= CONFIG_SUNRPC_XPRT_RDMA= - CONFIG_NFS_FS= - CONFIG_NFS_V3= - CONFIG_NFS_V4= - CONFIG_NFS_V3_ACL= - CONFIG_NFS_ACL_SUPPORT= - CONFIG_NFS_DIRECTIO= - CONFIG_EXPORTFS= - CONFIG_LOCKD= - CONFIG_LOCKD_V4= - CONFIG_NFSD= - CONFIG_NFSD_V2_ACL= - CONFIG_NFSD_V3= - CONFIG_NFSD_V3_ACL= - CONFIG_NFSD_V4= CONFIG_NFSD_RDMA= ;; --with-modprobe|--without-modprobe) diff --git a/ofed_scripts/makefile b/ofed_scripts/makefile index 467339b..df3dd96 100644 --- a/ofed_scripts/makefile +++ b/ofed_scripts/makefile @@ -24,12 +24,6 @@ else export KERNEL_MEMTRACK_CFLAGS = endif -ifeq ($(CONFIG_NFS_FS),m) - export KERNEL_NFS_FS_CFLAGS = -I$(CWD)/include-nfs -else - export KERNEL_NFS_FS_CFLAGS = -endif - export OPEN_ISCSI_MODULES = iscsi_tcp.ko libiscsi.ko scsi_transport_iscsi.ko configure.mk.kernel: @@ -239,8 +233,8 @@ install_kernel_iscsi: install_modules install_kernel_nfsrdma: install_modules # backup all the modules # Copy new nfs rdma kernel modules to $(DESTDIR)/$(MODULES_DIR)/kernel - NFSRDMA_PATHS="fs/nfs fs/nfsd fs/lockd fs/exportfs fs/nfs_common net/sunrpc net/sunrpc/xprtrdma net/sunrpc/auth_gss"; \ - NFSRDMA_MODS="net/sunrpc/auth_gss/auth_rpcgss.ko net/sunrpc/auth_gss/rpcsec_gss_krb5.ko net/sunrpc/auth_gss/rpcsec_gss_spkm3.ko fs/exportfs/exportfs.ko fs/lockd/lockd.ko fs/nfs_common/nfs_acl.ko fs/nfsd/nfsd.ko fs/nfs/nfs.ko net/sunrpc/sunrpc.ko net/sunrpc/xprtrdma/svcrdma.ko net/sunrpc/xprtrdma/xprtrdma.ko"; \ + NFSRDMA_PATHS="net/sunrpc/xprtrdma"; \ + NFSRDMA_MODS="net/sunrpc/xprtrdma/svcrdma.ko net/sunrpc/xprtrdma/xprtrdma.ko"; \ if [ -d $(CWD)/lib/modules/$(KVERSION)/net/sunrpc/xprtrdma ]; then \ for each_path in $$NFSRDMA_PATHS; do \ mkdir -p $(DESTDIR)/$(MODULES_DIR)/kernel/$$each_path; \ -- 1.7.3.4
_______________________________________________ ewg mailing list [email protected] http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ewg
