From nobody Thu Jan 30 15:51:59 2025 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 4YkNnC41Gbz5lZl3; Thu, 30 Jan 2025 15:51:59 +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 4YkNnC3Cr4z3XYy; Thu, 30 Jan 2025 15:51:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738252319; 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=G7MsM/j4FMqi9xwPFJLB2gugR654Qnu8jj7anORn9Z8=; b=vo4r/A/QabWWv3CqPJsJWptC68U6csGUrbToa4XeM8InVlFuNonIUhRSUV0bvztBvy1Vn2 frLhLbhuBg+in3aNeh+AzVu8Pl6M3gyFBKKOlR2SfUQY5mJ/iJDovoJjhaQd0Jur2//1y0 PJkz7kSjq+jTcKIzWjW+fQodpDGqDvjwJXrLu1fROZVKeKnSPGMJTbQzWYH3aizcVJkOcT CeX/6cHumJp+VY5DWWTUS6wvctU5h9TCH8tPRi0akJnpHbY19t3i4KlABrelEz65G/khe8 /D5T31HFqhcq5QhAIyTD1y6ZmsJ3J/ovx+nV11fPfwVgOdP5Gg5YsZnYNk9H2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738252319; 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=G7MsM/j4FMqi9xwPFJLB2gugR654Qnu8jj7anORn9Z8=; b=AvUqTKrpJ20PYQtkWpjaBOMQhLg61Gq+LaW5QVhdHSKhasZt6vLtI8LJ3xn+wJEEpwLu/6 g3JzUAdDBSpwLaPXA7fUZHkjjCl2fxZHGphJZFc567PzmA2PuOvx/gBccb9kFIMh2LLAS4 0+6Ym9vnn+Cpx5T1egOwuD3+Slx7uFF1zj4L0uocLi7zrU12AADO32E1ZT6wRLscTccRXz /leVcPpBZ8yGbESXW6QET0T/ZxjTyXKJ5uO7A42GxHI80KyQrV1Mi9AFxEYBDOwFr57Bcs SQRVi5raajRUTorxX/VVpyC6fD357kU8jyj9JCpbupukzfpT+R7aR0SE3KlNEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738252319; a=rsa-sha256; cv=none; b=SLnkxxgGmJDjDVluJg/p6qmXQKBwwtSPIhgvzuV2Yfb05Vjlje0z8GZXGYvDunc53TN3+H z+rV5tm9W0K7u2XHxqpCMDClObDQ2MIOKIbD0BSBPG24qLN7uoYD/+B9oEwC4B8pXHU9Aw GMjjzFZYJI8g0xxoVJYlJwoWn/p52K3W/p3oH5LcHPZShAfQYiPKDLy1XIbBDon2ZpBsQu 7ToKflHxePs8MPwv9myJI1PSjp0JZgdnRmAgUkMSkVbRhVF4BUFW7wTE4osqyLWh1oPhL+ Bag1qaBrzWMv6oheG8Ahg/0R5S1COFOMX0J3MQpqkHdR4gRUCJyrnHGVPoqvjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YkNnC2YP0ztL2; Thu, 30 Jan 2025 15:51:59 +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 50UFpxnc016931; Thu, 30 Jan 2025 15:51:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50UFpxmf016927; Thu, 30 Jan 2025 15:51:59 GMT (envelope-from git) Date: Thu, 30 Jan 2025 15:51:59 GMT Message-Id: <202501301551.50UFpxmf016927@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 10d188ae2c47 - main - nvmecontrol: Consolidate error paths in connect_nvm_queues() 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 10d188ae2c4716108030a7943c981cf25495cf35 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=10d188ae2c4716108030a7943c981cf25495cf35 commit 10d188ae2c4716108030a7943c981cf25495cf35 Author: John Baldwin AuthorDate: 2025-01-30 15:50:38 +0000 Commit: John Baldwin CommitDate: 2025-01-30 15:50:38 +0000 nvmecontrol: Consolidate error paths in connect_nvm_queues() Zero the I/O queue array earlier so that disconnect_nvm_queues() can be safely used for earlier failures. Suggested by: dab Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D48654 --- sbin/nvmecontrol/fabrics.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/sbin/nvmecontrol/fabrics.c b/sbin/nvmecontrol/fabrics.c index 1d90a62dd3e3..89589c88f7e3 100644 --- a/sbin/nvmecontrol/fabrics.c +++ b/sbin/nvmecontrol/fabrics.c @@ -458,44 +458,40 @@ connect_nvm_queues(const struct nvmf_association_params *aparams, } /* Validate I/O queue size. */ + memset(io, 0, sizeof(*io) * num_io_queues); if (queue_size == 0) queue_size = (u_int)mqes + 1; else if (queue_size > (u_int)mqes + 1) { - shutdown_controller(*admin); - nvmf_free_association(na); warnx("I/O queue size exceeds controller maximum (%u)", mqes + 1); - return (EX_USAGE); + error = EX_USAGE; + goto out; } /* Fetch controller data. */ error = nvmf_host_identify_controller(*admin, cdata); if (error != 0) { - shutdown_controller(*admin); - nvmf_free_association(na); warnc(error, "Failed to fetch controller data for %s", subnqn); - return (EX_IOERR); + error = EX_IOERR; + goto out; } nvmf_update_assocation(na, cdata); error = nvmf_host_request_queues(*admin, num_io_queues, &queues); if (error != 0) { - shutdown_controller(*admin); - nvmf_free_association(na); warnc(error, "Failed to request I/O queues"); - return (EX_IOERR); + error = EX_IOERR; + goto out; } if (queues < num_io_queues) { - shutdown_controller(*admin); - nvmf_free_association(na); warnx("Controller enabled fewer I/O queues (%u) than requested (%u)", queues, num_io_queues); - return (EX_PROTOCOL); + error = EX_PROTOCOL; + goto out; } /* I/O queues. */ - memset(io, 0, sizeof(*io) * num_io_queues); for (u_int i = 0; i < num_io_queues; i++) { memset(&qparams, 0, sizeof(qparams)); qparams.admin = false;