From owner-svn-src-projects@freebsd.org Sun Mar 25 08:39:52 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8C9CFF5644D for ; Sun, 25 Mar 2018 08:39:52 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3A9A37B1E1; Sun, 25 Mar 2018 08:39:52 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1C0F21BB83; Sun, 25 Mar 2018 08:39:52 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2P8dp91012008; Sun, 25 Mar 2018 08:39:51 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2P8dpBV012007; Sun, 25 Mar 2018 08:39:51 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <201803250839.w2P8dpBV012007@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sun, 25 Mar 2018 08:39:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r331530 - projects/routing_mpath X-SVN-Group: projects X-SVN-Commit-Author: melifaro X-SVN-Commit-Paths: projects/routing_mpath X-SVN-Commit-Revision: 331530 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 25 Mar 2018 08:39:52 -0000 Author: melifaro Date: Sun Mar 25 08:39:51 2018 New Revision: 331530 URL: https://svnweb.freebsd.org/changeset/base/331530 Log: Branch for bringing proper multipath to the networking stack. Added: - copied from r331529, head/ Directory Properties: projects/routing_mpath/ (props changed) From owner-svn-src-projects@freebsd.org Mon Mar 26 22:39:49 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E76F1F4A4E3 for ; Mon, 26 Mar 2018 22:39:48 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 97D1F78FD0; Mon, 26 Mar 2018 22:39:48 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 92DC1132D2; Mon, 26 Mar 2018 22:39:48 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2QMdmfF083228; Mon, 26 Mar 2018 22:39:48 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2QMdm94083227; Mon, 26 Mar 2018 22:39:48 GMT (envelope-from np@FreeBSD.org) Message-Id: <201803262239.w2QMdm94083227@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Mon, 26 Mar 2018 22:39:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r331599 - projects/bsd_rdma_4_9_stable_11/sys/dev/cxgbe/iw_cxgbe X-SVN-Group: projects X-SVN-Commit-Author: np X-SVN-Commit-Paths: projects/bsd_rdma_4_9_stable_11/sys/dev/cxgbe/iw_cxgbe X-SVN-Commit-Revision: 331599 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Mar 2018 22:39:49 -0000 Author: np Date: Mon Mar 26 22:39:48 2018 New Revision: 331599 URL: https://svnweb.freebsd.org/changeset/base/331599 Log: Use soupcall_set/clear because listen-only sockets are available in FreeBSD 12+ only. Sponsored by: Chelsio Communications Modified: projects/bsd_rdma_4_9_stable_11/sys/dev/cxgbe/iw_cxgbe/cm.c Modified: projects/bsd_rdma_4_9_stable_11/sys/dev/cxgbe/iw_cxgbe/cm.c ============================================================================== --- projects/bsd_rdma_4_9_stable_11/sys/dev/cxgbe/iw_cxgbe/cm.c Mon Mar 26 22:31:29 2018 (r331598) +++ projects/bsd_rdma_4_9_stable_11/sys/dev/cxgbe/iw_cxgbe/cm.c Mon Mar 26 22:39:48 2018 (r331599) @@ -846,31 +846,20 @@ setiwsockopt(struct socket *so) static void init_iwarp_socket(struct socket *so, void *arg) { - if (SOLISTENING(so)) { - SOLISTEN_LOCK(so); - solisten_upcall_set(so, c4iw_so_upcall, arg); - so->so_state |= SS_NBIO; - SOLISTEN_UNLOCK(so); - } else { - SOCKBUF_LOCK(&so->so_rcv); - soupcall_set(so, SO_RCV, c4iw_so_upcall, arg); - so->so_state |= SS_NBIO; - SOCKBUF_UNLOCK(&so->so_rcv); - } + + SOCKBUF_LOCK(&so->so_rcv); + soupcall_set(so, SO_RCV, c4iw_so_upcall, arg); + so->so_state |= SS_NBIO; + SOCKBUF_UNLOCK(&so->so_rcv); } static void uninit_iwarp_socket(struct socket *so) { - if (SOLISTENING(so)) { - SOLISTEN_LOCK(so); - solisten_upcall_set(so, NULL, NULL); - SOLISTEN_UNLOCK(so); - } else { - SOCKBUF_LOCK(&so->so_rcv); - soupcall_clear(so, SO_RCV); - SOCKBUF_UNLOCK(&so->so_rcv); - } + + SOCKBUF_LOCK(&so->so_rcv); + soupcall_clear(so, SO_RCV); + SOCKBUF_UNLOCK(&so->so_rcv); } static void From owner-svn-src-projects@freebsd.org Tue Mar 27 05:25:39 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 030ACF4EC3E for ; Tue, 27 Mar 2018 05:25:39 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ABDD26DC9B; Tue, 27 Mar 2018 05:25:38 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A6B3F17A88; Tue, 27 Mar 2018 05:25:38 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2R5PcGi089383; Tue, 27 Mar 2018 05:25:38 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2R5PcNA089382; Tue, 27 Mar 2018 05:25:38 GMT (envelope-from np@FreeBSD.org) Message-Id: <201803270525.w2R5PcNA089382@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Tue, 27 Mar 2018 05:25:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r331607 - projects/bsd_rdma_4_9_stable_11/sys/dev/cxgbe/iw_cxgbe X-SVN-Group: projects X-SVN-Commit-Author: np X-SVN-Commit-Paths: projects/bsd_rdma_4_9_stable_11/sys/dev/cxgbe/iw_cxgbe X-SVN-Commit-Revision: 331607 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2018 05:25:39 -0000 Author: np Date: Tue Mar 27 05:25:38 2018 New Revision: 331607 URL: https://svnweb.freebsd.org/changeset/base/331607 Log: Make a private copy of dequeue_socket from existing iwcm in 11 and use it instead of solisten_dequeue, which exists only in FreeBSD 12+. Modified: projects/bsd_rdma_4_9_stable_11/sys/dev/cxgbe/iw_cxgbe/cm.c Modified: projects/bsd_rdma_4_9_stable_11/sys/dev/cxgbe/iw_cxgbe/cm.c ============================================================================== --- projects/bsd_rdma_4_9_stable_11/sys/dev/cxgbe/iw_cxgbe/cm.c Tue Mar 27 03:37:04 2018 (r331606) +++ projects/bsd_rdma_4_9_stable_11/sys/dev/cxgbe/iw_cxgbe/cm.c Tue Mar 27 05:25:38 2018 (r331607) @@ -1090,6 +1090,40 @@ terminate(struct sge_iq *iq, const struct rss_header * return 0; } +static struct socket * +dequeue_socket(struct socket *head) +{ + struct socket *so; + struct sockaddr_in *remote; + + ACCEPT_LOCK(); + so = TAILQ_FIRST(&head->so_comp); + if (!so) { + ACCEPT_UNLOCK(); + return NULL; + } + + SOCK_LOCK(so); + /* + * Before changing the flags on the socket, we have to bump the + * reference count. Otherwise, if the protocol calls sofree(), + * the socket will be released due to a zero refcount. + */ + soref(so); + TAILQ_REMOVE(&head->so_comp, so, so_list); + head->so_qlen--; + so->so_qstate &= ~SQ_COMP; + so->so_head = NULL; + so->so_state |= SS_NBIO; + SOCK_UNLOCK(so); + ACCEPT_UNLOCK(); + remote = NULL; + soaccept(so, (struct sockaddr **)&remote); + + free(remote, M_SONAME); + return so; +} + static void process_socket_event(struct c4iw_ep *ep) { @@ -1113,28 +1147,11 @@ process_socket_event(struct c4iw_ep *ep) if (state == LISTEN) { struct c4iw_listen_ep *lep = (struct c4iw_listen_ep *)ep; - struct socket *listen_so = so, *new_so = NULL; - int error = 0; + struct socket *new_so; - SOLISTEN_LOCK(listen_so); - do { - error = solisten_dequeue(listen_so, &new_so, - SOCK_NONBLOCK); - if (error) { - CTR4(KTR_IW_CXGBE, "%s: lep %p listen_so %p " - "error %d", __func__, lep, listen_so, - error); - return; - } + while ((new_so = dequeue_socket(so)) != NULL) { process_newconn(lep, new_so); - - /* solisten_dequeue() unlocks while return, so aquire - * lock again for sol_qlen and also for next iteration. - */ - SOLISTEN_LOCK(listen_so); - } while (listen_so->sol_qlen); - SOLISTEN_UNLOCK(listen_so); - + } return; } From owner-svn-src-projects@freebsd.org Tue Mar 27 05:33:45 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 211C1F4F636 for ; Tue, 27 Mar 2018 05:33:45 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C80BA6E291; Tue, 27 Mar 2018 05:33:44 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C2B2617C28; Tue, 27 Mar 2018 05:33:44 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2R5XieJ094149; Tue, 27 Mar 2018 05:33:44 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2R5Xiio094148; Tue, 27 Mar 2018 05:33:44 GMT (envelope-from np@FreeBSD.org) Message-Id: <201803270533.w2R5Xiio094148@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Tue, 27 Mar 2018 05:33:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r331608 - projects/bsd_rdma_4_9_stable_11/sys/modules/cxgb X-SVN-Group: projects X-SVN-Commit-Author: np X-SVN-Commit-Paths: projects/bsd_rdma_4_9_stable_11/sys/modules/cxgb X-SVN-Commit-Revision: 331608 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Mar 2018 05:33:45 -0000 Author: np Date: Tue Mar 27 05:33:44 2018 New Revision: 331608 URL: https://svnweb.freebsd.org/changeset/base/331608 Log: Disconnect iw_cxgb from the build. Modified: projects/bsd_rdma_4_9_stable_11/sys/modules/cxgb/Makefile Modified: projects/bsd_rdma_4_9_stable_11/sys/modules/cxgb/Makefile ============================================================================== --- projects/bsd_rdma_4_9_stable_11/sys/modules/cxgb/Makefile Tue Mar 27 05:25:38 2018 (r331607) +++ projects/bsd_rdma_4_9_stable_11/sys/modules/cxgb/Makefile Tue Mar 27 05:33:44 2018 (r331608) @@ -6,13 +6,13 @@ SYSDIR?=${SRCTOP}/sys SUBDIR= cxgb SUBDIR+= cxgb_t3fw SUBDIR+= ${_tom} -SUBDIR+= ${_iw_cxgb} +#SUBDIR+= ${_iw_cxgb} .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" _tom= tom -.if ${MK_OFED} != "no" || defined(ALL_MODULES) -_iw_cxgb= iw_cxgb -.endif +#.if ${MK_OFED} != "no" || defined(ALL_MODULES) +#_iw_cxgb= iw_cxgb +#.endif .endif .include From owner-svn-src-projects@freebsd.org Wed Mar 28 08:58:33 2018 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 18615F6C45D for ; Wed, 28 Mar 2018 08:58:33 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C19EF7DE5E; Wed, 28 Mar 2018 08:58:32 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B85DA9D9; Wed, 28 Mar 2018 08:58:32 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2S8wWAc029388; Wed, 28 Mar 2018 08:58:32 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2S8wWY7029387; Wed, 28 Mar 2018 08:58:32 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201803280858.w2S8wWY7029387@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Wed, 28 Mar 2018 08:58:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r331667 - projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp X-SVN-Group: projects X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp X-SVN-Commit-Revision: 331667 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Mar 2018 08:58:33 -0000 Author: hselasky Date: Wed Mar 28 08:58:32 2018 New Revision: 331667 URL: https://svnweb.freebsd.org/changeset/base/331667 Log: Revert r315672 from SDP. This change is not yet available in 11-stable. Sponsored by: Mellanox Technologies Modified: projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c Modified: projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c ============================================================================== --- projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c Wed Mar 28 08:55:31 2018 (r331666) +++ projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c Wed Mar 28 08:58:32 2018 (r331667) @@ -1848,10 +1848,10 @@ sdp_pcblist(SYSCTL_HANDLER_ARGS) xt.xt_inp.inp_lport = ssk->lport; memcpy(&xt.xt_inp.inp_faddr, &ssk->faddr, sizeof(ssk->faddr)); xt.xt_inp.inp_fport = ssk->fport; - xt.t_state = ssk->state; + xt.xt_tp.t_state = ssk->state; if (ssk->socket != NULL) - sotoxsocket(ssk->socket, &xt.xt_inp.xi_socket); - xt.xt_inp.xi_socket.xso_protocol = IPPROTO_TCP; + sotoxsocket(ssk->socket, &xt.xt_socket); + xt.xt_socket.xso_protocol = IPPROTO_TCP; SDP_RUNLOCK(ssk); error = SYSCTL_OUT(req, &xt, sizeof xt); if (error)