Skip to contentSkip to conversation

Accelerated network drivers

PATCH In review Kieran Mansley 2 participants 4 messages Feb 15, 2008 – Feb 19, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 4/4 Accelerated network drivers

This patch provides the netback plug-in module (sfc_netback) to accelerate network access on Solarflare NICs.

SFC backend network accelerator source

drivers/xen/Kconfig +6 -0
diff -r 6dcdd8348e5b drivers/xen/Kconfig
@@ -82,6 +82,12 @@ config XEN_NETDEV_ACCEL_SFC_UTIL
 config XEN_NETDEV_ACCEL_SFC_UTIL
         tristate
         default n
+
+config XEN_NETDEV_ACCEL_SFC_BACKEND
+	tristate "Network-device backend driver acceleration for Solarflare NICs"
+        depends on XEN_NETDEV_BACKEND
+        select XEN_NETDEV_ACCEL_SFC_UTIL
+        default m
 
 config XEN_NETDEV_LOOPBACK
 	tristate "Network-device loopback driver"
drivers/xen/Makefile +1 -0
diff -r 6dcdd8348e5b drivers/xen/Makefile
@@ -22,3 +22,4 @@ obj-$(CONFIG_XEN_GRANT_DEV)	+= gntdev/
 obj-$(CONFIG_XEN_GRANT_DEV)	+= gntdev/
 obj-$(CONFIG_XEN_NETDEV_ACCEL_SFC_UTIL)		+= sfc_netutil/
 obj-$(CONFIG_XEN_NETDEV_ACCEL_SFC_FRONTEND)	+= sfc_netfront/
+obj-$(CONFIG_XEN_NETDEV_ACCEL_SFC_BACKEND)	+= sfc_netback/
drivers/xen/sfc_netback/Makefile new file +12 -0
diff -r 6dcdd8348e5b drivers/xen/sfc_netback/Makefile
@@ -0,0 +1,12 @@
+EXTRA_CFLAGS += -Idrivers/xen/sfc_netutil -Idrivers/xen/netback -Idrivers/net/sfc
+EXTRA_CFLAGS += -D__ci_driver__ 
+EXTRA_CFLAGS += -DEFX_USE_KCOMPAT
+EXTRA_CFLAGS += -Werror
+
+ifdef GCOV
+EXTRA_CFLAGS += -fprofile-arcs -ftest-coverage -DEFX_GCOV
+endif
+
+obj-$(CONFIG_XEN_NETDEV_ACCEL_SFC_BACKEND) := sfc_netback.o
+
+sfc_netback-objs   := accel.o accel_fwd.o accel_msg.o accel_solarflare.o accel_xenbus.o accel_debugfs.o
drivers/xen/sfc_netback/accel.c new file +129 -0

129 lines not on this page · raw message

drivers/xen/sfc_netback/accel.h new file +393 -0

393 lines not on this page · raw message

drivers/xen/sfc_netback/accel_debugfs.c new file +170 -0

170 lines not on this page · raw message

drivers/xen/sfc_netback/accel_fwd.c new file +415 -0

415 lines not on this page · raw message

drivers/xen/sfc_netback/accel_msg.c new file +392 -0

392 lines not on this page · raw message

drivers/xen/sfc_netback/accel_solarflare.c new file +1253 -0

1,253 lines not on this page · raw message

drivers/xen/sfc_netback/accel_solarflare.h new file +88 -0

88 lines not on this page · raw message

drivers/xen/sfc_netback/accel_xenbus.c new file +831 -0

132 lines not on this page · raw message

drivers/xen/sfc_netback/ci/compat.h new file +53 -0

53 lines not on this page · raw message

drivers/xen/sfc_netback/ci/compat/gcc.h new file +158 -0

158 lines not on this page · raw message

drivers/xen/sfc_netback/ci/compat/gcc_x86.h new file +115 -0

115 lines not on this page · raw message

drivers/xen/sfc_netback/ci/compat/primitive.h new file +77 -0

77 lines not on this page · raw message

drivers/xen/sfc_netback/ci/compat/sysdep.h new file +166 -0

166 lines not on this page · raw message

drivers/xen/sfc_netback/ci/compat/utils.h new file +269 -0

269 lines not on this page · raw message

drivers/xen/sfc_netback/ci/compat/x86.h new file +48 -0

48 lines not on this page · raw message

drivers/xen/sfc_netback/ci/compat/x86_64.h new file +54 -0

54 lines not on this page · raw message

drivers/xen/sfc_netback/ci/driver/resource/efx_vi.h new file +276 -0

276 lines not on this page · raw message

drivers/xen/sfc_netback/ci/efhw/common.h new file +102 -0

102 lines not on this page · raw message

drivers/xen/sfc_netback/ci/efhw/common_sysdep.h new file +67 -0

67 lines not on this page · raw message

drivers/xen/sfc_netback/ci/efhw/debug.h new file +84 -0

84 lines not on this page · raw message

drivers/xen/sfc_netback/ci/efhw/efhw_config.h new file +43 -0

43 lines not on this page · raw message

drivers/xen/sfc_netback/ci/efhw/efhw_types.h new file +342 -0

342 lines not on this page · raw message

drivers/xen/sfc_netback/ci/efhw/hardware_sysdep.h new file +84 -0

84 lines not on this page · raw message

drivers/xen/sfc_netback/ci/efhw/iopage_types.h new file +188 -0

188 lines not on this page · raw message

drivers/xen/sfc_netback/ci/efhw/public.h new file +83 -0

83 lines not on this page · raw message

drivers/xen/sfc_netback/ci/efhw/sysdep.h new file +72 -0

72 lines not on this page · raw message

drivers/xen/sfc_netback/ci/efrm/nic_table.h new file +98 -0

98 lines not on this page · raw message

drivers/xen/sfc_netback/ci/efrm/sysdep.h new file +54 -0

54 lines not on this page · raw message

drivers/xen/sfc_netback/ci/efrm/sysdep_linux.h new file +248 -0

248 lines not on this page · raw message

drivers/xen/sfc_netback/ci/tools/config.h new file +49 -0

49 lines not on this page · raw message

drivers/xen/sfc_netback/ci/tools/debug.h new file +336 -0

336 lines not on this page · raw message

drivers/xen/sfc_netback/ci/tools/log.h new file +262 -0

262 lines not on this page · raw message

drivers/xen/sfc_netback/ci/tools/platform/gcc_x86.h new file +361 -0

361 lines not on this page · raw message

drivers/xen/sfc_netback/ci/tools/platform/linux_kernel.h new file +362 -0

362 lines not on this page · raw message

drivers/xen/sfc_netback/ci/tools/sysdep.h new file +132 -0

132 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

Part of the diff is not shown here. View the raw message.

#1 lore raw

Hi,

Looks like this patch (linux-2.6.18-xen.hg 423:af0d925ba938) is causing a build failure.

===============================
In file included from drivers/xen/sfc_netback/accel_solarflare.c:36:
drivers/xen/sfc_netback/ci/efrm/nic_table.h:41:32: error:
ci/efhw/efhw_types.h: No such file or directory drivers/xen/sfc_netback/ci/efrm/nic_table.h:42:28: error:
ci/efrm/sysdep.h: No such file or directory
In file included from drivers/xen/sfc_netback/accel_solarflare.c:36:
drivers/xen/sfc_netback/ci/efrm/nic_table.h:54: error:
'EFHW_MAX_NR_DEVS' undeclared here (not in a function)
In file included from drivers/xen/sfc_netback/accel_solarflare.c:37:
drivers/xen/sfc_netback/ci/efhw/public.h:42:28: error: ci/efhw/common.h:
No such file or directory
In file included from drivers/xen/sfc_netback/accel_solarflare.c:37:
drivers/xen/sfc_netback/ci/efhw/public.h: In function 'efhw_nic_have_functional_units':
drivers/xen/sfc_netback/ci/efhw/public.h:49: error: dereferencing pointer to incomplete type
cc1: warnings being treated as errors drivers/xen/sfc_netback/ci/efhw/public.h: In function 'efhw_nic_have_hw':
drivers/xen/sfc_netback/ci/efhw/public.h:55: warning: implicit declaration of function 'EFHW_KVA' drivers/xen/sfc_netback/ci/efhw/public.h: At top level:
drivers/xen/sfc_netback/ci/efhw/public.h:68: warning: 'struct eventq_resource_hardware' declared inside parameter list drivers/xen/sfc_netback/ci/efhw/public.h:68: warning: its scope is only this definition or declaration, which is probably not what you want drivers/xen/sfc_netback/accel_solarflare.c: In function 'efx_device_to_efab_nic_index':
drivers/xen/sfc_netback/accel_solarflare.c:183: error: dereferencing pointer to incomplete type drivers/xen/sfc_netback/accel_solarflare.c:187: error: dereferencing pointer to incomplete type
make[3]: *** [drivers/xen/sfc_netback/accel_solarflare.o] Error 1 make[2]: *** [drivers/xen/sfc_netback] Error 2
make[1]: *** [drivers/xen] Error 2
make[1]: *** Waiting for unfinished jobs....
make: *** [drivers] Error 2
+ exit 1
error: Bad exit status from /var/tmp/rpm-tmp.77273 (%build)
===============================

Did you mean to add -Idrivers/net/sfc/sfc_resource or -Idrivers/xen/sfc_netback to drivers/xen/sfc_netback/Makefile?

Thanks
kurt

#2 lore raw
Quoted 10 lines · Kurt Hackel

Hi,

Looks like this patch (linux-2.6.18-xen.hg 423:af0d925ba938) is causing a build failure.

Did you mean to add -Idrivers/net/sfc/sfc_resource or -Idrivers/xen/sfc_netback to drivers/xen/sfc_netback/Makefile?

From your errors it would certainly look like adding -

Idrivers/xen/sfc_netback would fix it. What I don't yet understand is why I've never seen this problem. I'll investigate and sort out a patch.

Kieran

#3 lore raw
Quoted 6 lines · Kieran Mansley
Quoted 5 lines · Kurt Hackel

Hi,

Looks like this patch (linux-2.6.18-xen.hg 423:af0d925ba938) is causing a build failure.

Quoted 8 lines
Quoted 5 lines

Did you mean to add -Idrivers/net/sfc/sfc_resource or -Idrivers/xen/sfc_netback to drivers/xen/sfc_netback/Makefile?

From your errors it would certainly look like adding -

Idrivers/xen/sfc_netback would fix it. What I don't yet understand is why I've never seen this problem. I'll investigate and sort out a patch.

I'm still not sure why I've not seen this failure: a clean checkout and build has no problems for me, but the change should be harmless so I've attached a patch that should solve your problem.

Signed-off-by Kieran Mansley <[email protected]>

Thanks

Kieran

Add -I. to sfc module builds

drivers/net/sfc/sfc_resource/Makefile +1 -1
diff -r 9dea529497fe drivers/net/sfc/sfc_resource/Makefile
@@ -3,7 +3,7 @@ EXTRA_CFLAGS += -D__CI_HARDWARE_CONFIG_F
 EXTRA_CFLAGS += -D__CI_HARDWARE_CONFIG_FALCON__
 EXTRA_CFLAGS += -D__ci_driver__ 
 EXTRA_CFLAGS += -Werror
-EXTRA_CFLAGS += -Idrivers/net/sfc
+EXTRA_CFLAGS += -Idrivers/net/sfc -Idrivers/net/sfc/sfc_resource
 
 sfc_resource-objs := resource_driver.o iopage.o efx_vi_shm.o \
 	driverlink_new.o kernel_proc.o kfifo.o \
drivers/xen/sfc_netback/Makefile +1 -1
diff -r 9dea529497fe drivers/xen/sfc_netback/Makefile
@@ -1,4 +1,4 @@ EXTRA_CFLAGS += -Idrivers/xen/sfc_netuti
-EXTRA_CFLAGS += -Idrivers/xen/sfc_netutil -Idrivers/xen/netback -Idrivers/net/sfc
+EXTRA_CFLAGS += -Idrivers/xen/sfc_netback -Idrivers/xen/sfc_netutil -Idrivers/xen/netback -Idrivers/net/sfc
 EXTRA_CFLAGS += -D__ci_driver__ 
 EXTRA_CFLAGS += -DEFX_USE_KCOMPAT
 EXTRA_CFLAGS += -Werror
drivers/xen/sfc_netfront/Makefile +1 -1
diff -r 9dea529497fe drivers/xen/sfc_netfront/Makefile
@@ -1,4 +1,4 @@ EXTRA_CFLAGS += -Idrivers/xen/sfc_netuti
-EXTRA_CFLAGS += -Idrivers/xen/sfc_netutil -Idrivers/xen/netfront
+EXTRA_CFLAGS += -Idrivers/xen/sfc_netfront -Idrivers/xen/sfc_netutil -Idrivers/xen/netfront
 EXTRA_CFLAGS += -D__ci_driver__
 EXTRA_CFLAGS += -Werror
 
drivers/xen/sfc_netutil/Makefile +1 -0
diff -r 9dea529497fe drivers/xen/sfc_netutil/Makefile
@@ -1,3 +1,4 @@ EXTRA_CFLAGS += -Werror
+EXTRA_CFLAGS += -Idrivers/xen/sfc_netutil
 EXTRA_CFLAGS += -Werror
 
 ifdef GGOV

Add -I. to sfc module builds

drivers/net/sfc/sfc_resource/Makefile +1 -1
diff -r 9dea529497fe drivers/net/sfc/sfc_resource/Makefile
@@ -3,7 +3,7 @@ EXTRA_CFLAGS += -D__CI_HARDWARE_CONFIG_F
 EXTRA_CFLAGS += -D__CI_HARDWARE_CONFIG_FALCON__
 EXTRA_CFLAGS += -D__ci_driver__ 
 EXTRA_CFLAGS += -Werror
-EXTRA_CFLAGS += -Idrivers/net/sfc
+EXTRA_CFLAGS += -Idrivers/net/sfc -Idrivers/net/sfc/sfc_resource
 
 sfc_resource-objs := resource_driver.o iopage.o efx_vi_shm.o \
 	driverlink_new.o kernel_proc.o kfifo.o \
drivers/xen/sfc_netback/Makefile +1 -1
diff -r 9dea529497fe drivers/xen/sfc_netback/Makefile
@@ -1,4 +1,4 @@ EXTRA_CFLAGS += -Idrivers/xen/sfc_netuti
-EXTRA_CFLAGS += -Idrivers/xen/sfc_netutil -Idrivers/xen/netback -Idrivers/net/sfc
+EXTRA_CFLAGS += -Idrivers/xen/sfc_netback -Idrivers/xen/sfc_netutil -Idrivers/xen/netback -Idrivers/net/sfc
 EXTRA_CFLAGS += -D__ci_driver__ 
 EXTRA_CFLAGS += -DEFX_USE_KCOMPAT
 EXTRA_CFLAGS += -Werror
drivers/xen/sfc_netfront/Makefile +1 -1
diff -r 9dea529497fe drivers/xen/sfc_netfront/Makefile
@@ -1,4 +1,4 @@ EXTRA_CFLAGS += -Idrivers/xen/sfc_netuti
-EXTRA_CFLAGS += -Idrivers/xen/sfc_netutil -Idrivers/xen/netfront
+EXTRA_CFLAGS += -Idrivers/xen/sfc_netfront -Idrivers/xen/sfc_netutil -Idrivers/xen/netfront
 EXTRA_CFLAGS += -D__ci_driver__
 EXTRA_CFLAGS += -Werror
 
drivers/xen/sfc_netutil/Makefile +1 -0
diff -r 9dea529497fe drivers/xen/sfc_netutil/Makefile
@@ -1,3 +1,4 @@ EXTRA_CFLAGS += -Werror
+EXTRA_CFLAGS += -Idrivers/xen/sfc_netutil
 EXTRA_CFLAGS += -Werror
 
 ifdef GGOV

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel