From patchwork Tue Jun 27 16:55:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ahelenia_Ziemia=C5=84ska?= X-Patchwork-Id: 113519 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8366208vqr; Tue, 27 Jun 2023 10:41:24 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5vOuMRFaxdtiiYmIRjXIUybP5TAARLbOOIFuv2EZsWJ8ksoEGDnwQEwyxE97OPwawyDyS4 X-Received: by 2002:a17:906:ee8b:b0:974:c32c:b485 with SMTP id wt11-20020a170906ee8b00b00974c32cb485mr27684977ejb.45.1687887683885; Tue, 27 Jun 2023 10:41:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687887683; cv=none; d=google.com; s=arc-20160816; b=PMxGpDg+6OWFYKXxKi8PGDtHcqfqPp+buRuL031Nr4fBiAcXa8X0aKTLLO/gG4oQ7y ZBxfAWBzvOOoCxETUJJDN0FQfL3mFvl6UZFSjqOzdttgpuz0BazLQb48CVKidxGOmIYk ceBb5oHgHKltFLSocGKsleyqve7raa7K9Bhmq/jWiYVH4vaYki/RX4b/d7brm9/6EYZz 1lNfMC6e4AUzr7uaAeH/gAX+rat8cqgwYVkvb2o82t/0OKHftfnnF+YCZWCDCEDisSxT sYf1/aKSlbrVSlGtTMflsGPkLntdUqzNHTeyOUTmNRGxpEt+60GSp+mLdCJs5lFbw0Ye FcvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :dkim-signature; bh=6iSvSW//D5nLKAgleFhxPROnyhTfJTO0xROei99d7xI=; fh=dxa6PLKHmBVAinSve5UaytdH17N24IDvSMU4TVOqTkg=; b=MP3sFG8cvw6+1ETSoq1rILfm9OkpsZltt0UPealWLRrrjAFQRfB9sVBYlG2LuozYMx w3A0noxPdDtPAenU+Kl85pHDN9SU7TOwOVryekNG43wzSB+luY6DbKCApXTFz82EvYfU MnmPbjYuB5FFJTwAmrkev9nBFEHyPYQGqHGu6ZXB1itMLLuKpccQMtGPDlMZHtqWLezf vv9VaY8THZxk0rpqGucCP+rpTliDmB8gs+FcsLMIu8TQVZZs7e+PkeYAWt07Pv7bOvdg XbYqP7NEEAQ6b/y8ziW3kN5kloo6WgdRp9gZZD3uVzQcRLy7ipr0+2gRfxfEgOcKE5mY oBjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nabijaczleweli.xyz header.s=202305 header.b=WdMG1sm5; 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=nabijaczleweli.xyz Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id os17-20020a170906af7100b0098e19ebc8f4si3910235ejb.678.2023.06.27.10.40.59; Tue, 27 Jun 2023 10:41:23 -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=@nabijaczleweli.xyz header.s=202305 header.b=WdMG1sm5; 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=nabijaczleweli.xyz Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229877AbjF0Qz4 (ORCPT + 99 others); Tue, 27 Jun 2023 12:55:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229762AbjF0Qzx (ORCPT ); Tue, 27 Jun 2023 12:55:53 -0400 Received: from tarta.nabijaczleweli.xyz (unknown [139.28.40.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2C6ED10F; Tue, 27 Jun 2023 09:55:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nabijaczleweli.xyz; s=202305; t=1687884951; bh=zaiiTIQm+Ka+TX+0vYl9PnxvGYZU7w8NqATlroNC6p0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=WdMG1sm5NRYxvt8I5gq00DBkYKI3Q4MObBBsJbYbOqARD5a59yVLVqXWjEAMyxcRD Rh8oa93FQxAJBISz7ANoEICJf6GgApt42SYAZPxqLvX7dzSI0+rcZm7OdjR7dl6idW cc0RqjU+ghJV/0ITRG/Xfc8uh1cIQq4G4HDf7d0t1VOtaTkZErVTo5lnP8oJ/lhn8w /q57QcwV8wqexSrRO0lN212HReZZ771YSxo9FQie1eJ2AzDE2uwiugXgQRHVt+Y9KU 8l+5Qln1fSGx4g5ZAeCjHVZRrmSjCjVt5JwaXiqLt/xOtT678NxnQ5lohqkeh/2P5C MeKiMorEgQZGQ== Received: from tarta.nabijaczleweli.xyz (unknown [192.168.1.250]) by tarta.nabijaczleweli.xyz (Postfix) with ESMTPSA id 6E44B1A8E; Tue, 27 Jun 2023 18:55:51 +0200 (CEST) Date: Tue, 27 Jun 2023 18:55:50 +0200 From: Ahelenia =?utf-8?q?Ziemia=C5=84ska?= To: Amir Goldstein Cc: Alexander Viro , Christian Brauner , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Jan Kara , Chung-Chiang Cheng , ltp@vger.kernel.org Subject: [PATCH v3 2/3] splice: fsnotify_access(fd)/fsnotify_modify(fd) in vmsplice Message-ID: <4206d7388fdbee87053c9655919096225a461423.1687884031.git.nabijaczleweli@nabijaczleweli.xyz> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: NeoMutt/20230517 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,PDS_RDNS_DYNAMIC_FP, RDNS_DYNAMIC,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no 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?1769878515786973932?= X-GMAIL-MSGID: =?utf-8?q?1769878515786973932?= Same logic applies here: this can fill up the pipe and pollers that rely on getting IN_MODIFY notifications never wake up. Fixes: 983652c69199 ("splice: report related fsnotify events") Link: https://lore.kernel.org/linux-fsdevel/jbyihkyk5dtaohdwjyivambb2gffyjs3dodpofafnkkunxq7bu@jngkdxx65pux/t/#u Link: https://bugs.debian.org/1039488 Signed-off-by: Ahelenia Ziemiańska Reviewed-by: Amir Goldstein --- fs/splice.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fs/splice.c b/fs/splice.c index e16f4f032d2f..0eb36e93c030 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -1346,6 +1346,9 @@ static long vmsplice_to_user(struct file *file, struct iov_iter *iter, pipe_unlock(pipe); } + if (ret > 0) + fsnotify_access(file); + return ret; } @@ -1375,8 +1378,10 @@ static long vmsplice_to_pipe(struct file *file, struct iov_iter *iter, if (!ret) ret = iter_to_pipe(iter, pipe, buf_flag); pipe_unlock(pipe); - if (ret > 0) + if (ret > 0) { wakeup_pipe_readers(pipe); + fsnotify_modify(file); + } return ret; }