From owner-svn-src-stable-12@freebsd.org Sat Mar 14 01:38:05 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 108FD2717B3; Sat, 14 Mar 2020 01:38:05 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48fQDr4kfyz4JT9; Sat, 14 Mar 2020 01:38:04 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 84973F4D5; Sat, 14 Mar 2020 01:38:04 +0000 (UTC) (envelope-from np@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02E1c4O6040658; Sat, 14 Mar 2020 01:38:04 GMT (envelope-from np@FreeBSD.org) Received: (from np@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02E1c385040655; Sat, 14 Mar 2020 01:38:03 GMT (envelope-from np@FreeBSD.org) Message-Id: <202003140138.02E1c385040655@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: np set sender to np@FreeBSD.org using -f From: Navdeep Parhar Date: Sat, 14 Mar 2020 01:38:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r358977 - stable/12/sys/dev/cxgbe/iw_cxgbe X-SVN-Group: stable-12 X-SVN-Commit-Author: np X-SVN-Commit-Paths: stable/12/sys/dev/cxgbe/iw_cxgbe X-SVN-Commit-Revision: 358977 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Mar 2020 01:38:05 -0000 Author: np Date: Sat Mar 14 01:38:03 2020 New Revision: 358977 URL: https://svnweb.freebsd.org/changeset/base/358977 Log: MFC r356713: cxgbe/iw_cxgbe: Do not allow memory registrations with page size greater than 128MB, which is the maximum supported by the hardware in RDMA mode. Obtained from: Chelsio Communications Sponsored by: Chelsio Communications Modified: stable/12/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h stable/12/sys/dev/cxgbe/iw_cxgbe/mem.c stable/12/sys/dev/cxgbe/iw_cxgbe/qp.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h ============================================================================== --- stable/12/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h Sat Mar 14 01:33:11 2020 (r358976) +++ stable/12/sys/dev/cxgbe/iw_cxgbe/iw_cxgbe.h Sat Mar 14 01:38:03 2020 (r358977) @@ -91,6 +91,7 @@ static inline void *cplhdr(struct mbuf *m) #define C4IW_ID_TABLE_F_RANDOM 1 /* Pseudo-randomize the id's returned */ #define C4IW_ID_TABLE_F_EMPTY 2 /* Table is initially empty */ +#define C4IW_MAX_PAGE_SIZE 0x8000000 struct c4iw_id_table { u32 flags; Modified: stable/12/sys/dev/cxgbe/iw_cxgbe/mem.c ============================================================================== --- stable/12/sys/dev/cxgbe/iw_cxgbe/mem.c Sat Mar 14 01:33:11 2020 (r358976) +++ stable/12/sys/dev/cxgbe/iw_cxgbe/mem.c Sat Mar 14 01:38:03 2020 (r358977) @@ -287,6 +287,8 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 if (reset_tpt_entry) memset(&tpt, 0, sizeof(tpt)); else { + if (page_size > ilog2(C4IW_MAX_PAGE_SIZE) - 12) + return -EINVAL; tpt.valid_to_pdid = cpu_to_be32(F_FW_RI_TPTE_VALID | V_FW_RI_TPTE_STAGKEY((*stag & M_FW_RI_TPTE_STAGKEY)) | V_FW_RI_TPTE_STAGSTATE(stag_state) | Modified: stable/12/sys/dev/cxgbe/iw_cxgbe/qp.c ============================================================================== --- stable/12/sys/dev/cxgbe/iw_cxgbe/qp.c Sat Mar 14 01:33:11 2020 (r358976) +++ stable/12/sys/dev/cxgbe/iw_cxgbe/qp.c Sat Mar 14 01:38:03 2020 (r358977) @@ -669,11 +669,14 @@ static void complete_rq_drain_wr(struct c4iw_qp *qhp, spin_unlock_irqrestore(&rchp->comp_handler_lock, flag); } -static void build_tpte_memreg(struct fw_ri_fr_nsmr_tpte_wr *fr, +static int build_tpte_memreg(struct fw_ri_fr_nsmr_tpte_wr *fr, struct ib_reg_wr *wr, struct c4iw_mr *mhp, u8 *len16) { __be64 *p = (__be64 *)fr->pbl; + if (wr->mr->page_size > C4IW_MAX_PAGE_SIZE) + return -EINVAL; + fr->r2 = cpu_to_be32(0); fr->stag = cpu_to_be32(mhp->ibmr.rkey); @@ -698,6 +701,7 @@ static void build_tpte_memreg(struct fw_ri_fr_nsmr_tpt p[1] = cpu_to_be64((u64)mhp->mpl[1]); *len16 = DIV_ROUND_UP(sizeof(*fr), 16); + return 0; } static int build_memreg(struct t4_sq *sq, union t4_wr *wqe, @@ -712,6 +716,8 @@ static int build_memreg(struct t4_sq *sq, union t4_wr if (mhp->mpl_len > t4_max_fr_depth(use_dsgl && dsgl_supported)) return -EINVAL; + if (wr->mr->page_size > C4IW_MAX_PAGE_SIZE) + return -EINVAL; wqe->fr.qpbinde_to_dcacpu = 0; wqe->fr.pgsz_shift = ilog2(wr->mr->page_size) - 12; @@ -852,16 +858,16 @@ int c4iw_post_send(struct ib_qp *ibqp, struct ib_send_ if (rdev->adap->params.fr_nsmr_tpte_wr_support && !mhp->attr.state && mhp->mpl_len <= 2) { fw_opcode = FW_RI_FR_NSMR_TPTE_WR; - build_tpte_memreg(&wqe->fr_tpte, reg_wr(wr), + err = build_tpte_memreg(&wqe->fr_tpte, reg_wr(wr), mhp, &len16); } else { fw_opcode = FW_RI_FR_NSMR_WR; err = build_memreg(&qhp->wq.sq, wqe, reg_wr(wr), mhp, &len16, rdev->adap->params.ulptx_memwrite_dsgl); - if (err) - break; } + if (err) + break; mhp->attr.state = 1; break; }