From nobody Tue Oct 18 06:03:08 2022 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 4Ms3F93C4xz4g8Bm; Tue, 18 Oct 2022 06:03:09 +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 4Ms3F92GQRz3bl2; Tue, 18 Oct 2022 06:03:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666072989; 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=yXn6TKapJHDWV94yw0ZcUCqspafXjPd7FsbpGdqgqZU=; b=YUCIrTYGgRs5rJQVZBFtnOBtY3ebwHOQ29Rdmk9pJ6UaAoht0XxFPseQvMX0zDTWPNkOFo pT/vxZA0wSliymeJ3feVxBiTwVt5ece/wEeGfHb4UjAqwcsjyu+7n/v8FhuvoqIa9jgrK1 eJTB/DG6w29asaOksqKEVrVt/ng+Y3Y/pSVuUhLN16bzxzaO1MEQRmzZJnTjxBFWzBbHWx XLEn2Xq07ytQ8Rq0WB0q4V7NWIox4g9pNEj9T0pZj/ULJyoseiycnOMb5LIyJVfEfgq20v ZQXtHuEbe8RlYFNOdQP4vr3C1Sk3LLbHq0RGdmcgFnJMwGBFc45haHDGcFokgQ== 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 4Ms3F86BCqz157t; Tue, 18 Oct 2022 06:03:08 +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 29I638jq097359; Tue, 18 Oct 2022 06:03:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29I6382v097358; Tue, 18 Oct 2022 06:03:08 GMT (envelope-from git) Date: Tue, 18 Oct 2022 06:03:08 GMT Message-Id: <202210180603.29I6382v097358@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 3a8aff9d0879 - main - vtblk: Include pointer to softc in request 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3a8aff9d087961c38ffa253c0594028a48363ece Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666072989; 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=yXn6TKapJHDWV94yw0ZcUCqspafXjPd7FsbpGdqgqZU=; b=rfyzgpbr1dBqiUqihhqxoFlZO2qBEGiAwNSoMGNV9cnUA8rJq4K8e3WSj9G3trS+vNoxeF Vb9db1P8OzeCYYe8fjfprmJqrmO8DlX6akPrTLc/dvTHbL1wKDroQ/NInChtep6hm0s5C9 viGGF7LCyMt0Mu3fM8IMgFimfj0Xg46UPAtzNyVH6psonTi01coOvfJ41isbHSU0MyrC5n u9o9CsUburPi/lcgBlSv12sI5PBsTs9HBqWr8Rd5eSDzfO8b3MsF1pDaX17av6qoGeKWUj ioXgIzGySaDeB8CF1eFErsjIs3Tjbwch6yV45BeGGOhCHRw3rB88xFhoRrZ87Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666072989; a=rsa-sha256; cv=none; b=CdH7nNX9SFqN+eTvfLrZIPAQ1c4n6zWgrRXLrtt0Yg5FPkW8jAaUsgRvKpABu1XMQr7cET esTdD9nUi1mlg5tKgva1xRk+PDogk7/yszLZ4WaYcrDkHzA1twzlgvS3HAV0TQuFVaErqV 5iRFWA+7qujmiOQdYrG2eG4bSgCAsoqpyKzDYArKGXctj9uv5NqbeVrguSgokiENcInkVo RBq4AEFPAAp2MRt8zEhnm7SjAKd2DgcVAo4v4gAAQR3rGks2esS1KD6hCebM5Nzmz/HUhy eVbQTw6HuOACgfCf9rPUd6t8+ytytF4OQNGF5uoLwbsGD71banivuNSGjgsP/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=3a8aff9d087961c38ffa253c0594028a48363ece commit 3a8aff9d087961c38ffa253c0594028a48363ece Author: Colin Percival AuthorDate: 2022-09-18 22:37:07 +0000 Commit: Colin Percival CommitDate: 2022-10-18 06:02:21 +0000 vtblk: Include pointer to softc in request No functional change intended. Reviewed by: bryanv, imp Sponsored by: https://www.patreon.com/cperciva Differential Revision: https://reviews.freebsd.org/D36666 --- sys/dev/virtio/block/virtio_blk.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/sys/dev/virtio/block/virtio_blk.c b/sys/dev/virtio/block/virtio_blk.c index fca2d367c170..65f43c5de2d7 100644 --- a/sys/dev/virtio/block/virtio_blk.c +++ b/sys/dev/virtio/block/virtio_blk.c @@ -59,6 +59,9 @@ __FBSDID("$FreeBSD$"); #include "virtio_if.h" struct vtblk_request { + struct vtblk_softc *vbr_sc; + + /* Fields after this point are zeroed for each request. */ struct virtio_blk_outhdr vbr_hdr; struct bio *vbr_bp; uint8_t vbr_ack; @@ -163,8 +166,7 @@ static struct vtblk_request * vtblk_request_next(struct vtblk_softc *); static struct vtblk_request * vtblk_request_bio(struct vtblk_softc *); -static void vtblk_request_execute(struct vtblk_softc *, - struct vtblk_request *); +static void vtblk_request_execute(struct vtblk_request *); static int vtblk_request_error(struct vtblk_request *); static void vtblk_queue_completed(struct vtblk_softc *, @@ -806,6 +808,8 @@ vtblk_request_prealloc(struct vtblk_softc *sc) if (req == NULL) return (ENOMEM); + req->vbr_sc = sc; + MPASS(sglist_count(&req->vbr_hdr, sizeof(req->vbr_hdr)) == 1); MPASS(sglist_count(&req->vbr_ack, sizeof(req->vbr_ack)) == 1); @@ -840,7 +844,8 @@ vtblk_request_dequeue(struct vtblk_softc *sc) req = TAILQ_FIRST(&sc->vtblk_req_free); if (req != NULL) { TAILQ_REMOVE(&sc->vtblk_req_free, req, vbr_link); - bzero(req, sizeof(struct vtblk_request)); + bzero(&req->vbr_hdr, sizeof(struct vtblk_request) - + offsetof(struct vtblk_request, vbr_hdr)); } return (req); @@ -934,13 +939,15 @@ vtblk_request_bio(struct vtblk_softc *sc) } static void -vtblk_request_execute(struct vtblk_softc *sc, struct vtblk_request *req) +vtblk_request_execute(struct vtblk_request *req) { + struct vtblk_softc *sc; struct virtqueue *vq; struct sglist *sg; struct bio *bp; int ordered, readable, writable, error; + sc = req->vbr_sc; vq = sc->vtblk_vq; sg = sc->vtblk_sglist; bp = req->vbr_bp; @@ -1137,7 +1144,7 @@ vtblk_startio(struct vtblk_softc *sc) break; req->vbr_requeue_on_error = 1; - vtblk_request_execute(sc, req); + vtblk_request_execute(req); if (req->vbr_error != 0) break; @@ -1273,7 +1280,7 @@ vtblk_poll_request(struct vtblk_softc *sc, struct vtblk_request *req) if (!virtqueue_empty(vq)) return (EBUSY); - vtblk_request_execute(sc, req); + vtblk_request_execute(req); error = req->vbr_error; if (error) return (error);