{"id":2228135,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2228135/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20260425125426.3855807-7-dhowells@redhat.com/","project":{"id":12,"url":"http://patchwork.ozlabs.org/api/1.1/projects/12/?format=json","name":"Linux CIFS Client","link_name":"linux-cifs-client","list_id":"linux-cifs.vger.kernel.org","list_email":"linux-cifs@vger.kernel.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260425125426.3855807-7-dhowells@redhat.com>","date":"2026-04-25T12:54:10","name":"[v3,06/19] netfs: Fix read-gaps to remove netfs_folio from filled folio","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"1c97a4fd5b86fc9661288d2da6cca5f44dbdc64c","submitter":{"id":59,"url":"http://patchwork.ozlabs.org/api/1.1/people/59/?format=json","name":"David Howells","email":"dhowells@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-cifs-client/patch/20260425125426.3855807-7-dhowells@redhat.com/mbox/","series":[{"id":501437,"url":"http://patchwork.ozlabs.org/api/1.1/series/501437/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-cifs-client/list/?series=501437","date":"2026-04-25T12:54:04","name":"netfs: Miscellaneous fixes","version":3,"mbox":"http://patchwork.ozlabs.org/series/501437/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2228135/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2228135/checks/","tags":{},"headers":{"Return-Path":"\n ","X-Original-To":["incoming@patchwork.ozlabs.org","linux-cifs@vger.kernel.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=FQqcXQps;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c0a:e001:db::12fc:5321; helo=sea.lore.kernel.org;\n envelope-from=linux-cifs+bounces-11115-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)","smtp.subspace.kernel.org;\n\tdkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com\n header.b=\"FQqcXQps\"","smtp.subspace.kernel.org;\n arc=none smtp.client-ip=170.10.129.124","smtp.subspace.kernel.org;\n dmarc=pass (p=quarantine dis=none) header.from=redhat.com","smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=redhat.com"],"Received":["from sea.lore.kernel.org (sea.lore.kernel.org\n [IPv6:2600:3c0a:e001:db::12fc:5321])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g2qjC1XjGz1xvV\n\tfor ; Sat, 25 Apr 2026 23:01:51 +1000 (AEST)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sea.lore.kernel.org (Postfix) with ESMTP id 6E446301FD4D\n\tfor ; Sat, 25 Apr 2026 12:55:29 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 1A79D38A292;\n\tSat, 25 Apr 2026 12:55:15 +0000 (UTC)","from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.129.124])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id E85BE379EE7\n\tfor ; Sat, 25 Apr 2026 12:55:11 +0000 (UTC)","from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-131-IZZUQhSuMFKMZEV-YcWYQQ-1; Sat,\n 25 Apr 2026 08:55:05 -0400","from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n\t(No client certificate requested)\n\tby mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 6420E180057D;\n\tSat, 25 Apr 2026 12:55:04 +0000 (UTC)","from warthog.procyon.org.com (unknown [10.44.48.17])\n\tby mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id 573571800351;\n\tSat, 25 Apr 2026 12:55:01 +0000 (UTC)"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1777121715; cv=none;\n b=W95UENR8QLFfqe4+H3IkgaszbqQ6eW0i7EJ/FwmzlVfOhwvkF2TLikb/L/mIJaHCRNHWU3M9rhOjl+L2tXHA4g/d4J67fIQtOguQ/DzRCxWHd4WAqqH7PnPsO5Oq/z8emyNpE+wT215tPD9u+FupmJb4BrHTu8Gf1Q9oHN9LIfc=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1777121715; c=relaxed/simple;\n\tbh=nGH70d4XRAbidMXvHCD6HzbQ1ECJVS7A+JZBT9D/19o=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=YW6UJFlboQWCqhwzjNNq7fS9E9iDmu734mvo3/hfAoTMuyuH9IQ3KeIO9Vj61KOjKL84NVlPVYJieocPPUw3Zg6jAWnbDez9BhT7OKnY/EfQknOeiaGCI8hf2GfmtqCu/KuG8iXHm/02aQ9RjlDcOhNg3flDQlm5MvXIWk0S7BY=","ARC-Authentication-Results":"i=1; smtp.subspace.kernel.org;\n dmarc=pass (p=quarantine dis=none) header.from=redhat.com;\n spf=pass smtp.mailfrom=redhat.com;\n dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com\n header.b=FQqcXQps; arc=none smtp.client-ip=170.10.129.124","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1777121711;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\t to:to:cc:cc:mime-version:mime-version:\n\t content-transfer-encoding:content-transfer-encoding:\n\t in-reply-to:in-reply-to:references:references;\n\tbh=2MfJQB7/qymTq033uKX+KS+yRirCrgDyasPANbPHLD0=;\n\tb=FQqcXQpsJaHJ8yN0xWL/VtDVNMsYyANoDOVHMVjtyWOEPO/M9s02jpwmikkR8ntOOqtXtA\n\tXyaxzBzccBBEZX79LLJ41ozH0mXd3VOVk8IW06niK3fH8ADtNk0wI4AM82xLn4H+oFhUgb\n\ta3ocbHgHYEB5Ab6l7OqhgeaPI7Dz65Q=","X-MC-Unique":"IZZUQhSuMFKMZEV-YcWYQQ-1","X-Mimecast-MFC-AGG-ID":"IZZUQhSuMFKMZEV-YcWYQQ_1777121704","From":"David Howells ","To":"Christian Brauner ","Cc":"David Howells ,\n\tPaulo Alcantara ,\n\tnetfs@lists.linux.dev,\n\tlinux-afs@lists.infradead.org,\n\tlinux-cifs@vger.kernel.org,\n\tceph-devel@vger.kernel.org,\n\tlinux-fsdevel@vger.kernel.org,\n\tlinux-kernel@vger.kernel.org,\n\tMatthew Wilcox ","Subject":"[PATCH v3 06/19] netfs: Fix read-gaps to remove netfs_folio from\n filled folio","Date":"Sat, 25 Apr 2026 13:54:10 +0100","Message-ID":"<20260425125426.3855807-7-dhowells@redhat.com>","In-Reply-To":"<20260425125426.3855807-1-dhowells@redhat.com>","References":"<20260425125426.3855807-1-dhowells@redhat.com>","Precedence":"bulk","X-Mailing-List":"linux-cifs@vger.kernel.org","List-Id":"","List-Subscribe":"","List-Unsubscribe":"","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-Scanned-By":"MIMEDefang 3.4.1 on 10.30.177.111"},"content":"Fix netfs_read_gaps() to remove the netfs_folio record from the folio\nrecord before marking the folio uptodate if it successfully fills the gaps\naround the dirty data in a streaming write folio (dirty, but not uptodate).\n\nFound with:\n\n fsx -q -N 1000000 -p 10000 -o 128000 -l 600000 \\\n /xfstest.test/junk --replay-ops=junk.fsxops\n\nusing the following as junk.fsxops:\n\n truncate 0x0 0x138b1 0x8b15d *\n write 0x507ee 0x10df7 0x927c0\n write 0x19993 0x10e04 0x927c0 *\n mapwrite 0x66214 0x1a253 0x927c0\n copy_range 0xb704 0x89b9 0x24429 0x79380\n write 0x2402b 0x144a2 0x90660 *\n mapwrite 0x204d5 0x140a0 0x927c0 *\n copy_range 0x1f72c 0x137d0 0x7a906 0x927c0 *\n read 0 0x9157c 0x9157c\n\non cifs with the default cache option.\n\nIt shows folio 0x24 misbehaving if the FMODE_READ check is commented out in\nnetfs_perform_write():\n\n if (//(file->f_mode & FMODE_READ) ||\n netfs_is_cache_enabled(ctx)) {\n\nand no fscache. This was initially found with the generic/522 xfstest.\n\nSigned-off-by: David Howells \ncc: Paulo Alcantara \ncc: Matthew Wilcox \ncc: netfs@lists.linux.dev\ncc: linux-fsdevel@vger.kernel.org\nFixes: ee4cdf7ba857 (\"netfs: Speed up buffered reading\")\n---\n fs/netfs/buffered_read.c | 11 ++++++++---\n 1 file changed, 8 insertions(+), 3 deletions(-)","diff":"diff --git a/fs/netfs/buffered_read.c b/fs/netfs/buffered_read.c\nindex a8c0d86118c5..e87a55bda8c5 100644\n--- a/fs/netfs/buffered_read.c\n+++ b/fs/netfs/buffered_read.c\n@@ -397,6 +397,7 @@ static int netfs_read_gaps(struct file *file, struct folio *folio)\n {\n \tstruct netfs_io_request *rreq;\n \tstruct address_space *mapping = folio->mapping;\n+\tstruct netfs_group *group = netfs_folio_group(folio);\n \tstruct netfs_folio *finfo = netfs_folio_info(folio);\n \tstruct netfs_inode *ctx = netfs_inode(mapping->host);\n \tstruct folio *sink = NULL;\n@@ -463,6 +464,12 @@ static int netfs_read_gaps(struct file *file, struct folio *folio)\n \n \tret = netfs_wait_for_read(rreq);\n \tif (ret >= 0) {\n+\t\tif (group)\n+\t\t\tfolio_change_private(folio, group);\n+\t\telse\n+\t\t\tfolio_detach_private(folio);\n+\t\tkfree(finfo);\n+\t\ttrace_netfs_folio(folio, netfs_folio_trace_filled_gaps);\n \t\tflush_dcache_folio(folio);\n \t\tfolio_mark_uptodate(folio);\n \t}\n@@ -498,10 +505,8 @@ int netfs_read_folio(struct file *file, struct folio *folio)\n \tstruct netfs_inode *ctx = netfs_inode(mapping->host);\n \tint ret;\n \n-\tif (folio_test_dirty(folio)) {\n-\t\ttrace_netfs_folio(folio, netfs_folio_trace_read_gaps);\n+\tif (folio_test_dirty(folio))\n \t\treturn netfs_read_gaps(file, folio);\n-\t}\n \n \t_enter(\"%lx\", folio->index);\n \n","prefixes":["v3","06/19"]}