From patchwork Fri May 19 07:40:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 96244 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1062979vqo; Fri, 19 May 2023 01:03:58 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4jSoTRemKmoUcwAwDMYM+r6/kyZ+D9vynvuPP062hQAO2saOKAXQ/ZiCHwomuBo9v8Ilc7 X-Received: by 2002:a17:90a:2ec3:b0:24d:ec16:6f8c with SMTP id h3-20020a17090a2ec300b0024dec166f8cmr1295063pjs.20.1684483438257; Fri, 19 May 2023 01:03:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684483438; cv=none; d=google.com; s=arc-20160816; b=Iwf/G3j+ZxrKb+6/a2Q4porSMagQlXpkFQjTVkIBOhFCBi6k2DrJvBP8GEdVJX1p4k dRrZyxR/NyTbtUsp6F11kAgzoUX5psAKYhj5XKNt//Rcyv5P6sr0Qfc1+nJ9ddVgHM+q cuEgyPf37nZj0MuOPdmheSCANAzVp+9kr0osg/f1MqrWS6mHEYOKSd0BtSUUmxeTF1FS ClHKJ9OBRw5HchJJuWHhBTIaaOJuCuob0eAF/u3jTTwfrUKAq8KO+AwPPeyv8v5ZqetM gjUyfY0JQs05/innvRgPxeWfqPUsGYnM6mLG+VLkfS7awDnn3vY0fyBbMGFdLJ+NkGkC hqNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ronE9gr+sRXtILb6fInqA45jNbZvtaGttVkSNNlZgW8=; b=FadcRWT/gKRu7qV8snQeuMfJmeT3wc0WaOyg1oD1Ea7deKHGUWvnmo8YqjhAid7/tY b9DMYb8tqtO/KPznpkp9u82ZHJNq8PzFFtVdy/LQDAenz0J1u62QRVScjLpialwIvIpt FZz+hWHZRgvD4aA+Ngrv6wd39ogNz7A3wYexn7DQgTg1AFFegz5kdkV74cOawiPeZads XE3F17TaXhts8srusevEYuwUOZEMYQHAbeHFVp87LA1AjLIQXtOkZrjzP9xqF9GobaQS VkQwwKL3aJFSOmvUAdhDlg0bzmUKdsYrr+YYsQYXQp2rcpowxH7yjJV5w7eFwNgDSV+8 x1/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=d9bwyEpX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t10-20020a63a60a000000b00528d90d40cfsi3394172pge.228.2023.05.19.01.03.44; Fri, 19 May 2023 01:03:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=d9bwyEpX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229901AbjESHmx (ORCPT + 99 others); Fri, 19 May 2023 03:42:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59488 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229663AbjESHmo (ORCPT ); Fri, 19 May 2023 03:42:44 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61EE81727 for ; Fri, 19 May 2023 00:41:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684482100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ronE9gr+sRXtILb6fInqA45jNbZvtaGttVkSNNlZgW8=; b=d9bwyEpX11hsNtIbHG1LPT/oQKvurOLUUIw7NOM61s/sJJgUH4WHO4gN6y8SY7WD8sT2x4 nH/XOtXKUEQKrWruRDOKaa3UvTZ7JF2KD3n9W1Ozdnan1VjNzcZbC/uQ6S9VJz9T+VuGgF b8wILmRUW0ALi1BpFRh+bGIUuycekwk= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-274-frHc13ceOAyBYDJKrmNfcw-1; Fri, 19 May 2023 03:41:37 -0400 X-MC-Unique: frHc13ceOAyBYDJKrmNfcw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 39B0C80120A; Fri, 19 May 2023 07:41:36 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id A860140CFD45; Fri, 19 May 2023 07:41:33 +0000 (UTC) From: David Howells To: Jens Axboe , Al Viro , Christoph Hellwig Cc: David Howells , Matthew Wilcox , Jan Kara , Jeff Layton , David Hildenbrand , Jason Gunthorpe , Logan Gunthorpe , Hillf Danton , Christian Brauner , Linus Torvalds , linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Christoph Hellwig , netdev@vger.kernel.org Subject: [PATCH v20 10/32] net: Make sock_splice_read() use direct_splice_read() by default Date: Fri, 19 May 2023 08:40:25 +0100 Message-Id: <20230519074047.1739879-11-dhowells@redhat.com> In-Reply-To: <20230519074047.1739879-1-dhowells@redhat.com> References: <20230519074047.1739879-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766308905986385399?= X-GMAIL-MSGID: =?utf-8?q?1766308905986385399?= Make sock_splice_read() use direct_splice_read() by default as file_splice_read() will return immediately with 0 as a socket has no pagecache and is a zero-size file. Signed-off-by: David Howells cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: Christoph Hellwig cc: Al Viro cc: Jens Axboe cc: netdev@vger.kernel.org cc: linux-block@vger.kernel.org cc: linux-mm@kvack.org --- net/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/socket.c b/net/socket.c index b7e01d0fe082..40b204a47aba 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1093,7 +1093,7 @@ static ssize_t sock_splice_read(struct file *file, loff_t *ppos, struct socket *sock = file->private_data; if (unlikely(!sock->ops->splice_read)) - return generic_file_splice_read(file, ppos, pipe, len, flags); + return direct_splice_read(file, ppos, pipe, len, flags); return sock->ops->splice_read(sock, ppos, pipe, len, flags); }