From nobody Mon Sep 30 04:45:28 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XH7mS52LSz5Xk0v; Mon, 30 Sep 2024 04:45:28 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XH7mS3bzQz4FMF; Mon, 30 Sep 2024 04:45:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YOciIc/YY3aiP6QYsRdz7QxEs3ma5bWA60YooK/aMIo=; b=vACptZrM6tV5cu8fswEH5JOb6QbVSPmsnZc+1usEl2MXvzjPCDSedCYtLSMsMfYlH9sMSW xR689JrnuM8zRywTyKmviyFpzQS9iRM3IHWlfuG33UMALGoLn2ZTYYErEoqPvy3Ctl4te2 AHAaZCj84ErStv1jFhhX+C4YUk/eWa56uKCorTXa+N6EaFx4FfkADrwWVPVxsM4SrzH3RV a5H8WjoIah5pr8hCBMwpDH14bwxGd9/B3EUL8ZqXagQsiJSwVWkEFYxHewWCeSZxvNDa55 U5OqTdMdBxdZdfFcvFPvj1POv0LJ7f07acTmnx1uWNHIPP+xjRKopAO7tN9WzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727671528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YOciIc/YY3aiP6QYsRdz7QxEs3ma5bWA60YooK/aMIo=; b=qnldUcIHSXM6EqiFT5gcDDG+aLy2ONziU/D/BvBv2Ojt7Oh5rW1Vz3irlYDKZ/wwyk7tnK s8NsrE4//T6icTozUk1uaXuflWNU2uxgTJmEi+nXgqtfTD+fRDj14jartAtB44D6372PWW bNYUbl8xeQCroVivWi66n2NRoJrw7nlBhWnE1EkFQ3m6VF65G7sZ4MV6RqOA+O1ik9PzNy bkCVS5vfs66QMx9lJAGU02Q7oOfizkXTm0ICw0vt5HgAUf/ta/UWx1YHnKFryRF7ZKFpY8 z9ivo3/tWLvu4fC9r5K8Zg6uHBdANHlglpqp7qIaIJSg60wTEl3Dd6w2NCHwAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727671528; a=rsa-sha256; cv=none; b=uzGrnvus6pE7jnMnv+Ub1L8u1w8XTYFLwM6AN8ll7s7Jpsqk2iccrnGVEswzy4f4/1k/V2 zjVLUyQW5V3LpX4mv0X9pd447iApTGCgWmrfyEj2gaZh32PMbpjeZczSVuMTtpMXLW8tp6 2ssv+vHM/a7d59AQC0Gdj+qTWPNFlZDVcdeXwLOE+0HRfPKBOSDY0hGGDSy0svhu5hYsyN +LVKxy4+ApQ3Z89MKLZ7GF1tGOlsdDFD8DnrijO5XDOhb2M9DCslczfyOAwiklhtpZxKB2 hVeVE9JPbiS0p8MT8RqO36Cihyv0juV/s2srGlJlmBiIK2cqSxFn3x+qSHrCHw== 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 4XH7mS38sPzdwL; Mon, 30 Sep 2024 04:45:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48U4jSus087075; Mon, 30 Sep 2024 04:45:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U4jStr087072; Mon, 30 Sep 2024 04:45:28 GMT (envelope-from git) Date: Mon, 30 Sep 2024 04:45:28 GMT Message-Id: <202409300445.48U4jStr087072@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 9216ba1853b7 - stable/14 - cxgb(4): Stop checking for failures from malloc/buf_ring_alloc(M_WAITOK) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9216ba1853b76185c85abccbf338f2e4ea71a238 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=9216ba1853b76185c85abccbf338f2e4ea71a238 commit 9216ba1853b76185c85abccbf338f2e4ea71a238 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:25 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 04:44:20 +0000 cxgb(4): Stop checking for failures from malloc/buf_ring_alloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit bb51f7c8a48a4cd5dfa67fefa81f3d5d199da92b) --- sys/dev/cxgb/cxgb_main.c | 4 +--- sys/dev/cxgb/cxgb_sge.c | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c index 9bcdb86312c4..4d754aa8b1b7 100644 --- a/sys/dev/cxgb/cxgb_main.c +++ b/sys/dev/cxgb/cxgb_main.c @@ -2472,9 +2472,7 @@ set_eeprom(struct port_info *pi, const uint8_t *data, int len, int offset) aligned_len = (len + (offset & 3) + 3) & ~3; if (aligned_offset != offset || aligned_len != len) { - buf = malloc(aligned_len, M_DEVBUF, M_WAITOK|M_ZERO); - if (!buf) - return (ENOMEM); + buf = malloc(aligned_len, M_DEVBUF, M_WAITOK | M_ZERO); err = t3_seeprom_read(adapter, aligned_offset, (u32 *)buf); if (!err && aligned_len > 4) err = t3_seeprom_read(adapter, diff --git a/sys/dev/cxgb/cxgb_sge.c b/sys/dev/cxgb/cxgb_sge.c index f57494065aec..8469997b00a8 100644 --- a/sys/dev/cxgb/cxgb_sge.c +++ b/sys/dev/cxgb/cxgb_sge.c @@ -2422,11 +2422,8 @@ t3_sge_alloc_qset(adapter_t *sc, u_int id, int nports, int irq_vec_idx, q->port = pi; q->adap = sc; - if ((q->txq[TXQ_ETH].txq_mr = buf_ring_alloc(cxgb_txq_buf_ring_size, - M_DEVBUF, M_WAITOK, &q->lock)) == NULL) { - device_printf(sc->dev, "failed to allocate mbuf ring\n"); - goto err; - } + q->txq[TXQ_ETH].txq_mr = buf_ring_alloc(cxgb_txq_buf_ring_size, + M_DEVBUF, M_WAITOK, &q->lock); if ((q->txq[TXQ_ETH].txq_ifq = malloc(sizeof(struct ifaltq), M_DEVBUF, M_NOWAIT | M_ZERO)) == NULL) { device_printf(sc->dev, "failed to allocate ifq\n");