Date: Tue, 5 Jun 2012 23:48:20 +0000 (UTC) From: Navdeep Parhar <np@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r236646 - in user/np/toe_iwarp/sys: dev/cxgb/ulp/iw_cxgb dev/cxgb/ulp/tom dev/cxgbe/tom i386/conf netinet Message-ID: <201206052348.q55NmKAN052210@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: np Date: Tue Jun 5 23:48:20 2012 New Revision: 236646 URL: http://svn.freebsd.org/changeset/base/236646 Log: - cxgb/ulp/tom, cxgb/ulp/iw_cxgb, and cxgbe/tom should all be stub modules when the kernel is being built without TCP_OFFLOAD. - Exclude rdma in the XEN kernconf. machine/xen/xen-os.h has some Linuxy definitions that collide with ofed/include/linux/*.h make universe is successful after these changes. Note that the point at which this workspace was branched off had unrelated build breakages. I tested make universe with a patch to head that is equivalent to the changes in this workspace. Modified: user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c user/np/toe_iwarp/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c user/np/toe_iwarp/sys/dev/cxgb/ulp/tom/cxgb_l2t.c user/np/toe_iwarp/sys/dev/cxgb/ulp/tom/cxgb_listen.c user/np/toe_iwarp/sys/dev/cxgb/ulp/tom/cxgb_tom.c user/np/toe_iwarp/sys/dev/cxgbe/tom/t4_connect.c user/np/toe_iwarp/sys/dev/cxgbe/tom/t4_cpl_io.c user/np/toe_iwarp/sys/dev/cxgbe/tom/t4_listen.c user/np/toe_iwarp/sys/dev/cxgbe/tom/t4_tom.c user/np/toe_iwarp/sys/dev/cxgbe/tom/t4_tom_l2t.c user/np/toe_iwarp/sys/i386/conf/XEN user/np/toe_iwarp/sys/netinet/tcp_offload.c Modified: user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c ============================================================================== --- user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c Tue Jun 5 22:02:27 2012 (r236645) +++ user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c Tue Jun 5 23:48:20 2012 (r236646) @@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$"); #include <linux/idr.h> #include <ulp/iw_cxgb/iw_cxgb_ib_intfc.h> +#ifdef TCP_OFFLOAD #include <cxgb_include.h> #include <ulp/iw_cxgb/iw_cxgb_wr.h> #include <ulp/iw_cxgb/iw_cxgb_hal.h> @@ -248,6 +249,7 @@ iwch_mod_unload(void) return (0); } +#endif /* TCP_OFFLOAD */ #undef MODULE_VERSION #include <sys/module.h> @@ -257,6 +259,7 @@ iwch_modevent(module_t mod, int cmd, voi { int rc = 0; +#ifdef TCP_OFFLOAD switch (cmd) { case MOD_LOAD: rc = iwch_mod_load(); @@ -277,7 +280,10 @@ iwch_modevent(module_t mod, int cmd, voi default: rc = EINVAL; } - +#else + printf("iw_cxgb: compiled without TCP_OFFLOAD support.\n"); + rc = EOPNOTSUPP; +#endif return (rc); } Modified: user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c ============================================================================== --- user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c Tue Jun 5 22:02:27 2012 (r236645) +++ user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c Tue Jun 5 23:48:20 2012 (r236646) @@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" +#ifdef TCP_OFFLOAD #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -1728,3 +1729,4 @@ iwch_cm_term_cpl(struct adapter *sc) t3_register_cpl_handler(sc, CPL_RDMA_TERMINATE, NULL); t3_register_cpl_handler(sc, CPL_RDMA_EC_STATUS, NULL); } +#endif Modified: user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c ============================================================================== --- user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c Tue Jun 5 22:02:27 2012 (r236645) +++ user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c Tue Jun 5 23:48:20 2012 (r236646) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" +#ifdef TCP_OFFLOAD #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -264,4 +265,4 @@ int iwch_poll_cq(struct ib_cq *ibcq, int return npolled; } } - +#endif Modified: user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c ============================================================================== --- user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c Tue Jun 5 22:02:27 2012 (r236645) +++ user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c Tue Jun 5 23:48:20 2012 (r236646) @@ -67,7 +67,7 @@ __FBSDID("$FreeBSD$"); #include <linux/idr.h> #include <ulp/iw_cxgb/iw_cxgb_ib_intfc.h> -#ifdef INVARIANTS +#if defined(INVARIANTS) && defined(TCP_OFFLOAD) #include <cxgb_include.h> #include <ulp/iw_cxgb/iw_cxgb_wr.h> #include <ulp/iw_cxgb/iw_cxgb_hal.h> Modified: user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c ============================================================================== --- user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c Tue Jun 5 22:02:27 2012 (r236645) +++ user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c Tue Jun 5 23:48:20 2012 (r236646) @@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" +#ifdef TCP_OFFLOAD #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -258,3 +259,4 @@ done: mtx_unlock(&chp->lock); iwch_qp_rem_ref(&qhp->ibqp); } +#endif Modified: user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c ============================================================================== --- user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c Tue Jun 5 22:02:27 2012 (r236645) +++ user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c Tue Jun 5 23:48:20 2012 (r236646) @@ -1,4 +1,3 @@ - /************************************************************************** Copyright (c) 2007, Chelsio Inc. @@ -32,6 +31,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" +#ifdef TCP_OFFLOAD #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -1336,3 +1336,4 @@ skip_cqe: } return ret; } +#endif Modified: user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c ============================================================================== --- user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c Tue Jun 5 22:02:27 2012 (r236645) +++ user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c Tue Jun 5 23:48:20 2012 (r236646) @@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" +#ifdef TCP_OFFLOAD #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -236,3 +237,4 @@ int build_phys_page_list(struct ib_phys_ return 0; } +#endif Modified: user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c ============================================================================== --- user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c Tue Jun 5 22:02:27 2012 (r236645) +++ user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c Tue Jun 5 23:48:20 2012 (r236646) @@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" +#ifdef TCP_OFFLOAD #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -1153,3 +1154,4 @@ void iwch_unregister_device(struct iwch_ cxfree(dev->ibdev.iwcm); return; } +#endif Modified: user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c ============================================================================== --- user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c Tue Jun 5 22:02:27 2012 (r236645) +++ user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c Tue Jun 5 23:48:20 2012 (r236646) @@ -1,4 +1,3 @@ - /************************************************************************** Copyright (c) 2007, Chelsio Inc. @@ -32,6 +31,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" +#ifdef TCP_OFFLOAD #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -1104,3 +1104,4 @@ out: CTR2(KTR_IW_CXGB, "%s exit state %d", __FUNCTION__, qhp->attr.state); return ret; } +#endif Modified: user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c ============================================================================== --- user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c Tue Jun 5 22:02:27 2012 (r236645) +++ user/np/toe_iwarp/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c Tue Jun 5 23:48:20 2012 (r236646) @@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" +#ifdef TCP_OFFLOAD #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -372,3 +373,4 @@ void cxio_hal_rqtpool_destroy(struct cxi { gen_pool_destroy(rdev_p->rqt_pool); } +#endif Modified: user/np/toe_iwarp/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c ============================================================================== --- user/np/toe_iwarp/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c Tue Jun 5 22:02:27 2012 (r236645) +++ user/np/toe_iwarp/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c Tue Jun 5 23:48:20 2012 (r236646) @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" +#ifdef TCP_OFFLOAD #include <sys/param.h> #include <sys/systm.h> #include <sys/fcntl.h> @@ -1859,3 +1860,4 @@ t3_init_cpl_io(struct adapter *sc) t3_register_cpl_handler(sc, CPL_SMT_WRITE_RPL, do_smt_write_rpl); t3_register_cpl_handler(sc, CPL_SET_TCB_RPL, do_set_tcb_rpl); } +#endif Modified: user/np/toe_iwarp/sys/dev/cxgb/ulp/tom/cxgb_l2t.c ============================================================================== --- user/np/toe_iwarp/sys/dev/cxgb/ulp/tom/cxgb_l2t.c Tue Jun 5 22:02:27 2012 (r236645) +++ user/np/toe_iwarp/sys/dev/cxgb/ulp/tom/cxgb_l2t.c Tue Jun 5 23:48:20 2012 (r236646) @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" +#ifdef TCP_OFFLOAD #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -456,3 +457,4 @@ t3_init_l2t_cpl_handlers(struct adapter { t3_register_cpl_handler(sc, CPL_L2T_WRITE_RPL, do_l2t_write_rpl); } +#endif Modified: user/np/toe_iwarp/sys/dev/cxgb/ulp/tom/cxgb_listen.c ============================================================================== --- user/np/toe_iwarp/sys/dev/cxgb/ulp/tom/cxgb_listen.c Tue Jun 5 22:02:27 2012 (r236645) +++ user/np/toe_iwarp/sys/dev/cxgb/ulp/tom/cxgb_listen.c Tue Jun 5 23:48:20 2012 (r236646) @@ -29,6 +29,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" +#ifdef TCP_OFFLOAD #include <sys/param.h> #include <sys/refcount.h> #include <sys/socket.h> @@ -1136,3 +1137,4 @@ t3_offload_socket(struct toedev *tod, vo make_established(so, cpl->snd_isn, cpl->rcv_isn, cpl->tcp_opt); update_tid(td, toep, synqe->tid); } +#endif Modified: user/np/toe_iwarp/sys/dev/cxgb/ulp/tom/cxgb_tom.c ============================================================================== --- user/np/toe_iwarp/sys/dev/cxgb/ulp/tom/cxgb_tom.c Tue Jun 5 22:02:27 2012 (r236645) +++ user/np/toe_iwarp/sys/dev/cxgb/ulp/tom/cxgb_tom.c Tue Jun 5 23:48:20 2012 (r236646) @@ -42,6 +42,7 @@ __FBSDID("$FreeBSD$"); #include <netinet/tcp.h> #include <netinet/toecore.h> +#ifdef TCP_OFFLOAD #include "cxgb_include.h" #include "ulp/tom/cxgb_tom.h" #include "ulp/tom/cxgb_l2t.h" @@ -357,12 +358,14 @@ t3_tom_mod_unload(void) return (0); } +#endif /* ifdef TCP_OFFLOAD */ static int t3_tom_modevent(module_t mod, int cmd, void *arg) { int rc = 0; +#ifdef TCP_OFFLOAD switch (cmd) { case MOD_LOAD: rc = t3_tom_mod_load(); @@ -375,7 +378,9 @@ t3_tom_modevent(module_t mod, int cmd, v default: rc = EINVAL; } - +#else + rc = EOPNOTSUPP; +#endif return (rc); } Modified: user/np/toe_iwarp/sys/dev/cxgbe/tom/t4_connect.c ============================================================================== --- user/np/toe_iwarp/sys/dev/cxgbe/tom/t4_connect.c Tue Jun 5 22:02:27 2012 (r236645) +++ user/np/toe_iwarp/sys/dev/cxgbe/tom/t4_connect.c Tue Jun 5 23:48:20 2012 (r236646) @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" +#ifdef TCP_OFFLOAD #include <sys/param.h> #include <sys/types.h> #include <sys/kernel.h> @@ -373,3 +374,4 @@ failed: return (rc); } +#endif Modified: user/np/toe_iwarp/sys/dev/cxgbe/tom/t4_cpl_io.c ============================================================================== --- user/np/toe_iwarp/sys/dev/cxgbe/tom/t4_cpl_io.c Tue Jun 5 22:02:27 2012 (r236645) +++ user/np/toe_iwarp/sys/dev/cxgbe/tom/t4_cpl_io.c Tue Jun 5 23:48:20 2012 (r236646) @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" +#ifdef TCP_OFFLOAD #include <sys/param.h> #include <sys/types.h> #include <sys/kernel.h> @@ -1255,3 +1256,4 @@ t4_init_cpl_io_handlers(struct adapter * t4_register_cpl_handler(sc, CPL_RX_DATA, do_rx_data); t4_register_cpl_handler(sc, CPL_FW4_ACK, do_fw4_ack); } +#endif Modified: user/np/toe_iwarp/sys/dev/cxgbe/tom/t4_listen.c ============================================================================== --- user/np/toe_iwarp/sys/dev/cxgbe/tom/t4_listen.c Tue Jun 5 22:02:27 2012 (r236645) +++ user/np/toe_iwarp/sys/dev/cxgbe/tom/t4_listen.c Tue Jun 5 23:48:20 2012 (r236646) @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" +#ifdef TCP_OFFLOAD #include <sys/param.h> #include <sys/types.h> #include <sys/kernel.h> @@ -1358,3 +1359,4 @@ t4_init_listen_cpl_handlers(struct adapt t4_register_cpl_handler(sc, CPL_PASS_ACCEPT_REQ, do_pass_accept_req); t4_register_cpl_handler(sc, CPL_PASS_ESTABLISH, do_pass_establish); } +#endif Modified: user/np/toe_iwarp/sys/dev/cxgbe/tom/t4_tom.c ============================================================================== --- user/np/toe_iwarp/sys/dev/cxgbe/tom/t4_tom.c Tue Jun 5 22:02:27 2012 (r236645) +++ user/np/toe_iwarp/sys/dev/cxgbe/tom/t4_tom.c Tue Jun 5 23:48:20 2012 (r236646) @@ -32,6 +32,7 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <sys/types.h> +#include <sys/systm.h> #include <sys/kernel.h> #include <sys/ktr.h> #include <sys/module.h> @@ -47,6 +48,7 @@ __FBSDID("$FreeBSD$"); #include <netinet/tcp_fsm.h> #include <netinet/toecore.h> +#ifdef TCP_OFFLOAD #include "common/common.h" #include "common/t4_msg.h" #include "common/t4_regs.h" @@ -714,12 +716,14 @@ t4_tom_mod_unload(void) return (0); } +#endif /* TCP_OFFLOAD */ static int t4_tom_modevent(module_t mod, int cmd, void *arg) { int rc = 0; +#ifdef TCP_OFFLOAD switch (cmd) { case MOD_LOAD: rc = t4_tom_mod_load(); @@ -732,7 +736,10 @@ t4_tom_modevent(module_t mod, int cmd, v default: rc = EINVAL; } - +#else + printf("t4_tom: compiled without TCP_OFFLOAD support.\n"); + rc = EOPNOTSUPP; +#endif return (rc); } Modified: user/np/toe_iwarp/sys/dev/cxgbe/tom/t4_tom_l2t.c ============================================================================== --- user/np/toe_iwarp/sys/dev/cxgbe/tom/t4_tom_l2t.c Tue Jun 5 22:02:27 2012 (r236645) +++ user/np/toe_iwarp/sys/dev/cxgbe/tom/t4_tom_l2t.c Tue Jun 5 23:48:20 2012 (r236646) @@ -28,6 +28,7 @@ __FBSDID("$FreeBSD$"); #include "opt_inet.h" +#ifdef TCP_OFFLOAD #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -401,3 +402,4 @@ found: update_entry(sc, e, lladdr, vtag); mtx_unlock(&e->lock); } +#endif Modified: user/np/toe_iwarp/sys/i386/conf/XEN ============================================================================== --- user/np/toe_iwarp/sys/i386/conf/XEN Tue Jun 5 22:02:27 2012 (r236645) +++ user/np/toe_iwarp/sys/i386/conf/XEN Tue Jun 5 23:48:20 2012 (r236646) @@ -7,7 +7,7 @@ cpu I686_CPU ident XEN makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols -makeoptions WITHOUT_MODULES="aha ahb amd cxgb dpt drm hptmv ida malo mps mwl nve sound sym trm xfs" +makeoptions WITHOUT_MODULES="aha ahb amd cxgb dpt drm hptmv ida malo mps mwl nve rdma sound sym trm xfs" options SCHED_ULE # ULE scheduler options PREEMPTION # Enable kernel thread preemption Modified: user/np/toe_iwarp/sys/netinet/tcp_offload.c ============================================================================== --- user/np/toe_iwarp/sys/netinet/tcp_offload.c Tue Jun 5 22:02:27 2012 (r236645) +++ user/np/toe_iwarp/sys/netinet/tcp_offload.c Tue Jun 5 23:48:20 2012 (r236646) @@ -75,14 +75,10 @@ tcp_offload_connect(struct socket *so, s ifp = rt->rt_ifp; -#ifdef INET if (nam->sa_family == AF_INET && !(ifp->if_capenable & IFCAP_TOE4)) goto done; -#endif -#ifdef INET6 if (nam->sa_family == AF_INET6 && !(ifp->if_capenable & IFCAP_TOE6)) goto done; -#endif tod = TOEDEV(ifp); if (tod != NULL)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206052348.q55NmKAN052210>