From owner-svn-src-projects@freebsd.org Mon Feb 19 09:08:47 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 27ED8F11432 for ; Mon, 19 Feb 2018 09:08:47 +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 CB13368C53; Mon, 19 Feb 2018 09:08:46 +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 A388C18803; Mon, 19 Feb 2018 09:08:46 +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 w1J98kip045889; Mon, 19 Feb 2018 09:08:46 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1J98kTZ045888; Mon, 19 Feb 2018 09:08:46 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201802190908.w1J98kTZ045888@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 19 Feb 2018 09:08:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329557 - projects/bsd_rdma_4_9_stable_11 X-SVN-Group: projects X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: projects/bsd_rdma_4_9_stable_11 X-SVN-Commit-Revision: 329557 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, 19 Feb 2018 09:08:47 -0000 Author: hselasky Date: Mon Feb 19 09:08:46 2018 New Revision: 329557 URL: https://svnweb.freebsd.org/changeset/base/329557 Log: Create a projects branch for backporting projects/bsd_rdma_4_9 to FreeBSD 11-stable. Added: - copied from r329556, stable/11/ Directory Properties: projects/bsd_rdma_4_9_stable_11/ (props changed) From owner-svn-src-projects@freebsd.org Mon Feb 19 12:21:27 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 8E6CBF21641 for ; Mon, 19 Feb 2018 12:21:26 +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 3F4DA71CCA; Mon, 19 Feb 2018 12:21:26 +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 39B3E1A6B9; Mon, 19 Feb 2018 12:21:26 +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 w1JCLQeb054973; Mon, 19 Feb 2018 12:21:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1JCLPid054959; Mon, 19 Feb 2018 12:21:25 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201802191221.w1JCLPid054959@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 19 Feb 2018 12:21:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329564 - in projects/bsd_rdma_4_9_stable_11: . contrib/ofed contrib/ofed/include contrib/ofed/include/infiniband contrib/ofed/include/rdma contrib/ofed/infiniband-diags contrib/ofed/in... X-SVN-Group: projects X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in projects/bsd_rdma_4_9_stable_11: . contrib/ofed contrib/ofed/include contrib/ofed/include/infiniband contrib/ofed/include/rdma contrib/ofed/infiniband-diags contrib/ofed/infiniband-diags/build cont... X-SVN-Commit-Revision: 329564 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, 19 Feb 2018 12:21:27 -0000 Author: hselasky Date: Mon Feb 19 12:21:24 2018 New Revision: 329564 URL: https://svnweb.freebsd.org/changeset/base/329564 Log: MFC r326169 and r326563: RoCE/infiniband upgrade to Linux v4.9 for kernel and userspace. This commit merges projects/bsd_rdma_4_9 to head. List of kernel sources used: ============================ 1) kernel sources were cloned from git://github.com/torvalds/linux.git Top commit 69973b830859bc6529a7a0468ba0d80ee5117826 - tag: v4.9, linux-4.9 2) krping was cloned from https://github.com/larrystevenwise/krping Top commit 292a2f1abf0348285e678a82264740d52e4dcfe4 List of userspace sources used: =============================== 1) rdma-core was cloned from https://github.com/linux-rdma/rdma-core.git Top commit d65138ef93af30b3ea249f3a84aa6a24ba7f8a75 2) OpenSM was cloned from git://git.openfabrics.org/~halr/opensm.git Top commit 85f841cf209f791c89a075048a907020e924528d 3) libibmad was cloned from git://git.openfabrics.org/~iraweiny/libibmad.git Tag 1.3.13 with some additional patches from Mellanox. 4) infiniband-diags was cloned from git://git.openfabrics.org/~iraweiny/infiniband-diags.git Tag 1.6.7 with some additional patches from Mellanox. NOTES: ====== 1) The mthca driver has been removed in kernel and in userspace. 2) All GPLv2 only sources have been removed and where applicable rewritten from scratch under a BSD license. 3) List of fully supported drivers in userspace and kernel: a) iw_cxgbe (Chelsio) b) mlx4ib (Mellanox) c) mlx5ib (Mellanox) 4) WITH_OFED=YES is still required by make in order to build OFED userspace and kernel code. 5) Full support has been added for routable RoCE, RoCE v2. Sponsored by: Mellanox Technologies Added: projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/byteorder.h - copied unchanged from r326169, head/contrib/ofed/include/byteorder.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/byteswap.h - copied unchanged from r326169, head/contrib/ofed/include/byteswap.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/endian.h - copied unchanged from r326169, head/contrib/ofed/include/endian.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/types.h - copied unchanged from r326169, head/contrib/ofed/include/types.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/udma_barrier.h - copied unchanged from r326169, head/contrib/ofed/include/udma_barrier.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/infiniband-diags/ - copied from r326169, head/contrib/ofed/infiniband-diags/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/Makefile - copied unchanged from r326169, head/contrib/ofed/libcxgb4/Makefile projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/config.h - copied unchanged from r326169, head/contrib/ofed/libcxgb4/config.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/cq.c - copied unchanged from r326169, head/contrib/ofed/libcxgb4/cq.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/cxgb4-abi.h - copied unchanged from r326169, head/contrib/ofed/libcxgb4/cxgb4-abi.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/dev.c - copied unchanged from r326169, head/contrib/ofed/libcxgb4/dev.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/libcxgb4.h - copied unchanged from r326169, head/contrib/ofed/libcxgb4/libcxgb4.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/qp.c - copied unchanged from r326169, head/contrib/ofed/libcxgb4/qp.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/t4.h - copied unchanged from r326169, head/contrib/ofed/libcxgb4/t4.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/t4_chip_type.h - copied unchanged from r326169, head/contrib/ofed/libcxgb4/t4_chip_type.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/t4_pci_id_tbl.h - copied unchanged from r326169, head/contrib/ofed/libcxgb4/t4_pci_id_tbl.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/t4_regs.h - copied unchanged from r326169, head/contrib/ofed/libcxgb4/t4_regs.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/t4fw_api.h - copied unchanged from r326169, head/contrib/ofed/libcxgb4/t4fw_api.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/t4fw_ri_api.h - copied unchanged from r326169, head/contrib/ofed/libcxgb4/t4fw_ri_api.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/verbs.c - copied unchanged from r326169, head/contrib/ofed/libcxgb4/verbs.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/Makefile - copied unchanged from r326169, head/contrib/ofed/libibcm/Makefile projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/cm.c - copied unchanged from r326169, head/contrib/ofed/libibcm/cm.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/cm.h - copied unchanged from r326169, head/contrib/ofed/libibcm/cm.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/cm_abi.h - copied unchanged from r326169, head/contrib/ofed/libibcm/cm_abi.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/config.h - copied unchanged from r326169, head/contrib/ofed/libibcm/config.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/libibcm.map - copied unchanged from r326169, head/contrib/ofed/libibcm/libibcm.map projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibmad/ - copied from r326169, head/contrib/ofed/libibmad/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibnetdisc/ - copied from r326169, head/contrib/ofed/libibnetdisc/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibumad/ - copied from r326169, head/contrib/ofed/libibumad/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/Makefile - copied unchanged from r326169, head/contrib/ofed/libibverbs/Makefile projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/alloca.h - copied unchanged from r326169, head/contrib/ofed/libibverbs/alloca.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/arch.h - copied unchanged from r326169, head/contrib/ofed/libibverbs/arch.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/cmd.c - copied unchanged from r326169, head/contrib/ofed/libibverbs/cmd.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/compat-1_0.c - copied unchanged from r326169, head/contrib/ofed/libibverbs/compat-1_0.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/config.h - copied unchanged from r326169, head/contrib/ofed/libibverbs/config.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/device.c - copied unchanged from r326169, head/contrib/ofed/libibverbs/device.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/driver.h - copied unchanged from r326169, head/contrib/ofed/libibverbs/driver.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/enum_strs.c - copied unchanged from r326169, head/contrib/ofed/libibverbs/enum_strs.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/examples/build/devices/ - copied from r326169, head/contrib/ofed/libibverbs/examples/build/devices/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/examples/xsrq_pingpong.c - copied unchanged from r326169, head/contrib/ofed/libibverbs/examples/xsrq_pingpong.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/ibverbs.h - copied unchanged from r326169, head/contrib/ofed/libibverbs/ibverbs.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/init.c - copied unchanged from r326169, head/contrib/ofed/libibverbs/init.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/kern-abi.h - copied unchanged from r326169, head/contrib/ofed/libibverbs/kern-abi.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/libibverbs.map - copied unchanged from r326169, head/contrib/ofed/libibverbs/libibverbs.map projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_alloc_mw.3 - copied unchanged from r326169, head/contrib/ofed/libibverbs/man/ibv_alloc_mw.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_bind_mw.3 - copied unchanged from r326169, head/contrib/ofed/libibverbs/man/ibv_bind_mw.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_create_cq_ex.3 - copied unchanged from r326169, head/contrib/ofed/libibverbs/man/ibv_create_cq_ex.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_create_flow.3 - copied unchanged from r326169, head/contrib/ofed/libibverbs/man/ibv_create_flow.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_create_qp_ex.3 - copied unchanged from r326169, head/contrib/ofed/libibverbs/man/ibv_create_qp_ex.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_create_rwq_ind_table.3 - copied unchanged from r326169, head/contrib/ofed/libibverbs/man/ibv_create_rwq_ind_table.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_create_srq_ex.3 - copied unchanged from r326169, head/contrib/ofed/libibverbs/man/ibv_create_srq_ex.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_create_wq.3 - copied unchanged from r326169, head/contrib/ofed/libibverbs/man/ibv_create_wq.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_get_srq_num.3 - copied unchanged from r326169, head/contrib/ofed/libibverbs/man/ibv_get_srq_num.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_inc_rkey.3 - copied unchanged from r326169, head/contrib/ofed/libibverbs/man/ibv_inc_rkey.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_modify_wq.3 - copied unchanged from r326169, head/contrib/ofed/libibverbs/man/ibv_modify_wq.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_open_qp.3 - copied unchanged from r326169, head/contrib/ofed/libibverbs/man/ibv_open_qp.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_open_xrcd.3 - copied unchanged from r326169, head/contrib/ofed/libibverbs/man/ibv_open_xrcd.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_query_device_ex.3 - copied unchanged from r326169, head/contrib/ofed/libibverbs/man/ibv_query_device_ex.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_query_rt_values_ex.3 - copied unchanged from r326169, head/contrib/ofed/libibverbs/man/ibv_query_rt_values_ex.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_rate_to_mbps.3 - copied unchanged from r326169, head/contrib/ofed/libibverbs/man/ibv_rate_to_mbps.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_rereg_mr.3 - copied unchanged from r326169, head/contrib/ofed/libibverbs/man/ibv_rereg_mr.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_xsrq_pingpong.1 - copied unchanged from r326169, head/contrib/ofed/libibverbs/man/ibv_xsrq_pingpong.1 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/marshall.c - copied unchanged from r326169, head/contrib/ofed/libibverbs/marshall.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/marshall.h - copied unchanged from r326169, head/contrib/ofed/libibverbs/marshall.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/memory.c - copied unchanged from r326169, head/contrib/ofed/libibverbs/memory.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/neigh.c - copied unchanged from r326169, head/contrib/ofed/libibverbs/neigh.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/neigh.h - copied unchanged from r326169, head/contrib/ofed/libibverbs/neigh.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/nl1_compat.h - copied unchanged from r326169, head/contrib/ofed/libibverbs/nl1_compat.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/opcode.h - copied unchanged from r326169, head/contrib/ofed/libibverbs/opcode.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/sa-kern-abi.h - copied unchanged from r326169, head/contrib/ofed/libibverbs/sa-kern-abi.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/sa.h - copied unchanged from r326169, head/contrib/ofed/libibverbs/sa.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/sysfs.c - copied unchanged from r326169, head/contrib/ofed/libibverbs/sysfs.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/verbs.c - copied unchanged from r326169, head/contrib/ofed/libibverbs/verbs.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/verbs.h - copied unchanged from r326169, head/contrib/ofed/libibverbs/verbs.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/Makefile - copied unchanged from r326169, head/contrib/ofed/libmlx4/Makefile projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/buf.c - copied unchanged from r326169, head/contrib/ofed/libmlx4/buf.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/config.h - copied unchanged from r326169, head/contrib/ofed/libmlx4/config.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/cq.c - copied unchanged from r326169, head/contrib/ofed/libmlx4/cq.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/dbrec.c - copied unchanged from r326169, head/contrib/ofed/libmlx4/dbrec.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/doorbell.h - copied unchanged from r326169, head/contrib/ofed/libmlx4/doorbell.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/mlx4-abi.h - copied unchanged from r326169, head/contrib/ofed/libmlx4/mlx4-abi.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/mlx4.c - copied unchanged from r326169, head/contrib/ofed/libmlx4/mlx4.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/mlx4.h - copied unchanged from r326169, head/contrib/ofed/libmlx4/mlx4.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/mmio.h - copied unchanged from r326169, head/contrib/ofed/libmlx4/mmio.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/qp.c - copied unchanged from r326169, head/contrib/ofed/libmlx4/qp.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/srq.c - copied unchanged from r326169, head/contrib/ofed/libmlx4/srq.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/verbs.c - copied unchanged from r326169, head/contrib/ofed/libmlx4/verbs.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/wqe.h - copied unchanged from r326169, head/contrib/ofed/libmlx4/wqe.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx5/ - copied from r326169, head/contrib/ofed/libmlx5/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/Makefile - copied unchanged from r326169, head/contrib/ofed/librdmacm/Makefile projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/acm.c - copied unchanged from r326169, head/contrib/ofed/librdmacm/acm.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/addrinfo.c - copied unchanged from r326169, head/contrib/ofed/librdmacm/addrinfo.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/cma.c - copied unchanged from r326169, head/contrib/ofed/librdmacm/cma.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/cma.h - copied unchanged from r326169, head/contrib/ofed/librdmacm/cma.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/config.h - copied unchanged from r326169, head/contrib/ofed/librdmacm/config.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/build/ucmatose/ - copied from r326169, head/contrib/ofed/librdmacm/examples/build/ucmatose/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/cmtime.c - copied unchanged from r326169, head/contrib/ofed/librdmacm/examples/cmtime.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/common.c - copied unchanged from r326169, head/contrib/ofed/librdmacm/examples/common.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/common.h - copied unchanged from r326169, head/contrib/ofed/librdmacm/examples/common.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/rcopy.c - copied unchanged from r326169, head/contrib/ofed/librdmacm/examples/rcopy.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/rdma_client.c - copied unchanged from r326169, head/contrib/ofed/librdmacm/examples/rdma_client.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/rdma_server.c - copied unchanged from r326169, head/contrib/ofed/librdmacm/examples/rdma_server.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/rdma_xclient.c - copied unchanged from r326169, head/contrib/ofed/librdmacm/examples/rdma_xclient.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/rdma_xserver.c - copied unchanged from r326169, head/contrib/ofed/librdmacm/examples/rdma_xserver.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/riostream.c - copied unchanged from r326169, head/contrib/ofed/librdmacm/examples/riostream.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/rstream.c - copied unchanged from r326169, head/contrib/ofed/librdmacm/examples/rstream.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/udpong.c - copied unchanged from r326169, head/contrib/ofed/librdmacm/examples/udpong.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/ib.h - copied unchanged from r326169, head/contrib/ofed/librdmacm/ib.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/indexer.c - copied unchanged from r326169, head/contrib/ofed/librdmacm/indexer.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/indexer.h - copied unchanged from r326169, head/contrib/ofed/librdmacm/indexer.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/librdmacm.map - copied unchanged from r326169, head/contrib/ofed/librdmacm/librdmacm.map projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/librspreload.map - copied unchanged from r326169, head/contrib/ofed/librdmacm/librspreload.map projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/CMakeLists.txt - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/CMakeLists.txt projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/cmtime.1 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/cmtime.1 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rcopy.1 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rcopy.1 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_client.1 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_client.1 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_create_ep.3 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_create_ep.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_create_srq.3 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_create_srq.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_dereg_mr.3 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_dereg_mr.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_destroy_ep.3 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_destroy_ep.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_destroy_srq.3 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_destroy_srq.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_get_recv_comp.3 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_get_recv_comp.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_get_request.3 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_get_request.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_get_send_comp.3 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_get_send_comp.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_getaddrinfo.3 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_getaddrinfo.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_post_read.3 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_post_read.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_post_readv.3 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_post_readv.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_post_recv.3 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_post_recv.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_post_recvv.3 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_post_recvv.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_post_send.3 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_post_send.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_post_sendv.3 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_post_sendv.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_post_ud_send.3 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_post_ud_send.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_post_write.3 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_post_write.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_post_writev.3 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_post_writev.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_reg_msgs.3 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_reg_msgs.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_reg_read.3 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_reg_read.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_reg_write.3 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_reg_write.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_server.1 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_server.1 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_xclient.1 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_xclient.1 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_xserver.1 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rdma_xserver.1 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/riostream.1 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/riostream.1 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rsocket.7.in - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rsocket.7.in projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rstream.1 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/rstream.1 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/udpong.1 - copied unchanged from r326169, head/contrib/ofed/librdmacm/man/udpong.1 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/preload.c - copied unchanged from r326169, head/contrib/ofed/librdmacm/preload.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/rdma_cma.h - copied unchanged from r326169, head/contrib/ofed/librdmacm/rdma_cma.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/rdma_cma_abi.h - copied unchanged from r326169, head/contrib/ofed/librdmacm/rdma_cma_abi.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/rdma_verbs.h - copied unchanged from r326169, head/contrib/ofed/librdmacm/rdma_verbs.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/rsocket.c - copied unchanged from r326169, head/contrib/ofed/librdmacm/rsocket.c projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/rsocket.h - copied unchanged from r326169, head/contrib/ofed/librdmacm/rsocket.h projects/bsd_rdma_4_9_stable_11/contrib/ofed/opensm/ - copied from r326169, head/contrib/ofed/opensm/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.lib/0/ - copied from r326169, head/contrib/ofed/usr.lib/0/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.lib/1/ - copied from r326169, head/contrib/ofed/usr.lib/1/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.lib/2/ - copied from r326169, head/contrib/ofed/usr.lib/2/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.lib/3/ - copied from r326169, head/contrib/ofed/usr.lib/3/ projects/bsd_rdma_4_9_stable_11/sys/dev/mlx5/mlx5_ib/mlx5_ib_gsi.c - copied unchanged from r326169, head/sys/dev/mlx5/mlx5_ib/mlx5_ib_gsi.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx5/mlx5_ib/mlx5_ib_virt.c - copied unchanged from r326169, head/sys/dev/mlx5/mlx5_ib/mlx5_ib_virt.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_addr.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_addr.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_agent.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_agent.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_cache.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_cache.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_cm.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_cm.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_cma.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_cma.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_cq.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_cq.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_device.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_device.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_fmr_pool.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_fmr_pool.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_iwcm.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_iwcm.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_iwpm_msg.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_iwpm_msg.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_iwpm_util.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_iwpm_util.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_mad.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_mad.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_mad_rmpp.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_mad_rmpp.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_multicast.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_multicast.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_packer.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_packer.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_sa_query.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_sa_query.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_smi.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_smi.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_sysfs.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_sysfs.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_ucm.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_ucm.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_ucma.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_ucma.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_ud_header.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_ud_header.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_umem.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_umem.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_umem_odp.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_umem_odp.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_umem_rbtree.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_umem_rbtree.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_user_mad.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_user_mad.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_uverbs_cmd.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_uverbs_cmd.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_uverbs_main.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_uverbs_main.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_uverbs_marshall.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_uverbs_marshall.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ib_verbs.c - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/ib_verbs.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/iwpm_util.h - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/iwpm_util.h projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/opa_smi.h - copied unchanged from r326169, head/sys/ofed/drivers/infiniband/core/opa_smi.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/ib.h - copied unchanged from r326169, head/sys/ofed/include/rdma/ib.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/ib_hdrs.h - copied unchanged from r326169, head/sys/ofed/include/rdma/ib_hdrs.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/ib_umem_odp.h - copied unchanged from r326169, head/sys/ofed/include/rdma/ib_umem_odp.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/iw_portmap.h - copied unchanged from r326169, head/sys/ofed/include/rdma/iw_portmap.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/opa_port_info.h - copied unchanged from r326169, head/sys/ofed/include/rdma/opa_port_info.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/opa_smi.h - copied unchanged from r326169, head/sys/ofed/include/rdma/opa_smi.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/rdma_vt.h - copied unchanged from r326169, head/sys/ofed/include/rdma/rdma_vt.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/rdmavt_cq.h - copied unchanged from r326169, head/sys/ofed/include/rdma/rdmavt_cq.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/rdmavt_mr.h - copied unchanged from r326169, head/sys/ofed/include/rdma/rdmavt_mr.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/rdmavt_qp.h - copied unchanged from r326169, head/sys/ofed/include/rdma/rdmavt_qp.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/uapi/ - copied from r326169, head/sys/ofed/include/uapi/ Deleted: projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/infiniband/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/rdma/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/AUTHORS projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/COPYING projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/ChangeLog projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/README projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/cxgb4.driver projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/src/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/AUTHORS projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/COPYING projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/ChangeLog projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/INSTALL projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/Makefile.am projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/Makefile.in projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/NEWS projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/README projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/aclocal.m4 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/config/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/config.h.in projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/configure projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/configure.in projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/include/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/libibcm.spec projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/libibcm.spec.in projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/src/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/AUTHORS projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/COPYING projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/ChangeLog projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/Makefile.am projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/README projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/autogen.sh projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/config/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/configure.in projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/debian/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/examples/build/device_list/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/fixes/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/include/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/libibverbs.spec.in projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_create_xrc_rcv_qp.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_modify_xrc_rcv_qp.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_open_xrc_domain.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_query_xrc_rcv_qp.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_reg_xrc_rcv_qp.3 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/verbs.7 projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/src/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/AUTHORS projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/COPYING projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/Makefile.am projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/README projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/autogen.sh projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/config/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/configure.in projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/debian/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/fixes/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/libmlx4.spec.in projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/mlx4.driver projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/src/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmthca/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/AUTHORS projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/COPYING projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/ChangeLog projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/INSTALL projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/Makefile.am projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/Makefile.in projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/NEWS projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/README projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/aclocal.m4 projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/config/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/config.h.in projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/configure projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/configure.in projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/build/cmatose/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/include/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/librdmacm.spec projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/librdmacm.spec.in projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/src/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libsdp/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/management/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.bin/Makefile.inc projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.bin/ibaddr/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.bin/ibnetdiscover/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.bin/ibping/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.bin/ibportstate/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.bin/ibroute/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.bin/ibsendtrap/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.bin/ibstat/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.bin/ibsysstat/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.bin/ibtracert/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.bin/opensm/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.bin/osmtest/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.bin/perfquery/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.bin/saquery/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.bin/sminfo/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.bin/smpdump/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.bin/smpquery/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.bin/vendstat/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.lib/Makefile.inc projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.lib/libcxgb4/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.lib/libibcm/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.lib/libibcommon/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.lib/libibmad/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.lib/libibumad/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.lib/libibverbs/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.lib/libmlx4/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.lib/libmthca/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.lib/libopensm/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.lib/libosmcomp/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.lib/libosmvendor/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.lib/librdmacm/ projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.lib/libsdp/ projects/bsd_rdma_4_9_stable_11/sys/dev/mlx4/mlx4_ib/mlx4_exp.h projects/bsd_rdma_4_9_stable_11/sys/dev/mlx4/mlx4_ib/mlx4_ib_exp.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx4/mlx4_ib/user.h projects/bsd_rdma_4_9_stable_11/sys/dev/mlx5/mlx5_ib/mlx5_ib_roce.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx5/mlx5_ib/user.h projects/bsd_rdma_4_9_stable_11/sys/modules/mthca/ projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/Kconfig projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/Makefile projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/addr.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/agent.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/cache.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/cm.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/cma.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/device.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/fmr_pool.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/iwcm.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/mad.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/mad_rmpp.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/multicast.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/packer.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/peer_mem.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/sa_query.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/smi.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/sysfs.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ucm.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ucma.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/ud_header.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/umem.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/user_mad.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/uverbs_cmd.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/uverbs_main.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/uverbs_marshall.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/verbs.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/debug/Makefile projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/debug/memtrack.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/debug/memtrack.h projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/debug/mtrack.h projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/hw/ projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/ipoib/Kconfig projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/util/Kconfig projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/ib_peer_mem.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/ib_user_cm.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/ib_user_mad.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/ib_user_sa.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/ib_user_verbs.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/ib_user_verbs_exp.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/ib_verbs_exp.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/peer_mem.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/rdma_user_cm.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/sdp_socket.h Modified: projects/bsd_rdma_4_9_stable_11/Makefile.inc1 projects/bsd_rdma_4_9_stable_11/contrib/ofed/Makefile (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/Makefile (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/infiniband-diags/build/Makefile.inc projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibnetdisc/Makefile projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/examples/asyncwatch.c (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/examples/build/Makefile (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/examples/build/Makefile.inc (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/examples/build/asyncwatch/Makefile (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/examples/build/devinfo/Makefile (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/examples/build/rc_pingpong/Makefile (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/examples/build/srq_pingpong/Makefile (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/examples/build/uc_pingpong/Makefile (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/examples/build/ud_pingpong/Makefile (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/examples/device_list.c (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/examples/devinfo.c (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/examples/pingpong.c (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/examples/pingpong.h (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/examples/rc_pingpong.c (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/examples/srq_pingpong.c (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/examples/uc_pingpong.c (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/examples/ud_pingpong.c (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_alloc_pd.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_asyncwatch.1 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_attach_mcast.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_create_ah.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_create_ah_from_wc.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_create_comp_channel.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_create_cq.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_create_qp.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_create_srq.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_devices.1 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_devinfo.1 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_event_type_str.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_fork_init.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_get_async_event.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_get_cq_event.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_get_device_guid.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_get_device_list.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_get_device_name.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_modify_qp.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_modify_srq.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_open_device.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_poll_cq.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_post_recv.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_post_send.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_post_srq_recv.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_query_device.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_query_gid.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_query_pkey.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_query_port.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_query_qp.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_query_srq.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_rate_to_mult.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_rc_pingpong.1 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_reg_mr.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_req_notify_cq.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_resize_cq.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_srq_pingpong.1 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_uc_pingpong.1 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ibv_ud_pingpong.1 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/build/Makefile (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/build/Makefile.inc (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/build/mckey/Makefile (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/build/rping/Makefile (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/build/udaddy/Makefile (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/cmatose.c (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/mckey.c (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/rping.c (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/udaddy.c (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/mckey.1 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_accept.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_ack_cm_event.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_bind_addr.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_cm.7 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_connect.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_create_event_channel.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_create_id.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_create_qp.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_destroy_event_channel.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_destroy_id.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_destroy_qp.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_disconnect.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_event_str.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_free_devices.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_get_cm_event.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_get_devices.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_get_dst_port.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_get_local_addr.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_get_peer_addr.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_get_src_port.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_join_multicast.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_leave_multicast.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_listen.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_migrate_id.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_notify.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_reject.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_resolve_addr.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_resolve_route.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rdma_set_option.3 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/rping.1 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/ucmatose.1 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/udaddy.1 (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/opensm/complib/Makefile projects/bsd_rdma_4_9_stable_11/contrib/ofed/opensm/libopensm/Makefile projects/bsd_rdma_4_9_stable_11/contrib/ofed/opensm/libvendor/Makefile projects/bsd_rdma_4_9_stable_11/contrib/ofed/opensm/opensm/Makefile projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.bin/Makefile (contents, props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/usr.lib/Makefile (contents, props changed) projects/bsd_rdma_4_9_stable_11/share/mk/bsd.libnames.mk projects/bsd_rdma_4_9_stable_11/share/mk/src.libnames.mk projects/bsd_rdma_4_9_stable_11/sys/amd64/conf/NOTES projects/bsd_rdma_4_9_stable_11/sys/conf/files projects/bsd_rdma_4_9_stable_11/sys/conf/kern.pre.mk projects/bsd_rdma_4_9_stable_11/sys/contrib/rdma/krping/krping.c projects/bsd_rdma_4_9_stable_11/sys/contrib/rdma/krping/krping.h projects/bsd_rdma_4_9_stable_11/sys/contrib/rdma/krping/krping_dev.c projects/bsd_rdma_4_9_stable_11/sys/dev/cxgbe/adapter.h projects/bsd_rdma_4_9_stable_11/sys/dev/cxgbe/common/common.h projects/bsd_rdma_4_9_stable_11/sys/dev/cxgbe/common/t4_hw.c projects/bsd_rdma_4_9_stable_11/sys/dev/cxgbe/offload.h projects/bsd_rdma_4_9_stable_11/sys/dev/cxgbe/t4_main.c projects/bsd_rdma_4_9_stable_11/sys/dev/iser/icl_iser.c projects/bsd_rdma_4_9_stable_11/sys/dev/iser/icl_iser.h projects/bsd_rdma_4_9_stable_11/sys/dev/iser/iser_memory.c projects/bsd_rdma_4_9_stable_11/sys/dev/iser/iser_verbs.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx4/device.h projects/bsd_rdma_4_9_stable_11/sys/dev/mlx4/mlx4_ib/mlx4_ib.h projects/bsd_rdma_4_9_stable_11/sys/dev/mlx4/mlx4_ib/mlx4_ib_ah.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx4/mlx4_ib/mlx4_ib_alias_GUID.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx4/mlx4_ib/mlx4_ib_cm.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx4/mlx4_ib/mlx4_ib_cq.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx4/mlx4_ib/mlx4_ib_mad.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx4/mlx4_ib/mlx4_ib_main.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx4/mlx4_ib/mlx4_ib_mcg.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx4/mlx4_ib/mlx4_ib_mr.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx4/mlx4_ib/mlx4_ib_qp.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx4/mlx4_ib/mlx4_ib_srq.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx4/mlx4_ib/mlx4_ib_sysfs.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx5/mlx5_ib/mlx5_ib.h projects/bsd_rdma_4_9_stable_11/sys/dev/mlx5/mlx5_ib/mlx5_ib_ah.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx5/mlx5_ib/mlx5_ib_cq.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx5/mlx5_ib/mlx5_ib_doorbell.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx5/mlx5_ib/mlx5_ib_mad.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx5/mlx5_ib/mlx5_ib_mem.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx5/mlx5_ib/mlx5_ib_mr.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx5/mlx5_ib/mlx5_ib_qp.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx5/mlx5_ib/mlx5_ib_srq.c projects/bsd_rdma_4_9_stable_11/sys/dev/mlx5/qp.h projects/bsd_rdma_4_9_stable_11/sys/i386/conf/NOTES projects/bsd_rdma_4_9_stable_11/sys/modules/Makefile projects/bsd_rdma_4_9_stable_11/sys/modules/cxgbe/iw_cxgbe/Makefile projects/bsd_rdma_4_9_stable_11/sys/modules/ibcore/Makefile projects/bsd_rdma_4_9_stable_11/sys/modules/ipoib/Makefile projects/bsd_rdma_4_9_stable_11/sys/modules/iser/Makefile projects/bsd_rdma_4_9_stable_11/sys/modules/mlx4/Makefile projects/bsd_rdma_4_9_stable_11/sys/modules/mlx4ib/Makefile projects/bsd_rdma_4_9_stable_11/sys/modules/mlx5ib/Makefile projects/bsd_rdma_4_9_stable_11/sys/modules/rdma/krping/Makefile projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/agent.h projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/cm_msgs.h projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/core_priv.h projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/iwcm.h projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/mad_priv.h projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/smi.h projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/core/uverbs.h projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib.h projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_cm.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_ib.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_multicast.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_verbs.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp_cma.c 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_proc.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp_rx.c projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/ib_addr.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/ib_cache.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/ib_cm.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/ib_mad.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/ib_pack.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/ib_pma.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/ib_sa.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/ib_smi.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/ib_umem.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/ib_verbs.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/iw_cm.h projects/bsd_rdma_4_9_stable_11/sys/ofed/include/rdma/rdma_cm.h projects/bsd_rdma_4_9_stable_11/targets/pseudo/userland/lib/Makefile.depend Directory Properties: projects/bsd_rdma_4_9_stable_11/ (props changed) projects/bsd_rdma_4_9_stable_11/MAINTAINERS (props changed) projects/bsd_rdma_4_9_stable_11/cddl/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/atf/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/binutils/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/blacklist/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/bmake/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/byacc/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/compiler-rt/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/dma/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/elftoolchain/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/file/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/gcc/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/ipfilter/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/less/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/libarchive/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/libc++/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/libc-vis/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/libpcap/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/libstdc++/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/libxo/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/llvm/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/mdocml/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/netbsd-tests/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibcm/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/examples/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibverbs/man/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/libmlx4/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/examples/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/man/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/one-true-awk/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/openbsm/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/openpam/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/pjdfstest/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/sqlite3/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/subversion/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/tcpdump/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/top/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/tzdata/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/unbound/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/wpa/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/xz/ (props changed) projects/bsd_rdma_4_9_stable_11/contrib/zlib/ (props changed) projects/bsd_rdma_4_9_stable_11/crypto/heimdal/ (props changed) projects/bsd_rdma_4_9_stable_11/crypto/openssh/ (props changed) projects/bsd_rdma_4_9_stable_11/crypto/openssl/ (props changed) projects/bsd_rdma_4_9_stable_11/gnu/lib/ (props changed) projects/bsd_rdma_4_9_stable_11/gnu/usr.bin/binutils/ (props changed) projects/bsd_rdma_4_9_stable_11/gnu/usr.bin/cc/cc_tools/ (props changed) projects/bsd_rdma_4_9_stable_11/gnu/usr.bin/gdb/ (props changed) projects/bsd_rdma_4_9_stable_11/lib/libc/locale/ascii.c (props changed) projects/bsd_rdma_4_9_stable_11/lib/libedit/ (props changed) projects/bsd_rdma_4_9_stable_11/sys/cddl/contrib/opensolaris/ (props changed) projects/bsd_rdma_4_9_stable_11/sys/contrib/dev/acpica/ (props changed) projects/bsd_rdma_4_9_stable_11/sys/contrib/ena-com/ (props changed) projects/bsd_rdma_4_9_stable_11/sys/contrib/ipfilter/ (props changed) projects/bsd_rdma_4_9_stable_11/sys/contrib/octeon-sdk/ (props changed) projects/bsd_rdma_4_9_stable_11/sys/gnu/dts/arm/ (props changed) projects/bsd_rdma_4_9_stable_11/sys/gnu/dts/include/ (props changed) projects/bsd_rdma_4_9_stable_11/usr.sbin/bhyve/bhyvegc.c (props changed) projects/bsd_rdma_4_9_stable_11/usr.sbin/bhyve/pci_fbuf.c (props changed) projects/bsd_rdma_4_9_stable_11/usr.sbin/bhyve/pci_xhci.c (props changed) projects/bsd_rdma_4_9_stable_11/usr.sbin/bhyve/rfb.c (props changed) projects/bsd_rdma_4_9_stable_11/usr.sbin/bhyve/rfb.h (props changed) projects/bsd_rdma_4_9_stable_11/usr.sbin/bhyve/vga.c (props changed) Modified: projects/bsd_rdma_4_9_stable_11/Makefile.inc1 ============================================================================== --- projects/bsd_rdma_4_9_stable_11/Makefile.inc1 Mon Feb 19 12:20:51 2018 (r329563) +++ projects/bsd_rdma_4_9_stable_11/Makefile.inc1 Mon Feb 19 12:21:24 2018 (r329564) @@ -2135,16 +2135,24 @@ _lib_libradius= lib/libradius .endif .if ${MK_OFED} != "no" -_ofed_lib= contrib/ofed/usr.lib -_prebuild_libs+= contrib/ofed/usr.lib/libosmcomp -_prebuild_libs+= contrib/ofed/usr.lib/libopensm -_prebuild_libs+= contrib/ofed/usr.lib/libibcommon -_prebuild_libs+= contrib/ofed/usr.lib/libibverbs -_prebuild_libs+= contrib/ofed/usr.lib/libibumad +# +# The OFED libraries are built in four steps +# as reflected below, due to interdependencies. +# +# NOTE: Depending on contrib/ofed/include is only needed for +# the lib32 compat build. +# +_ofed_lib= \ +contrib/ofed/include \ +contrib/ofed/usr.lib/0 \ +contrib/ofed/usr.lib/1 \ +contrib/ofed/usr.lib/2 \ +contrib/ofed/usr.lib/3 -contrib/ofed/usr.lib/libopensm__L: lib/libthr__L -contrib/ofed/usr.lib/libosmcomp__L: lib/libthr__L -contrib/ofed/usr.lib/libibumad__L: contrib/ofed/usr.lib/libibcommon__L +contrib/ofed/usr.lib/0__L: contrib/ofed/include__L lib/libthr__L +contrib/ofed/usr.lib/1__L: contrib/ofed/usr.lib/0__L +contrib/ofed/usr.lib/2__L: contrib/ofed/usr.lib/1__L +contrib/ofed/usr.lib/3__L: contrib/ofed/usr.lib/2__L .endif .if ${MK_CASPER} != "no" Modified: projects/bsd_rdma_4_9_stable_11/contrib/ofed/Makefile ============================================================================== --- projects/bsd_rdma_4_9_stable_11/contrib/ofed/Makefile Mon Feb 19 12:20:51 2018 (r329563) +++ projects/bsd_rdma_4_9_stable_11/contrib/ofed/Makefile Mon Feb 19 12:21:24 2018 (r329564) @@ -1,3 +1,10 @@ -SUBDIR = include usr.lib usr.bin +# $FreeBSD$ + +# NOTE: Make sure WITH_OFED=YES is set when building this top-level directory. + +SUBDIR= \ +include \ +usr.lib \ +usr.bin .include Modified: projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/Makefile ============================================================================== --- projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/Makefile Mon Feb 19 12:20:51 2018 (r329563) +++ projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/Makefile Mon Feb 19 12:21:24 2018 (r329564) @@ -1,5 +1,191 @@ -.include +# $FreeBSD$ -SUBDIR = infiniband rdma +IBVERBS= ${.CURDIR}/../libibverbs +IBMAD= ${.CURDIR}/../libibmad +IBUMAD= ${.CURDIR}/../libibumad +IBCM= ${.CURDIR}/../libibcm +IBND= ${.CURDIR}/../libibnetdisc +RDMACM= ${.CURDIR}/../librdmacm +RDMA= ${.CURDIR}/../../../sys/ofed/include/uapi/rdma +OSM= ${.CURDIR}/../opensm/include -.include +IBINCS= \ +byteorder.h \ +byteswap.h \ +endian.h \ +types.h \ +udma_barrier.h \ +${IBVERBS}/arch.h \ +${IBVERBS}/driver.h \ +${IBVERBS}/kern-abi.h \ +${IBVERBS}/marshall.h \ +${IBVERBS}/opcode.h \ +${IBVERBS}/sa-kern-abi.h \ +${IBVERBS}/sa.h \ +${IBVERBS}/verbs.h \ +${IBUMAD}/umad.h \ +${IBUMAD}/umad_cm.h \ +${IBUMAD}/umad_sa.h \ +${IBUMAD}/umad_sm.h \ +${IBUMAD}/umad_str.h \ +${IBUMAD}/umad_types.h \ +${IBMAD}/mad.h \ +${IBMAD}/mad_osd.h \ +${IBCM}/cm.h \ +${IBCM}/cm_abi.h \ +${IBND}/ibnetdisc.h \ +${IBND}/ibnetdisc_osd.h \ +${RDMACM}/ib.h +IBINCSDIR= ${INCLUDEDIR}/infiniband + +RDMAINCS= \ +${RDMACM}/rdma_cma.h \ +${RDMACM}/rdma_cma_abi.h \ +${RDMACM}/rdma_verbs.h \ +${RDMACM}/rsocket.h \ +${RDMA}/ib_user_cm.h \ +${RDMA}/ib_user_sa.h \ +${RDMA}/ib_user_verbs.h \ +${RDMA}/rdma_user_cm.h \ +${RDMA}/mlx4-abi.h \ +${RDMA}/mlx5-abi.h +RDMAINCSDIR= ${INCLUDEDIR}/rdma + +COMPINCS= \ +${OSM}/complib/cl_atomic.h \ +${OSM}/complib/cl_atomic_osd.h \ +${OSM}/complib/cl_byteswap.h \ +${OSM}/complib/cl_byteswap_osd.h \ +${OSM}/complib/cl_comppool.h \ +${OSM}/complib/cl_debug.h \ +${OSM}/complib/cl_debug_osd.h \ +${OSM}/complib/cl_dispatcher.h \ +${OSM}/complib/cl_event.h \ +${OSM}/complib/cl_event_osd.h \ +${OSM}/complib/cl_event_wheel.h \ +${OSM}/complib/cl_fleximap.h \ +${OSM}/complib/cl_list.h \ +${OSM}/complib/cl_log.h \ +${OSM}/complib/cl_map.h \ +${OSM}/complib/cl_math.h \ +${OSM}/complib/cl_nodenamemap.h \ +${OSM}/complib/cl_packoff.h \ +${OSM}/complib/cl_packon.h \ +${OSM}/complib/cl_passivelock.h \ +${OSM}/complib/cl_pool.h \ +${OSM}/complib/cl_ptr_vector.h \ +${OSM}/complib/cl_qcomppool.h \ +${OSM}/complib/cl_qlist.h \ +${OSM}/complib/cl_qmap.h \ +${OSM}/complib/cl_qpool.h \ +${OSM}/complib/cl_spinlock.h \ +${OSM}/complib/cl_spinlock_osd.h \ +${OSM}/complib/cl_thread.h \ +${OSM}/complib/cl_thread_osd.h \ +${OSM}/complib/cl_threadpool.h \ +${OSM}/complib/cl_timer.h \ +${OSM}/complib/cl_timer_osd.h \ +${OSM}/complib/cl_types.h \ +${OSM}/complib/cl_types_osd.h \ +${OSM}/complib/cl_vector.h +COMPINCSDIR= ${INCLUDEDIR}/infiniband/complib + +OSMINCS= \ +${OSM}/opensm/osm_attrib_req.h \ +${OSM}/opensm/osm_base.h \ +${OSM}/opensm/osm_config.h \ +${OSM}/opensm/osm_congestion_control.h \ +${OSM}/opensm/osm_console.h \ +${OSM}/opensm/osm_console_io.h \ +${OSM}/opensm/osm_db.h \ +${OSM}/opensm/osm_db_pack.h \ +${OSM}/opensm/osm_errors.h \ +${OSM}/opensm/osm_event_plugin.h \ +${OSM}/opensm/osm_file_ids.h \ +${OSM}/opensm/osm_guid.h \ +${OSM}/opensm/osm_helper.h \ +${OSM}/opensm/osm_inform.h \ +${OSM}/opensm/osm_lid_mgr.h \ +${OSM}/opensm/osm_log.h \ +${OSM}/opensm/osm_mad_pool.h \ +${OSM}/opensm/osm_madw.h \ +${OSM}/opensm/osm_mcast_mgr.h \ +${OSM}/opensm/osm_mcast_tbl.h \ +${OSM}/opensm/osm_mcm_port.h \ +${OSM}/opensm/osm_mesh.h \ +${OSM}/opensm/osm_msgdef.h \ +${OSM}/opensm/osm_mtree.h \ +${OSM}/opensm/osm_multicast.h \ +${OSM}/opensm/osm_node.h \ +${OSM}/opensm/osm_opensm.h \ +${OSM}/opensm/osm_partition.h \ +${OSM}/opensm/osm_path.h \ +${OSM}/opensm/osm_perfmgr.h \ +${OSM}/opensm/osm_perfmgr_db.h \ +${OSM}/opensm/osm_pkey.h \ +${OSM}/opensm/osm_port.h \ +${OSM}/opensm/osm_port_profile.h \ +${OSM}/opensm/osm_prefix_route.h \ +${OSM}/opensm/osm_qos_policy.h \ +${OSM}/opensm/osm_remote_sm.h \ +${OSM}/opensm/osm_router.h \ +${OSM}/opensm/osm_sa.h \ +${OSM}/opensm/osm_sa_mad_ctrl.h \ +${OSM}/opensm/osm_service.h \ +${OSM}/opensm/osm_sm.h \ +${OSM}/opensm/osm_sm_mad_ctrl.h \ +${OSM}/opensm/osm_stats.h \ +${OSM}/opensm/osm_subnet.h \ +${OSM}/opensm/osm_switch.h \ +${OSM}/opensm/osm_ucast_cache.h \ +${OSM}/opensm/osm_ucast_lash.h \ +${OSM}/opensm/osm_ucast_mgr.h \ +${OSM}/opensm/osm_version.h \ +${OSM}/opensm/osm_vl15intf.h \ +${OSM}/opensm/st.h +OSMINCSDIR= ${INCLUDEDIR}/infiniband/opensm + +IBAINCS= \ +${OSM}/iba/ib_cm_types.h \ +${OSM}/iba/ib_types.h +IBAINCSDIR= ${INCLUDEDIR}/infiniband/iba + +VENDORINCS= \ +${OSM}/vendor/osm_mtl_bind.h \ +${OSM}/vendor/osm_pkt_randomizer.h \ +${OSM}/vendor/osm_ts_useraccess.h \ +${OSM}/vendor/osm_umadt.h \ +${OSM}/vendor/osm_vendor.h \ +${OSM}/vendor/osm_vendor_al.h \ +${OSM}/vendor/osm_vendor_api.h \ +${OSM}/vendor/osm_vendor_ibumad.h \ +${OSM}/vendor/osm_vendor_mlx.h \ +${OSM}/vendor/osm_vendor_mlx_defs.h \ +${OSM}/vendor/osm_vendor_mlx_dispatcher.h \ +${OSM}/vendor/osm_vendor_mlx_hca.h \ +${OSM}/vendor/osm_vendor_mlx_inout.h \ +${OSM}/vendor/osm_vendor_mlx_rmpp_ctx.h \ +${OSM}/vendor/osm_vendor_mlx_sar.h \ +${OSM}/vendor/osm_vendor_mlx_sender.h \ +${OSM}/vendor/osm_vendor_mlx_svc.h \ +${OSM}/vendor/osm_vendor_mlx_transport.h \ +${OSM}/vendor/osm_vendor_mlx_transport_anafa.h \ +${OSM}/vendor/osm_vendor_mlx_txn.h \ +${OSM}/vendor/osm_vendor_mtl.h \ +${OSM}/vendor/osm_vendor_mtl_hca_guid.h \ +${OSM}/vendor/osm_vendor_mtl_transaction_mgr.h \ +${OSM}/vendor/osm_vendor_sa_api.h \ +${OSM}/vendor/osm_vendor_test.h \ +${OSM}/vendor/osm_vendor_ts.h \ +${OSM}/vendor/osm_vendor_umadt.h +VENDORINCSDIR= ${INCLUDEDIR}/infiniband/vendor + +INCSGROUPS= \ +IBINCS \ +RDMAINCS \ +COMPINCS \ +OSMINCS \ +IBAINCS \ +VENDORINCS + +.include Copied: projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/byteorder.h (from r326169, head/contrib/ofed/include/byteorder.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/byteorder.h Mon Feb 19 12:21:24 2018 (r329564, copy of r326169, head/contrib/ofed/include/byteorder.h) @@ -0,0 +1,84 @@ +/*- + * Copyright (c) 2010 Isilon Systems, Inc. + * Copyright (c) 2010 iX Systems, Inc. + * Copyright (c) 2010 Panasas, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#ifndef _INFINIBAND_BYTEORDER_H_ +#define _INFINIBAND_BYTEORDER_H_ + +#include +#include + +#if BYTE_ORDER == LITTLE_ENDIAN +#define __LITTLE_ENDIAN +#else +#define __BIG_ENDIAN +#endif + +#define cpu_to_le64 htole64 +#define le64_to_cpu le64toh +#define cpu_to_le32 htole32 +#define le32_to_cpu le32toh +#define cpu_to_le16 htole16 +#define le16_to_cpu le16toh +#define cpu_to_be64 htobe64 +#define be64_to_cpu be64toh +#define cpu_to_be32 htobe32 +#define be32_to_cpu be32toh +#define cpu_to_be16 htobe16 +#define be16_to_cpu be16toh +#define __be16_to_cpu be16toh + +#define cpu_to_le64p(x) htole64(*((uint64_t *)x)) +#define le64_to_cpup(x) le64toh(*((uint64_t *)x)) +#define cpu_to_le32p(x) htole32(*((uint32_t *)x)) +#define le32_to_cpup(x) le32toh(*((uint32_t *)x)) +#define cpu_to_le16p(x) htole16(*((uint16_t *)x)) +#define le16_to_cpup(x) le16toh(*((uint16_t *)x)) +#define cpu_to_be64p(x) htobe64(*((uint64_t *)x)) +#define be64_to_cpup(x) be64toh(*((uint64_t *)x)) +#define cpu_to_be32p(x) htobe32(*((uint32_t *)x)) +#define be32_to_cpup(x) be32toh(*((uint32_t *)x)) +#define cpu_to_be16p(x) htobe16(*((uint16_t *)x)) +#define be16_to_cpup(x) be16toh(*((uint16_t *)x)) + +#define cpu_to_le64s(x) do { *((uint64_t *)x) = cpu_to_le64p((x)) } while (0) +#define le64_to_cpus(x) do { *((uint64_t *)x) = le64_to_cpup((x)) } while (0) +#define cpu_to_le32s(x) do { *((uint32_t *)x) = cpu_to_le32p((x)) } while (0) +#define le32_to_cpus(x) do { *((uint32_t *)x) = le32_to_cpup((x)) } while (0) +#define cpu_to_le16s(x) do { *((uint16_t *)x) = cpu_to_le16p((x)) } while (0) +#define le16_to_cpus(x) do { *((uint16_t *)x) = le16_to_cpup((x)) } while (0) +#define cpu_to_be64s(x) do { *((uint64_t *)x) = cpu_to_be64p((x)) } while (0) +#define be64_to_cpus(x) do { *((uint64_t *)x) = be64_to_cpup((x)) } while (0) +#define cpu_to_be32s(x) do { *((uint32_t *)x) = cpu_to_be32p((x)) } while (0) +#define be32_to_cpus(x) do { *((uint32_t *)x) = be32_to_cpup((x)) } while (0) +#define cpu_to_be16s(x) do { *((uint16_t *)x) = cpu_to_be16p((x)) } while (0) +#define be16_to_cpus(x) do { *((uint16_t *)x) = be16_to_cpup((x)) } while (0) + +#define swab16 bswap16 +#define swab32 bswap32 +#define swab64 bswap64 + +#endif /* _INFINIBAND_BYTEORDER_H_ */ Copied: projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/byteswap.h (from r326169, head/contrib/ofed/include/byteswap.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/byteswap.h Mon Feb 19 12:21:24 2018 (r329564, copy of r326169, head/contrib/ofed/include/byteswap.h) @@ -0,0 +1,42 @@ +/*- + * Copyright (c) 2010 Isilon Systems, Inc. + * Copyright (c) 2010 iX Systems, Inc. + * Copyright (c) 2010 Panasas, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _INFINIBAND_BYTESWAP_H_ +#define _INFINIBAND_BYTESWAP_H_ +/* + * This file is included for compatibility with the userland libraries + * accompanying the infiniband stack. + */ +#include +#include + +#define bswap_16 bswap16 +#define bswap_32 bswap32 +#define bswap_64 bswap64 + +#endif /* _INFINIBAND_BYTESWAP_H_ */ Copied: projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/endian.h (from r326169, head/contrib/ofed/include/endian.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/endian.h Mon Feb 19 12:21:24 2018 (r329564, copy of r326169, head/contrib/ofed/include/endian.h) @@ -0,0 +1,42 @@ +/*- + * Copyright (c) 2010 Isilon Systems, Inc. + * Copyright (c) 2010 iX Systems, Inc. + * Copyright (c) 2010 Panasas, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +/* + * This file is included for compatibility with the userland libraries + * accompanying the infiniband stack. + */ + +#ifndef _INFINIBAND_ENDIAN_H_ +#define _INFINIBAND_ENDIAN_H_ + +#include +#include +#define __LITTLE_ENDIAN _LITTLE_ENDIAN +#define __BIG_ENDIAN _BIG_ENDIAN +#define __BYTE_ORDER _BYTE_ORDER + +#endif /* _INFINIBAND_ENDIAN_H_ */ Copied: projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/types.h (from r326169, head/contrib/ofed/include/types.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/types.h Mon Feb 19 12:21:24 2018 (r329564, copy of r326169, head/contrib/ofed/include/types.h) @@ -0,0 +1,61 @@ +/*- + * Copyright (c) 2010 Isilon Systems, Inc. + * Copyright (c) 2010 iX Systems, Inc. + * Copyright (c) 2010 Panasas, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#ifndef _INFINIBAND_TYPES_H_ +#define _INFINIBAND_TYPES_H_ + +#include +#include + +typedef int8_t s8; +typedef uint8_t u8; +typedef int8_t __s8; +typedef uint8_t __u8; + +typedef int16_t s16; +typedef uint16_t u16; +typedef int16_t __s16; +typedef uint16_t __u16; + +typedef int32_t s32; +typedef uint32_t u32; +typedef int32_t __s32; +typedef uint32_t __u32; + +typedef int64_t s64; +typedef uint64_t u64; +typedef int64_t __s64; +typedef uint64_t __u64; + +typedef uint16_t __le16; +typedef uint16_t __be16; +typedef uint32_t __le32; +typedef uint32_t __be32; +typedef uint64_t __le64; +typedef uint64_t __be64; + +#endif /* _INFINIBAND_TYPES_H_ */ Copied: projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/udma_barrier.h (from r326169, head/contrib/ofed/include/udma_barrier.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/udma_barrier.h Mon Feb 19 12:21:24 2018 (r329564, copy of r326169, head/contrib/ofed/include/udma_barrier.h) @@ -0,0 +1,261 @@ +/* + * Copyright (c) 2005 Topspin Communications. All rights reserved. + * + * This software is available to you under a choice of one of two + * licenses. You may choose to be licensed under the terms of the GNU + * General Public License (GPL) Version 2, available from the file + * COPYING in the main directory of this source tree, or the + * OpenIB.org BSD license below: + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#ifndef __UTIL_UDMA_BARRIER_H +#define __UTIL_UDMA_BARRIER_H + +#include + +/* Barriers for DMA. + + These barriers are expliclty only for use with user DMA operations. If you + are looking for barriers to use with cache-coherent multi-threaded + consitency then look in stdatomic.h. If you need both kinds of synchronicity + for the same address then use an atomic operation followed by one + of these barriers. + + When reasoning about these barriers there are two objects: + - CPU attached address space (the CPU memory could be a range of things: + cached/uncached/non-temporal CPU DRAM, uncached MMIO space in another + device, pMEM). Generally speaking the ordering is only relative + to the local CPU's view of the system. Eg if the local CPU + is not guaranteed to see a write from another CPU then it is also + OK for the DMA device to also not see the write after the barrier. + - A DMA initiator on a bus. For instance a PCI-E device issuing + MemRd/MemWr TLPs. + + The ordering guarantee is always stated between those two streams. Eg what + happens if a MemRd TLP is sent in via PCI-E relative to a CPU WRITE to the + same memory location. + + The providers have a very regular and predictable use of these barriers, + to make things very clear each narrow use is given a name and the proper + name should be used in the provider as a form of documentation. +*/ + +/* Ensure that the device's view of memory matches the CPU's view of memory. + This should be placed before any MMIO store that could trigger the device + to begin doing DMA, such as a device doorbell ring. + + eg + *dma_buf = 1; + udma_to_device_barrier(); + mmio_write(DO_DMA_REG, dma_buf); + Must ensure that the device sees the '1'. + + This is required to fence writes created by the libibverbs user. Those + writes could be to any CPU mapped memory object with any cachability mode. + + NOTE: x86 has historically used a weaker semantic for this barrier, and + only fenced normal stores to normal memory. libibverbs users using other + memory types or non-temporal stores are required to use SFENCE in their own + code prior to calling verbs to start a DMA. +*/ +#if defined(__i386__) +#define udma_to_device_barrier() asm volatile("" ::: "memory") +#elif defined(__x86_64__) +#define udma_to_device_barrier() asm volatile("" ::: "memory") +#elif defined(__PPC64__) +#define udma_to_device_barrier() asm volatile("sync" ::: "memory") +#elif defined(__PPC__) +#define udma_to_device_barrier() asm volatile("sync" ::: "memory") +#elif defined(__ia64__) +#define udma_to_device_barrier() asm volatile("mf" ::: "memory") +#elif defined(__sparc_v9__) +#define udma_to_device_barrier() asm volatile("membar #StoreStore" ::: "memory") +#elif defined(__aarch64__) +#define udma_to_device_barrier() asm volatile("dsb st" ::: "memory"); +#elif defined(__sparc__) || defined(__s390x__) +#define udma_to_device_barrier() asm volatile("" ::: "memory") +#else +#error No architecture specific memory barrier defines found! +#endif + +/* Ensure that all ordered stores from the device are observable from the + CPU. This only makes sense after something that observes an ordered store + from the device - eg by reading a MMIO register or seeing that CPU memory is + updated. + + This guarantees that all reads that follow the barrier see the ordered + stores that preceded the observation. + + For instance, this would be used after testing a valid bit in a memory + that is a DMA target, to ensure that the following reads see the + data written before the MemWr TLP that set the valid bit. +*/ +#if defined(__i386__) +#define udma_from_device_barrier() asm volatile("lock; addl $0,0(%%esp) " ::: "memory") +#elif defined(__x86_64__) +#define udma_from_device_barrier() asm volatile("lfence" ::: "memory") +#elif defined(__PPC64__) +#define udma_from_device_barrier() asm volatile("lwsync" ::: "memory") +#elif defined(__PPC__) +#define udma_from_device_barrier() asm volatile("sync" ::: "memory") +#elif defined(__ia64__) +#define udma_from_device_barrier() asm volatile("mf" ::: "memory") +#elif defined(__sparc_v9__) +#define udma_from_device_barrier() asm volatile("membar #LoadLoad" ::: "memory") +#elif defined(__aarch64__) +#define udma_from_device_barrier() asm volatile("dsb ld" ::: "memory"); +#elif defined(__sparc__) || defined(__s390x__) +#define udma_from_device_barrier() asm volatile("" ::: "memory") +#else +#error No architecture specific memory barrier defines found! +#endif + +/* Order writes to CPU memory so that a DMA device cannot view writes after + the barrier without also seeing all writes before the barrier. This does + not guarantee any writes are visible to DMA. + + This would be used in cases where a DMA buffer might have a valid bit and + data, this barrier is placed after writing the data but before writing the + valid bit to ensure the DMA device cannot observe a set valid bit with + unwritten data. + + Compared to udma_to_device_barrier() this barrier is not required to fence + anything but normal stores to normal malloc memory. Usage should be: + + write_wqe + udma_to_device_barrier(); // Get user memory ready for DMA + wqe->addr = ...; + wqe->flags = ...; + udma_ordering_write_barrier(); // Guarantee WQE written in order + wqe->valid = 1; +*/ +#define udma_ordering_write_barrier() udma_to_device_barrier() + +/* Promptly flush writes to MMIO Write Cominbing memory. + This should be used after a write to WC memory. This is both a barrier + and a hint to the CPU to flush any buffers to reduce latency to TLP + generation. + + This is not required to have any effect on CPU memory. + + If done while holding a lock then the ordering of MMIO writes across CPUs + must be guaranteed to follow the natural ordering implied by the lock. + + This must also act as a barrier that prevents write combining, eg + *wc_mem = 1; + mmio_flush_writes(); + *wc_mem = 2; + Must always produce two MemWr TLPs, '1' and '2'. Without the barrier + the CPU is allowed to produce a single TLP '2'. + + Note that there is no order guarantee for writes to WC memory without + barriers. + + This is intended to be used in conjunction with WC memory to generate large + PCI-E MemWr TLPs from the CPU. +*/ +#if defined(__i386__) +#define mmio_flush_writes() asm volatile("lock; addl $0,0(%%esp) " ::: "memory") +#elif defined(__x86_64__) +#define mmio_flush_writes() asm volatile("sfence" ::: "memory") +#elif defined(__PPC64__) +#define mmio_flush_writes() asm volatile("sync" ::: "memory") +#elif defined(__PPC__) +#define mmio_flush_writes() asm volatile("sync" ::: "memory") +#elif defined(__ia64__) +#define mmio_flush_writes() asm volatile("fwb" ::: "memory") +#elif defined(__sparc_v9__) +#define mmio_flush_writes() asm volatile("membar #StoreStore" ::: "memory") +#elif defined(__aarch64__) +#define mmio_flush_writes() asm volatile("dsb st" ::: "memory"); +#elif defined(__sparc__) || defined(__s390x__) +#define mmio_flush_writes() asm volatile("" ::: "memory") +#else +#error No architecture specific memory barrier defines found! +#endif + +/* Prevent WC writes from being re-ordered relative to other MMIO + writes. This should be used before a write to WC memory. + + This must act as a barrier to prevent write re-ordering from different + memory types: + *mmio_mem = 1; + mmio_flush_writes(); + *wc_mem = 2; + Must always produce a TLP '1' followed by '2'. + + This barrier implies udma_to_device_barrier() + + This is intended to be used in conjunction with WC memory to generate large + PCI-E MemWr TLPs from the CPU. +*/ +#define mmio_wc_start() mmio_flush_writes() + +/* Keep MMIO writes in order. + Currently we lack writel macros that universally guarantee MMIO + writes happen in order, like the kernel does. Even worse many + providers haphazardly open code writes to MMIO memory omitting even + volatile. + + Until this can be fixed with a proper writel macro, this barrier + is a stand in to indicate places where MMIO writes should be switched + to some future writel. +*/ +#define mmio_ordered_writes_hack() mmio_flush_writes() + +/* Write Combining Spinlock primitive + + Any access to a multi-value WC region must ensure that multiple cpus do not + write to the same values concurrently, these macros make that + straightforward and efficient if the choosen exclusion is a spinlock. + + The spinlock guarantees that the WC writes issued within the critical + section are made visible as TLP to the device. The TLP must be seen by the + device strictly in the order that the spinlocks are acquired, and combining + WC writes between different sections is not permitted. + + Use of these macros allow the fencing inside the spinlock to be combined + with the fencing required for DMA. + */ +static inline void mmio_wc_spinlock(pthread_spinlock_t *lock) +{ + pthread_spin_lock(lock); +#if !defined(__i386__) && !defined(__x86_64__) + /* For x86 the serialization within the spin lock is enough to + * strongly order WC and other memory types. */ + mmio_wc_start(); +#endif +} + +static inline void mmio_wc_spinunlock(pthread_spinlock_t *lock) +{ + /* It is possible that on x86 the atomic in the lock is strong enough + * to force-flush the WC buffers quickly, and this SFENCE can be + * omitted too. */ + mmio_flush_writes(); + pthread_spin_unlock(lock); +} + +#endif Modified: projects/bsd_rdma_4_9_stable_11/contrib/ofed/infiniband-diags/build/Makefile.inc ============================================================================== --- head/contrib/ofed/infiniband-diags/build/Makefile.inc Fri Nov 24 14:50:28 2017 (r326169) +++ projects/bsd_rdma_4_9_stable_11/contrib/ofed/infiniband-diags/build/Makefile.inc Mon Feb 19 12:21:24 2018 (r329564) @@ -4,7 +4,7 @@ BINDIR?= /usr/bin SRCS+= ibdiag_common.c ibdiag_sa.c -CFLAGS+= -I${INCLUDEDIR}/infiniband +CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband CFLAGS+= -DHAVE_CONFIG_H=1 CFLAGS+= -I${.CURDIR}/../../ CFLAGS+= -I${.CURDIR}/../../src Copied: projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/Makefile (from r326169, head/contrib/ofed/libcxgb4/Makefile) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/Makefile Mon Feb 19 12:21:24 2018 (r329564, copy of r326169, head/contrib/ofed/libcxgb4/Makefile) @@ -0,0 +1,19 @@ +# $FreeBSD$ + +.PATH: ${.CURDIR} + +SHLIBDIR?= /usr/lib +LIB= cxgb4 +SHLIB_MAJOR= 1 +MK_PROFILE= no + +SRCS= \ +cq.c \ +dev.c \ +qp.c \ +verbs.c + +LIBADD= ibverbs pthread +CFLAGS+= -I${.CURDIR} + +.include Copied: projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/config.h (from r326169, head/contrib/ofed/libcxgb4/config.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/config.h Mon Feb 19 12:21:24 2018 (r329564, copy of r326169, head/contrib/ofed/libcxgb4/config.h) @@ -0,0 +1,6 @@ +/* $FreeBSD$ */ + +#define ENODATA ECONNREFUSED +#define likely(x) __predict_true(x) +#define unlikely(x) __predict_false(x) + Copied: projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/cq.c (from r326169, head/contrib/ofed/libcxgb4/cq.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libcxgb4/cq.c Mon Feb 19 12:21:24 2018 (r329564, copy of r326169, head/contrib/ofed/libcxgb4/cq.c) @@ -0,0 +1,750 @@ +/* + * Copyright (c) 2006-2016 Chelsio, Inc. All rights reserved. + * + * This software is available to you under a choice of one of two + * licenses. You may choose to be licensed under the terms of the GNU + * General Public License (GPL) Version 2, available from the file + * COPYING in the main directory of this source tree, or the + * OpenIB.org BSD license below: + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#include + +#include +#include +#include +#include +#include +#include "libcxgb4.h" +#include "cxgb4-abi.h" + +static void insert_recv_cqe(struct t4_wq *wq, struct t4_cq *cq) +{ + struct t4_cqe cqe; + + PDBG("%s wq %p cq %p sw_cidx %u sw_pidx %u\n", __func__, + wq, cq, cq->sw_cidx, cq->sw_pidx); + memset(&cqe, 0, sizeof(cqe)); + cqe.header = htobe32(V_CQE_STATUS(T4_ERR_SWFLUSH) | + V_CQE_OPCODE(FW_RI_SEND) | + V_CQE_TYPE(0) | + V_CQE_SWCQE(1) | + V_CQE_QPID(wq->sq.qid)); + cqe.bits_type_ts = htobe64(V_CQE_GENBIT((u64)cq->gen)); + cq->sw_queue[cq->sw_pidx] = cqe; + t4_swcq_produce(cq); +} + +int c4iw_flush_rq(struct t4_wq *wq, struct t4_cq *cq, int count) +{ + int flushed = 0; + int in_use = wq->rq.in_use - count; + + BUG_ON(in_use < 0); + PDBG("%s wq %p cq %p rq.in_use %u skip count %u\n", __func__, + wq, cq, wq->rq.in_use, count); + while (in_use--) { + insert_recv_cqe(wq, cq); + flushed++; + } + return flushed; +} + +static void insert_sq_cqe(struct t4_wq *wq, struct t4_cq *cq, + struct t4_swsqe *swcqe) +{ + struct t4_cqe cqe; + + PDBG("%s wq %p cq %p sw_cidx %u sw_pidx %u\n", __func__, + wq, cq, cq->sw_cidx, cq->sw_pidx); + memset(&cqe, 0, sizeof(cqe)); + cqe.header = htobe32(V_CQE_STATUS(T4_ERR_SWFLUSH) | + V_CQE_OPCODE(swcqe->opcode) | + V_CQE_TYPE(1) | + V_CQE_SWCQE(1) | + V_CQE_QPID(wq->sq.qid)); + CQE_WRID_SQ_IDX(&cqe) = swcqe->idx; + cqe.bits_type_ts = htobe64(V_CQE_GENBIT((u64)cq->gen)); + cq->sw_queue[cq->sw_pidx] = cqe; + t4_swcq_produce(cq); +} + +static void advance_oldest_read(struct t4_wq *wq); + +void c4iw_flush_sq(struct c4iw_qp *qhp) +{ + unsigned short flushed = 0; + struct t4_wq *wq = &qhp->wq; + struct c4iw_cq *chp = to_c4iw_cq(qhp->ibv_qp.send_cq); + struct t4_cq *cq = &chp->cq; + int idx; + struct t4_swsqe *swsqe; + + if (wq->sq.flush_cidx == -1) + wq->sq.flush_cidx = wq->sq.cidx; + idx = wq->sq.flush_cidx; + BUG_ON(idx >= wq->sq.size); + while (idx != wq->sq.pidx) { + swsqe = &wq->sq.sw_sq[idx]; + BUG_ON(swsqe->flushed); + swsqe->flushed = 1; + insert_sq_cqe(wq, cq, swsqe); + if (wq->sq.oldest_read == swsqe) { + BUG_ON(swsqe->opcode != FW_RI_READ_REQ); + advance_oldest_read(wq); + } + flushed++; + if (++idx == wq->sq.size) + idx = 0; + } + wq->sq.flush_cidx += flushed; + if (wq->sq.flush_cidx >= wq->sq.size) + wq->sq.flush_cidx -= wq->sq.size; +} + +static void flush_completed_wrs(struct t4_wq *wq, struct t4_cq *cq) +{ + struct t4_swsqe *swsqe; + unsigned short cidx; + + if (wq->sq.flush_cidx == -1) + wq->sq.flush_cidx = wq->sq.cidx; + cidx = wq->sq.flush_cidx; + BUG_ON(cidx >= wq->sq.size); + + while (cidx != wq->sq.pidx) { + swsqe = &wq->sq.sw_sq[cidx]; + if (!swsqe->signaled) { + if (++cidx == wq->sq.size) + cidx = 0; + } else if (swsqe->complete) { + + BUG_ON(swsqe->flushed); + + /* + * Insert this completed cqe into the swcq. + */ + PDBG("%s moving cqe into swcq sq idx %u cq idx %u\n", + __func__, cidx, cq->sw_pidx); + + swsqe->cqe.header |= htobe32(V_CQE_SWCQE(1)); + cq->sw_queue[cq->sw_pidx] = swsqe->cqe; + t4_swcq_produce(cq); + swsqe->flushed = 1; + if (++cidx == wq->sq.size) + cidx = 0; + wq->sq.flush_cidx = cidx; + } else + break; + } +} + +static void create_read_req_cqe(struct t4_wq *wq, struct t4_cqe *hw_cqe, + struct t4_cqe *read_cqe) +{ + read_cqe->u.scqe.cidx = wq->sq.oldest_read->idx; + read_cqe->len = be32toh(wq->sq.oldest_read->read_len); + read_cqe->header = htobe32(V_CQE_QPID(CQE_QPID(hw_cqe)) | + V_CQE_SWCQE(SW_CQE(hw_cqe)) | + V_CQE_OPCODE(FW_RI_READ_REQ) | + V_CQE_TYPE(1)); + read_cqe->bits_type_ts = hw_cqe->bits_type_ts; +} + +static void advance_oldest_read(struct t4_wq *wq) +{ + + u32 rptr = wq->sq.oldest_read - wq->sq.sw_sq + 1; + + if (rptr == wq->sq.size) + rptr = 0; + while (rptr != wq->sq.pidx) { + wq->sq.oldest_read = &wq->sq.sw_sq[rptr]; + + if (wq->sq.oldest_read->opcode == FW_RI_READ_REQ) + return; + if (++rptr == wq->sq.size) + rptr = 0; + } + wq->sq.oldest_read = NULL; +} + +/* + * Move all CQEs from the HWCQ into the SWCQ. + * Deal with out-of-order and/or completions that complete + * prior unsignalled WRs. + */ +void c4iw_flush_hw_cq(struct c4iw_cq *chp) +{ + struct t4_cqe *hw_cqe, *swcqe, read_cqe; + struct c4iw_qp *qhp; + struct t4_swsqe *swsqe; + int ret; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@freebsd.org Mon Feb 19 12:23:18 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 20F70F21B3B for ; Mon, 19 Feb 2018 12:23:18 +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 C1572721A1; Mon, 19 Feb 2018 12:23:17 +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 BC1AB1A809; Mon, 19 Feb 2018 12:23:17 +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 w1JCNHgs058019; Mon, 19 Feb 2018 12:23:17 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1JCNHet058017; Mon, 19 Feb 2018 12:23:17 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201802191223.w1JCNHet058017@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 19 Feb 2018 12:23:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329566 - projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibnetdisc X-SVN-Group: projects X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibnetdisc X-SVN-Commit-Revision: 329566 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, 19 Feb 2018 12:23:18 -0000 Author: hselasky Date: Mon Feb 19 12:23:17 2018 New Revision: 329566 URL: https://svnweb.freebsd.org/changeset/base/329566 Log: MFC r326716: Correctly define the unordered_map namespace in ofed/libibnetdisc . This should fix ofed/libibnetdisc compilation with C-compilers different from clang and GCC v4.2.1. Submitted by: kib Sponsored by: Mellanox Technologies Modified: projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibnetdisc/Makefile projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibnetdisc/g_hash_table.cpp Directory Properties: projects/bsd_rdma_4_9_stable_11/ (props changed) Modified: projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibnetdisc/Makefile ============================================================================== --- projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibnetdisc/Makefile Mon Feb 19 12:21:56 2018 (r329565) +++ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibnetdisc/Makefile Mon Feb 19 12:23:17 2018 (r329566) @@ -1,5 +1,7 @@ # $FreeBSD$ +.include + .PATH: ${.CURDIR} ${.CURDIR}/man SHLIBDIR?= /usr/lib @@ -28,6 +30,9 @@ LIBADD= osmcomp ibmad ibumad CFLAGS+= -DHAVE_CONFIG_H=1 CFLAGS+= -I${.CURDIR} CFLAGS+= -I${SYSROOT:U${DESTDIR}}/${INCLUDEDIR}/infiniband +.if ${COMPILER_FEATURES:Mc++11} +CXXFLAGS+= -std=c++11 +.endif VERSION_MAP= ${.CURDIR}/libibnetdisc.map .include Modified: projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibnetdisc/g_hash_table.cpp ============================================================================== --- projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibnetdisc/g_hash_table.cpp Mon Feb 19 12:21:56 2018 (r329565) +++ projects/bsd_rdma_4_9_stable_11/contrib/ofed/libibnetdisc/g_hash_table.cpp Mon Feb 19 12:23:17 2018 (r329566) @@ -31,17 +31,17 @@ * */ -#if defined(__clang__) +#if __cplusplus >= 201103L #include -#define HASH_TABLE_UNORDERED_MAP std::unordered_map +#define UM_NAMESPACE std #else #include -#define HASH_TABLE_UNORDERED_MAP std::tr1::unordered_map +#define UM_NAMESPACE std::tr1 #endif class HashTable { public: - HASH_TABLE_UNORDERED_MAP map; + UM_NAMESPACE::unordered_map map; HashTable() { }; ~HashTable() { }; }; From owner-svn-src-projects@freebsd.org Mon Feb 19 12:24:28 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 CE65FF21CDD for ; Mon, 19 Feb 2018 12:24:28 +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 80855722CB; Mon, 19 Feb 2018 12:24:28 +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 7B0571A811; Mon, 19 Feb 2018 12:24:28 +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 w1JCOS8R058128; Mon, 19 Feb 2018 12:24:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1JCOSId058127; Mon, 19 Feb 2018 12:24:28 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201802191224.w1JCOSId058127@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 19 Feb 2018 12:24:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329567 - projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm X-SVN-Group: projects X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm X-SVN-Commit-Revision: 329567 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, 19 Feb 2018 12:24:29 -0000 Author: hselasky Date: Mon Feb 19 12:24:28 2018 New Revision: 329567 URL: https://svnweb.freebsd.org/changeset/base/329567 Log: MFC r326764: ofed: Remove duplicated symbols from the version file. ld.bfd accepts multiple listing of the same symbol in the version script. lld is stricter and errors out. Since arm64 and sometimes amd64 use lld, we should correct this cosmetic issue. Sponsored by: Mellanox Technologies Reviewed by: hselasky Differential revision: https://reviews.freebsd.org/D13329 Modified: projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/librdmacm.map Directory Properties: projects/bsd_rdma_4_9_stable_11/ (props changed) Modified: projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/librdmacm.map ============================================================================== --- projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/librdmacm.map Mon Feb 19 12:23:17 2018 (r329566) +++ projects/bsd_rdma_4_9_stable_11/contrib/ofed/librdmacm/librdmacm.map Mon Feb 19 12:24:28 2018 (r329567) @@ -60,10 +60,6 @@ RDMACM_1.0 { rsetsockopt; rgetsockopt; rfcntl; - rpoll; - rselect; - rdma_get_src_port; - rdma_get_dst_port; riomap; riounmap; riowrite; From owner-svn-src-projects@freebsd.org Mon Feb 19 12:25:32 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 C427DF21E9F for ; Mon, 19 Feb 2018 12:25:32 +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 76C32724D7; Mon, 19 Feb 2018 12:25: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 71B1B1A814; Mon, 19 Feb 2018 12:25: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 w1JCPWQ4058340; Mon, 19 Feb 2018 12:25:32 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1JCPWkR058339; Mon, 19 Feb 2018 12:25:32 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201802191225.w1JCPWkR058339@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 19 Feb 2018 12:25:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329568 - projects/bsd_rdma_4_9_stable_11/contrib/ofed/include X-SVN-Group: projects X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: projects/bsd_rdma_4_9_stable_11/contrib/ofed/include X-SVN-Commit-Revision: 329568 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, 19 Feb 2018 12:25:33 -0000 Author: hselasky Date: Mon Feb 19 12:25:32 2018 New Revision: 329568 URL: https://svnweb.freebsd.org/changeset/base/329568 Log: MFC r326765: ofed: Define barriers for mips and arm. I used the strongest barriers available on the architectures, so if the future analysis show that it is excessive, the barriers could be relaxed. Still, it is unlikely that it is meaningful to run IB on 32bit ARM or current MIPS machines, so the change is to make WITH_OFED to pass tinderbox. Sponsored by: Mellanox Technologies Reviewed by: hselasky Differential revision: https://reviews.freebsd.org/D13329 Modified: projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/udma_barrier.h Directory Properties: projects/bsd_rdma_4_9_stable_11/ (props changed) Modified: projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/udma_barrier.h ============================================================================== --- projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/udma_barrier.h Mon Feb 19 12:24:28 2018 (r329567) +++ projects/bsd_rdma_4_9_stable_11/contrib/ofed/include/udma_barrier.h Mon Feb 19 12:25:32 2018 (r329568) @@ -96,6 +96,14 @@ #define udma_to_device_barrier() asm volatile("dsb st" ::: "memory"); #elif defined(__sparc__) || defined(__s390x__) #define udma_to_device_barrier() asm volatile("" ::: "memory") +#elif defined(__mips__) +#include +#include +#define udma_to_device_barrier() mips_sync() +#elif defined(__arm__) +#include +#include +#define udma_to_device_barrier() dmb() #else #error No architecture specific memory barrier defines found! #endif @@ -128,6 +136,10 @@ #define udma_from_device_barrier() asm volatile("dsb ld" ::: "memory"); #elif defined(__sparc__) || defined(__s390x__) #define udma_from_device_barrier() asm volatile("" ::: "memory") +#elif defined(__mips__) +#define udma_from_device_barrier() mips_sync() +#elif defined(__arm__) +#define udma_from_device_barrier() dmb() #else #error No architecture specific memory barrier defines found! #endif @@ -192,6 +204,10 @@ #define mmio_flush_writes() asm volatile("dsb st" ::: "memory"); #elif defined(__sparc__) || defined(__s390x__) #define mmio_flush_writes() asm volatile("" ::: "memory") +#elif defined(__mips__) +#define mmio_flush_writes() mips_sync() +#elif defined(__arm__) +#define mmio_flush_writes() dmb() #else #error No architecture specific memory barrier defines found! #endif From owner-svn-src-projects@freebsd.org Mon Feb 19 12:33:38 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 D9A58F227BE for ; Mon, 19 Feb 2018 12:33:38 +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 8D51972B23; Mon, 19 Feb 2018 12:33:38 +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 87B451A9C2; Mon, 19 Feb 2018 12:33:38 +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 w1JCXcTa063181; Mon, 19 Feb 2018 12:33:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1JCXcaF063179; Mon, 19 Feb 2018 12:33:38 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201802191233.w1JCXcaF063179@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 19 Feb 2018 12:33:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329569 - 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: 329569 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, 19 Feb 2018 12:33:39 -0000 Author: hselasky Date: Mon Feb 19 12:33:38 2018 New Revision: 329569 URL: https://svnweb.freebsd.org/changeset/base/329569 Log: MFC r303505: sdp: Use an mbufq for received control packets. This is simpler than the hand-rolled queue, and fixes a use-after-free. Sponsored by: EMC / Isilon Storage Division Modified: projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c Directory Properties: projects/bsd_rdma_4_9_stable_11/ (props changed) Modified: projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h ============================================================================== --- projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h Mon Feb 19 12:25:32 2018 (r329568) +++ projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h Mon Feb 19 12:33:38 2018 (r329569) @@ -401,8 +401,7 @@ struct sdp_sock { struct sdp_rx_ring rx_ring; struct sdp_tx_ring tx_ring; struct rwlock lock; - struct mbuf *rx_ctl_q; - struct mbuf *rx_ctl_tail; + struct mbufq rxctlq; /* received control packets */ int qp_active; /* XXX Flag. */ int max_sge; 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 Mon Feb 19 12:25:32 2018 (r329568) +++ projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c Mon Feb 19 12:33:38 2018 (r329569) @@ -469,6 +469,7 @@ sdp_attach(struct socket *so, int proto, struct thread ssk->flags = 0; ssk->qp_active = 0; ssk->state = TCPS_CLOSED; + mbufq_init(&ssk->rxctlq, INT_MAX); SDP_LIST_WLOCK(); LIST_INSERT_HEAD(&sdp_list, ssk, list); sdp_count++; From owner-svn-src-projects@freebsd.org Mon Feb 19 12:34:38 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 AB290F22864 for ; Mon, 19 Feb 2018 12:34:38 +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 5AEB572C25; Mon, 19 Feb 2018 12:34:38 +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 5543F1A9C3; Mon, 19 Feb 2018 12:34:38 +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 w1JCYcKh063272; Mon, 19 Feb 2018 12:34:38 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1JCYcxN063271; Mon, 19 Feb 2018 12:34:38 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201802191234.w1JCYcxN063271@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 19 Feb 2018 12:34:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329570 - 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: 329570 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, 19 Feb 2018 12:34:38 -0000 Author: hselasky Date: Mon Feb 19 12:34:38 2018 New Revision: 329570 URL: https://svnweb.freebsd.org/changeset/base/329570 Log: MFC r303506: sdp: Destroy the PCB lock before freeing to the zone. Sponsored by: EMC / Isilon Storage Division Modified: projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c Directory Properties: projects/bsd_rdma_4_9_stable_11/ (props changed) 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 Mon Feb 19 12:33:38 2018 (r329569) +++ projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c Mon Feb 19 12:34:38 2018 (r329570) @@ -176,8 +176,8 @@ sdp_pcbfree(struct sdp_sock *ssk) sdp_tx_ring_destroy(ssk); sdp_rx_ring_destroy(ssk); rw_destroy(&ssk->rx_ring.destroyed_lock); - uma_zfree(sdp_zone, ssk); rw_destroy(&ssk->lock); + uma_zfree(sdp_zone, ssk); } /* From owner-svn-src-projects@freebsd.org Mon Feb 19 12:37:08 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 F04A2F22A5C for ; Mon, 19 Feb 2018 12:37:07 +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 9E12F72D8B; Mon, 19 Feb 2018 12:37:07 +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 98ED61A9CA; Mon, 19 Feb 2018 12:37:07 +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 w1JCb7dK063420; Mon, 19 Feb 2018 12:37:07 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1JCb7G6063417; Mon, 19 Feb 2018 12:37:07 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201802191237.w1JCb7G6063417@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 19 Feb 2018 12:37:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329571 - 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: 329571 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, 19 Feb 2018 12:37:08 -0000 Author: hselasky Date: Mon Feb 19 12:37:07 2018 New Revision: 329571 URL: https://svnweb.freebsd.org/changeset/base/329571 Log: MFC r303512: sdp: Use malloc(9) instead of the Linux compat layer. SDP transmit and receive rings are always created in a sleepable context, so we can use M_WAITOK and remove error checks. Sponsored by: EMC / Isilon Storage Division Modified: projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h 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_tx.c Directory Properties: projects/bsd_rdma_4_9_stable_11/ (props changed) Modified: projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h ============================================================================== --- projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h Mon Feb 19 12:34:38 2018 (r329570) +++ projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h Mon Feb 19 12:37:07 2018 (r329571) @@ -453,6 +453,8 @@ struct sdp_sock { #define SDP_RLOCK_ASSERT(ssk) rw_assert(&(ssk)->lock, RA_RLOCKED) #define SDP_LOCK_ASSERT(ssk) rw_assert(&(ssk)->lock, RA_LOCKED) +MALLOC_DECLARE(M_SDP); + static inline void tx_sa_reset(struct tx_srcavail_state *tx_sa) { memset((void *)&tx_sa->busy, 0, 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 Mon Feb 19 12:34:38 2018 (r329570) +++ projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c Mon Feb 19 12:37:07 2018 (r329571) @@ -64,6 +64,10 @@ #include __FBSDID("$FreeBSD$"); +#include +#include +#include + #include "sdp.h" #include @@ -86,7 +90,7 @@ RW_SYSINIT(sdplockinit, &sdp_lock, "SDP lock"); #define SDP_LIST_RLOCK_ASSERT() rw_assert(&sdp_lock, RW_RLOCKED) #define SDP_LIST_LOCK_ASSERT() rw_assert(&sdp_lock, RW_LOCKED) -static MALLOC_DEFINE(M_SDP, "sdp", "Socket Direct Protocol"); +MALLOC_DEFINE(M_SDP, "sdp", "Sockets Direct Protocol"); static void sdp_stop_keepalive_timer(struct socket *so); Modified: projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c ============================================================================== --- projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c Mon Feb 19 12:34:38 2018 (r329570) +++ projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp_tx.c Mon Feb 19 12:37:07 2018 (r329571) @@ -432,19 +432,11 @@ sdp_tx_ring_create(struct sdp_sock *ssk, struct ib_dev atomic_set(&ssk->tx_ring.head, 1); atomic_set(&ssk->tx_ring.tail, 1); - ssk->tx_ring.buffer = kzalloc( - sizeof *ssk->tx_ring.buffer * SDP_TX_SIZE, GFP_KERNEL); - if (!ssk->tx_ring.buffer) { - rc = -ENOMEM; - sdp_warn(ssk->socket, "Can't allocate TX Ring size %zd.\n", - sizeof(*ssk->tx_ring.buffer) * SDP_TX_SIZE); + ssk->tx_ring.buffer = malloc(sizeof(*ssk->tx_ring.buffer) * SDP_TX_SIZE, + M_SDP, M_WAITOK); - goto out; - } - tx_cq = ib_create_cq(device, sdp_tx_irq, sdp_tx_cq_event_handler, ssk, &tx_cq_attr); - if (IS_ERR(tx_cq)) { rc = PTR_ERR(tx_cq); sdp_warn(ssk->socket, "Unable to allocate TX CQ: %d.\n", rc); @@ -457,9 +449,8 @@ sdp_tx_ring_create(struct sdp_sock *ssk, struct ib_dev return 0; err_cq: - kfree(ssk->tx_ring.buffer); + free(ssk->tx_ring.buffer, M_SDP); ssk->tx_ring.buffer = NULL; -out: return rc; } @@ -477,8 +468,7 @@ sdp_tx_ring_destroy(struct sdp_sock *ssk) if (ssk->tx_ring.buffer) { sdp_tx_ring_purge(ssk); - - kfree(ssk->tx_ring.buffer); + free(ssk->tx_ring.buffer, M_SDP); ssk->tx_ring.buffer = NULL; } From owner-svn-src-projects@freebsd.org Mon Feb 19 12:38:41 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 78ED4F22C6C for ; Mon, 19 Feb 2018 12:38:41 +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 1F08172F07; Mon, 19 Feb 2018 12:38:41 +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 19FAC1A9CB; Mon, 19 Feb 2018 12:38:41 +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 w1JCcerS063523; Mon, 19 Feb 2018 12:38:40 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1JCceiU063522; Mon, 19 Feb 2018 12:38:40 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201802191238.w1JCceiU063522@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 19 Feb 2018 12:38:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329572 - 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: 329572 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, 19 Feb 2018 12:38:41 -0000 Author: hselasky Date: Mon Feb 19 12:38:40 2018 New Revision: 329572 URL: https://svnweb.freebsd.org/changeset/base/329572 Log: MFC r303513: sdp: Destroy the RDMA ID after destroying the connection's queue pair. This is the ordering documented by rdma_destroy_qp(). Also add a useful KASSERT to sdp_pcbfree(). Sponsored by: EMC / Isilon Storage Division Modified: projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c Directory Properties: projects/bsd_rdma_4_9_stable_11/ (props changed) 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 Mon Feb 19 12:37:07 2018 (r329571) +++ projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c Mon Feb 19 12:38:40 2018 (r329572) @@ -160,7 +160,10 @@ sdp_pcbbind(struct sdp_sock *ssk, struct sockaddr *nam static void sdp_pcbfree(struct sdp_sock *ssk) { + KASSERT(ssk->socket == NULL, ("ssk %p socket still attached", ssk)); + KASSERT((ssk->flags & SDP_DESTROY) == 0, + ("ssk %p already destroyed", ssk)); sdp_dbg(ssk->socket, "Freeing pcb"); SDP_WLOCK_ASSERT(ssk); @@ -171,7 +174,6 @@ sdp_pcbfree(struct sdp_sock *ssk) LIST_REMOVE(ssk, list); SDP_LIST_WUNLOCK(); crfree(ssk->cred); - sdp_destroy_cma(ssk); ssk->qp_active = 0; if (ssk->qp) { ib_destroy_qp(ssk->qp); @@ -179,6 +181,7 @@ sdp_pcbfree(struct sdp_sock *ssk) } sdp_tx_ring_destroy(ssk); sdp_rx_ring_destroy(ssk); + sdp_destroy_cma(ssk); rw_destroy(&ssk->rx_ring.destroyed_lock); rw_destroy(&ssk->lock); uma_zfree(sdp_zone, ssk); From owner-svn-src-projects@freebsd.org Mon Feb 19 12:42:41 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 8A4EFF231B8 for ; Mon, 19 Feb 2018 12:42:41 +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 3C96373425; Mon, 19 Feb 2018 12:42:41 +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 3784D1AB5B; Mon, 19 Feb 2018 12:42:41 +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 w1JCgfwC068898; Mon, 19 Feb 2018 12:42:41 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1JCgfZM068897; Mon, 19 Feb 2018 12:42:41 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201802191242.w1JCgfZM068897@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 19 Feb 2018 12:42:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329573 - 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: 329573 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, 19 Feb 2018 12:42:41 -0000 Author: hselasky Date: Mon Feb 19 12:42:40 2018 New Revision: 329573 URL: https://svnweb.freebsd.org/changeset/base/329573 Log: MFC r315672: Make sdp compilable after r315662. Modified: projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c Directory Properties: projects/bsd_rdma_4_9_stable_11/ (props changed) 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 Mon Feb 19 12:38:40 2018 (r329572) +++ projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/sdp/sdp_main.c Mon Feb 19 12:42:40 2018 (r329573) @@ -1848,12 +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.xt_tp.t_state = ssk->state; + xt.t_state = ssk->state; if (ssk->socket != NULL) - sotoxsocket(ssk->socket, &xt.xt_socket); - else - bzero(&xt.xt_socket, sizeof xt.xt_socket); - xt.xt_socket.xso_protocol = IPPROTO_TCP; + sotoxsocket(ssk->socket, &xt.xt_inp.xi_socket); + xt.xt_inp.xi_socket.xso_protocol = IPPROTO_TCP; SDP_RUNLOCK(ssk); error = SYSCTL_OUT(req, &xt, sizeof xt); if (error) From owner-svn-src-projects@freebsd.org Mon Feb 19 12:48:00 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 1FBB6F236EB for ; Mon, 19 Feb 2018 12:48:00 +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 C3943736BF; Mon, 19 Feb 2018 12:47:59 +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 B965E1AB5D; Mon, 19 Feb 2018 12:47:59 +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 w1JClxau069517; Mon, 19 Feb 2018 12:47:59 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1JClxIg069516; Mon, 19 Feb 2018 12:47:59 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201802191247.w1JClxIg069516@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 19 Feb 2018 12:47:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329574 - projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/ipoib 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/ipoib X-SVN-Commit-Revision: 329574 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, 19 Feb 2018 12:48:00 -0000 Author: hselasky Date: Mon Feb 19 12:47:59 2018 New Revision: 329574 URL: https://svnweb.freebsd.org/changeset/base/329574 Log: MFC r303646: ipoib: Bound the number of egress mbufs buffered during pathrec lookups. In pathological situations where the master subnet manager becomes unresponsive for an extended period, we may otherwise end up queuing all of the system's mbufs while waiting for a response to a path record lookup. This addresses the same issue as commit 1e85b806f9 in Linux. Reviewed by: cem, ngie Sponsored by: EMC / Isilon Storage Division Modified: projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c Directory Properties: projects/bsd_rdma_4_9_stable_11/ (props changed) Modified: projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c ============================================================================== --- projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c Mon Feb 19 12:42:40 2018 (r329573) +++ projects/bsd_rdma_4_9_stable_11/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c Mon Feb 19 12:47:59 2018 (r329574) @@ -685,7 +685,13 @@ ipoib_unicast_send(struct mbuf *mb, struct ipoib_dev_p new_path = 1; } if (path) { - _IF_ENQUEUE(&path->queue, mb); + if (_IF_QLEN(&path->queue) < IPOIB_MAX_PATH_REC_QUEUE) + _IF_ENQUEUE(&path->queue, mb); + else { + if_inc_counter(priv->dev, IFCOUNTER_OERRORS, 1); + m_freem(mb); + } + if (!path->query && path_rec_start(priv, path)) { spin_unlock_irqrestore(&priv->lock, flags); if (new_path) From owner-svn-src-projects@freebsd.org Mon Feb 19 12:52:19 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 EE53AF23CF9 for ; Mon, 19 Feb 2018 12:52:18 +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 9F0D473C8C; Mon, 19 Feb 2018 12:52:18 +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 9A0FE1ACD5; Mon, 19 Feb 2018 12:52:18 +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 w1JCqIq3073854; Mon, 19 Feb 2018 12:52:18 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1JCqIKM073848; Mon, 19 Feb 2018 12:52:18 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201802191252.w1JCqIKM073848@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Mon, 19 Feb 2018 12:52:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329575 - in projects/bsd_rdma_4_9_stable_11/sys: amd64/conf conf dev/mthca i386/conf modules modules/mthca ofed/include/uapi/rdma X-SVN-Group: projects X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: in projects/bsd_rdma_4_9_stable_11/sys: amd64/conf conf dev/mthca i386/conf modules modules/mthca ofed/include/uapi/rdma X-SVN-Commit-Revision: 329575 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, 19 Feb 2018 12:52:19 -0000 Author: hselasky Date: Mon Feb 19 12:52:17 2018 New Revision: 329575 URL: https://svnweb.freebsd.org/changeset/base/329575 Log: MFC r329222: Import the mthca kernel side infiniband driver from Linux 4.9 and fix compilation under FreeBSD. The mthca driver was temporarily removed as part of the Linux 4.9 RoCE/infinband upgrade. Top commit in Linux source tree: 69973b830859bc6529a7a0468ba0d80ee5117826 Sponsored by: Mellanox Technologies Added: projects/bsd_rdma_4_9_stable_11/sys/dev/mthca/ - copied from r329222, head/sys/dev/mthca/ projects/bsd_rdma_4_9_stable_11/sys/modules/mthca/ - copied from r329222, head/sys/modules/mthca/ projects/bsd_rdma_4_9_stable_11/sys/ofed/include/uapi/rdma/mthca-abi.h - copied unchanged from r329222, head/sys/ofed/include/uapi/rdma/mthca-abi.h Modified: projects/bsd_rdma_4_9_stable_11/sys/amd64/conf/NOTES projects/bsd_rdma_4_9_stable_11/sys/conf/files projects/bsd_rdma_4_9_stable_11/sys/i386/conf/NOTES projects/bsd_rdma_4_9_stable_11/sys/modules/Makefile Directory Properties: projects/bsd_rdma_4_9_stable_11/ (props changed) Modified: projects/bsd_rdma_4_9_stable_11/sys/amd64/conf/NOTES ============================================================================== --- projects/bsd_rdma_4_9_stable_11/sys/amd64/conf/NOTES Mon Feb 19 12:47:59 2018 (r329574) +++ projects/bsd_rdma_4_9_stable_11/sys/amd64/conf/NOTES Mon Feb 19 12:52:17 2018 (r329575) @@ -323,6 +323,7 @@ options DRM_DEBUG # Include debug printfs (slow) # Requires the iwn firmware module # ixl: Intel XL710 40Gbe PCIE Ethernet # ixlv: Intel XL710 40Gbe VF PCIE Ethernet +# mthca: Mellanox HCA InfiniBand # mlx4ib: Mellanox ConnectX HCA InfiniBand # mlx4en: Mellanox ConnectX HCA Ethernet # nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source) @@ -342,6 +343,7 @@ device iwn # Intel 4965/1000/5000/6000 wireless NICs device ixl # Intel XL710 40Gbe PCIE Ethernet options IXL_IW # Enable iWARP Client Interface in ixl(4) device ixlv # Intel XL710 40Gbe VF PCIE Ethernet +device mthca # Mellanox HCA InfiniBand device mlx4 # Shared code module between IB and Ethernet device mlx4ib # Mellanox ConnectX HCA InfiniBand device mlx4en # Mellanox ConnectX HCA Ethernet Modified: projects/bsd_rdma_4_9_stable_11/sys/conf/files ============================================================================== --- projects/bsd_rdma_4_9_stable_11/sys/conf/files Mon Feb 19 12:47:59 2018 (r329574) +++ projects/bsd_rdma_4_9_stable_11/sys/conf/files Mon Feb 19 12:52:17 2018 (r329575) @@ -4290,6 +4290,43 @@ ofed/drivers/infiniband/ulp/sdp/sdp_cma.c optional sdp ofed/drivers/infiniband/ulp/sdp/sdp_tx.c optional sdp inet \ compile-with "${OFED_C} -I$S/ofed/drivers/infiniband/ulp/sdp/" +dev/mthca/mthca_allocator.c optional mthca pci ofed \ + compile-with "${OFED_C}" +dev/mthca/mthca_av.c optional mthca pci ofed \ + compile-with "${OFED_C}" +dev/mthca/mthca_catas.c optional mthca pci ofed \ + compile-with "${OFED_C}" +dev/mthca/mthca_cmd.c optional mthca pci ofed \ + compile-with "${OFED_C}" +dev/mthca/mthca_cq.c optional mthca pci ofed \ + compile-with "${OFED_C}" +dev/mthca/mthca_eq.c optional mthca pci ofed \ + compile-with "${OFED_C}" +dev/mthca/mthca_mad.c optional mthca pci ofed \ + compile-with "${OFED_C}" +dev/mthca/mthca_main.c optional mthca pci ofed \ + compile-with "${OFED_C}" +dev/mthca/mthca_mcg.c optional mthca pci ofed \ + compile-with "${OFED_C}" +dev/mthca/mthca_memfree.c optional mthca pci ofed \ + compile-with "${OFED_C}" +dev/mthca/mthca_mr.c optional mthca pci ofed \ + compile-with "${OFED_C}" +dev/mthca/mthca_pd.c optional mthca pci ofed \ + compile-with "${OFED_C}" +dev/mthca/mthca_profile.c optional mthca pci ofed \ + compile-with "${OFED_C}" +dev/mthca/mthca_provider.c optional mthca pci ofed \ + compile-with "${OFED_C}" +dev/mthca/mthca_qp.c optional mthca pci ofed \ + compile-with "${OFED_C}" +dev/mthca/mthca_reset.c optional mthca pci ofed \ + compile-with "${OFED_C}" +dev/mthca/mthca_srq.c optional mthca pci ofed \ + compile-with "${OFED_C}" +dev/mthca/mthca_uar.c optional mthca pci ofed \ + compile-with "${OFED_C}" + dev/mlx4/mlx4_ib/mlx4_ib_alias_GUID.c optional mlx4ib pci ofed \ compile-with "${OFED_C}" dev/mlx4/mlx4_ib/mlx4_ib_mcg.c optional mlx4ib pci ofed \ Modified: projects/bsd_rdma_4_9_stable_11/sys/i386/conf/NOTES ============================================================================== --- projects/bsd_rdma_4_9_stable_11/sys/i386/conf/NOTES Mon Feb 19 12:47:59 2018 (r329574) +++ projects/bsd_rdma_4_9_stable_11/sys/i386/conf/NOTES Mon Feb 19 12:52:17 2018 (r329575) @@ -580,6 +580,7 @@ hint.mse.0.irq="5" # iwn: Intel Wireless WiFi Link 1000/105/135/2000/4965/5000/6000/6050 abgn # 802.11 network adapters # Requires the iwn firmware module +# mthca: Mellanox HCA InfiniBand # mlx4ib: Mellanox ConnectX HCA InfiniBand # mlx4en: Mellanox ConnectX HCA Ethernet # nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source) @@ -625,6 +626,7 @@ hint.le.0.at="isa" hint.le.0.port="0x280" hint.le.0.irq="10" hint.le.0.drq="0" +device mthca # Mellanox HCA InfiniBand device mlx4 # Shared code module between IB and Ethernet device mlx4ib # Mellanox ConnectX HCA InfiniBand device mlx4en # Mellanox ConnectX HCA Ethernet Modified: projects/bsd_rdma_4_9_stable_11/sys/modules/Makefile ============================================================================== --- projects/bsd_rdma_4_9_stable_11/sys/modules/Makefile Mon Feb 19 12:47:59 2018 (r329574) +++ projects/bsd_rdma_4_9_stable_11/sys/modules/Makefile Mon Feb 19 12:52:17 2018 (r329575) @@ -261,6 +261,7 @@ SUBDIR= \ msdosfs_iconv \ ${_mse} \ msk \ + ${_mthca} \ mvs \ mwl \ ${_mwlfw} \ @@ -674,6 +675,7 @@ _mlx4en= mlx4en _mlx5en= mlx5en .endif .if ${MK_OFED} != "no" || defined(ALL_MODULES) +_mthca= mthca _mlx4ib= mlx4ib _mlx5ib= mlx5ib .endif Copied: projects/bsd_rdma_4_9_stable_11/sys/ofed/include/uapi/rdma/mthca-abi.h (from r329222, head/sys/ofed/include/uapi/rdma/mthca-abi.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bsd_rdma_4_9_stable_11/sys/ofed/include/uapi/rdma/mthca-abi.h Mon Feb 19 12:52:17 2018 (r329575, copy of r329222, head/sys/ofed/include/uapi/rdma/mthca-abi.h) @@ -0,0 +1,111 @@ +/* + * Copyright (c) 2005 Topspin Communications. All rights reserved. + * Copyright (c) 2005, 2006 Cisco Systems. All rights reserved. + * + * This software is available to you under a choice of one of two + * licenses. You may choose to be licensed under the terms of the GNU + * General Public License (GPL) Version 2, available from the file + * COPYING in the main directory of this source tree, or the + * OpenIB.org BSD license below: + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above + * copyright notice, this list of conditions and the following + * disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#ifndef MTHCA_ABI_USER_H +#define MTHCA_ABI_USER_H + +#include + +/* + * Increment this value if any changes that break userspace ABI + * compatibility are made. + */ +#define MTHCA_UVERBS_ABI_VERSION 1 + +/* + * Make sure that all structs defined in this file remain laid out so + * that they pack the same way on 32-bit and 64-bit architectures (to + * avoid incompatibility between 32-bit userspace and 64-bit kernels). + * In particular do not use pointer types -- pass pointers in __u64 + * instead. + */ +struct mthca_alloc_ucontext_resp { + __u32 qp_tab_size; + __u32 uarc_size; +}; + +struct mthca_alloc_pd_resp { + __u32 pdn; + __u32 reserved; +}; + +/* + * Mark the memory region with a DMA attribute that causes + * in-flight DMA to be flushed when the region is written to: + */ +#define MTHCA_MR_DMASYNC 0x1 + +struct mthca_reg_mr { + __u32 mr_attrs; + __u32 reserved; +}; + +struct mthca_create_cq { + __u32 lkey; + __u32 pdn; + __u64 arm_db_page; + __u64 set_db_page; + __u32 arm_db_index; + __u32 set_db_index; +}; + +struct mthca_create_cq_resp { + __u32 cqn; + __u32 reserved; +}; + +struct mthca_resize_cq { + __u32 lkey; + __u32 reserved; +}; + +struct mthca_create_srq { + __u32 lkey; + __u32 db_index; + __u64 db_page; +}; + +struct mthca_create_srq_resp { + __u32 srqn; + __u32 reserved; +}; + +struct mthca_create_qp { + __u32 lkey; + __u32 reserved; + __u64 sq_db_page; + __u64 rq_db_page; + __u32 sq_db_index; + __u32 rq_db_index; +}; +#endif /* MTHCA_ABI_USER_H */ From owner-svn-src-projects@freebsd.org Mon Feb 19 18:14:12 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 CF31BF1740B for ; Mon, 19 Feb 2018 18:14:12 +0000 (UTC) (envelope-from asomers@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 7FC5383BEC; Mon, 19 Feb 2018 18:14:12 +0000 (UTC) (envelope-from asomers@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 7AE141E0B7; Mon, 19 Feb 2018 18:14:12 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1JIECUL057162; Mon, 19 Feb 2018 18:14:12 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1JIECrI057161; Mon, 19 Feb 2018 18:14:12 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802191814.w1JIECrI057161@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Mon, 19 Feb 2018 18:14:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329597 - projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot X-SVN-Commit-Revision: 329597 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, 19 Feb 2018 18:14:13 -0000 Author: asomers Date: Mon Feb 19 18:14:12 2018 New Revision: 329597 URL: https://svnweb.freebsd.org/changeset/base/329597 Log: No longer skip snapshot_019_pos, now that PR 225795 is fixed PR: 225795 Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh Mon Feb 19 18:11:35 2018 (r329596) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh Mon Feb 19 18:14:12 2018 (r329597) @@ -567,7 +567,6 @@ snapshot_019_pos_body() . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg - atf_skip "PR 225795 panic: found unreferenced mountpoint when accessing and unmounting snapshots in parallel" verify_disk_count "$DISKS" 1 ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/snapshot_019_pos.ksh || atf_fail "Testcase failed" From owner-svn-src-projects@freebsd.org Tue Feb 20 18:42:09 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 C121DF1F98A for ; Tue, 20 Feb 2018 18:42:09 +0000 (UTC) (envelope-from asomers@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 71EF886245; Tue, 20 Feb 2018 18:42:09 +0000 (UTC) (envelope-from asomers@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 6CCA1582B; Tue, 20 Feb 2018 18:42:09 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1KIg99I094430; Tue, 20 Feb 2018 18:42:09 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1KIg980094426; Tue, 20 Feb 2018 18:42:09 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802201842.w1KIg980094426@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 20 Feb 2018 18:42:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329652 - in projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root: zfs_get zfs_mount X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root: zfs_get zfs_mount X-SVN-Commit-Revision: 329652 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, 20 Feb 2018 18:42:10 -0000 Author: asomers Date: Tue Feb 20 18:42:08 2018 New Revision: 329652 URL: https://svnweb.freebsd.org/changeset/base/329652 Log: Update ZFS tests now that PR 221985 is fixed tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_003_pos.ksh tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_007_pos.ksh Convert Illumos syntax => FreeBSD syntax tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_test.sh Clear expected failure for zfs_get_003_pos tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_007_pos.ksh Remove the "devices" property. Unlike on Illumos, on FreeBSD it can't be changed temporarily (or at all). tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh Remove the expected failure for zfs_mount_007_pos due to 221985, but add a new expected failure due to PR 115361. PR: 221985 PR: 115361 Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_003_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_test.sh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_007_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_003_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_003_pos.ksh Tue Feb 20 18:33:45 2018 (r329651) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_003_pos.ksh Tue Feb 20 18:42:08 2018 (r329652) @@ -40,7 +40,7 @@ # # STRATEGY: # 1. Create pool and filesystem. -# 2. 'zfs mount -o remount,noatime .' +# 2. 'zfs mount -o update,noatime .' # 3. Verify the value of 'zfs get atime' and 'zfs get all | grep atime' # are identical. # @@ -58,14 +58,14 @@ verify_runnable "both" function cleanup { - log_must $ZFS mount -o remount,atime $TESTPOOL/$TESTFS + log_must $ZFS mount -o update,atime $TESTPOOL/$TESTFS } log_assert "'zfs get' should get consistent report with different option." log_onexit cleanup log_must $ZFS set atime=on $TESTPOOL/$TESTFS -log_must $ZFS mount -o remount,noatime $TESTPOOL/$TESTFS +log_must $ZFS mount -o update,noatime $TESTPOOL/$TESTFS value1=$($ZFS get -H atime $TESTPOOL/$TESTFS | $AWK '{print $3}') value2=$($ZFS get -H all $TESTPOOL/$TESTFS | $AWK '{print $2 " " $3}' | \ Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_test.sh Tue Feb 20 18:33:45 2018 (r329651) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_get/zfs_get_test.sh Tue Feb 20 18:42:08 2018 (r329652) @@ -88,7 +88,6 @@ zfs_get_003_pos_head() } zfs_get_003_pos_body() { - atf_expect_fail "kern/221985 - zfs mount -o remount is broken" . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zfs_get_list_d.kshlib . $(atf_get_srcdir)/zfs_get_common.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_007_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_007_pos.ksh Tue Feb 20 18:33:45 2018 (r329651) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_007_pos.ksh Tue Feb 20 18:42:08 2018 (r329652) @@ -42,7 +42,6 @@ # # PROPERTY MOUNT OPTION # atime atime/noatime -# devices devices/nodevices # exec exec/noexec # readonly ro/rw # setuid setuid/nosetuid @@ -74,7 +73,7 @@ log_assert "Verify '-o' will set filesystem property t "without affecting the property that is stored on disk." log_onexit cleanup -set -A properties "atime" "devices" "exec" "readonly" "setuid" +set -A properties "atime" "exec" "readonly" "setuid" # # Get the specified filesystem property reverse mount option. @@ -89,7 +88,6 @@ function get_reverse_option # Define property value: "reverse if value=on" "reverse if value=off" set -A values "noatime" "atime" \ - "nodevices" "devices" \ "noexec" "exec" \ "rw" "ro" \ "nosetuid" "setuid" @@ -127,19 +125,13 @@ for property in ${properties[@]}; do # Set filesystem property temporarily reverse_opt=$(get_reverse_option $fs $property) - log_must $ZFS mount -o remount,$reverse_opt $fs + log_must $ZFS mount -o update,$reverse_opt $fs cur_val=$(get_prop $property $fs) (($? != 0)) && log_fail "get_prop $property $fs" - # In LZ, a user with all zone privileges can never with "devices" - if ! is_global_zone && [[ $property == devices ]] ; then - if [[ $cur_val != off || $orig_val != off ]]; then - log_fail "'devices' property shouldn't " \ - "be enabled in LZ" - fi - elif [[ $orig_val == $cur_val ]]; then - log_fail "zfs mount -o remount,$reverse_opt " \ + if [[ $orig_val == $cur_val ]]; then + log_fail "zfs mount -o update,$reverse_opt " \ "doesn't change property." fi @@ -150,7 +142,7 @@ for property in ${properties[@]}; do cur_val=$(get_prop $property $fs) (($? != 0)) && log_fail "get_prop $property $fs" if [[ $orig_val != $cur_val ]]; then - log_fail "zfs mount -o remount,$reverse_opt " \ + log_fail "zfs mount -o update,$reverse_opt " \ "change the property that is stored on disks" fi done Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh Tue Feb 20 18:33:45 2018 (r329651) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh Tue Feb 20 18:42:08 2018 (r329652) @@ -194,12 +194,12 @@ zfs_mount_007_pos_head() } zfs_mount_007_pos_body() { - atf_expect_fail "kern/221985 - zfs mount -o remount is broken" . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zfs_mount.kshlib . $(atf_get_srcdir)/zfs_mount.cfg verify_disk_count "$DISKS" 1 + atf_expect_fail "PR 115361 zfs get setuid doesn't reflect setuid state as set by zfs mount" ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/zfs_mount_007_pos.ksh || atf_fail "Testcase failed" } From owner-svn-src-projects@freebsd.org Tue Feb 20 18:45: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 741A7F1FF6D for ; Tue, 20 Feb 2018 18:45:39 +0000 (UTC) (envelope-from asomers@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 22809866FA; Tue, 20 Feb 2018 18:45:39 +0000 (UTC) (envelope-from asomers@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 1D8A45859; Tue, 20 Feb 2018 18:45:39 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1KIjctO094758; Tue, 20 Feb 2018 18:45:38 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1KIjcVQ094756; Tue, 20 Feb 2018 18:45:38 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802201845.w1KIjcVQ094756@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Tue, 20 Feb 2018 18:45:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329653 - projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount X-SVN-Commit-Revision: 329653 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, 20 Feb 2018 18:45:39 -0000 Author: asomers Date: Tue Feb 20 18:45:38 2018 New Revision: 329653 URL: https://svnweb.freebsd.org/changeset/base/329653 Log: Fix zfs_mount_008_pos tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_008_pos.ksh Illumos syntax => FreeBSD syntax. All FreeBSD mounts are the equivalent of Illumos's overlay mounts. tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh Don't skip this test. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_008_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_008_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_008_pos.ksh Tue Feb 20 18:42:08 2018 (r329652) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_008_pos.ksh Tue Feb 20 18:45:38 2018 (r329653) @@ -85,8 +85,7 @@ log_must $MKFILE 1M $testfile $testfile1 log_must $ZFS unmount $fs1 log_must $ZFS set mountpoint=$mntpnt $fs1 -log_mustnot $ZFS mount $fs1 -log_must $ZFS mount -O $fs1 +log_must $ZFS mount $fs1 # Create new file in override mountpoint log_must $MKFILE 1M $mntpnt/$TESTFILE2 Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh Tue Feb 20 18:42:08 2018 (r329652) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/zfs_mount_test.sh Tue Feb 20 18:45:38 2018 (r329653) @@ -221,8 +221,6 @@ zfs_mount_008_pos_head() } zfs_mount_008_pos_body() { - [[ `uname -s` = "FreeBSD" ]] && \ - atf_skip "Overlay mounts are not supported on FreeBSD" . $(atf_get_srcdir)/../../../include/default.cfg . $(atf_get_srcdir)/zfs_mount.kshlib . $(atf_get_srcdir)/zfs_mount.cfg From owner-svn-src-projects@freebsd.org Wed Feb 21 20:55:53 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 85B2FF29732 for ; Wed, 21 Feb 2018 20:55:53 +0000 (UTC) (envelope-from asomers@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 31C59727CB; Wed, 21 Feb 2018 20:55:53 +0000 (UTC) (envelope-from asomers@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 286601DA3F; Wed, 21 Feb 2018 20:55:53 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1LKtrLE001807; Wed, 21 Feb 2018 20:55:53 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1LKtr2T001806; Wed, 21 Feb 2018 20:55:53 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802212055.w1LKtr2T001806@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 21 Feb 2018 20:55:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329751 - projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd X-SVN-Commit-Revision: 329751 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, 21 Feb 2018 20:55:53 -0000 Author: asomers Date: Wed Feb 21 20:55:52 2018 New Revision: 329751 URL: https://svnweb.freebsd.org/changeset/base/329751 Log: Remove an obsolete cleanup step from hotspare_007_pos We no longer need this after the gnop conversion Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh Wed Feb 21 20:45:43 2018 (r329750) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd_hotspare_007_pos.ksh Wed Feb 21 20:55:52 2018 (r329751) @@ -62,8 +62,6 @@ verify_runnable "global" log_assert "zfsd will spare missing drives on startup" -log_onexit autoreplace_cleanup - function verify_assertion # spare_dev { From owner-svn-src-projects@freebsd.org Wed Feb 21 20:56:29 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 7FA32F297A1 for ; Wed, 21 Feb 2018 20:56:29 +0000 (UTC) (envelope-from asomers@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 2D8E5728C0; Wed, 21 Feb 2018 20:56:29 +0000 (UTC) (envelope-from asomers@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 27F821DA40; Wed, 21 Feb 2018 20:56:29 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1LKuTUH001877; Wed, 21 Feb 2018 20:56:29 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1LKuTxm001876; Wed, 21 Feb 2018 20:56:29 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802212056.w1LKuTxm001876@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 21 Feb 2018 20:56:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329752 - projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd X-SVN-Commit-Revision: 329752 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, 21 Feb 2018 20:56:29 -0000 Author: asomers Date: Wed Feb 21 20:56:28 2018 New Revision: 329752 URL: https://svnweb.freebsd.org/changeset/base/329752 Log: Fix zfsd_degrade_001_pos. $TESTPOOL was running out of space. Reduce the size of the data that we generate. Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib Wed Feb 21 20:55:52 2018 (r329751) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/zfsd/zfsd.kshlib Wed Feb 21 20:56:28 2018 (r329752) @@ -67,7 +67,7 @@ function corrupt_pool_vdev typeset file=$3 # do some IO on the pool - log_must $DD if=/dev/zero of=$file bs=1024k count=128 + log_must $DD if=/dev/zero of=$file bs=1024k count=64 $FSYNC $file # scribble on the underlying file to corrupt the vdev From owner-svn-src-projects@freebsd.org Thu Feb 22 16:59:56 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 9E803F16C20 for ; Thu, 22 Feb 2018 16:59:56 +0000 (UTC) (envelope-from asomers@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 511A16D50A; Thu, 22 Feb 2018 16:59:56 +0000 (UTC) (envelope-from asomers@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 47AF624B8; Thu, 22 Feb 2018 16:59:56 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1MGxuwf006892; Thu, 22 Feb 2018 16:59:56 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1MGxtIK006889; Thu, 22 Feb 2018 16:59:55 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802221659.w1MGxtIK006889@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 22 Feb 2018 16:59:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329828 - in projects/zfsd/head/tests/sys/cddl/zfs: include tests/snapshot X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/zfsd/head/tests/sys/cddl/zfs: include tests/snapshot X-SVN-Commit-Revision: 329828 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: Thu, 22 Feb 2018 16:59:56 -0000 Author: asomers Date: Thu Feb 22 16:59:55 2018 New Revision: 329828 URL: https://svnweb.freebsd.org/changeset/base/329828 Log: Fix and reenable clone_001_pos tests/sys/cddl/zfs/include/libtest.kshlib Declare local variables tests/sys/cddl/zfs/snapshot/clone_001_pos.ksh * Remove a Solarism * Remove extraneous teardown steps * Don't autofail on FreeBSD tests/sys/cddl/zfs/snapshot/snapshot_test.sh Clear an expected failure, and skip if vfs.zfs.vol.recursive=0 Submitted by: avg Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/clone_001_pos.ksh projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh Modified: projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Thu Feb 22 16:16:49 2018 (r329827) +++ projects/zfsd/head/tests/sys/cddl/zfs/include/libtest.kshlib Thu Feb 22 16:59:55 2018 (r329828) @@ -3427,6 +3427,7 @@ function populate_dir # basename num_files write_count typeset -i num_files=$2 typeset -i write_count=$3 typeset -i blocksz=$4 + typeset -i i typeset data=$5 typeset snapbase="$6" Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/clone_001_pos.ksh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/clone_001_pos.ksh Thu Feb 22 16:16:49 2018 (r329827) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/clone_001_pos.ksh Thu Feb 22 16:59:55 2018 (r329828) @@ -71,7 +71,7 @@ set -A args "$SNAPFS" "$SNAPDIR" "$TESTPOOL/$TESTCLONE function setup_all { - create_pool $TESTPOOL1 /dev/zvol/dsk/$TESTPOOL/$TESTVOL + create_pool $TESTPOOL1 /dev/zvol/$TESTPOOL/$TESTVOL log_must $ZFS create $TESTPOOL1/$TESTFS log_must $ZFS set mountpoint=$TESTDIR2 $TESTPOOL1/$TESTFS @@ -80,25 +80,6 @@ function setup_all function cleanup_all { - typeset -i i=0 - - i=0 - while (( i < ${#args[*]} )); do - snapexists ${args[i]} && \ - log_must $ZFS destroy -Rf ${args[i]} - - [[ -d ${args[i+3]} ]] && \ - log_must $RM -rf ${args[i+3]} - - [[ -d ${args[i+1]} ]] && \ - log_must $RM -rf ${args[i+1]} - - (( i = i + 4 )) - done - - datasetexists $TESTPOOL1/$TESTFS && \ - log_must $ZFS destroy -f $TESTPOOL1/$TESTFS - destroy_pool $TESTPOOL1 [[ -d $TESTDIR2 ]] && \ @@ -110,9 +91,6 @@ function cleanup_all log_assert "Verify a cloned file system is writable." log_onexit cleanup_all - -[[ $os_name == "FreeBSD" ]] && - log_uninitiated "Creating a pool on a zvol is not yet supported in FreeBSD" setup_all Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh Thu Feb 22 16:16:49 2018 (r329827) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/snapshot/snapshot_test.sh Thu Feb 22 16:59:55 2018 (r329828) @@ -32,11 +32,11 @@ clone_001_pos_head() } clone_001_pos_body() { - atf_expect_fail "Creating a pool on a zvol is not yet supported in FreeBSD" . $(atf_get_srcdir)/../../include/default.cfg . $(atf_get_srcdir)/snapshot.cfg verify_disk_count "$DISKS" 1 + verify_zvol_recursive ksh93 $(atf_get_srcdir)/setup.ksh || atf_fail "Setup failed" ksh93 $(atf_get_srcdir)/clone_001_pos.ksh || atf_fail "Testcase failed" } From owner-svn-src-projects@freebsd.org Thu Feb 22 21:41:58 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 CDE85F03839 for ; Thu, 22 Feb 2018 21:41:58 +0000 (UTC) (envelope-from asomers@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 808C97AB28; Thu, 22 Feb 2018 21:41:58 +0000 (UTC) (envelope-from asomers@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 7B56C5826; Thu, 22 Feb 2018 21:41:58 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1MLfw1S060061; Thu, 22 Feb 2018 21:41:58 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1MLfwuj060060; Thu, 22 Feb 2018 21:41:58 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802222141.w1MLfwuj060060@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 22 Feb 2018 21:41:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329839 - projects/zfsd/head/etc/mtree X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/etc/mtree X-SVN-Commit-Revision: 329839 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: Thu, 22 Feb 2018 21:41:59 -0000 Author: asomers Date: Thu Feb 22 21:41:58 2018 New Revision: 329839 URL: https://svnweb.freebsd.org/changeset/base/329839 Log: Fix an mtree error from r329291 Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/etc/mtree/BSD.tests.dist Modified: projects/zfsd/head/etc/mtree/BSD.tests.dist ============================================================================== --- projects/zfsd/head/etc/mtree/BSD.tests.dist Thu Feb 22 20:48:02 2018 (r329838) +++ projects/zfsd/head/etc/mtree/BSD.tests.dist Thu Feb 22 21:41:58 2018 (r329839) @@ -131,6 +131,8 @@ .. llquantize .. + mdb + .. mib .. misc @@ -586,8 +588,6 @@ largest_pool .. link_count - .. - mdb .. migration .. From owner-svn-src-projects@freebsd.org Thu Feb 22 22:24:02 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 689B8F06C26 for ; Thu, 22 Feb 2018 22:24:02 +0000 (UTC) (envelope-from asomers@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 0FE5F7C503; Thu, 22 Feb 2018 22:24:02 +0000 (UTC) (envelope-from asomers@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 0A8D75EA4; Thu, 22 Feb 2018 22:24:02 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1MMO1bL081315; Thu, 22 Feb 2018 22:24:01 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1MMO1fl081314; Thu, 22 Feb 2018 22:24:01 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201802222224.w1MMO1fl081314@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Thu, 22 Feb 2018 22:24:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r329840 - projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity X-SVN-Commit-Revision: 329840 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: Thu, 22 Feb 2018 22:24:02 -0000 Author: asomers Date: Thu Feb 22 22:24:01 2018 New Revision: 329840 URL: https://svnweb.freebsd.org/changeset/base/329840 Log: apply PEP8 style to a python helper script Sponsored by: Spectra Logic Corp Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/make_patterns.py Modified: projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/make_patterns.py ============================================================================== --- projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/make_patterns.py Thu Feb 22 21:41:58 2018 (r329839) +++ projects/zfsd/head/tests/sys/cddl/zfs/tests/txg_integrity/make_patterns.py Thu Feb 22 22:24:01 2018 (r329840) @@ -1,51 +1,57 @@ #! /usr/bin/env python # Generate random IO patterns for the txg_integrity test -# We do this statically and embed the results into the code so that the +# We do this statically and embed the results into the code so that the # Testing will be more repeatable compared to generating the tables at runtime import random CLUSTERSIZE = (1 << 16) -NUM_CHUNKS = 64 +NUM_CHUNKS = 64 def rand_partition(): - partitions = [] - while len(partitions) != NUM_CHUNKS: - #We don't want any duplicates, so we make a set and then check that its - #length is correct - partitions = sorted( - list( - set( - [random.randrange(0, 2**31, (2**31) * 8 / (NUM_CHUNKS * CLUSTERSIZE)) - for i in range(NUM_CHUNKS - 1)] + [2**31]))) - return partitions + partitions = [] + while len(partitions) != NUM_CHUNKS: + # We don't want any duplicates, so we make a set and then check that + # its length is correct + partitions = sorted( + list( + set( + [random.randrange(0, + 2**31, + (2**31) * 8 / (NUM_CHUNKS * CLUSTERSIZE)) + for i in range(NUM_CHUNKS - 1)] + [2**31]))) + return partitions + def rand_permutation(): - perm = range(NUM_CHUNKS) - random.shuffle(perm) - return perm + perm = range(NUM_CHUNKS) + random.shuffle(perm) + return perm + def rand_follower_bitmap(): - bmp = 0; - chunks = random.sample(range(NUM_CHUNKS), NUM_CHUNKS / 2) - for chunk in chunks: - bmp |= (1 << chunk) - return bmp + bmp = 0 + chunks = random.sample(range(NUM_CHUNKS), NUM_CHUNKS / 2) + for chunk in chunks: + bmp |= (1 << chunk) + return bmp + def print_pattern(n): - print "const pattern_t pat%d = {" % n - print " {", - for p in rand_partition(): - print "%#x, " % p, - print " }," - print " {", - for p in rand_permutation(): - print "%d, " % p, - print " }," - print " %#x" % rand_follower_bitmap() - print "};" + print "const pattern_t pat%d = {" % n + print " {", + for p in rand_partition(): + print "%#x, " % p, + print " }," + print " {", + for p in rand_permutation(): + print "%d, " % p, + print " }," + print " %#x" % rand_follower_bitmap() + print "};" + for n in range(32): - print_pattern(n) + print_pattern(n)