From nobody Mon Sep 30 05:08:19 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 4XH8Gq3fvlz5XltK; Mon, 30 Sep 2024 05:08:19 +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 4XH8Gq2q2Fz4XD7; Mon, 30 Sep 2024 05:08:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672899; 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=qbCFndWmpwU7IeMHTA1bbWuUd20C21EpnUVkzk+E52I=; b=FiQpwecGs+d26CUdSA6kZ5wfkqNNiMx8+hagOoerPeDY/Tpcw6Bmxu9X4PaZQDIOUTSNmf xAwLvz6bw810UHlPzRhhPIf23MLRrVL/H1jB+t5DYnvUAsJ3+pQDXb5OSiOW5Nk4E6Sc26 l/zLz7rWDIGel+IK1lzHb8/sLiT9venjoKifrq8bupfgHWoDTqEOhuVs048ButBzvdGQ1n A8YToMl5xAwB46IyXodQ+Qx6j0E3tul08WgEXodOAh6PiwxClRBx23YAWIvc9/d5NADENo K+YIqlTBzo9/jeoI/YNPapFvvU7yxez48bxmfyXIZQBbZmRCD3lwQUz/x2WHoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672899; 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=qbCFndWmpwU7IeMHTA1bbWuUd20C21EpnUVkzk+E52I=; b=GYPikxm9Wc8AU4jfAZYPDCZv25vWLXzpIS0KbRPHDmw8/mouMUmBlDz8NxTIMx1NNDbldD cW+oGSsAp3X3IqSzoKpfVJRmLMA3jEjDFmQiDLR952xud4PfZjUBrw7HmyRES2R/Dsca9m /rVGNjzsfFU1CvJyrfVZ1rppkATJLJ82xclJWoCjHDcGokOyP9mOeBBbLrOUSQPZVclVdK 5p12y5kerSqzQRukI7dsK6D0AqE8TNq53wKm9VlIiIh4TITfPd2vTWbJB4Ux4M6xup+60n G0cPNCEpNzWNM3cW8P/fH/j6phURwW+4Lic0qHJSs2jWVsxjdDhzDSSpFZ/GwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672899; a=rsa-sha256; cv=none; b=Wggeee68vU3ppZnQi/v/sAB/JVxE2b3Z01sdvR/VJlZvyvQ81q0Yel2Of8shcJtSfI5ONW EtFnOyxw7mzLiGyBNiGVrg2cXzPNqRTIA9OwNTtK6J3n+8ymz7rb9g7extHd88CqTieTGq K3INcI+uUCNYL3aylnZ/MQ5VwSHGwlWmM4XwgGzC2V9h6aw3rRp5BZMk/oW4fzeGcO8glx nUJWZio50OEvb74f6t59NpYkD0riyDTJbtXQTEiM9G152UuYApUCbT/3g32B8ij8Zb5MM7 haPraAi6QP/k+InCTFL6o94Jr5BhGaLPU0Qr+jBQENI+DpAHN9RrwHwMTg6Lmg== 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 4XH8Gq2QxYzftb; Mon, 30 Sep 2024 05:08:19 +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 48U58JSK024864; Mon, 30 Sep 2024 05:08:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58JpJ024861; Mon, 30 Sep 2024 05:08:19 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:19 GMT Message-Id: <202409300508.48U58JpJ024861@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: 09491167a541 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 09491167a54120caf95822500e440ead964b5bb7 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=09491167a54120caf95822500e440ead964b5bb7 commit 09491167a54120caf95822500e440ead964b5bb7 Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:25 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:34 +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) (cherry picked from commit 9216ba1853b76185c85abccbf338f2e4ea71a238) --- 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 ba3a065cf806..8c817d751cdc 100644 --- a/sys/dev/cxgb/cxgb_main.c +++ b/sys/dev/cxgb/cxgb_main.c @@ -2485,9 +2485,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 9d6d181ce64e..de1c1928f350 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");