From patchwork Mon Nov 21 13:35:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Benjamin Coddington X-Patchwork-Id: 13056545 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aib29ajc252.phx1.oracleemaildelivery.com (aib29ajc252.phx1.oracleemaildelivery.com [192.29.103.252]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0A372C636F8 for ; Sat, 26 Nov 2022 18:13:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=oss-phx-1109; d=oss.oracle.com; h=Date:To:From:Subject:Message-Id:MIME-Version:Sender; bh=RHrI02f8PgsJHnG/Ytc7hHED8KutIfzpBG/nXUJiXIo=; b=0+Ukg9AlyR3m6heQRWG6tYby/GezVrBiSvUKWojhAdDfMDWcfT1kDkL7tMtocoosEn1iexG4J1l2 9IxtlSlK83uH0Z2tgoc4n80+721V/Xr4t/F3iIszH/EMMG4aMURIhPoMlONoFZ3lJWQYyXL3Igkp IMriV+CKBXy+GKrErEAykC1cV9oxAnRySNudjBgb1OnPusnAhZCa9Trd03P/oJxTjPjCA2hHEMEs XXyqIHbac4MxZNicI9uUybBe/AhUl9HS/F+DDZsZLjAVep5opx3ppCKUuu+iBeV/cW0mAJl56QBV Ldwtr8xHcqDiXebpgXWR4GLR17H7U5klTWj7UQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=prod-phx-20191217; d=phx1.rp.oracleemaildelivery.com; h=Date:To:From:Subject:Message-Id:MIME-Version:Sender; bh=RHrI02f8PgsJHnG/Ytc7hHED8KutIfzpBG/nXUJiXIo=; b=HguaaFkkG1cWrc9OoypznyY+45UWbNlw6nJAzQLHnu7mYql4TuLVRvFxAaeKfUyh+fp0cguSMLGP ITgqWnJiKUXMjnn5SkwrPoMsmYshbY4toljUxN3GCNCIoPkxaC0U1Piz3bR/LDPmorf2G32r77Xt 08iHHX42mgjcR0QthKi6A7t8RwKZxT8Acy2xqGD2cEdz4NsCcgvZBglIjJfVSIr5ZwoLk0/++DZA 8cXmsgUngDCpjqL+VZWhFGSAPZaZYyFF01BuLkvo2bqQAHl6bne9goa8PUtmoOK+AjBkIPPqZBzP ciAWf2aaIi1LOnBzZVpgal3AmhYm/5ceRLn5Ew== Received: by omta-ad3-fd1-301-us-phoenix-1.omtaad3.vcndpphx.oraclevcn.com (Oracle Communications Messaging Server 8.1.0.1.20221104 64bit (built Nov 4 2022)) with ESMTPS id <0RLY00KA1VZ00Y40@omta-ad3-fd1-301-us-phoenix-1.omtaad3.vcndpphx.oraclevcn.com> for ocfs2-devel@archiver.kernel.org; Sat, 26 Nov 2022 18:13:48 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669037741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0PNVVbxIqYIMNHfObHOmGwpKRDt3WRR+KlB649CkZdU=; b=YmXC0/CW2OlrX1YiXUKN2GVTivrtYHzi7yDOE8AxfPFFqHYtGy2XbjyOA4pR2zRJ4kfIzN 5y7BZlr3QgIMyEjMAAGyh0r+DVTZLguG16pFe4aKc7VY1SVQ6EYuPwb0XW6DErwKHeEoBu gPCwrivwnZMxNBYzNkDs5b8pGfAogTo= To: netdev@vger.kernel.org Date: Mon, 21 Nov 2022 08:35:18 -0500 Message-id: In-reply-to: References: MIME-version: 1.0 X-Source-IP: 170.10.133.124 X-Proofpoint-Virus-Version: vendor=nai engine=6500 definitions=10537 signatures=596816 Cc: Latchesar Ionkov , samba-technical@lists.samba.org, Dominique Martinet , Valentina Manea , linux-nvme@lists.infradead.org, Philipp Reisner , David Howells , Eric Dumazet , linux-nfs@vger.kernel.org, Marc Dionne , Shuah Khan , Mike Christie , drbd-dev@lists.linbit.com, linux-cifs@vger.kernel.org, Sagi Grimberg , linux-scsi@vger.kernel.org, linux-afs@lists.infradead.org, cluster-devel@redhat.com, Christine Caulfield , Jakub Kicinski , Ilya Dryomov , Paolo Abeni , Anna Schumaker , Eric Van Hensbergen , "James E.J. Bottomley" , Josef Bacik , nbd@other.debian.org, linux-block@vger.kernel.org, v9fs-developer@lists.sourceforge.net, Keith Busch , ceph-devel@vger.kernel.org, Xiubo Li , Trond Myklebust , Jens Axboe , Chris Leech , open-iscsi@googlegroups.com, Greg Kroah-Hartman , linux-usb@vger.kernel.org, Jeff Layton , linux-kernel@vger.kernel.org, Steve French , =?utf-8?q?C?= =?utf-8?q?hristoph_B=C3=B6hmwalder?= , Chuck Lever , Lee Duncan , Lars Ellenberg , "David S. Miller" , ocfs2-devel@oss.oracle.com Subject: [Ocfs2-devel] [PATCH v1 2/3] Treewide: Stop corrupting socket's task_frag X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Benjamin Coddington via Ocfs2-devel Reply-to: Benjamin Coddington Content-type: text/plain; charset="utf-8" Content-transfer-encoding: base64 Errors-to: ocfs2-devel-bounces@oss.oracle.com X-MC-Unique: rlO582ulOneUVS_CgfihtA-1 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 ip4:107.21.15.141 ip4:108.177.8.0/21 ip4:128.17.0.0/20 ip4:128.17.128.0/20 ip4:128.17.192.0/20 ip4:128.17.64.0/20 ip4:128.245.0.0/20 ip4:128.245.64.0/20 ip4:13.110.208.0/21 ip4:13.110.216.0/22 ip4:13.110.224.0/20 ip4:13.111.0.0/16 ip4:136.147.128.0/20 ip4:136.147.176.0/20 ip4:148.105.8.0/21 ip4:149.72.0.0/16 ip4:159.183.0.0/16 include:spf1.redhat.com -all X-Proofpoint-SPF-VenPass: Allowed X-ServerName: us-smtp-delivery-124.mimecast.com X-Proofpoint-SPF-Result: pass X-Proofpoint-SPF-Record: v=spf1 ip4:107.21.15.141 ip4:108.177.8.0/21 ip4:128.17.0.0/20 ip4:128.17.128.0/20 ip4:128.17.192.0/20 ip4:128.17.64.0/20 ip4:128.245.0.0/20 ip4:128.245.64.0/20 ip4:13.110.208.0/21 ip4:13.110.216.0/22 ip4:13.110.224.0/20 ip4:13.111.0.0/16 ip4:136.147.128.0/20 ip4:136.147.176.0/20 ip4:148.105.8.0/21 ip4:149.72.0.0/16 ip4:159.183.0.0/16 include:spf1.redhat.com -all X-Proofpoint-Spam-Reason: safe X-Spam: OrgSafeList X-SpamRule: orgsafelist X-Proofpoint-GUID: jFxb4HP6EH1Rm65rDsrSOILrOEUyn_Cv X-Proofpoint-ORIG-GUID: jFxb4HP6EH1Rm65rDsrSOILrOEUyn_Cv X-Mailman-Approved-At: Sat, 26 Nov 2022 18:13:43 +0000 Reporting-Meta: AAGTmyQ01KNkxxsYLDXuJLiz3otvkA+WDOeQ5shw84YaqYhoJ7Lam7Thu2jgKz/A 2Qt0wvfvBkUX3XQ10cNcJfp+pqWuejtqzexxQVtln2XthCRxGNKfvnyPFK33pdva Y896Az4L4MkaIqtI1HR8aYDRGn/LA2dayIYPk6GyFjRGTg0JJY7WEngGBl4nQWBI Ptzv8UwkNNrCBznziy/ZwuroJ2Adlbr0zXiY8U/wFu8wpW6u2UNmWv7OY7qkso2g seN9fUrKkvLG+ucLBGYwQI5KN0gbSES4gksqf0Q9co5/VsEgzVGCX55U+47U3N3G q6x05Ha7yD6ONiooTPol/87DJgG4DCaatlE0schTkN769IJhMk24ZoUcpZ0MuyBP s8IElmP4RDpvqJa5bwA4fK5v88Aw7QujUNypCk7Q27otRLrRfLP/rDTKiZU5sQey GW5ukrZdDaTAef1dVskYDRVYuccBo79dUkPoKDB/TmxhHAQ/81OhUIo8JE0BE6EX RzPgQygkfm9oJs6FYlQuMn6RXTFOQ14YCp4y+ZndRCJD Since moving to memalloc_nofs_save/restore, SUNRPC has stopped setting the GFP_NOIO flag on sk_allocation which the networking system uses to decide when it is safe to use current->task_frag. The results of this are unexpected corruption in task_frag when SUNRPC is involved in memory reclaim. The corruption can be seen in crashes, but the root cause is often difficult to ascertain as a crashing machine's stack trace will have no evidence of being near NFS or SUNRPC code. I believe this problem to be much more pervasive than reports to the community may indicate. Fix this by having kernel users of sockets that may corrupt task_frag due to reclaim set sk_use_task_frag = false. Preemptively correcting this situation for users that still set sk_allocation allows them to convert to memalloc_nofs_save/restore without the same unexpected corruptions that are sure to follow, unlikely to show up in testing, and difficult to bisect. CC: Philipp Reisner CC: Lars Ellenberg CC: "Christoph Böhmwalder" CC: Jens Axboe CC: Josef Bacik CC: Keith Busch CC: Christoph Hellwig CC: Sagi Grimberg CC: Lee Duncan CC: Chris Leech CC: Mike Christie CC: "James E.J. Bottomley" CC: "Martin K. Petersen" CC: Valentina Manea CC: Shuah Khan CC: Greg Kroah-Hartman CC: David Howells CC: Marc Dionne CC: Steve French CC: Christine Caulfield CC: David Teigland CC: Mark Fasheh CC: Joel Becker CC: Joseph Qi CC: Eric Van Hensbergen CC: Latchesar Ionkov CC: Dominique Martinet CC: "David S. Miller" CC: Eric Dumazet CC: Jakub Kicinski CC: Paolo Abeni CC: Ilya Dryomov CC: Xiubo Li CC: Chuck Lever CC: Jeff Layton CC: Trond Myklebust CC: Anna Schumaker CC: drbd-dev@lists.linbit.com CC: linux-block@vger.kernel.org CC: linux-kernel@vger.kernel.org CC: nbd@other.debian.org CC: linux-nvme@lists.infradead.org CC: open-iscsi@googlegroups.com CC: linux-scsi@vger.kernel.org CC: linux-usb@vger.kernel.org CC: linux-afs@lists.infradead.org CC: linux-cifs@vger.kernel.org CC: samba-technical@lists.samba.org CC: cluster-devel@redhat.com CC: ocfs2-devel@oss.oracle.com CC: v9fs-developer@lists.sourceforge.net CC: netdev@vger.kernel.org CC: ceph-devel@vger.kernel.org CC: linux-nfs@vger.kernel.org Suggested-by: Guillaume Nault Signed-off-by: Benjamin Coddington --- drivers/block/drbd/drbd_receiver.c | 3 +++ drivers/block/nbd.c | 1 + drivers/nvme/host/tcp.c | 1 + drivers/scsi/iscsi_tcp.c | 1 + drivers/usb/usbip/usbip_common.c | 1 + fs/afs/rxrpc.c | 1 + fs/cifs/connect.c | 1 + fs/dlm/lowcomms.c | 2 ++ fs/ocfs2/cluster/tcp.c | 1 + net/9p/trans_fd.c | 1 + net/ceph/messenger.c | 1 + net/sunrpc/xprtsock.c | 3 +++ 12 files changed, 17 insertions(+) diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c index af4c7d65490b..09ad8d82c200 100644 --- a/drivers/block/drbd/drbd_receiver.c +++ b/drivers/block/drbd/drbd_receiver.c @@ -1030,6 +1030,9 @@ static int conn_connect(struct drbd_connection *connection) sock.socket->sk->sk_allocation = GFP_NOIO; msock.socket->sk->sk_allocation = GFP_NOIO; + sock.socket->sk->sk_use_task_frag = false; + msock.socket->sk->sk_use_task_frag = false; + sock.socket->sk->sk_priority = TC_PRIO_INTERACTIVE_BULK; msock.socket->sk->sk_priority = TC_PRIO_INTERACTIVE; diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 2a709daefbc4..815ee631ed30 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -514,6 +514,7 @@ static int sock_xmit(struct nbd_device *nbd, int index, int send, noreclaim_flag = memalloc_noreclaim_save(); do { sock->sk->sk_allocation = GFP_NOIO | __GFP_MEMALLOC; + sock->sk->sk_use_task_frag = false; msg.msg_name = NULL; msg.msg_namelen = 0; msg.msg_control = NULL; diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index d5871fd6f769..e01d78858cb4 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -1531,6 +1531,7 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, queue->sock->sk->sk_rcvtimeo = 10 * HZ; queue->sock->sk->sk_allocation = GFP_ATOMIC; + queue->sock->sk->sk_use_task_frag = false; nvme_tcp_set_queue_io_cpu(queue); queue->request = NULL; queue->data_remaining = 0; diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index 29b1bd755afe..733e540d0abf 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c @@ -733,6 +733,7 @@ iscsi_sw_tcp_conn_bind(struct iscsi_cls_session *cls_session, sk->sk_reuse = SK_CAN_REUSE; sk->sk_sndtimeo = 15 * HZ; /* FIXME: make it configurable */ sk->sk_allocation = GFP_ATOMIC; + sk->sk_use_task_frag = false; sk_set_memalloc(sk); sock_no_linger(sk); diff --git a/drivers/usb/usbip/usbip_common.c b/drivers/usb/usbip/usbip_common.c index 2ab99244bc31..76bfc6e43881 100644 --- a/drivers/usb/usbip/usbip_common.c +++ b/drivers/usb/usbip/usbip_common.c @@ -315,6 +315,7 @@ int usbip_recv(struct socket *sock, void *buf, int size) do { sock->sk->sk_allocation = GFP_NOIO; + sock->sk->sk_use_task_frag = false; result = sock_recvmsg(sock, &msg, MSG_WAITALL); if (result <= 0) diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c index eccc3cd0cb70..ac75ad18db83 100644 --- a/fs/afs/rxrpc.c +++ b/fs/afs/rxrpc.c @@ -46,6 +46,7 @@ int afs_open_socket(struct afs_net *net) goto error_1; socket->sk->sk_allocation = GFP_NOFS; + socket->sk->sk_use_task_frag = false; /* bind the callback manager's address to make this a server socket */ memset(&srx, 0, sizeof(srx)); diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 7ae6f2c08153..c2b0d6f59f79 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -2935,6 +2935,7 @@ generic_ip_connect(struct TCP_Server_Info *server) cifs_dbg(FYI, "Socket created\n"); server->ssocket = socket; socket->sk->sk_allocation = GFP_NOFS; + socket->sk->sk_use_task_frag = false; if (sfamily == AF_INET6) cifs_reclassify_socket6(socket); else diff --git a/fs/dlm/lowcomms.c b/fs/dlm/lowcomms.c index a4e84e8d94c8..4cf29ac3c428 100644 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c @@ -699,6 +699,7 @@ static void add_listen_sock(struct socket *sock, struct listen_connection *con) sk->sk_user_data = con; sk->sk_allocation = GFP_NOFS; + sk->sk_use_task_frag = false; /* Install a data_ready callback */ sk->sk_data_ready = lowcomms_listen_data_ready; release_sock(sk); @@ -718,6 +719,7 @@ static void add_sock(struct socket *sock, struct connection *con) sk->sk_write_space = lowcomms_write_space; sk->sk_state_change = lowcomms_state_change; sk->sk_allocation = GFP_NOFS; + sk->sk_use_task_frag = false; sk->sk_error_report = lowcomms_error_report; release_sock(sk); } diff --git a/fs/ocfs2/cluster/tcp.c b/fs/ocfs2/cluster/tcp.c index f660c0dbdb63..3eaafa5e5ec4 100644 --- a/fs/ocfs2/cluster/tcp.c +++ b/fs/ocfs2/cluster/tcp.c @@ -1604,6 +1604,7 @@ static void o2net_start_connect(struct work_struct *work) sc->sc_sock = sock; /* freed by sc_kref_release */ sock->sk->sk_allocation = GFP_ATOMIC; + sock->sk->sk_use_task_frag = false; myaddr.sin_family = AF_INET; myaddr.sin_addr.s_addr = mynode->nd_ipv4_address; diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c index e758978b44be..96f803499323 100644 --- a/net/9p/trans_fd.c +++ b/net/9p/trans_fd.c @@ -851,6 +851,7 @@ static int p9_socket_open(struct p9_client *client, struct socket *csocket) return -ENOMEM; csocket->sk->sk_allocation = GFP_NOIO; + csocket->sk->sk_use_task_frag = false; file = sock_alloc_file(csocket, 0, NULL); if (IS_ERR(file)) { pr_err("%s (%d): failed to map fd\n", diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index d3bb656308b4..cad8e0ca8432 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -446,6 +446,7 @@ int ceph_tcp_connect(struct ceph_connection *con) if (ret) return ret; sock->sk->sk_allocation = GFP_NOFS; + sock->sk->sk_use_task_frag = false; #ifdef CONFIG_LOCKDEP lockdep_set_class(&sock->sk->sk_lock, &socket_class); diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index e976007f4fd0..d3170b753dfc 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c @@ -1882,6 +1882,7 @@ static int xs_local_finish_connecting(struct rpc_xprt *xprt, sk->sk_write_space = xs_udp_write_space; sk->sk_state_change = xs_local_state_change; sk->sk_error_report = xs_error_report; + sk->sk_use_task_frag = false; xprt_clear_connected(xprt); @@ -2083,6 +2084,7 @@ static void xs_udp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock) sk->sk_user_data = xprt; sk->sk_data_ready = xs_data_ready; sk->sk_write_space = xs_udp_write_space; + sk->sk_use_task_frag = false; xprt_set_connected(xprt); @@ -2250,6 +2252,7 @@ static int xs_tcp_finish_connecting(struct rpc_xprt *xprt, struct socket *sock) sk->sk_state_change = xs_tcp_state_change; sk->sk_write_space = xs_tcp_write_space; sk->sk_error_report = xs_error_report; + sk->sk_use_task_frag = false; /* socket options */ sock_reset_flag(sk, SOCK_LINGER);