* [PATCH 1/4] staging: lustre: move libcfs to lnet layer
2016-03-08 22:35 [PATCH 0/4] Support lustre routers with stand alone LNet stack James Simmons
@ 2016-03-08 22:35 ` James Simmons
2016-03-08 22:35 ` [PATCH 2/4] staging: lustre: fixup kernel Kconfig option LNET_MAX_PAYLOAD James Simmons
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: James Simmons @ 2016-03-08 22:35 UTC (permalink / raw)
To: Greg Kroah-Hartman, devel, Andreas Dilger, Oleg Drokin
Cc: Linux Kernel Mailing List, Lustre Development List, James Simmons
The lustre file system has a layered architecture with
libcfs as the lowest layer and LNet layered on top. Then
on top of LNet we run the lustre client. This patch moves
the libcfs module code out of lustre into the lnet tree.
This fits into the long term goal of eventually merging
libcfs into LNet.
Signed-off-by: James Simmons <jsimmons@infradead.org>
---
drivers/staging/lustre/lnet/Makefile | 2 +-
.../lustre/{lustre => lnet}/libcfs/Makefile | 2 +-
.../staging/lustre/{lustre => lnet}/libcfs/debug.c | 0
.../staging/lustre/{lustre => lnet}/libcfs/fail.c | 0
.../staging/lustre/{lustre => lnet}/libcfs/hash.c | 0
.../lustre/{lustre => lnet}/libcfs/libcfs_cpu.c | 0
.../lustre/{lustre => lnet}/libcfs/libcfs_lock.c | 0
.../lustre/{lustre => lnet}/libcfs/libcfs_mem.c | 0
.../lustre/{lustre => lnet}/libcfs/libcfs_string.c | 0
.../{lustre => lnet}/libcfs/linux/linux-cpu.c | 0
.../libcfs/linux/linux-crypto-adler.c | 0
.../{lustre => lnet}/libcfs/linux/linux-crypto.c | 0
.../{lustre => lnet}/libcfs/linux/linux-crypto.h | 0
.../{lustre => lnet}/libcfs/linux/linux-curproc.c | 0
.../{lustre => lnet}/libcfs/linux/linux-debug.c | 0
.../{lustre => lnet}/libcfs/linux/linux-mem.c | 0
.../{lustre => lnet}/libcfs/linux/linux-module.c | 0
.../{lustre => lnet}/libcfs/linux/linux-prim.c | 0
.../libcfs/linux/linux-tracefile.c | 0
.../lustre/{lustre => lnet}/libcfs/module.c | 0
.../staging/lustre/{lustre => lnet}/libcfs/prng.c | 0
.../lustre/{lustre => lnet}/libcfs/tracefile.c | 0
.../lustre/{lustre => lnet}/libcfs/tracefile.h | 0
.../lustre/{lustre => lnet}/libcfs/workitem.c | 0
drivers/staging/lustre/lustre/Makefile | 2 +-
25 files changed, 3 insertions(+), 3 deletions(-)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/Makefile (93%)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/debug.c (100%)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/fail.c (100%)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/hash.c (100%)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/libcfs_cpu.c (100%)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/libcfs_lock.c (100%)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/libcfs_mem.c (100%)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/libcfs_string.c (100%)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/linux/linux-cpu.c (100%)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/linux/linux-crypto-adler.c (100%)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/linux/linux-crypto.c (100%)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/linux/linux-crypto.h (100%)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/linux/linux-curproc.c (100%)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/linux/linux-debug.c (100%)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/linux/linux-mem.c (100%)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/linux/linux-module.c (100%)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/linux/linux-prim.c (100%)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/linux/linux-tracefile.c (100%)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/module.c (100%)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/prng.c (100%)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/tracefile.c (100%)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/tracefile.h (100%)
rename drivers/staging/lustre/{lustre => lnet}/libcfs/workitem.c (100%)
diff --git a/drivers/staging/lustre/lnet/Makefile b/drivers/staging/lustre/lnet/Makefile
index f6f03e3..0a380fe 100644
--- a/drivers/staging/lustre/lnet/Makefile
+++ b/drivers/staging/lustre/lnet/Makefile
@@ -1 +1 @@
-obj-$(CONFIG_LNET) += lnet/ klnds/ selftest/
+obj-$(CONFIG_LNET) += libcfs/ lnet/ klnds/ selftest/
diff --git a/drivers/staging/lustre/lustre/libcfs/Makefile b/drivers/staging/lustre/lnet/libcfs/Makefile
similarity index 93%
rename from drivers/staging/lustre/lustre/libcfs/Makefile
rename to drivers/staging/lustre/lnet/libcfs/Makefile
index 277c123..8c89455 100644
--- a/drivers/staging/lustre/lustre/libcfs/Makefile
+++ b/drivers/staging/lustre/lnet/libcfs/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_LUSTRE_FS) += libcfs.o
+obj-$(CONFIG_LNET) += libcfs.o
libcfs-linux-objs := linux-tracefile.o linux-debug.o
libcfs-linux-objs += linux-prim.o linux-cpu.o
diff --git a/drivers/staging/lustre/lustre/libcfs/debug.c b/drivers/staging/lustre/lnet/libcfs/debug.c
similarity index 100%
rename from drivers/staging/lustre/lustre/libcfs/debug.c
rename to drivers/staging/lustre/lnet/libcfs/debug.c
diff --git a/drivers/staging/lustre/lustre/libcfs/fail.c b/drivers/staging/lustre/lnet/libcfs/fail.c
similarity index 100%
rename from drivers/staging/lustre/lustre/libcfs/fail.c
rename to drivers/staging/lustre/lnet/libcfs/fail.c
diff --git a/drivers/staging/lustre/lustre/libcfs/hash.c b/drivers/staging/lustre/lnet/libcfs/hash.c
similarity index 100%
rename from drivers/staging/lustre/lustre/libcfs/hash.c
rename to drivers/staging/lustre/lnet/libcfs/hash.c
diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c b/drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c
similarity index 100%
rename from drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c
rename to drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c
diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_lock.c b/drivers/staging/lustre/lnet/libcfs/libcfs_lock.c
similarity index 100%
rename from drivers/staging/lustre/lustre/libcfs/libcfs_lock.c
rename to drivers/staging/lustre/lnet/libcfs/libcfs_lock.c
diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_mem.c b/drivers/staging/lustre/lnet/libcfs/libcfs_mem.c
similarity index 100%
rename from drivers/staging/lustre/lustre/libcfs/libcfs_mem.c
rename to drivers/staging/lustre/lnet/libcfs/libcfs_mem.c
diff --git a/drivers/staging/lustre/lustre/libcfs/libcfs_string.c b/drivers/staging/lustre/lnet/libcfs/libcfs_string.c
similarity index 100%
rename from drivers/staging/lustre/lustre/libcfs/libcfs_string.c
rename to drivers/staging/lustre/lnet/libcfs/libcfs_string.c
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c
similarity index 100%
rename from drivers/staging/lustre/lustre/libcfs/linux/linux-cpu.c
rename to drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto-adler.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto-adler.c
similarity index 100%
rename from drivers/staging/lustre/lustre/libcfs/linux/linux-crypto-adler.c
rename to drivers/staging/lustre/lnet/libcfs/linux/linux-crypto-adler.c
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c
similarity index 100%
rename from drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c
rename to drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.c
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.h b/drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.h
similarity index 100%
rename from drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.h
rename to drivers/staging/lustre/lnet/libcfs/linux/linux-crypto.h
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c
similarity index 100%
rename from drivers/staging/lustre/lustre/libcfs/linux/linux-curproc.c
rename to drivers/staging/lustre/lnet/libcfs/linux/linux-curproc.c
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c
similarity index 100%
rename from drivers/staging/lustre/lustre/libcfs/linux/linux-debug.c
rename to drivers/staging/lustre/lnet/libcfs/linux/linux-debug.c
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-mem.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-mem.c
similarity index 100%
rename from drivers/staging/lustre/lustre/libcfs/linux/linux-mem.c
rename to drivers/staging/lustre/lnet/libcfs/linux/linux-mem.c
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-module.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-module.c
similarity index 100%
rename from drivers/staging/lustre/lustre/libcfs/linux/linux-module.c
rename to drivers/staging/lustre/lnet/libcfs/linux/linux-module.c
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c
similarity index 100%
rename from drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c
rename to drivers/staging/lustre/lnet/libcfs/linux/linux-prim.c
diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c
similarity index 100%
rename from drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.c
rename to drivers/staging/lustre/lnet/libcfs/linux/linux-tracefile.c
diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lnet/libcfs/module.c
similarity index 100%
rename from drivers/staging/lustre/lustre/libcfs/module.c
rename to drivers/staging/lustre/lnet/libcfs/module.c
diff --git a/drivers/staging/lustre/lustre/libcfs/prng.c b/drivers/staging/lustre/lnet/libcfs/prng.c
similarity index 100%
rename from drivers/staging/lustre/lustre/libcfs/prng.c
rename to drivers/staging/lustre/lnet/libcfs/prng.c
diff --git a/drivers/staging/lustre/lustre/libcfs/tracefile.c b/drivers/staging/lustre/lnet/libcfs/tracefile.c
similarity index 100%
rename from drivers/staging/lustre/lustre/libcfs/tracefile.c
rename to drivers/staging/lustre/lnet/libcfs/tracefile.c
diff --git a/drivers/staging/lustre/lustre/libcfs/tracefile.h b/drivers/staging/lustre/lnet/libcfs/tracefile.h
similarity index 100%
rename from drivers/staging/lustre/lustre/libcfs/tracefile.h
rename to drivers/staging/lustre/lnet/libcfs/tracefile.h
diff --git a/drivers/staging/lustre/lustre/libcfs/workitem.c b/drivers/staging/lustre/lnet/libcfs/workitem.c
similarity index 100%
rename from drivers/staging/lustre/lustre/libcfs/workitem.c
rename to drivers/staging/lustre/lnet/libcfs/workitem.c
diff --git a/drivers/staging/lustre/lustre/Makefile b/drivers/staging/lustre/lustre/Makefile
index 35d8b0b..331e4fc 100644
--- a/drivers/staging/lustre/lustre/Makefile
+++ b/drivers/staging/lustre/lustre/Makefile
@@ -1,2 +1,2 @@
-obj-$(CONFIG_LUSTRE_FS) += libcfs/ obdclass/ ptlrpc/ fld/ osc/ mgc/ \
+obj-$(CONFIG_LUSTRE_FS) += obdclass/ ptlrpc/ fld/ osc/ mgc/ \
fid/ lov/ mdc/ lmv/ llite/ obdecho/
--
1.7.1
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 2/4] staging: lustre: fixup kernel Kconfig option LNET_MAX_PAYLOAD
2016-03-08 22:35 [PATCH 0/4] Support lustre routers with stand alone LNet stack James Simmons
2016-03-08 22:35 ` [PATCH 1/4] staging: lustre: move libcfs to lnet layer James Simmons
@ 2016-03-08 22:35 ` James Simmons
2016-03-08 22:35 ` [PATCH 3/4] staging: lustre: add help section of Kconfig config LNET James Simmons
2016-03-08 22:35 ` [PATCH 4/4] staging: lustre: make lustre dependent on LNet James Simmons
3 siblings, 0 replies; 5+ messages in thread
From: James Simmons @ 2016-03-08 22:35 UTC (permalink / raw)
To: Greg Kroah-Hartman, devel, Andreas Dilger, Oleg Drokin
Cc: Linux Kernel Mailing List, Lustre Development List, James Simmons
A few errors exist for the Kconfig option LNET_MAX_PAYLOAD. First
mistake is the default size is 1MB not 2MB as it is shown to the
person configuring the kernel. Second the LNET_MAX_PAYLOAD option
is more closely related to LNET than the LUSTRE_FS option.
Signed-off-by: James Simmons <jsimmons@infradead.org>
---
drivers/staging/lustre/lnet/Kconfig | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/lustre/lnet/Kconfig b/drivers/staging/lustre/lnet/Kconfig
index 00850ee..9c85091 100644
--- a/drivers/staging/lustre/lnet/Kconfig
+++ b/drivers/staging/lustre/lnet/Kconfig
@@ -3,8 +3,8 @@ config LNET
depends on LUSTRE_FS
config LNET_MAX_PAYLOAD
- int "Lustre lnet max transfer payload (default 2MB)"
- depends on LUSTRE_FS
+ int "Lustre lnet max transfer payload (default 1MB)"
+ depends on LNET
default "1048576"
help
This option defines the maximum size of payload in bytes that lnet
--
1.7.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 3/4] staging: lustre: add help section of Kconfig config LNET
2016-03-08 22:35 [PATCH 0/4] Support lustre routers with stand alone LNet stack James Simmons
2016-03-08 22:35 ` [PATCH 1/4] staging: lustre: move libcfs to lnet layer James Simmons
2016-03-08 22:35 ` [PATCH 2/4] staging: lustre: fixup kernel Kconfig option LNET_MAX_PAYLOAD James Simmons
@ 2016-03-08 22:35 ` James Simmons
2016-03-08 22:35 ` [PATCH 4/4] staging: lustre: make lustre dependent on LNet James Simmons
3 siblings, 0 replies; 5+ messages in thread
From: James Simmons @ 2016-03-08 22:35 UTC (permalink / raw)
To: Greg Kroah-Hartman, devel, Andreas Dilger, Oleg Drokin
Cc: Linux Kernel Mailing List, Lustre Development List, James Simmons
Include a help section for Kconfig LNET.
Signed-off-by: James Simmons <jsimmons@infradead.org>
---
drivers/staging/lustre/lnet/Kconfig | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/drivers/staging/lustre/lnet/Kconfig b/drivers/staging/lustre/lnet/Kconfig
index 9c85091..980ce44 100644
--- a/drivers/staging/lustre/lnet/Kconfig
+++ b/drivers/staging/lustre/lnet/Kconfig
@@ -1,6 +1,12 @@
config LNET
- tristate "Lustre networking subsystem"
+ tristate "Lustre networking subsystem (LNet)"
depends on LUSTRE_FS
+ help
+ The Lustre network layer, also known as LNet, is a networking abstaction
+ level API that was initially created to allow Lustre Filesystem to utilize
+ very different networks like tcp and ib verbs in a uniform way. In the
+ case of Lustre routers only the LNet layer is required. Lately other
+ projects are also looking into using LNet as their networking API as well.
config LNET_MAX_PAYLOAD
int "Lustre lnet max transfer payload (default 1MB)"
--
1.7.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 4/4] staging: lustre: make lustre dependent on LNet
2016-03-08 22:35 [PATCH 0/4] Support lustre routers with stand alone LNet stack James Simmons
` (2 preceding siblings ...)
2016-03-08 22:35 ` [PATCH 3/4] staging: lustre: add help section of Kconfig config LNET James Simmons
@ 2016-03-08 22:35 ` James Simmons
3 siblings, 0 replies; 5+ messages in thread
From: James Simmons @ 2016-03-08 22:35 UTC (permalink / raw)
To: Greg Kroah-Hartman, devel, Andreas Dilger, Oleg Drokin
Cc: Linux Kernel Mailing List, Lustre Development List, James Simmons
In the case of lustre routers you only need a functioning
LNet stack. Especially since often the routers are very
light weight and want to avoid any addition software that
would create additional pressures on the system.
Signed-off-by: James Simmons <jsimmons@infradead.org>
---
drivers/staging/Makefile | 2 +-
drivers/staging/lustre/Kconfig | 4 ++--
drivers/staging/lustre/lnet/Kconfig | 2 +-
drivers/staging/lustre/lustre/Kconfig | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 8242923..c008cfc 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -30,7 +30,7 @@ obj-$(CONFIG_WIMAX_GDM72XX) += gdm72xx/
obj-$(CONFIG_LTE_GDM724X) += gdm724x/
obj-$(CONFIG_FIREWIRE_SERIAL) += fwserial/
obj-$(CONFIG_GOLDFISH) += goldfish/
-obj-$(CONFIG_LUSTRE_FS) += lustre/
+obj-$(CONFIG_LNET) += lustre/
obj-$(CONFIG_DGNC) += dgnc/
obj-$(CONFIG_MTD_SPINAND_MT29F) += mt29f_spinand/
obj-$(CONFIG_GS_FPGABOOT) += gs_fpgaboot/
diff --git a/drivers/staging/lustre/Kconfig b/drivers/staging/lustre/Kconfig
index a224d88..b7d8109 100644
--- a/drivers/staging/lustre/Kconfig
+++ b/drivers/staging/lustre/Kconfig
@@ -1,3 +1,3 @@
-source "drivers/staging/lustre/lustre/Kconfig"
-
source "drivers/staging/lustre/lnet/Kconfig"
+
+source "drivers/staging/lustre/lustre/Kconfig"
diff --git a/drivers/staging/lustre/lnet/Kconfig b/drivers/staging/lustre/lnet/Kconfig
index 980ce44..2b59301 100644
--- a/drivers/staging/lustre/lnet/Kconfig
+++ b/drivers/staging/lustre/lnet/Kconfig
@@ -1,6 +1,6 @@
config LNET
tristate "Lustre networking subsystem (LNet)"
- depends on LUSTRE_FS
+ depends on INET && m
help
The Lustre network layer, also known as LNet, is a networking abstaction
level API that was initially created to allow Lustre Filesystem to utilize
diff --git a/drivers/staging/lustre/lustre/Kconfig b/drivers/staging/lustre/lustre/Kconfig
index 62c7bba..a09b51c 100644
--- a/drivers/staging/lustre/lustre/Kconfig
+++ b/drivers/staging/lustre/lustre/Kconfig
@@ -1,6 +1,6 @@
config LUSTRE_FS
tristate "Lustre file system client support"
- depends on INET && m && !MIPS && !XTENSA && !SUPERH
+ depends on m && !MIPS && !XTENSA && !SUPERH
select LNET
select CRYPTO
select CRYPTO_CRC32
--
1.7.1
^ permalink raw reply [flat|nested] 5+ messages in thread