From patchwork Mon May 22 13:49:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 97453 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1466372vqo; Mon, 22 May 2023 06:55:20 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7Dno9LR2aXnVhyvxoAo7Qfx3BaPoH0ewQy6HUjMdcVygZOlYCAUPPcM4Jtd7m7U8Ez/ouM X-Received: by 2002:a17:902:e88d:b0:1af:a143:b0e7 with SMTP id w13-20020a170902e88d00b001afa143b0e7mr7257590plg.10.1684763719724; Mon, 22 May 2023 06:55:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684763719; cv=none; d=google.com; s=arc-20160816; b=ChqzRtEPTUXT4EPDZ+0KS010ln01JG3v9BYDV5/t0/tD+kCQGngbecQ1qpnThRwf5D 1lrWS4OOQHyFEoOsa3WYqwO7FW4n3IcvZ6cB9hJWArz8PaIthlheO90guR7HyePYxjJU OfDSrlkbU+CyGsQAmK4c/p8Ci6gsJc7bkyUG7h1kE9x/wDmYD8LRP6aettlJuVmzhznb rGf1/s8RPMTFLnS8JJBGLDYxj/AkD4lHQxSsCjJV8AjOK2Ua2dTQkc36E3gwsgFO9o+3 UpjWR2a+3aXAqOy5nvv0W9rRB1nnxb6TL9qUYfOkpMX/FgLc88eI54AdQl1aIdFWVomC upEg== 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=OAfj5fBZSZu8a/UyjUmcAHzT3o8yzjmkKwDwGprM6r0=; b=mHS1wcM14GCIGwEke9kX6up/769/Y/U7w0fJFrM+etP6UtUYDLgkPvv6GcG2I2GMs+ BYoY4HC0tqTTJ7Ut/8h98KnWtaQIm+1PWJGgvuI0B+KjMqYclJqW+dVXLv6mv+PVQHv5 Y46qTL//gvxhpBNJctXG4/ibiYxuaXZrpo9K1onCaP5wdymUtM/PvJ8FRim82ZsU/kGt zLlhPZ9acjRsJZp6XAd6fYjrAigrCLUy8qa71SMzF7ud70eMW4erkMUHP+Ar0gAJ8cdt zettqO2GyPS8Y208b5/TyuKPfFcrFIfl5jSJOCImjAwLDozPR6ZJiMXNr0+YoQkWiY5u NaxQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XqHtON+Z; 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 iw13-20020a170903044d00b0019e6e61c1bcsi4442683plb.9.2023.05.22.06.55.03; Mon, 22 May 2023 06:55:19 -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=XqHtON+Z; 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 S234113AbjEVNwu (ORCPT + 99 others); Mon, 22 May 2023 09:52:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234012AbjEVNwM (ORCPT ); Mon, 22 May 2023 09:52:12 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 108211BD for ; Mon, 22 May 2023 06:50:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684763454; 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=OAfj5fBZSZu8a/UyjUmcAHzT3o8yzjmkKwDwGprM6r0=; b=XqHtON+ZMM48V3wGwftT/JKGROkePfuXyHwCEeXx0A4KuXUsm9l+pElc9U3MD79HeMC/XJ xZdTKwJ7FowIHfkf1hz8sVmMjKjMgReKQbWwLOmM0jYURw92U/nLVBttGyYDOBapH31QFf 5qPM1D4gx0UNANrkVlVBGKMIDZP3bPk= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-315-ESFFS34sPvibgfGTGCbRAQ-1; Mon, 22 May 2023 09:50:49 -0400 X-MC-Unique: ESFFS34sPvibgfGTGCbRAQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 160012812947; Mon, 22 May 2023 13:50:48 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.39.192.68]) by smtp.corp.redhat.com (Postfix) with ESMTP id A0BB8C1ED99; Mon, 22 May 2023 13:50:45 +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, Christoph Hellwig Subject: [PATCH v22 06/31] splice: Check for zero count in vfs_splice_read() Date: Mon, 22 May 2023 14:49:53 +0100 Message-Id: <20230522135018.2742245-7-dhowells@redhat.com> In-Reply-To: <20230522135018.2742245-1-dhowells@redhat.com> References: <20230522135018.2742245-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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=ham 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?1766602802603862159?= X-GMAIL-MSGID: =?utf-8?q?1766602802603862159?= Make vfs_splice_read() return immediately if the length is 0. Signed-off-by: David Howells Reviewed-by: Christoph Hellwig Reviewed-by: Christian Brauner cc: Jens Axboe cc: Al Viro cc: linux-block@vger.kernel.org cc: linux-fsdevel@vger.kernel.org cc: linux-mm@kvack.org --- fs/splice.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/splice.c b/fs/splice.c index d815a69f6589..fe3309ffeb26 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -891,6 +891,8 @@ long vfs_splice_read(struct file *in, loff_t *ppos, if (unlikely(!(in->f_mode & FMODE_READ))) return -EBADF; + if (!len) + return 0; /* Don't try to read more the pipe has space for. */ p_space = pipe->max_usage - pipe_occupancy(pipe->head, pipe->tail);