From nobody Fri Oct 11 07:42:49 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 4XPzB20DGWz5YRcn; Fri, 11 Oct 2024 07:42:50 +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 4XPzB16XBmz4nns; Fri, 11 Oct 2024 07:42:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728632569; 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=ybsybKTXjNrzlnpo8lkXdJ4LH70ExT/qm5f/VcZawu0=; b=dvHxgtxa0nsoxxHeygOWmRp1M8CBWqByCbhOIm0J7lk2DuSkK/YyUgEcR+nQBi/EAG66ay J6Vzsy7RJWurBDBoLihiwRZHyNzjw4t2JSkVDA2Sd56Vleel/CPcCsSfyXP5tvoNt5VsLd Qmvb6cJxjkk+S+jsFTxTd+nsyTW2+ILXehptFiWNPyCKT0NuvZxmM+3brC7LkZXXa1r64M VbJ+z0GrHCVFr8zZ695fEjaWmVr/5TI/JOJduh8+R1TRDWYLHzZHWUXSgIYzxCBcOtc9sX MkQssPJfYFu6/kY5WN09ACOTxqcvig+gH8VulN6vhcqMBdqZFzNioqqzjebS9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1728632569; 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=ybsybKTXjNrzlnpo8lkXdJ4LH70ExT/qm5f/VcZawu0=; b=dr26bORNa6AOZSn6LJfTvF7Cm0i0kuAU7jJ0hgghTDIpCHhW8qZ9AukTXTvQgrV89SFIgY 5IeYL/YWYejhaq9fb04fKVIntTYdC2C7Q1xCx9t+m3h54PJpuzlcHc/bx3BFeAuYp7Cn0r SG7czlpcXgeVt1NMSyvM9W/Z7528ne2xox/KO2+NaawXwiBRErgTL1lxsLOlsMUxnnc/+U 7Z0oDYCyCQY3VSTbpUXBZ7XUuDyRG4iVL3sEhJjt/y6b+7UGxKMM7H8oeXg/5YyVun/lTL yusXlJB70WDhfn4lmCwp2LVcDiaLz8HwDcYoOeJXlJSaRvFuzfjFEv97tuA/fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1728632569; a=rsa-sha256; cv=none; b=RrvV1DyrHsJoDfNfDrEGJ9kzHRnCYRmIzKn9Pu9sLZzZirGOOdVAv7N7v+Q9pv9gNYJupZ e0eTs7+Jie99NRi+F8BDjsWuk0QKNVW9LzwGC7ClAVnJTZjunRYBc7l9xpi4dv9Ij8BSOh gJiLKgHEWoByn88UIrCjQG7eCufIlQ4szT9WzzmWs62fa4eEGsdahuD2/sIo5VQveQvKcj ZHz7tckHGBNp5DAeZ+L6VM6mMYtdACElaISPUW+uN0SUwVXJ7tqG/YzhExceG/H11BeHmt VQHhhMY8zaJYMSOi+ZipjmA12UGJkynXZ/TJXip70P5q+b9X9hDwkE3sxlBB2Q== 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 4XPzB167Q8zYrk; Fri, 11 Oct 2024 07:42:49 +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 49B7gnxp056835; Fri, 11 Oct 2024 07:42:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49B7gno1056832; Fri, 11 Oct 2024 07:42:49 GMT (envelope-from git) Date: Fri, 11 Oct 2024 07:42:49 GMT Message-Id: <202410110742.49B7gno1056832@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Roger Pau =?utf-8?Q?Monn=C3=A9?= Subject: git: 72e277f41aa5 - stable/13 - xen-netfront: attempt to make cleanup idempotent 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: royger X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 72e277f41aa5c31068c7f9c7e237d2926450a1d8 Auto-Submitted: auto-generated The branch stable/13 has been updated by royger: URL: https://cgit.FreeBSD.org/src/commit/?id=72e277f41aa5c31068c7f9c7e237d2926450a1d8 commit 72e277f41aa5c31068c7f9c7e237d2926450a1d8 Author: Roger Pau Monné AuthorDate: 2023-11-03 09:28:16 +0000 Commit: Roger Pau Monné CommitDate: 2024-10-11 07:41:17 +0000 xen-netfront: attempt to make cleanup idempotent Current cleanup code assumes that all the fields are allocated and/or setup by the time cleanup is called, but this is not always true: a failure in mid-setup of the device will cause the functions to be called with possibly uninitialized fields. Fix the functions to cope with such sate, while also attempting to make the cleanup idempotent. Finally fix an error path during setup that would not mark the device as closed, and hence prevents the kernel from finishing booting. Fixes: 96375eac945c ("xen-netfront: add multiqueue support") Sponsored by: Citrix Systems R&D (cherry picked from commit 318bbb6d5a1eae77eb5dc687bcc63c0f99558e21) --- sys/dev/xen/netfront/netfront.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/sys/dev/xen/netfront/netfront.c b/sys/dev/xen/netfront/netfront.c index f6778fd3759d..391bc17e02d9 100644 --- a/sys/dev/xen/netfront/netfront.c +++ b/sys/dev/xen/netfront/netfront.c @@ -539,8 +539,10 @@ talk_to_backend(device_t dev, struct netfront_info *info) num_queues = max_queues; err = setup_device(dev, info, num_queues); - if (err != 0) + if (err != 0) { + xenbus_dev_fatal(dev, err, "setup device"); goto out; + } again: err = xs_transaction_start(&xst); @@ -667,7 +669,10 @@ disconnect_rxq(struct netfront_rxq *rxq) xn_release_rx_bufs(rxq); gnttab_free_grant_references(rxq->gref_head); - gnttab_end_foreign_access(rxq->ring_ref, NULL); + if (rxq->ring_ref != GRANT_REF_INVALID) { + gnttab_end_foreign_access(rxq->ring_ref, NULL); + rxq->ring_ref = GRANT_REF_INVALID; + } /* * No split event channel support at the moment, handle will * be unbound in tx. So no need to call xen_intr_unbind here, @@ -682,6 +687,7 @@ destroy_rxq(struct netfront_rxq *rxq) callout_drain(&rxq->rx_refill); free(rxq->ring.sring, M_DEVBUF); + rxq->ring.sring = NULL; } static void @@ -713,6 +719,8 @@ setup_rxqs(device_t dev, struct netfront_info *info, rxq->id = q; rxq->info = info; + + rxq->gref_head = GNTTAB_LIST_END; rxq->ring_ref = GRANT_REF_INVALID; rxq->ring.sring = NULL; snprintf(rxq->name, XN_QUEUE_NAME_LEN, "xnrx_%u", q); @@ -769,7 +777,10 @@ disconnect_txq(struct netfront_txq *txq) xn_release_tx_bufs(txq); gnttab_free_grant_references(txq->gref_head); - gnttab_end_foreign_access(txq->ring_ref, NULL); + if (txq->ring_ref != GRANT_REF_INVALID) { + gnttab_end_foreign_access(txq->ring_ref, NULL); + txq->ring_ref = GRANT_REF_INVALID; + } xen_intr_unbind(&txq->xen_intr_handle); } @@ -778,9 +789,14 @@ destroy_txq(struct netfront_txq *txq) { free(txq->ring.sring, M_DEVBUF); + txq->ring.sring = NULL; buf_ring_free(txq->br, M_DEVBUF); - taskqueue_drain_all(txq->tq); - taskqueue_free(txq->tq); + txq->br = NULL; + if (txq->tq) { + taskqueue_drain_all(txq->tq); + taskqueue_free(txq->tq); + txq->tq = NULL; + } } static void @@ -813,6 +829,7 @@ setup_txqs(device_t dev, struct netfront_info *info, txq->id = q; txq->info = info; + txq->gref_head = GNTTAB_LIST_END; txq->ring_ref = GRANT_REF_INVALID; txq->ring.sring = NULL;