Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Sep 2024 05:08:20 GMT
From:      Zhenlei Huang <zlei@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: be61ff389f42 - stable/13 - cxgbe(4): Stop checking for failures from malloc/mb_alloc_ext_pgs(M_WAITOK)
Message-ID:  <202409300508.48U58Krp024909@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by zlei:

URL: https://cgit.FreeBSD.org/src/commit/?id=be61ff389f425e9555ed5078240a05b49aa21556

commit be61ff389f425e9555ed5078240a05b49aa21556
Author:     Zhenlei Huang <zlei@FreeBSD.org>
AuthorDate: 2024-09-03 10:25:26 +0000
Commit:     Zhenlei Huang <zlei@FreeBSD.org>
CommitDate: 2024-09-30 05:05:34 +0000

    cxgbe(4): Stop checking for failures from malloc/mb_alloc_ext_pgs(M_WAITOK)
    
    MFC after:      1 week
    Differential Revision:  https://reviews.freebsd.org/D45852
    
    (cherry picked from commit 955b380365af174b3d35905b7b8afae97506a0bd)
    (cherry picked from commit 09ed34449c795c137d0dd55890486165e2bb0c15)
---
 sys/dev/cxgbe/cxgbei/cxgbei.c | 3 ---
 sys/dev/cxgbe/tom/t4_cpl_io.c | 5 -----
 2 files changed, 8 deletions(-)

diff --git a/sys/dev/cxgbe/cxgbei/cxgbei.c b/sys/dev/cxgbe/cxgbei/cxgbei.c
index 2f3cc4eb6821..45adcf4338b0 100644
--- a/sys/dev/cxgbe/cxgbei/cxgbei.c
+++ b/sys/dev/cxgbe/cxgbei/cxgbei.c
@@ -842,9 +842,6 @@ cxgbei_activate(struct adapter *sc)
 
 	/* per-adapter softc for iSCSI */
 	ci = malloc(sizeof(*ci), M_CXGBE, M_ZERO | M_WAITOK);
-	if (ci == NULL)
-		return (ENOMEM);
-
 	rc = cxgbei_init(sc, ci);
 	if (rc != 0) {
 		free(ci, M_CXGBE);
diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c
index e8a78b5f6c1b..e20c92350499 100644
--- a/sys/dev/cxgbe/tom/t4_cpl_io.c
+++ b/sys/dev/cxgbe/tom/t4_cpl_io.c
@@ -2138,11 +2138,6 @@ alloc_aiotx_mbuf(struct kaiocb *job, int len)
 			break;
 
 		m = mb_alloc_ext_pgs(M_WAITOK, aiotx_free_pgs);
-		if (m == NULL) {
-			vm_page_unhold_pages(pgs, npages);
-			break;
-		}
-
 		m->m_epg_1st_off = pgoff;
 		m->m_epg_npgs = npages;
 		if (npages == 1) {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409300508.48U58Krp024909>