From nobody Thu Apr 09 14:14:33 2026 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 4fs24b67R9z6Y0PH for ; Thu, 09 Apr 2026 14:14:39 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fs24b05DWz40C7 for ; Thu, 09 Apr 2026 14:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775744079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KkrGR/1zTs3sqbIiGoFN1Iw36sDCfETHMID5v8CJT9s=; b=gIuykKZybGfE0hXWzs86UZuh5UT1PvtmMv/ljAqJHQ03TGMUYdDpMF+TBD9cAAvI6IBIkn TRs27wD89P7GAB1T3lSEQ0aGq9UEHv9acKMUaTKTfPqxd1iR3/89+10GKBUI0g1paRq0zy 2ccwz78sJJFclu92wKwWVTGpMFFnCjxcsSOpWTbNN1+Kmop8DcagW+feVJK3E8eWrvqPt6 wWe453HNUiXw4Eslbof94zDLe6YBiqjUOPSpNhpq3V3JtFnee4++sei6chKqNjETiIVvpD nHkwH+6L639xy8y0LDotBbCWalAPvHN3UvsRes1VvdEN6ygTLTd8CLqMUCRZzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775744079; a=rsa-sha256; cv=none; b=TQBSsS7FP1VaVvf/8Fp3wSf2/02sMihlHBaUTpdHf3K3/sXLAsLoz+y1gfOVxl4QQVAeCe GmOCdrkCwHT24bK9sk078lb1QBbOYnXh3DoV1w8ilMKPjFOu25lsRr3BtU/g5t4JioXgS0 Clh8odFYW4uY/+LadbVJc9KQir9VS94a1MCEjoIPbpAn9XyKyXJKPaw4LmUI5CZMhIPfUu clqihwmtxYoCMo426k4cIcvWloX0i00113gcQOk/Ynfo6ZlEobyadp9DbAZjsvVvHDbNmT NrwtUFx2CqPbm56DeSsyMe+s9y+I8uMoQNuMT1WtufXD8R4AsNO+FF7fgT2J+A== 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=1775744079; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KkrGR/1zTs3sqbIiGoFN1Iw36sDCfETHMID5v8CJT9s=; b=p8rWmd3KJaiHzxcy63Y+FeJw8/o0vJjTqVNkcAdX62BbN3MO7g2it1D0HyacZikWqr8Us/ YSWXp8QJLmlyRmp7Ym0jIiTqQ82c2SdKCBIsPrrV4UKqrRoNFaaKnpxQp43XjBL+UwVR18 T66Ih4KFme9SLmYY+bfzmA740p3SslxhVyIUlKAJrra8GZSVYqdk4oMEDqcn9t2YbF9j73 8iSDujeFjSthlWbL/yGJgV+qkmhGdBRpkeXWxLD85wq4Eemf/O1MXoEl8hhpFBuwVXMxGn IGVkLcWFS8rFTTDNndZIeQXon40YUk6M20ZMCCn7N+g6pB002yjVTpBvGInyCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fs24Z6mwnz1G6J for ; Thu, 09 Apr 2026 14:14:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3bac4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 09 Apr 2026 14:14:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Sarah Walker From: Andrew Turner Subject: git: f54209510b1b - main - virtio_blk: Fix initialisation of dump request structure 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f54209510b1b30b1445792db7d33401f7c7a97d6 Auto-Submitted: auto-generated Date: Thu, 09 Apr 2026 14:14:33 +0000 Message-Id: <69d7b449.3bac4.eb5c0e1@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=f54209510b1b30b1445792db7d33401f7c7a97d6 commit f54209510b1b30b1445792db7d33401f7c7a97d6 Author: Sarah Walker AuthorDate: 2026-04-09 10:52:05 +0000 Commit: Andrew Turner CommitDate: 2026-04-09 14:13:31 +0000 virtio_blk: Fix initialisation of dump request structure Commit c8c37141 ("virtio_blk: Use bus_dma for command/ack buffer allocations") failed to update initialisation of the dedicated dump request structure. This caused a panic on attempting to dump core to a virtio_blk device. Reviewed by: asomers Sponsored by: Arm Ltd Pull Request: https://reviews.freebsd.org/D56156 --- sys/dev/virtio/block/virtio_blk.c | 94 ++++++++++++++++++++++----------------- 1 file changed, 54 insertions(+), 40 deletions(-) diff --git a/sys/dev/virtio/block/virtio_blk.c b/sys/dev/virtio/block/virtio_blk.c index 4cedb9b45a0e..96846eb0529a 100644 --- a/sys/dev/virtio/block/virtio_blk.c +++ b/sys/dev/virtio/block/virtio_blk.c @@ -930,11 +930,58 @@ vtblk_hdr_load_callback(void *arg, bus_dma_segment_t *segs, int nsegs, req->vbr_hdr_paddr = segs[0].ds_addr; } +static int +vtblk_create_request(struct vtblk_softc *sc, struct vtblk_request *req) +{ + req->vbr_sc = sc; + + if (bus_dmamap_create(sc->vtblk_dmat, 0, &req->vbr_mapp)) + goto error_free; + + if (bus_dmamem_alloc(sc->vtblk_hdr_dmat, (void **)&req->vbr_hdr, + BUS_DMA_NOWAIT | BUS_DMA_ZERO | BUS_DMA_COHERENT, + &req->vbr_hdr_mapp)) + goto error_destroy; + + if (bus_dmamem_alloc(sc->vtblk_ack_dmat, (void **)&req->vbr_ack, + BUS_DMA_NOWAIT | BUS_DMA_ZERO | BUS_DMA_COHERENT, + &req->vbr_ack_mapp)) + goto error_hdr_free; + + MPASS(sglist_count(req->vbr_hdr, sizeof(*req->vbr_hdr)) == 1); + MPASS(sglist_count(req->vbr_ack, sizeof(*req->vbr_ack)) == 1); + + if (bus_dmamap_load(sc->vtblk_hdr_dmat, req->vbr_hdr_mapp, + req->vbr_hdr, sizeof(struct virtio_blk_outhdr), + vtblk_hdr_load_callback, req, BUS_DMA_NOWAIT)) + goto error_ack_free; + + if (bus_dmamap_load(sc->vtblk_ack_dmat, req->vbr_ack_mapp, + req->vbr_ack, sizeof(uint8_t), vtblk_ack_load_callback, + req, BUS_DMA_NOWAIT)) + goto error_hdr_unload; + + return (0); + +error_hdr_unload: + bus_dmamap_unload(sc->vtblk_hdr_dmat, req->vbr_hdr_mapp); +error_ack_free: + bus_dmamem_free(sc->vtblk_ack_dmat, req->vbr_ack, req->vbr_ack_mapp); +error_hdr_free: + bus_dmamem_free(sc->vtblk_hdr_dmat, req->vbr_hdr, req->vbr_hdr_mapp); +error_destroy: + bus_dmamap_destroy(sc->vtblk_dmat, req->vbr_mapp); +error_free: + + return (ENOMEM); +} + static int vtblk_request_prealloc(struct vtblk_softc *sc) { struct vtblk_request *req; int i, nreqs; + int error; nreqs = virtqueue_size(sc->vtblk_vq); @@ -951,52 +998,19 @@ vtblk_request_prealloc(struct vtblk_softc *sc) if (req == NULL) return (ENOMEM); - req->vbr_sc = sc; - - if (bus_dmamap_create(sc->vtblk_dmat, 0, &req->vbr_mapp)) - goto error_free; - - if (bus_dmamem_alloc(sc->vtblk_hdr_dmat, (void **)&req->vbr_hdr, - BUS_DMA_NOWAIT | BUS_DMA_ZERO | BUS_DMA_COHERENT, - &req->vbr_hdr_mapp)) - goto error_destroy; - - if (bus_dmamem_alloc(sc->vtblk_ack_dmat, (void **)&req->vbr_ack, - BUS_DMA_NOWAIT | BUS_DMA_ZERO | BUS_DMA_COHERENT, - &req->vbr_ack_mapp)) - goto error_hdr_free; - - MPASS(sglist_count(req->vbr_hdr, sizeof(*req->vbr_hdr)) == 1); - MPASS(sglist_count(req->vbr_ack, sizeof(*req->vbr_ack)) == 1); - - if (bus_dmamap_load(sc->vtblk_hdr_dmat, req->vbr_hdr_mapp, - req->vbr_hdr, sizeof(struct virtio_blk_outhdr), - vtblk_hdr_load_callback, req, BUS_DMA_NOWAIT)) - goto error_ack_free; - - if (bus_dmamap_load(sc->vtblk_ack_dmat, req->vbr_ack_mapp, - req->vbr_ack, sizeof(uint8_t), vtblk_ack_load_callback, - req, BUS_DMA_NOWAIT)) - goto error_hdr_unload; + error = vtblk_create_request(sc, req); + if (error) { + free(req, M_DEVBUF); + return (error); + } sc->vtblk_request_count++; vtblk_request_enqueue(sc, req); } - return (0); + error = vtblk_create_request(sc, &sc->vtblk_dump_request); -error_hdr_unload: - bus_dmamap_unload(sc->vtblk_hdr_dmat, req->vbr_hdr_mapp); -error_ack_free: - bus_dmamem_free(sc->vtblk_ack_dmat, req->vbr_ack, req->vbr_ack_mapp); -error_hdr_free: - bus_dmamem_free(sc->vtblk_hdr_dmat, req->vbr_hdr, req->vbr_hdr_mapp); -error_destroy: - bus_dmamap_destroy(sc->vtblk_dmat, req->vbr_mapp); -error_free: - free(req, M_DEVBUF); - - return (ENOMEM); + return (error); } static void