From patchwork Wed Sep 4 20:28:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 13791366 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0DCFCD4F25 for ; Wed, 4 Sep 2024 20:29:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 121AE6B0158; Wed, 4 Sep 2024 16:29:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0AC416B0159; Wed, 4 Sep 2024 16:29:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DCA4C6B015A; Wed, 4 Sep 2024 16:29:37 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id B79516B0158 for ; Wed, 4 Sep 2024 16:29:37 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 7D21BA9CED for ; Wed, 4 Sep 2024 20:29:37 +0000 (UTC) X-FDA: 82528196394.14.75CE3FE Received: from mail-yb1-f169.google.com (mail-yb1-f169.google.com [209.85.219.169]) by imf21.hostedemail.com (Postfix) with ESMTP id BE9F41C0004 for ; Wed, 4 Sep 2024 20:29:35 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=toxicpanda-com.20230601.gappssmtp.com header.s=20230601 header.b=JmhvrgC9; spf=none (imf21.hostedemail.com: domain of josef@toxicpanda.com has no SPF policy when checking 209.85.219.169) smtp.mailfrom=josef@toxicpanda.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1725481648; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=NQ0y3/dQBSJxG2OyPRkhEh3Vj0wjByustgiYia+MZqs=; b=TbrwGocNhkIBUw/IBRy4qDgyu7/yAkRSh2GTIdsZ1FwTCORyIfoUAWwT6uPnGub1BxEe6U ourXFSQar1AmLun2EYoIUk1FoB9eTcukKYdn5HnGpxQcOW2mTRxduR2g72VC8Uy0y3MOuC 2EPgYTIxUjMc2VLvF/MMlxs6eUbgbzM= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=toxicpanda-com.20230601.gappssmtp.com header.s=20230601 header.b=JmhvrgC9; spf=none (imf21.hostedemail.com: domain of josef@toxicpanda.com has no SPF policy when checking 209.85.219.169) smtp.mailfrom=josef@toxicpanda.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1725481648; a=rsa-sha256; cv=none; b=kWLpT+XkYH3Yu5OJ5XULTJnKqHqeLtbcnjQXIaX3FN9WPuWDKNtylpb26CrRU5qxGAcBlq PYB9leDVBgqx2mkOdbOP7X0BTK9rrI83dSqPkT1Z7Iht+IcUm7oZjhej0qHroAEPmpprmy 6xMEg462Fqnmim2FM/zwg7+/1Xt2NNc= Received: by mail-yb1-f169.google.com with SMTP id 3f1490d57ef6-e1a9dc3efc1so81766276.2 for ; Wed, 04 Sep 2024 13:29:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20230601.gappssmtp.com; s=20230601; t=1725481775; x=1726086575; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=NQ0y3/dQBSJxG2OyPRkhEh3Vj0wjByustgiYia+MZqs=; b=JmhvrgC9aHP3R00xeVMUMcYC5SUlqIJnuqaE6CArTNjPMGf1HaL2CKLQIFMlVeDMnC KxjqleKdx6+Nf52exqi6JuQZHIIHaBBLyPoCriNI2j/fYgTGRI4a07//ViV01pZSslZ1 Op+OjlqrGGPn9eJ4yLWDjk18H2coy22KNNmj9cIg/jaSjs+H4FicVesxHRXvqcrp5q27 qAjPf68g0k89bF/fFmfgSjt8ZKxuIyt3DR/63M4brdbqHUsNEGOSK2JGDRKGM2nNX+V4 pfj56HQkNfj2VSEb/DAX85qtcH/NgLIddGHYzSewxT3R6em9uUd+qiSRGDuMQwpsh5ES nzqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725481775; x=1726086575; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NQ0y3/dQBSJxG2OyPRkhEh3Vj0wjByustgiYia+MZqs=; b=hZIKYIOmJ8D684ZbjROOKETF38aBn5INhtADJ9Avqg1ZmOB9Ja8d0hlzZc8K0g/xkU UOWgZu5nXdAefvaCvrt3Ymuy8lcw4ouwqgZl1OviRPyGLARyGbM58aiHdVGpn1/CaqPI VCIJN5lsnlEfe6rpfHsYKMLsyQKIhEnEaHY4Cyx1jjK4TXHRXXIqJkEd0m/rr75bR4N1 34O0kG/ZXaXla5vfOKOTkBG914zvpOJUWbhzTLGCp7aNLzDtdKm63SjzN8kvY1RS1iuF dM2lURrKcwAKtN2G5RXKyvE0vH+NNvpzBDxlCF10x4ATY98KoefYPS0td/nqJkpcw5nt nF6g== X-Forwarded-Encrypted: i=1; AJvYcCUmY3sviB4+8Cs4PVAW0X59T3tLY2atk7i7mJ30lq+9PFd0dGIRzVSkygDm9bGw6+1y9YSnXF7a1g==@kvack.org X-Gm-Message-State: AOJu0YyjgzUWD7qgH+qusCkmGQVFwgtPUkx2/dVqOKFQA83QS1sO0OFP T5gadXMmoMMoha8GBwXgg0YAqS6ajiP/Aynfg+0lfVXwLvCmPb5SD7Kce4627/s= X-Google-Smtp-Source: AGHT+IGBp2PIdRLM2XqIHSfjLgeh3BUtPWJbF41aaoGgznmohKpzreGJIvh+qUevQhYUH2lFWA7hgg== X-Received: by 2002:a05:6902:138d:b0:e0e:8adf:2e80 with SMTP id 3f1490d57ef6-e1a7a1a48abmr20532053276.44.1725481774821; Wed, 04 Sep 2024 13:29:34 -0700 (PDT) Received: from localhost (syn-076-182-020-124.res.spectrum.com. [76.182.20.124]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-6c5201e4720sm1608386d6.51.2024.09.04.13.29.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2024 13:29:34 -0700 (PDT) From: Josef Bacik To: kernel-team@fb.com, linux-fsdevel@vger.kernel.org, jack@suse.cz, amir73il@gmail.com, brauner@kernel.org, linux-xfs@vger.kernel.org, linux-bcachefs@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v5 12/18] fanotify: disable readahead if we have pre-content watches Date: Wed, 4 Sep 2024 16:28:02 -0400 Message-ID: <5ce248ad6e7b551c6d566fd4580795f7a3495352.1725481503.git.josef@toxicpanda.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: BE9F41C0004 X-Stat-Signature: phecqxwiz46eierbyjkschf38a1tgbfw X-Rspam-User: X-HE-Tag: 1725481775-854215 X-HE-Meta: U2FsdGVkX19Lto1NjPXEQ+IyvW7TXHWPfP8vcoRVRXs8AXWQMk5S08EDMpp2dNOvgzKElQ/mnAI4cRE/3f7ExzM+HaRdZCavWiIya8a/QutA8+d7hfzMBNJ6VE8RLd94GPCd2/ZM2i5+sICRFil5eESPhvhozj7NQFfHenik9J2I7DDPZSfrYW7z+IiIN5GozJPMi01hjfhZp/cKiLcrccHzgZGHum37aEkkfcsjvaGtWB+VOrQSELhiUbKAxW9UoPaNerBbaIIIQESknFbmnxpoQloxpjFi92QtX7z/3q/9Z7lykgSxVx3K6hIHi0Q+nQuTqek8XQe6cEvgJyNfxF0h++T0Ouy0hyBljKuF3NbbuT+hS1pSCdCdecqvtgDiLwE85waIvuI9YHbqQbrgPZkobnjATal9gwsmfvNYTac+F3oDRPr99D97nc4/JE3MztpZKRsgbyZ6kVt6EVFZfjwnWZ4Im4pui6JIlbrj3toWm35IcRPpKP4T1JUvWj0y/mjeieAz00md0iXR2sn80q8V4wrlHnfdtB90ZLOUAXT0vQTspLUaoIjUlurTVBD+C+7yL3YU40E1/rIQgdz8dVUdRUuyEVVgwwYhJm4PEa4F+9KIhpZw2tY2iXlnhfT4rSzDwhqopEGvCQZmjXEAiPjQ/G34sPFq6MpReXPti7/k3ptWmwDfKqwZlMDjfFHUX2E7FMNU9KODmsMP+xtfAFiv47vHumQ1uDScgxCdABxoH946wfRdL+hQtewrSOo+RegwRqE1NibfCRvvgbCy/SYlSJJUBI7YzcUDyNbhxrP4dSqZucorqxhvRGrR5L7qOAF5QQHNvo58fdmAo8dzq6G57LqM/COlW9tUcgUp6QRCWf21Tpk7QC6BRD7PG5aJyzONJcNywejW2JWICXbPbj41lZUuvXMqjT3QRoi7/pMGc/ENCAbXEmHQU3ybSeahItcH2tAdDPlceY94wZE TFhSXJeR ytSWNck6CleZ2+bprmY7D95TCW8aHl6UJl2mWUOZUi0bv6a1X1s5ZMnpyVxciQbY087QNbAHTbYL68tq3XA947Qwyaw69SluJ3s2a2X7E97jfqPk2Vw2XyuxHZSJrspVMz+sT4dDyFkabxhDou1WBBJPOKGzb98qc8E7yW1OS4XBmcr6YqVgK3Lzn6J6DbvAZvPM12ibH7Gfj4q8Vchw6EYO8z6LQl6Fe9doJHHlbwEpFOdq0cCLYzb3rvd35B9F7rYQpel4POSdu7tmHPvV5cR6yCzaR1F06a/A5J6rL4UxLEP+KwepJdTXeWx0dwIiFhARGMTBWNoPhZ8KqWqf5vJFbgrmW39Q69DTLmTvJTfcOfrCbWtR1rN/w/WMQeLstvx2pZtQHlj+qz/A= X-Bogosity: Ham, tests=bogofilter, spamicity=0.001603, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: With page faults we can trigger readahead on the file, and then subsequent faults can find these pages and insert them into the file without emitting an fanotify event. To avoid this case, disable readahead if we have pre-content watches on the file. This way we are guaranteed to get an event for every range we attempt to access on a pre-content watched file. Reviewed-by: Christian Brauner Signed-off-by: Josef Bacik Reviewed-by: Amir Goldstein --- mm/filemap.c | 12 ++++++++++++ mm/readahead.c | 13 +++++++++++++ 2 files changed, 25 insertions(+) diff --git a/mm/filemap.c b/mm/filemap.c index ca8c8d889eef..8b1684b62177 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3122,6 +3122,14 @@ static struct file *do_sync_mmap_readahead(struct vm_fault *vmf) unsigned long vm_flags = vmf->vma->vm_flags; unsigned int mmap_miss; + /* + * If we have pre-content watches we need to disable readahead to make + * sure that we don't populate our mapping with 0 filled pages that we + * never emitted an event for. + */ + if (fsnotify_file_has_pre_content_watches(file)) + return fpin; + #ifdef CONFIG_TRANSPARENT_HUGEPAGE /* Use the readahead code, even if readahead is disabled */ if ((vm_flags & VM_HUGEPAGE) && HPAGE_PMD_ORDER <= MAX_PAGECACHE_ORDER) { @@ -3190,6 +3198,10 @@ static struct file *do_async_mmap_readahead(struct vm_fault *vmf, struct file *fpin = NULL; unsigned int mmap_miss; + /* See comment in do_sync_mmap_readahead. */ + if (fsnotify_file_has_pre_content_watches(file)) + return fpin; + /* If we don't want any read-ahead, don't bother */ if (vmf->vma->vm_flags & VM_RAND_READ || !ra->ra_pages) return fpin; diff --git a/mm/readahead.c b/mm/readahead.c index 817b2a352d78..bc068d9218e3 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -128,6 +128,7 @@ #include #include #include +#include #include "internal.h" @@ -674,6 +675,14 @@ void page_cache_sync_ra(struct readahead_control *ractl, { bool do_forced_ra = ractl->file && (ractl->file->f_mode & FMODE_RANDOM); + /* + * If we have pre-content watches we need to disable readahead to make + * sure that we don't find 0 filled pages in cache that we never emitted + * events for. + */ + if (ractl->file && fsnotify_file_has_pre_content_watches(ractl->file)) + return; + /* * Even if readahead is disabled, issue this request as readahead * as we'll need it to satisfy the requested range. The forced @@ -704,6 +713,10 @@ void page_cache_async_ra(struct readahead_control *ractl, if (!ractl->ra->ra_pages) return; + /* See the comment in page_cache_sync_ra. */ + if (ractl->file && fsnotify_file_has_pre_content_watches(ractl->file)) + return; + /* * Same bit is used for PG_readahead and PG_reclaim. */