From nobody Mon Sep 30 05:08:34 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 4XH8H65cz5z5Xltm; Mon, 30 Sep 2024 05:08:34 +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 4XH8H63nGMz4Xg2; Mon, 30 Sep 2024 05:08:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672914; 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=FDPp/Smo0p9Qd6Lv0aItZgJS8hVjbRwST78vq++ljwA=; b=dnvlDedJp93RtIOMNj0BQxtIQR1pcHLE6u7y/PVLjMLNSuJ8j8BoazV9wVYHR+YEDUe2Jf BX3FMy+XNPt5bYkUF7ocH9YSPCwImxQLkEYsmmxJj9puJtVpz5BFwWvlxNVQwuituUdn64 NwOM1oVAoMFfmQbJMQxd/ceztA+YaObglrgg1Liaj4gEhZP2tOQcR3r/JjpNBqQF8gY3gg xVqNDSMTef5pI+OINi3+rGnW8EjubKYOyE5g8l3c1QwKciwQ+buCK88IJrC3AZtAOx6jmK EMxsZRcnFNjsReudY6xmJM1NXmaLUc3wulCng0iqlMjKcFX6IDRB3wEttvN3UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727672914; 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=FDPp/Smo0p9Qd6Lv0aItZgJS8hVjbRwST78vq++ljwA=; b=HNGX4kvsPsgiW+ywhcs9kYWm52COvdTpaP+mSbEv8R1VWHWZU/UGO6QhKQ1NK2qK9ma9sG lTZ9HhsS+RqrWEnrLgOAC6Gvh/L8lkkKjccwcyvRVvi/lF66VKVTLqalCRJ4U1mku2C43t 33pg0obJPhzfSPyacIhV7Vwls9aFyQoxkSYNomEqD1GgzY9uq84jN9veGVxCtEx7JC5nvH vziC/X6QylmyLwMcVABf0GdGSCRCdlyGv9NkTgv3fvs1OKPdZCBlmgvmGEAV2BvEUHR1tn h2YAS+V1rGHX8/a0IB015Y2HbicB2oWtiz0dH3hBraisqCfn0HHKSlPE32z4iw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727672914; a=rsa-sha256; cv=none; b=G5NiZUX4juFA4ZLvgbLTn6D0xGZDufYKBI+i7SMgAURoaejY10PGLWB/UnPWL7WWZJC7n/ H/M+eep16cViAWWQWM19ggU3xalqPB9+JChowMABjAKK5TZGytGF5AcDIKU4fvZQ9+VyHU QvqKImLVjwW95NmYt+8IHkAtGbgP1CP1Jvuxjy9Gk4qh30my7lpf4RhyDcXNNZqVgDavbO qSX/Iz1juCT1VljUXgEacD+U8v+gbq+iKuqrmQsehgFfJ/6koFVAgJRegeAX34QsABHzrE xMRzl8gEgghc6ZrYQ72bAW+aek2ITfNh2dlt3Y9f0YuNOTkF77y5NVlgrXU2Cw== 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 4XH8H62v0Szfyx; Mon, 30 Sep 2024 05:08:34 +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 48U58Y2E025514; Mon, 30 Sep 2024 05:08:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48U58YIh025511; Mon, 30 Sep 2024 05:08:34 GMT (envelope-from git) Date: Mon, 30 Sep 2024 05:08:34 GMT Message-Id: <202409300508.48U58YIh025511@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: 5d9c2687c3c8 - stable/13 - pms(4): Stop checking for failures from malloc(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: 5d9c2687c3c89e5cff9b76fc88f5417c6651354c Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=5d9c2687c3c89e5cff9b76fc88f5417c6651354c commit 5d9c2687c3c89e5cff9b76fc88f5417c6651354c Author: Zhenlei Huang AuthorDate: 2024-09-03 10:25:32 +0000 Commit: Zhenlei Huang CommitDate: 2024-09-30 05:05:38 +0000 pms(4): Stop checking for failures from malloc(M_WAITOK) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45852 (cherry picked from commit 4fb8a80a78aa65e0b30bd5a74373512c678841c9) (cherry picked from commit 025c4754941956e24830a9c3c6f5e2466b19a9e1) --- sys/dev/pms/freebsd/driver/ini/src/agtiapi.c | 38 +++------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c b/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c index 3368897d1d19..29290ec94ec7 100644 --- a/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c +++ b/sys/dev/pms/freebsd/driver/ini/src/agtiapi.c @@ -318,13 +318,6 @@ int agtiapi_getdevlist( struct agtiapi_softc *pCard, sizeof(void *) ); AGTIAPI_PRINTK("agtiapi_getdevlist: portCount %d\n", pCard->portCount); devList = malloc(memNeeded1, TEMP2, M_WAITOK); - if (devList == NULL) - { - AGTIAPI_PRINTK("agtiapi_getdevlist: failed to allocate memory\n"); - ret_val = IOCTL_CALL_FAIL; - agIOCTLPayload->Status = IOCTL_ERR_STATUS_INTERNAL_ERROR; - return ret_val; - } osti_memset(devList, 0, memNeeded1); pPortalData = &pCard->pPortalData[0]; pDeviceHandleList = (bit8*)devList; @@ -968,13 +961,8 @@ static int agtiapi_attach( device_t devx ) } else { - pmsc->pPortalData = (ag_portal_data_t *) - malloc( sizeof(ag_portal_data_t) * pmsc->portCount, + pmsc->pPortalData = malloc( sizeof(ag_portal_data_t) * pmsc->portCount, M_PMC_MPRT, M_ZERO | M_WAITOK ); - if (pmsc->pPortalData == NULL) - { - AGTIAPI_PRINTK( "agtiapi_attach: Portal memory allocation ERROR\n" ); - } } pPortalData = pmsc->pPortalData; @@ -1225,32 +1213,14 @@ STATIC agBOOLEAN agtiapi_InitCardHW( struct agtiapi_softc *pmsc ) pmsc->flags |= AGTIAPI_SYS_INTR_ON; numVal = sizeof(ag_device_t) * pmsc->devDiscover; - pmsc->pDevList = - (ag_device_t *)malloc( numVal, M_PMC_MDVT, M_ZERO | M_WAITOK ); - if( !pmsc->pDevList ) { - AGTIAPI_PRINTK( "agtiapi_InitCardHW: kmalloc %d DevList ERROR\n", numVal ); - panic( "agtiapi_InitCardHW\n" ); - return AGTIAPI_FAIL; - } + pmsc->pDevList = malloc( numVal, M_PMC_MDVT, M_ZERO | M_WAITOK ); #ifdef LINUX_PERBI_SUPPORT numVal = sizeof(ag_slr_map_t) * pmsc->devDiscover; - pmsc->pSLRList = - (ag_slr_map_t *)malloc( numVal, M_PMC_MSLR, M_ZERO | M_WAITOK ); - if( !pmsc->pSLRList ) { - AGTIAPI_PRINTK( "agtiapi_InitCardHW: kmalloc %d SLRList ERROR\n", numVal ); - panic( "agtiapi_InitCardHW SLRL\n" ); - return AGTIAPI_FAIL; - } + pmsc->pSLRList = malloc( numVal, M_PMC_MSLR, M_ZERO | M_WAITOK ); numVal = sizeof(ag_tgt_map_t) * pmsc->devDiscover; - pmsc->pWWNList = - (ag_tgt_map_t *)malloc( numVal, M_PMC_MTGT, M_ZERO | M_WAITOK ); - if( !pmsc->pWWNList ) { - AGTIAPI_PRINTK( "agtiapi_InitCardHW: kmalloc %d WWNList ERROR\n", numVal ); - panic( "agtiapi_InitCardHW WWNL\n" ); - return AGTIAPI_FAIL; - } + pmsc->pWWNList = malloc( numVal, M_PMC_MTGT, M_ZERO | M_WAITOK ); // Get the WWN_to_target_ID mappings from the // holding area which contains the input of the