From nobody Tue Sep 03 10:27:07 2024 X-Original-To: dev-commits-src-all@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 4Wyhd74pZbz5MkRC; Tue, 03 Sep 2024 10:27:07 +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 4Wyhd72vyLz4sL0; Tue, 3 Sep 2024 10:27:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725359227; 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=b65/+IakpNO18QWJY5byk1MARlBeW2r8AweoAw4SZsA=; b=IsFtKu46IOKVo3nlHw949wnbToEgsr940pL97ou5pAPnV5SzhD/nugf42XZxFh+0cSXkJI 4nCeLZVyIHtIGJZ09qwayD6Xc8Ry/T4Prr1Cjjx0RCSHWCmku0a+LWdRshWEHtU7Dp4O3G NBDpy6JYXOOWjWd3a78L9ddqwNzPSF8P2KKuy3aJhVt5X58upAQr7gpjs8wVZwvX0ZPO7/ DI7EnJtWIxfO8NwNcIGcw+T7bG36FViYE+N7hYDgheokYnwB49cWAwSsWxTK+KYIP+1kvF eMirQmsa5aY67hKNAtVJh29zLXg4rAnfT4B20OwjZecbOjEvza3atG0IOODeoQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725359227; a=rsa-sha256; cv=none; b=mvarakxIuQUM2TStn4Y5cChd3cob1SFImWARY34yQhrj4aCSCq8mcDdPQ5mHL65Ddv2w+x 6d/7JHXsqLbXi+f2yUa+i9++CYkw6vTpFeXvfs3bVnYfwEpVpZ96XMuvYtp7eFwOycm4OE 4uR98TfgfSeR15F7dGwtKDYIuAVL8Ti4EyCQEdAHki4i0h8AQ0yibD+NGpDbsxxV4RDt9O icxFsmorEbuA+lQ9lPWopiiwTG/7EddbEDxYXHgFvZrbqeO7R6QMdM2+fM7vM79qWG+O1l jAjocO5SP4D1Rwp97dBHalLixPZOf/DXb/6WBv2g/SjeQgxe/LXCojCfxjeVSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725359227; 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=b65/+IakpNO18QWJY5byk1MARlBeW2r8AweoAw4SZsA=; b=OkkTkYhnofVnpT3jDgYqZLb7t+P7r51hymaUoiLr8vIdSnBwJQatw8vdFp84HjhWzldEab /kcPVyEklVhgcctTkIu3mE+tWeDDu4yHPz83e1rH3/4cVyfpeDY9O4EMC5wnBJMn8SUJ2T 3lj0r6RfwCLnPMqVElzZ8FfZb7nk4++lPcnXfJiZ/mCoC383mIxNPYoMyuo6c/96utaurp Ws5MfpgWVChnxfGbWukOqmUsaijq+IZYaE3r9y7lcY0KKkFgYXIZ1dP7tuWd3Crc6/aIFR 7vTE57c28BIqyz0E5H7pKRhNr+WnUu+SMr6Dwrqkg2yXnAqET7eu28YHD4johg== 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 4Wyhd72RBSzcb4; Tue, 3 Sep 2024 10:27:07 +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 483AR7bG009779; Tue, 3 Sep 2024 10:27:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 483AR7Dv009776; Tue, 3 Sep 2024 10:27:07 GMT (envelope-from git) Date: Tue, 3 Sep 2024 10:27:07 GMT Message-Id: <202409031027.483AR7Dv009776@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: bb51f7c8a48a - main - cxgb(4): Stop checking for failures from malloc/buf_ring_alloc(M_WAITOK) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: bb51f7c8a48a4cd5dfa67fefa81f3d5d199da92b Auto-Submitted: auto-generated The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=bb51f7c8a48a4cd5dfa67fefa81f3d5d199da92b commit bb51f7c8a48a4cd5dfa67fefa81f3d5d199da92b Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:25 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-03 10:25:25 +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 --- 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 1b82f2ebcaae..52ffa5cdaffa 100644 --- a/sys/dev/cxgb/cxgb_sge.c +++ b/sys/dev/cxgb/cxgb_sge.c @@ -2419,11 +2419,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");