From owner-p4-projects@FreeBSD.ORG Tue Oct 30 18:59:15 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2B48E16A421; Tue, 30 Oct 2007 18:59:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D677616A418 for ; Tue, 30 Oct 2007 18:59:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B558513C4C8 for ; Tue, 30 Oct 2007 18:59:14 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9UIxEO4017387 for ; Tue, 30 Oct 2007 18:59:14 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9UIxERi017384 for perforce@freebsd.org; Tue, 30 Oct 2007 18:59:14 GMT (envelope-from kmacy@freebsd.org) Date: Tue, 30 Oct 2007 18:59:14 GMT Message-Id: <200710301859.l9UIxERi017384@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 128359 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Oct 2007 18:59:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=128359 Change 128359 by kmacy@kmacy_home:ethng on 2007/10/30 18:59:01 initial import of core support for in-kernel iwarp Affected files ... .. //depot/projects/ethng/src/sys/contrib/rdma/ib_addr.h#2 edit .. //depot/projects/ethng/src/sys/contrib/rdma/ib_sa.h#3 edit .. //depot/projects/ethng/src/sys/contrib/rdma/ib_umem.h#3 edit .. //depot/projects/ethng/src/sys/contrib/rdma/ib_verbs.h#6 edit .. //depot/projects/ethng/src/sys/contrib/rdma/rdma_addr.c#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/rdma_cma.c#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/rdma_device.c#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/rdma_iwcm.c#1 add .. //depot/projects/ethng/src/sys/contrib/rdma/rdma_verbs.c#1 add .. //depot/projects/ethng/src/sys/modules/Makefile#7 edit .. //depot/projects/ethng/src/sys/modules/rdma/Makefile#1 add Differences ... ==== //depot/projects/ethng/src/sys/contrib/rdma/ib_addr.h#2 (text+ko) ==== @@ -30,15 +30,11 @@ #if !defined(IB_ADDR_H) #define IB_ADDR_H -#include -#include -#include -#include -#include +#include struct rdma_addr_client { atomic_t refcount; - struct completion comp; + struct cv comp; }; /** ==== //depot/projects/ethng/src/sys/contrib/rdma/ib_sa.h#3 (text+ko) ==== @@ -326,10 +326,10 @@ * * If the join operation fails; status will be non-zero, with the following * failures possible: - * -ETIMEDOUT: The request timed out. - * -EIO: An error occurred sending the query. - * -EINVAL: The MCMemberRecord values differed from the existing group's. - * -ENETRESET: Indicates that an fatal error has occurred on the multicast + * ETIMEDOUT: The request timed out. + * EIO: An error occurred sending the query. + * EINVAL: The MCMemberRecord values differed from the existing group's. + * ENETRESET: Indicates that an fatal error has occurred on the multicast * group, and the user must rejoin the group to continue using it. */ struct ib_sa_multicast *ib_sa_join_multicast(struct ib_sa_client *client, ==== //depot/projects/ethng/src/sys/contrib/rdma/ib_umem.h#3 (text+ko) ==== @@ -74,7 +74,7 @@ static inline struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, size_t size, int access) { - return ERR_PTR(-EINVAL); + return ERR_PTR(EINVAL); } static inline void ib_umem_release(struct ib_umem *umem) { } static inline int ib_umem_page_count(struct ib_umem *umem) { return 0; } ==== //depot/projects/ethng/src/sys/contrib/rdma/ib_verbs.h#6 (text+ko) ==== @@ -1072,12 +1072,12 @@ static inline int ib_copy_from_udata(void *dest, struct ib_udata *udata, size_t len) { - return copyin(udata->inbuf, dest, len) ? -EFAULT : 0; + return copyin(udata->inbuf, dest, len); } static inline int ib_copy_to_udata(struct ib_udata *udata, void *src, size_t len) { - return copyout(src, udata->outbuf, len) ? -EFAULT : 0; + return copyout(src, udata->outbuf, len); } /** @@ -1452,7 +1452,7 @@ { return cq->device->req_ncomp_notif ? cq->device->req_ncomp_notif(cq, wc_cnt) : - -ENOSYS; + ENOSYS; } /** @@ -1766,7 +1766,7 @@ /* XXX reference counting in corresponding MR? */ return mw->device->bind_mw ? mw->device->bind_mw(qp, mw, mw_bind) : - -ENOSYS; + ENOSYS; } /** ==== //depot/projects/ethng/src/sys/modules/Makefile#7 (text+ko) ==== @@ -216,6 +216,7 @@ ${_ray} \ rc \ rc4 \ + rdma \ re \ reiserfs \ rl \