From owner-dev-commits-src-branches@freebsd.org Fri Jan 22 12:48:49 2021 Return-Path: Delivered-To: dev-commits-src-branches@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 F26454F41EA; Fri, 22 Jan 2021 12:48:47 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DMfFl0V24z4rcF; Fri, 22 Jan 2021 12:48:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EAAD71EBB1; Fri, 22 Jan 2021 12:48:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 10MCmfG7019971; Fri, 22 Jan 2021 12:48:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10MCmfYA019970; Fri, 22 Jan 2021 12:48:41 GMT (envelope-from git) Date: Fri, 22 Jan 2021 12:48:41 GMT Message-Id: <202101221248.10MCmfYA019970@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Hans Petter Selasky Subject: git: f301a7de8b76 - stable/11 - MFC daa150aaa30f: Properly handle case where firmware dump returns more registers on second pass in mlx5core. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/stable/11 X-Git-Reftype: branch X-Git-Commit: f301a7de8b764923aaba16dad6814936e3c80ac5 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the stable branches of the FreeBSD src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jan 2021 12:48:49 -0000 The branch stable/11 has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=f301a7de8b764923aaba16dad6814936e3c80ac5 commit f301a7de8b764923aaba16dad6814936e3c80ac5 Author: Hans Petter Selasky AuthorDate: 2021-01-08 10:52:44 +0000 Commit: Hans Petter Selasky CommitDate: 2021-01-22 12:36:20 +0000 MFC daa150aaa30f: Properly handle case where firmware dump returns more registers on second pass in mlx5core. Sponsored by: Mellanox Technologies // NVIDIA Networking --- sys/dev/mlx5/mlx5_core/mlx5_fwdump.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c b/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c index 25aaf16147c1..0eb816bf17fd 100644 --- a/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c +++ b/sys/dev/mlx5/mlx5_core/mlx5_fwdump.c @@ -115,11 +115,15 @@ mlx5_fwdump_prep(struct mlx5_core_dev *mdev) mlx5_core_warn(mdev, "no output from scan space\n"); goto unlock_vsc; } - mdev->dump_rege = malloc(sz * sizeof(struct mlx5_crspace_regmap), + + /* + * We add a sentinel element at the end of the array to + * terminate the read loop in mlx5_fwdump(), so allocate sz + 1. + */ + mdev->dump_rege = malloc((sz + 1) * sizeof(struct mlx5_crspace_regmap), M_MLX5_DUMP, M_WAITOK | M_ZERO); for (i = 0, addr = 0;;) { - MPASS(i < sz); mdev->dump_rege[i].cnt++; MLX5_VSC_SET(vsc_addr, &in, address, addr); pci_write_config(dev, vsc_addr + MLX5_VSC_ADDR_OFFSET, in, 4); @@ -137,13 +141,21 @@ mlx5_fwdump_prep(struct mlx5_core_dev *mdev) next_addr = MLX5_VSC_GET(vsc_addr, &out, address); if (next_addr == 0 || next_addr == addr) break; - if (next_addr != addr + 4) - mdev->dump_rege[++i].addr = next_addr; + if (next_addr != addr + 4) { + if (++i == sz) { + mlx5_core_err(mdev, + "Inconsistent hw crspace reads (1): sz %u i %u addr %#lx", + sz, i, (unsigned long)addr); + break; + } + mdev->dump_rege[i].addr = next_addr; + } addr = next_addr; } - if (i + 1 != sz) { + /* i == sz case already reported by loop above */ + if (i + 1 != sz && i != sz) { mlx5_core_err(mdev, - "Inconsistent hw crspace reads: sz %u i %u addr %#lx", + "Inconsistent hw crspace reads (2): sz %u i %u addr %#lx", sz, i, (unsigned long)addr); }