Date: Tue, 21 Nov 2017 01:18:58 +0000 (UTC) From: Navdeep Parhar <np@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r326042 - head/sys/dev/cxgbe/cudbg Message-ID: <201711210118.vAL1IwDZ072579@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: np Date: Tue Nov 21 01:18:58 2017 New Revision: 326042 URL: https://svnweb.freebsd.org/changeset/base/326042 Log: cxgbe(4): Fix unsafe mailbox access in cudbg. MFC after: 1 week Sponsored by: Chelsio Communications Modified: head/sys/dev/cxgbe/cudbg/cudbg_lib.c Modified: head/sys/dev/cxgbe/cudbg/cudbg_lib.c ============================================================================== --- head/sys/dev/cxgbe/cudbg/cudbg_lib.c Mon Nov 20 23:51:51 2017 (r326041) +++ head/sys/dev/cxgbe/cudbg/cudbg_lib.c Tue Nov 21 01:18:58 2017 (r326042) @@ -77,10 +77,17 @@ static void read_sge_ctxt(struct cudbg_init *pdbg_init struct adapter *padap = pdbg_init->adap; int rc = -1; - if (is_fw_attached(pdbg_init)) + if (is_fw_attached(pdbg_init)) { + rc = begin_synchronized_op(padap, NULL, SLEEP_OK | INTR_OK, + "t4cudf"); + if (rc != 0) + goto out; rc = t4_sge_ctxt_rd(padap, padap->mbox, cid, ctype, data); + end_synchronized_op(padap, 0); + } +out: if (rc) t4_sge_ctxt_rd_bd(padap, cid, ctype, data); } @@ -2720,7 +2727,12 @@ static void cudbg_t4_fwcache(struct cudbg_init *pdbg_i if (is_fw_attached(pdbg_init)) { /* Flush uP dcache before reading edcX/mcX */ - rc = t4_fwcache(padap, FW_PARAM_DEV_FWCACHE_FLUSH); + rc = begin_synchronized_op(padap, NULL, SLEEP_OK | INTR_OK, + "t4cudl"); + if (rc == 0) { + rc = t4_fwcache(padap, FW_PARAM_DEV_FWCACHE_FLUSH); + end_synchronized_op(padap, 0); + } if (rc) { if (pdbg_init->verbose) @@ -3331,6 +3343,9 @@ static int collect_tid(struct cudbg_init *pdbg_init, para[5] = FW_PARAM_PFVF_A(SERVER_START); para[6] = FW_PARAM_PFVF_A(SERVER_END); + rc = begin_synchronized_op(padap, NULL, SLEEP_OK | INTR_OK, "t4cudq"); + if (rc) + goto err; mbox = padap->mbox; pf = padap->pf; rc = t4_query_params(padap, mbox, pf, 0, 7, para, val); @@ -3417,6 +3432,7 @@ static int collect_tid(struct cudbg_init *pdbg_init, rc = compress_buff(&scratch_buff, dbg_buff); err1: + end_synchronized_op(padap, 0); release_scratch_buff(&scratch_buff, dbg_buff); err: return rc; @@ -3602,8 +3618,13 @@ static int collect_mps_tcam(struct cudbg_init *pdbg_in htons(V_FW_LDST_CMD_FID(FW_LDST_MPS_RPLC) | V_FW_LDST_CMD_IDX(i)); - rc = t4_wr_mbox(padap, padap->mbox, &ldst_cmd, - sizeof(ldst_cmd), &ldst_cmd); + rc = begin_synchronized_op(padap, NULL, + SLEEP_OK | INTR_OK, "t4cudm"); + if (rc == 0) { + rc = t4_wr_mbox(padap, padap->mbox, &ldst_cmd, + sizeof(ldst_cmd), &ldst_cmd); + end_synchronized_op(padap, 0); + } if (rc) mps_rpl_backdoor(padap, &mps_rplc);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711210118.vAL1IwDZ072579>