From nobody Mon Jun 27 17:07:56 2022 X-Original-To: dev-commits-src-main@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 2206A87E510; Mon, 27 Jun 2022 17:07:57 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LWvLP0Qd9z4tYG; Mon, 27 Jun 2022 17:07:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656349677; 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=9a02SPbDA4HknbbYr2IJ8BsGH1SBmooL/h5ZZmyVcsg=; b=i3f/bxARihM1Z5qhgxoyPABUaKFDpj2iNN/pvo3oY7/52l20AELyGSziVcgrcZ4nRRy+Ow iYHidD6hhLzQbzCrwvabPgEnUAiAG6/E1a5NJRqADrnD90zjIuWqj7PNw9RFCJIMGkXhrW KLvhr/8LML993DGnF+xybX3U777w0Ob5TRXOvPxmG0Oj09AxMQjrzk3nh4YyaRr+BLZ6rd lk4tytJwyjPSLvPpN3qGG7CGtOJRVR7VKj2j7x0WjiXXkkqQhl0xDTn5xPdXU5mOOLTJEb ZykwFvh/AKoGCp/5LKWDmr6fcJRRAPGEpBJnDX2pDVTvMHfL+AhjVgEaiSzm/Q== 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 E3863478A; Mon, 27 Jun 2022 17:07:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25RH7uWr015745; Mon, 27 Jun 2022 17:07:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25RH7uA5015744; Mon, 27 Jun 2022 17:07:56 GMT (envelope-from git) Date: Mon, 27 Jun 2022 17:07:56 GMT Message-Id: <202206271707.25RH7uA5015744@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: f4497b9f7779 - main - smartpqi: Allocate DMA memory NOWAIT List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f4497b9f77795ece4d2f2fad4c0329d82d53bc63 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656349677; 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=9a02SPbDA4HknbbYr2IJ8BsGH1SBmooL/h5ZZmyVcsg=; b=DEybmaD+1dDE7XRymW32B8H/GxjIlaIru7QzncRWshi3bXauTBzq4WbmbtVBOYtt+S+wPT QmvFOLXkmEJ0aBNCxKAlFLzgAIFuyVkg+gEUw7v6OEOIqLeJcPz6I16lD9cGhLlRLqfreu 3TP0ugQAbLDjSx4nky3rjZEo88IwWL0zhnfD53HKagwnVaMd5+OmMin+ppR3sf65Gi3HL1 R4v5cIJo9dtjeV1fYDOhQeeepF16Sr/gsyVDaN2lHY+8RcuXE5czi1hM3n/A8ZCosI70mG x4BScQysDH4XvJoO3KXjfg/AEwSTwLO30S2iXlEKRdAxRosXvK7tDc0G+tm3Cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656349677; a=rsa-sha256; cv=none; b=Yt2nQfYjsIDaolDxsok9vxnfyPYqpnTR7qvB+VqBdGbv5y7L6kcHhHQVyhnXIaqhwPZwKI M8qrZmulq1+eNTkCrCdj4ZYUvZ0mMvfDImE+l4stAvWzkjDqI3iuHf/uajNwwP/oBZdl2z Sm9epAncxEO2Q668a6jLCrbrA78zHax+6oJuxgVDJVgZO+MUAAk11dJHO3oV4mwYHDsM54 nL9Ou4Jt4ojLRgMtegJ7VE6Pp12CkOdsNXTOzhxR4kS+tCfa31jEL1HpCg6habTAXZaQg0 dwmZTQJVqosGJe9SrWeXxEt73Olu0aDHB4r2eVDy5uny3wVrcnv2P9yxahFp4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f4497b9f77795ece4d2f2fad4c0329d82d53bc63 commit f4497b9f77795ece4d2f2fad4c0329d82d53bc63 Author: Yuri AuthorDate: 2022-06-27 15:48:31 +0000 Commit: Warner Losh CommitDate: 2022-06-27 17:06:31 +0000 smartpqi: Allocate DMA memory NOWAIT We're not allowed to wait in this allocation path, so allocate the memory NOWAIT instead of WAITOK. The code already copes with the failures that may result, so no additional code is needed. PR: 263008 Reviewed by: markj, Scott Benesh at Microsemi, imp Differential Revision: https://reviews.freebsd.org/D35601 --- sys/dev/smartpqi/smartpqi_mem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/smartpqi/smartpqi_mem.c b/sys/dev/smartpqi/smartpqi_mem.c index 1ed2a582e574..e377473c19e8 100644 --- a/sys/dev/smartpqi/smartpqi_mem.c +++ b/sys/dev/smartpqi/smartpqi_mem.c @@ -99,7 +99,7 @@ os_dma_mem_alloc(pqisrc_softstate_t *softs, struct dma_mem *dma_mem) } if ((ret = bus_dmamem_alloc(dma_mem->dma_tag, (void **)&dma_mem->virt_addr, - BUS_DMA_WAITOK, &dma_mem->dma_map)) != 0) { + BUS_DMA_NOWAIT, &dma_mem->dma_map)) != 0) { DBG_ERR("can't allocate DMA memory for required object \ with error = 0x%x\n", ret); goto err_mem;