From nobody Tue Jun 7 10:30:02 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 268E05D2098; Tue, 7 Jun 2022 10:30:03 +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 4LHRSW0B4Fz4jc3; Tue, 7 Jun 2022 10:30:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654597803; 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=HIBx27rSLWG7QT2PCzHlSWbPjmatQ1Cwr3orHRiBGiA=; b=txkqViCchwGuDSXUhR4YOu1jnFAcAO8Z962IcGRSIKgRlepzE0QPirJ4a/vjd27MDpqjc7 PRsxdGx9JjcBjmrSk9ZY2IjBN1V5Dt4Z49+zK8i9TfK0+zlcfHYZsmqcNmeaNgPXid7ph8 BZTZziXe3/RxD7ZwwNIkK3L1SD1Je1OW4pS9vsmc8IAeVbKecziOQ23QSCEYvBnppxwbBd NZKD3W+XrZME9O6GwBYHg7RalhXaVt1B/NBRYWXigYgCKTgtOCI/+izsPrztnNAmrs59Ow agm8XaCqgZMU4gu1GUxWadWaAiF58378RcUshHP5wXYhAkFYlIALKKQxMUij4w== 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 C742919488; Tue, 7 Jun 2022 10:30:02 +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 257AU283097096; Tue, 7 Jun 2022 10:30:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 257AU24w097093; Tue, 7 Jun 2022 10:30:02 GMT (envelope-from git) Date: Tue, 7 Jun 2022 10:30:02 GMT Message-Id: <202206071030.257AU24w097093@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Roger Pau Monn=C3=A9?= Subject: git: 137381ca606c - main - xen/blkback: fix tear-down issues 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: royger X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 137381ca606ca38a5a24949b9966ee461e155788 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654597803; 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=HIBx27rSLWG7QT2PCzHlSWbPjmatQ1Cwr3orHRiBGiA=; b=dHkhXygkf5Tz+QP1vaC24E9o2GTs/agI5/PKM5xPfo31DhmMah/9BajQGtPj/kIdxwcQNQ l5maL2DlVRVbImXF6OtdUB9Yhx2eeJiGO28egXFGXIncCcft3hlJ3xT9/XL1AL7rZPjXU4 ONam9Wc8ASkVEzBwSBSZsZuRuCykMPNJMUX1jXPpj1k59N7KWRmlFPbrB9VrHSBc470NiH utl4W0meF0hHGEHRsPVpJ/Lr/lE28GSgacYu4RXZq1F49fiTy5hAxAyIJCL6+X0QXfCtkK SJ87Hem4NigaZf65nO2iyrRTs0qLxJJp6oGm38rjOCr1RtnL2b10sR66+87hcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654597803; a=rsa-sha256; cv=none; b=cc2hsOpkjMq6E+qT7RaHCYkiB6989fMSD+RO18IUwpoeWYOIMLAzLsXZ9R0e4cnB4qMop/ 0s74YvT7B6RSpYzZBLMtjBGATZRrQxcogkVUHNzfpdUW9BxRANnwmfjCkGkT0lzGyqNZp9 YgKhx5u1gG4FHGBvSHx4Ss2DsbA9ib39y98E2m3hrtKH2aIx0hNCARn6+HSk7Gbwx14JcH Rxuqd/CdPb0eQYnlQHD5OwjdQbr8A8Ma/YUepqvN+yd6eXjeHwzVLGY5wVRFywrDdfAfTR nZyABXFLcgHq75dHZgv+MzlGWCJJoGWt5wc92pupyT+U491K57aSmvBXEU5mow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=137381ca606ca38a5a24949b9966ee461e155788 commit 137381ca606ca38a5a24949b9966ee461e155788 Author: Roger Pau Monné AuthorDate: 2022-03-27 08:43:42 +0000 Commit: Roger Pau Monné CommitDate: 2022-06-07 10:29:53 +0000 xen/blkback: fix tear-down issues Handle tearing down a blkback that hasn't been fully initialized. This requires carefully checking that fields are allocated before trying to access them. Also communication memory is allocated before setting XBBF_RING_CONNECTED, so gating it's freeing on XBBF_RING_CONNECTED being set is wrong and will lead to memory leaks. Also stop using xbb_disconnect() in error paths. Use xenbus_dev_fatal and let the normal disconnection procedure take care of the cleanup. Reported by: Ze Dupsys Sponsored by: Citrix Systems R&D --- sys/dev/xen/blkback/blkback.c | 63 +++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 33 deletions(-) diff --git a/sys/dev/xen/blkback/blkback.c b/sys/dev/xen/blkback/blkback.c index e32236d507f3..fa0bb3ff85ed 100644 --- a/sys/dev/xen/blkback/blkback.c +++ b/sys/dev/xen/blkback/blkback.c @@ -2774,19 +2774,12 @@ xbb_free_communication_mem(struct xbb_softc *xbb) static int xbb_disconnect(struct xbb_softc *xbb) { - struct gnttab_unmap_grant_ref ops[XBB_MAX_RING_PAGES]; - struct gnttab_unmap_grant_ref *op; - u_int ring_idx; - int error; - DPRINTF("\n"); - if ((xbb->flags & XBBF_RING_CONNECTED) == 0) - return (0); - mtx_unlock(&xbb->lock); xen_intr_unbind(&xbb->xen_intr_handle); - taskqueue_drain(xbb->io_taskqueue, &xbb->io_task); + if (xbb->io_taskqueue != NULL) + taskqueue_drain(xbb->io_taskqueue, &xbb->io_task); mtx_lock(&xbb->lock); /* @@ -2796,19 +2789,28 @@ xbb_disconnect(struct xbb_softc *xbb) if (xbb->active_request_count != 0) return (EAGAIN); - for (ring_idx = 0, op = ops; - ring_idx < xbb->ring_config.ring_pages; - ring_idx++, op++) { - op->host_addr = xbb->ring_config.gnt_addr - + (ring_idx * PAGE_SIZE); - op->dev_bus_addr = xbb->ring_config.bus_addr[ring_idx]; - op->handle = xbb->ring_config.handle[ring_idx]; - } + if (xbb->flags & XBBF_RING_CONNECTED) { + struct gnttab_unmap_grant_ref ops[XBB_MAX_RING_PAGES]; + struct gnttab_unmap_grant_ref *op; + unsigned int ring_idx; + int error; + + for (ring_idx = 0, op = ops; + ring_idx < xbb->ring_config.ring_pages; + ring_idx++, op++) { + op->host_addr = xbb->ring_config.gnt_addr + + (ring_idx * PAGE_SIZE); + op->dev_bus_addr = xbb->ring_config.bus_addr[ring_idx]; + op->handle = xbb->ring_config.handle[ring_idx]; + } - error = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, ops, - xbb->ring_config.ring_pages); - if (error != 0) - panic("Grant table op failed (%d)", error); + error = HYPERVISOR_grant_table_op(GNTTABOP_unmap_grant_ref, ops, + xbb->ring_config.ring_pages); + if (error != 0) + panic("Grant table op failed (%d)", error); + + xbb->flags &= ~XBBF_RING_CONNECTED; + } xbb_free_communication_mem(xbb); @@ -2839,7 +2841,6 @@ xbb_disconnect(struct xbb_softc *xbb) xbb->request_lists = NULL; } - xbb->flags &= ~XBBF_RING_CONNECTED; return (0); } @@ -2963,7 +2964,6 @@ xbb_connect_ring(struct xbb_softc *xbb) INTR_TYPE_BIO | INTR_MPSAFE, &xbb->xen_intr_handle); if (error) { - (void)xbb_disconnect(xbb); xenbus_dev_fatal(xbb->dev, error, "binding event channel"); return (error); } @@ -3338,6 +3338,13 @@ xbb_connect(struct xbb_softc *xbb) return; } + error = xbb_publish_backend_info(xbb); + if (error != 0) { + xenbus_dev_fatal(xbb->dev, error, + "Unable to publish device information"); + return; + } + error = xbb_alloc_requests(xbb); if (error != 0) { /* Specific errors are reported by xbb_alloc_requests(). */ @@ -3359,16 +3366,6 @@ xbb_connect(struct xbb_softc *xbb) return; } - if (xbb_publish_backend_info(xbb) != 0) { - /* - * If we can't publish our data, we cannot participate - * in this connection, and waiting for a front-end state - * change will not help the situation. - */ - (void)xbb_disconnect(xbb); - return; - } - /* Ready for I/O. */ xenbus_set_state(xbb->dev, XenbusStateConnected); }