scsi: iscsi: iscsi_tcp: Set no linger
authorMike Christie <michael.christie@oracle.com>
Tue, 25 May 2021 18:18:01 +0000 (13:18 -0500)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 2 Jun 2021 05:28:20 +0000 (01:28 -0400)
Userspace (open-iscsi based tools at least) sets no linger on the socket to
prevent stale data from being sent. However, with the in-kernel cleanup if
userspace is not up the sockfd_put will release the socket without having
set that sockopt.

iscsid sets that opt at socket close time, but it seems ok to set this at
setup time in the kernel for all tools.

Link: https://lore.kernel.org/r/20210525181821.7617-9-michael.christie@oracle.com
Reviewed-by: Lee Duncan <lduncan@suse.com>
Signed-off-by: Mike Christie <michael.christie@oracle.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/iscsi_tcp.c

index dd33ce0e37374e2a42d8d6cdc6f40097ba3b66c4..553e95ad619720a774daab20fe750adcc7d59247 100644 (file)
@@ -689,6 +689,7 @@ iscsi_sw_tcp_conn_bind(struct iscsi_cls_session *cls_session,
        sk->sk_sndtimeo = 15 * HZ; /* FIXME: make it configurable */
        sk->sk_allocation = GFP_ATOMIC;
        sk_set_memalloc(sk);
+       sock_no_linger(sk);
 
        iscsi_sw_tcp_conn_set_callbacks(conn);
        tcp_sw_conn->sendpage = tcp_sw_conn->sock->ops->sendpage;