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 D407A1BDA95; Thu, 30 Jan 2025 14:20:35 +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=1738246835; cv=none; b=dP6wh3MmrPwYFFb2ozoNiCKwRtpVBBLFRiQ9wZjbhFGUjZatcDqlyimriz9Z9veAajfdeHsTQl7iDcQnbxXsVCU6uGNclvdt3ZMH7MIvaNlLbVUYxRQBEX/pwWiLoeSIg+actFKUKPZBMBv/mqQRXVaGGqax6oGi4l9DVR4tUPA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738246835; c=relaxed/simple; bh=j7/hEFnpbBa7c/VBbMbaRRHGbMJY2uLS8Am6p21zD1s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YBsluChtUGSnZs2ocis/vFsPPRpGpY7V0UOJpIQko18FnxLlNwnHX3eKjXGWkV4WkyNRWi+kaxtFLLLwqWEgxFgDI7QM9b0Op7AVH+f9ZdSKZL4d7AyGHFPJ4svmc/ZBgsTCPH201MxJlT62h7dmmQbidw0EP2Z8Z94SjnMj1sI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=bqL7Sx4O; 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="bqL7Sx4O" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4FC6CC4CED2; Thu, 30 Jan 2025 14:20:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738246835; bh=j7/hEFnpbBa7c/VBbMbaRRHGbMJY2uLS8Am6p21zD1s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bqL7Sx4OMi1fJT71Dtb3i2JGpq2Em+tsV0hiOE4L2aIFs3N6s1OYgSnRipM+Nb5ub XhahqVxEBjWDhif9K79M0fSn+yx49X1czhTlkX8CFOEzJspFmL1mTmRgAxVSYXZYKQ a0L5UuxWwA6uryLGS6UFbikoE7hTYswiwgaxG1f8= 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 5.4 76/91] scsi: iscsi: Fix redundant response for ISCSI_UEVENT_GET_HOST_STATS request Date: Thu, 30 Jan 2025 15:01:35 +0100 Message-ID: <20250130140136.729995142@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250130140133.662535583@linuxfoundation.org> References: <20250130140133.662535583@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-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 51f53638629cb..9ef242d2a2c9d 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c @@ -3746,7 +3746,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. @@ -3755,6 +3755,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