From nobody Mon Feb 07 20:55:29 2022 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 C4CE619C130A; Mon, 7 Feb 2022 20:55:29 +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 4Jsz1Y5BnXz4kFN; Mon, 7 Feb 2022 20:55:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644267329; 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=e6TieKAv4vL9ahNBYxqQ1DLozVshMuTOm7VyDhvjl3E=; b=tpQgyrrHsO4/9XOI/f92IPGS6LKIXIIFYkFeNq+3+7itQSbWelDUk7gmQgOO4QS+z+1MNn AmhzkRefapI6SoQmsOXZuh6Dl+BlfDLMfEQDMcpT+e4OG6DDUAV3oImck4dMriYgjDI65t O8tmJudVjJBKqgwlzCugSzcjv0v8+AdC076VEmRnaKDtopvfUlKZwMRDgXKybiYS+eaRJC esEjU8qpGnjpzkNMobNkH2UzTNwz0AYejNx2sGWZX2kOSlzJdvcjG+HRbW944h/kSdbBXP zNh+lT3MmEu2gNBdrrScXpBKmJ9klDbfZnHURAtWXlkmBpMFfCSxUY7b9PTs6Q== 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 925484B13; Mon, 7 Feb 2022 20:55:29 +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 217KtT8l050864; Mon, 7 Feb 2022 20:55:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 217KtTGC050863; Mon, 7 Feb 2022 20:55:29 GMT (envelope-from git) Date: Mon, 7 Feb 2022 20:55:29 GMT Message-Id: <202202072055.217KtTGC050863@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: a3d71fffa786 - main - cfiscsi_done: Free the dummy PDU earlier. 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: a3d71fffa78619fb394b8bb595d2ef680bd0e43a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644267329; 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=e6TieKAv4vL9ahNBYxqQ1DLozVshMuTOm7VyDhvjl3E=; b=mpLclaw56B6slgkG9UjaLEfmhUAWvqqJBZo2w0SwhiNjyyXBELToaEFiCxNP5hP99HHwmw HAXxwKfQYzjKqYy5xfbUcmr/7stLDd+FoBaPZFbMNsx/XNUGAivoZ1IPM1thHP+H+jA+sl CnPxYQYH22RgSQa47NLen1NLBBwpw1s9na+TGUl0pjBtB+EkO3ypUBzmUXZ/ISiorZeeoC YMS5m+VHvr8mXc1Wajf5w5x4eF6lEh7M5tnumWt5IrheU4rosppNSNkr0tjMi4t81emVE2 o02jWbQQXIlpodJozeEeVD1fuqXv/hIFVTK0qoRk4V9/FvOyVBrK28bKs86ZqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644267329; a=rsa-sha256; cv=none; b=etuoUjSnlvPo2FHp6hubxBPWVkON0UHlJ52s1yuxpEDSL+FLAQiIjhQibR6yQlXHlCETR0 id5pW8G7YqReuzRIjYtnUIwS3B9J1vIkMA15As6ooZrD3z9CQF7xK5pFKkrqJ16cBsWITv jt0LsWf/TMgyJFsB6e+Irct3IOEsU8YjO0WdlXfK1XLEmke4Jq1HT0W8D5FEuQpB5+H1F3 pm3SkCVfLAt+Of4ccpDY52MLa84LBTKBJpzsuGpGmqWRsFQFI5yADK3CaV3ybT81IoiTct blf8IoWA0VKEV49ni4qRzw6Ccnn3WC2SD0uDcwg70ApwVO7C3lHL8pKde1/GaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a3d71fffa78619fb394b8bb595d2ef680bd0e43a commit a3d71fffa78619fb394b8bb595d2ef680bd0e43a Author: John Baldwin AuthorDate: 2022-02-07 20:55:08 +0000 Commit: John Baldwin CommitDate: 2022-02-07 20:55:08 +0000 cfiscsi_done: Free the dummy PDU earlier. The dummy PDU needs to be freed before marking task abortion complete as otherwise cfiscsi_session_terminate_tasks can return and destroy the session in another thread before the PDU is freed. Fixes: 2e8d1a55258d iscsi: Allocate a dummy PDU for the internal nexus reset task. Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D34176 --- sys/cam/ctl/ctl_frontend_iscsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cam/ctl/ctl_frontend_iscsi.c b/sys/cam/ctl/ctl_frontend_iscsi.c index 9827491dba4d..cccb3fd90317 100644 --- a/sys/cam/ctl/ctl_frontend_iscsi.c +++ b/sys/cam/ctl/ctl_frontend_iscsi.c @@ -3062,11 +3062,11 @@ cfiscsi_done(union ctl_io *io) /* * Implicit task termination has just completed; nothing to do. */ + icl_pdu_free(request); cs->cs_tasks_aborted = true; refcount_release(&cs->cs_outstanding_ctl_pdus); wakeup(__DEVOLATILE(void *, &cs->cs_outstanding_ctl_pdus)); ctl_free_io(io); - icl_pdu_free(request); return; default: panic("cfiscsi_done called with wrong opcode 0x%x",