From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 886341E522; Thu, 30 Jan 2025 14:29:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738247387; cv=none; b=MwqJp3eUYLbDCa+XKboOg+FlWr50p5oQSQwJEm738yINHkY2mcDUyEXR7ER7kez7klrz/AldGobFUg13hixe/cW9JppYi6JAaP/msk6sFI7quI2rZk/amvrvk6t2A5winwyrR9LO1/R3+9z9evcZp1PHOCQFijSlNF+9o4oqOTo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738247387; c=relaxed/simple; bh=oJo6Ntu4T/ODxPUIvDQ/bHOQ1pewBgdCqXTUZGhw6vE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RbXH1os11s2gxRu3hcPer6RWbbsQy0TttFHNF8jNlhY3O8Hr+FicB1VjP9Krx/+EmKj7jb+xn/sMkYDKArp1hVf/4S0jJL8Vk4H7qAcGX18br9NJGgGE7la9LO/3pn42r7CtfT9zcQ1k1xRThNlprXMY9hhxvAXOBx/WKrQ5Xks= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KDkgWY6Y; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="KDkgWY6Y" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 11C57C4CED2; Thu, 30 Jan 2025 14:29:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738247387; bh=oJo6Ntu4T/ODxPUIvDQ/bHOQ1pewBgdCqXTUZGhw6vE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KDkgWY6YGXz0tkP7JANuWmXXWvzvfl3Rhn/8/WuH/uVzGicprKXrwnw9xxTPYGE2D +EINqrqSjkvWPUhOFBaOMwX173yYOQM6A25QO0JZRsQLOAaffKbHSlJ0vK6CeHu+kK K8p/D3entbu3UxyfuK9auz1sTOIYMzKgZvT9wm4c= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Xiang Zhang , Mike Christie , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 6.1 04/49] scsi: iscsi: Fix redundant response for ISCSI_UEVENT_GET_HOST_STATS request Date: Thu, 30 Jan 2025 15:01:40 +0100 Message-ID: <20250130140134.007794705@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250130140133.825446496@linuxfoundation.org> References: <20250130140133.825446496@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xiang Zhang [ Upstream commit 63ca02221cc5aa0731fe2b0cc28158aaa4b84982 ] The ISCSI_UEVENT_GET_HOST_STATS request is already handled in iscsi_get_host_stats(). This fix ensures that redundant responses are skipped in iscsi_if_rx(). - On success: send reply and stats from iscsi_get_host_stats() within if_recv_msg(). - On error: fall through. Signed-off-by: Xiang Zhang Link: https://lore.kernel.org/r/20250107022432.65390-1-hawkxiang.cpp@gmail.com Reviewed-by: Mike Christie Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/scsi_transport_iscsi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c index 49dbcd67579aa..687487ea4fd3b 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c @@ -4102,7 +4102,7 @@ iscsi_if_rx(struct sk_buff *skb) } do { /* - * special case for GET_STATS: + * special case for GET_STATS, GET_CHAP and GET_HOST_STATS: * on success - sending reply and stats from * inside of if_recv_msg(), * on error - fall through. @@ -4111,6 +4111,8 @@ iscsi_if_rx(struct sk_buff *skb) break; if (ev->type == ISCSI_UEVENT_GET_CHAP && !err) break; + if (ev->type == ISCSI_UEVENT_GET_HOST_STATS && !err) + break; err = iscsi_if_send_reply(portid, nlh->nlmsg_type, ev, sizeof(*ev)); if (err == -EAGAIN && --retries < 0) { -- 2.39.5