From patchwork Tue Jun 27 16:55:22 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: 113522 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp8368155vqr; Tue, 27 Jun 2023 10:45:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6ToXUP2/xk9PJpj3NQ1bgbDZCQh3hbXIM3O0SgrmpL1/XS5BtsBnZE6LZluZEHHE+w0biD X-Received: by 2002:a2e:9c14:0:b0:2b5:80e0:f190 with SMTP id s20-20020a2e9c14000000b002b580e0f190mr12873428lji.37.1687887920544; Tue, 27 Jun 2023 10:45:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687887920; cv=none; d=google.com; s=arc-20160816; b=kPImoGlcUUaCYBfuPyvqgcwo3DUFtsklYokjkc8MgeLmodyPYdj5ouE575/mIhGM31 DSt5XjwBgwTqXPcH0x3+U2JuV9HGr4V5KYw6VSvNdg4GLwYapqIaIxcjhPAFRpufUViE CvRzscZJ+p+ZWQLfB6ZYbbtO0XWMf/xvn1A2Al9+/Wpqb9Ze27xhXY4aE5z50De06TVF 4DmKdlnUecCyJfFZknGdGCYzOISeEpCjs+CpcrliwlWgumpZTnh67wP3uDR50/vwbBt6 wR62EaCr+eHwGjV6Fhl9nTziGhBxzQi77oexM+cxjerfEa+A3bG9yMowG+degpz/VoWS 7GcA== 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=nYcF9xvkMDs0Kn9RQlZw6V4MCfHlJydnFYQZsy8pxdw=; fh=dxa6PLKHmBVAinSve5UaytdH17N24IDvSMU4TVOqTkg=; b=wWuGTUJiJMD7ZoBkYY8f29jLBAflDkJdQIvARq+0lKBFrK1hP1DZncyT2iw6+3if9m bOuXWNvyVrR03nKO6Ie/+v2IivK9dYpct2khBeZd/ByrRcGl9pA0YQPZAg2vxjNGhInj pJrXOo+JlxSDL3N4MO8LS6oncpR6RaY+lv0Y28heFhmg6B2IpjYqrZZAiKtDKHD3IUyU xaJUQAV0hKjVwk+eCIYmNjQYwYNha1WHmsEVzNyecLT2zWCPoQ+FhUpVLIxXyL0udT3C 6KhwK8Jy1EYs43ThSA2Fmo9cuH/v9juyILZ2sP03SFyxIxPN5YL21BQgaaDf8CLqUZtc j1xg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nabijaczleweli.xyz header.s=202305 header.b=MUO1vDXx; 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 ci13-20020a170906c34d00b009887417e314si4412107ejb.999.2023.06.27.10.44.56; Tue, 27 Jun 2023 10:45:20 -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=MUO1vDXx; 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 S229623AbjF0Qzb (ORCPT + 99 others); Tue, 27 Jun 2023 12:55:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36778 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229454AbjF0Qza (ORCPT ); Tue, 27 Jun 2023 12:55:30 -0400 Received: from tarta.nabijaczleweli.xyz (unknown [139.28.40.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id EA06397; Tue, 27 Jun 2023 09:55:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nabijaczleweli.xyz; s=202305; t=1687884923; bh=JbdHKDIIKTI2/zLdYwnwsm7aGJ9yF1yJAJVd+rjxLKE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=MUO1vDXxXz65himZ9pbtz3C9L+ROPw+Lh6PGBVcZpo2R1LG+J2X1rMfA/P6bk2MfA YQl769QrR2gOTNNjJVLEtY57Bump4i0jvV+oeG+LqKpHnKJwazU0tFN+hd+04G02Wu Cm5UXQV1MOuBm3uGdJ7jU6o+smeBu4rKzXq24aWfyQcvd/QEWEgjYSHauXmT9JgxPb cy+UC6Vf7gGot7CszkTcPhxdu1y+Jb7mfxqz9UbYoHzb8odyQyiklbM3F4fWPGCRbw rwU+/Gi1+yaQrcovrHIti/GZCG6/yqUN41/TjUlSV3hMyqKSOkxCa+hXcHwP7KVC68 lsPejDrYmTyqw== Received: from tarta.nabijaczleweli.xyz (unknown [192.168.1.250]) by tarta.nabijaczleweli.xyz (Postfix) with ESMTPSA id 914181A88; Tue, 27 Jun 2023 18:55:23 +0200 (CEST) Date: Tue, 27 Jun 2023 18:55:22 +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 0/3+1] fanotify accounting for fs/splice.c Message-ID: 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?1769809317722550559?= X-GMAIL-MSGID: =?utf-8?q?1769878763877986742?= In 1/3 I've applied if/else if/else tree like you said, and expounded a bit in the message. This is less pretty now, however, since it turns out that iter_file_splice_write() already marks the out fd as written because it writes to it via vfs_iter_write(), and that sent a double notification. $ git grep -F .splice_write | grep -v iter_file_splice_write drivers/char/mem.c: .splice_write = splice_write_null, drivers/char/virtio_console.c: .splice_write = port_fops_splice_write, fs/fuse/dev.c: .splice_write = fuse_dev_splice_write, fs/gfs2/file.c: .splice_write = gfs2_file_splice_write, fs/gfs2/file.c: .splice_write = gfs2_file_splice_write, fs/overlayfs/file.c: .splice_write = ovl_splice_write, net/socket.c: .splice_write = generic_splice_sendpage, scripts/coccinelle/api/stream_open.cocci: .splice_write = splice_write_f, Of these, splice_write_null() doesn't mark out as written (but it's for /dev/null so I think this is expected), and I haven't been able to visually confirm whether port_fops_splice_write() and generic_splice_sendpage() do. All the others delegate to iter_file_splice_write(). In 2/3 I fixed the vmsplice notification placement (access from pipe, modify to pipe). I'm following this up with an LTP patch, where only sendfile_file_to_pipe passes on 6.1.27-1 and all tests pass on v6.4 + this patchset. Ahelenia Ziemiańska (3): splice: always fsnotify_access(in), fsnotify_modify(out) on success splice: fsnotify_access(fd)/fsnotify_modify(fd) in vmsplice splice: fsnotify_access(in), fsnotify_modify(out) on success in tee fs/splice.c | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) Interdiff against v2: diff --git a/fs/splice.c b/fs/splice.c index 3234aaa6e957..0427f0a91c7d 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -1155,10 +1155,7 @@ long do_splice(struct file *in, loff_t *off_in, struct file *out, flags |= SPLICE_F_NONBLOCK; ret = splice_pipe_to_pipe(ipipe, opipe, len, flags); - goto notify; - } - - if (ipipe) { + } else if (ipipe) { if (off_in) return -ESPIPE; if (off_out) { @@ -1188,10 +1185,10 @@ long do_splice(struct file *in, loff_t *off_in, struct file *out, else *off_out = offset; - goto notify; - } - - if (opipe) { + // ->splice_write already marked out + // as modified via vfs_iter_write() + goto noaccessout; + } else if (opipe) { if (off_out) return -ESPIPE; if (off_in) { @@ -1211,17 +1208,14 @@ long do_splice(struct file *in, loff_t *off_in, struct file *out, in->f_pos = offset; else *off_in = offset; + } else + return -EINVAL; - goto notify; - } - - return -EINVAL; - -notify: - if (ret > 0) { - fsnotify_access(in); + if (ret > 0) fsnotify_modify(out); - } +noaccessout: + if (ret > 0) + fsnotify_access(in); return ret; } @@ -1352,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; } @@ -1381,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; } @@ -1447,9 +1446,6 @@ SYSCALL_DEFINE4(vmsplice, int, fd, const struct iovec __user *, uiov, else error = vmsplice_to_user(f.file, &iter, flags); - if (error > 0) - fsnotify_modify(f.file); - kfree(iov); out_fdput: fdput(f);