From nobody Thu Nov 23 16:08:02 2023 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 4Sbjh301Tdz51nZM; Thu, 23 Nov 2023 16:08: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 4Sbjh24R72z4Q8y; Thu, 23 Nov 2023 16:08:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700755682; 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=nS+D8jXPdHoKoPyu85BRRyAVoRQXC1ksGAKCTNgolZc=; b=QAnVXC5tUF5E1TTEPHmnFnuz5FCzcCIH+CwgIsxkIRhWrEyn230Ir7OyV6+1vAI3QNFKAj 23odnRo7CwlvZlruVKDubSNQdFLRoFCbADc/NJ4jkRgeGuG5/t+DU4ZrmMpcs5rgWhN0mt U1G7Id45c15caEQt85Eyhrrryy15+xX65p8Sb3tSW/izeG4O5pwo7FDCP6ByHHE3/ny/BQ qbs2w+xqRhC2H6CXED337mrnBE7J6QHm9bt+2r/01YcE/qkpFQ3ilyv3PLGWXZuq8uELQL DELTcYtTCC3HEMhacNvNBIpI4t5kMtE7SogQjgCTMr+qs4GyVXejKxIIAU0k1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700755682; 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=nS+D8jXPdHoKoPyu85BRRyAVoRQXC1ksGAKCTNgolZc=; b=Y1wh8A1akcbNRxfCfdVpIPzkHRn8QOxuQCRVUQAQrfsvngm/ow8gX5oJn7giHtVf1P0blA 9q0DhgpQNRC/8jXbfaESRcVgtEHFdzDpqFm9tVwJCAQ59Cg15uRGg4kajbWmv8ATMxDYyC OgqBNpSyFq4OlxNp8weOainDmiSiX6uUA1dfkrNyRQBi4VmfGoEpXega0rGxpd59Vg8PYF JIGoJIz2FuoH5QXj9vhC1h5iBeuYYGQcaign1rslofJTpGfVeN/KA6oGiHAOtM/H8nXSk7 y1CYZUyN8bzmHCx4K2jqeocg1jp3PrichdxHcGgHoWWOpmqxkXOfjqb4ATGW/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700755682; a=rsa-sha256; cv=none; b=kM+YAqMq9SfD6oSU5MymOV2ISM5cicm9ae8N/lF9CBVdp9SvUScxvp1UwB9dFIvnLToSo+ z+7RggmOZGcb/5iTOORWCFGcbnIRrUnXhVcgxkq36YoYEcANwPsap3cG7PqhpViyr+22Ir rKM/ZU+IbQn40NN6MddaB6fq2duvyK0haHMH/NkMzOupTkNPT3IwJ+cqyJIWTM8l/X5kyU BFvA30abIlYSucdRBcnV4y9cKHt/SuzmtXPIbHMPK+4QKly5aLzWoJvu31O1mQWkRHiEot R2vb2epITLPcKPiix+NblaQ78WIuEhMQt6G15N5pweiQlbK/+6KcXlInm93nKQ== 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 4Sbjh23XnTz17hM; Thu, 23 Nov 2023 16:08:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3ANG82Js007631; Thu, 23 Nov 2023 16:08:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ANG82Hj007628; Thu, 23 Nov 2023 16:08:02 GMT (envelope-from git) Date: Thu, 23 Nov 2023 16:08:02 GMT Message-Id: <202311231608.3ANG82Hj007628@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 2ce1c45b3411 - main - iscsi: adjust shutdown_pre_sync handler 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ce1c45b3411410a5d0a4d08198a3b0010d493b7 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=2ce1c45b3411410a5d0a4d08198a3b0010d493b7 commit 2ce1c45b3411410a5d0a4d08198a3b0010d493b7 Author: Mitchell Horne AuthorDate: 2023-11-23 15:26:12 +0000 Commit: Mitchell Horne CommitDate: 2023-11-23 16:07:42 +0000 iscsi: adjust shutdown_pre_sync handler Don't attempt to service reconnections if RB_NOSYNC is set. More crucially, don't do it if the scheduler is stopped, as the maintenance thread will never run again. Reviewed by: jhb MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D42342 --- sys/dev/iscsi/iscsi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/dev/iscsi/iscsi.c b/sys/dev/iscsi/iscsi.c index 311b339caf7a..38973898a9d1 100644 --- a/sys/dev/iscsi/iscsi.c +++ b/sys/dev/iscsi/iscsi.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -2680,11 +2681,12 @@ iscsi_terminate_sessions(struct iscsi_softc *sc) } static void -iscsi_shutdown_pre(struct iscsi_softc *sc) +iscsi_shutdown_pre(struct iscsi_softc *sc, int howto) { struct iscsi_session *is; - if (!fail_on_shutdown) + if (!fail_on_shutdown || (howto & RB_NOSYNC) != 0 || + SCHEDULER_STOPPED()) return; /*