From patchwork Fri Nov 15 15:30:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 13876456 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 C53ADD68BC8 for ; Fri, 15 Nov 2024 15:32:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8E8696B00AB; Fri, 15 Nov 2024 10:32:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 897E06B00AC; Fri, 15 Nov 2024 10:32:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 711136B00AD; Fri, 15 Nov 2024 10:32:05 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 52D356B00AB for ; Fri, 15 Nov 2024 10:32:05 -0500 (EST) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 03DF214184F for ; Fri, 15 Nov 2024 15:32:05 +0000 (UTC) X-FDA: 82788719244.18.9E2E95C Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by imf20.hostedemail.com (Postfix) with ESMTP id 6083E1C000C for ; Fri, 15 Nov 2024 15:31:06 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=toxicpanda-com.20230601.gappssmtp.com header.s=20230601 header.b=e+gf3xkG; dmarc=none; spf=none (imf20.hostedemail.com: domain of josef@toxicpanda.com has no SPF policy when checking 209.85.215.176) smtp.mailfrom=josef@toxicpanda.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731684659; a=rsa-sha256; cv=none; b=z0u68BW+fAQa274IB81JVYGBD9n0HrvwdtRWRrX/iKNrFk1GaqoKG74IHSCQVHJpV2Wffw irmPjqlpxnc/lV/WEQip1W7YOcBecIGuXxIx3x7lHTVcMNTGjyNcgeigSfTgz3vTe6qEc2 1IwJTQ12vKDzdMyArfgvfAgHGEZxl6E= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=toxicpanda-com.20230601.gappssmtp.com header.s=20230601 header.b=e+gf3xkG; dmarc=none; spf=none (imf20.hostedemail.com: domain of josef@toxicpanda.com has no SPF policy when checking 209.85.215.176) smtp.mailfrom=josef@toxicpanda.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731684659; 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=GWXqETStm7Md/ZZi4QCCd1GSXP4JC1lp6P3n7C6qnQo=; b=g1vFOWPX/vO4pl34bIbIHnJy2dEDTyF8v6NJlacDaRxmm5CQFPr3Y3Hp+dxYhPcUqbuvPw rnq8DazyS4kTdxJvmtrYgfDgHvStrVUw0N+SrXSybJeEuNFEYVNYNcmsbGT2jp/c0pOEvY gqLhXCpFxWJN1KXd0lRMMB1zI0XCBsU= Received: by mail-pg1-f176.google.com with SMTP id 41be03b00d2f7-7ee11ff7210so1371165a12.1 for ; Fri, 15 Nov 2024 07:32:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20230601.gappssmtp.com; s=20230601; t=1731684722; x=1732289522; 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=GWXqETStm7Md/ZZi4QCCd1GSXP4JC1lp6P3n7C6qnQo=; b=e+gf3xkGy8f8TgOZf++wrKb+/6WdTOzR4gOTWCZoDnA0Qxwj5x7X3qIpxQnEI5iOAJ DHGA3unGG40C2fIeqp6llMESw1XLphRZ/11IGvMt/I3RFjjD4wCGd0U2H7ueGTI+A04p MgrDTZCpiSWpupwVgiKDfkMlN0+GNRmKrfn60Kfs+ucKFy2xFhwb1wADEioNK1CPQwwm NFj+Q5ifvo+tj4AXsRd4c3+DZ1UtnY539rX3DUb4rLnCYE06zEE/3+Y4mLBDYFMf6VC/ LI7RS7vqL5f86CM8NhFPZNqap2j7ahxHXv4zTeqAX3265QYiO0jMoiBnAByoJUDliook 8FlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731684722; x=1732289522; 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=GWXqETStm7Md/ZZi4QCCd1GSXP4JC1lp6P3n7C6qnQo=; b=sjKrob9eUTVuOFPT7aVjK5CmG6h0WTTZyHPZwqfLwu2sfILNxGiqh2uKalkY+8FhPL xtCOOYco88EjRNJAZ6m4qu9hZUM6ZYDYfeyQzwAMYM9OsmR2/IbXiq4zwOZsAqc1cbkK giyPiBRZRQhZN/yPApM+IFBN7EHr+AHUyQmTnX4WkkX5eMAmk4Xul2uwuGypGvEb4hRW kifI20we3GqZkMIMCswcZNpkNXX6OsAqFCy1xPdpVqoA0dhRki4/YHY6He0diT/IYKQi R8ogMNMZAE0E0MXULYwRfujI6sBYUsaj9zn74LMjk6wEkahyoLZ+ym2DFq9mXfGDl8xj FciA== X-Forwarded-Encrypted: i=1; AJvYcCU29W6eu4e7ZdrqMvj2EtmWXpbD5humPDELR/bf0LFRho9YbKAUJHgoEPMvhfiEIe43J8QPPuJSrw==@kvack.org X-Gm-Message-State: AOJu0Yzm+Dqp3L5nS/Qs0iorhzvT+qEFLmkldwOTgN6gjAjNtDZJxPPZ oDJPGK/LZK/L/wZ8e/8tn/3Rxxi+9hde4eUhNLxhX1YWP4oloU4ckkmWmZN1Un40tyl8o+ykC3J 0 X-Google-Smtp-Source: AGHT+IEHUujjEReLNYNPy+KE0ogVxqRd47YtuHwtc3zNs/tYtNRt3+/0IcuvnNweNADhk1HvQaDdYw== X-Received: by 2002:a05:6902:20c7:b0:e29:1627:d4d3 with SMTP id 3f1490d57ef6-e38263c0d7amr3021251276.41.1731684704575; Fri, 15 Nov 2024 07:31:44 -0800 (PST) Received: from localhost (syn-076-182-020-124.res.spectrum.com. [76.182.20.124]) by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e381545ae18sm987344276.46.2024.11.15.07.31.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2024 07:31:44 -0800 (PST) From: Josef Bacik To: kernel-team@fb.com, linux-fsdevel@vger.kernel.org, jack@suse.cz, amir73il@gmail.com, brauner@kernel.org, torvalds@linux-foundation.org, viro@zeniv.linux.org.uk, linux-xfs@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-mm@kvack.org, linux-ext4@vger.kernel.org Subject: [PATCH v8 14/19] fanotify: disable readahead if we have pre-content watches Date: Fri, 15 Nov 2024 10:30:27 -0500 Message-ID: <70a54e859f555e54bc7a47b32fe5aca92b085615.1731684329.git.josef@toxicpanda.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: 6083E1C000C X-Rspamd-Server: rspam01 X-Stat-Signature: kq3qdcwbbsrirwzqsttssapsnqybx76s X-HE-Tag: 1731684666-439581 X-HE-Meta: U2FsdGVkX19ATRhIb538HvVXg7tJQO4wd2DWZHgoWLeGTn53I6Hl+5PawW5vYXYBD79ayGjZNeepMROd6jK+EgW30nt3uohJzoHXSwcISiQfWEQ/qdHXPP+FBmpHUJTPuESsGB+pBqQQ3GiSLyk66E09pKpaWFlSNKHSPgUaKwS/0pl3hX+waiVHuGXuI/LrByex7Q6Mz81vOgvsQJKq67FDwEoVbdnsI3Qvga7Guh4jLZePYDFmujgYhBKV2esFSXuZaMogp11pIeavAHkZI6yOVyUg4huPKitBIJ7HR9DpSe0Uwih07tJ5sd3pnQJM1FwkTgywkRwCqQPDdRy+gBw7QOBghULwJFc1vDEL/StKbAiwvq/wL66nuo3r7R/PeCoyBl1aLPhhbu2pt/NTaIs4jSKNenkYl5n/WlHIfteDjQoGHdyEzFN7FCoegCijejj/NFR1S4TbtFGWN7UQIBm6s4ivFvmsaczJIOi0IYETHEZB0pYyquzesWMpdCQ5uEpuUjhdvTMVJrc9mWQMnXYAijmsFXx0B3PQNOGdIyD1DUNAV9NCdb5GIkgqNmwLw3rEYW3xA7lCRQ2Q2UFaVOrSMTH594SZG27ZE/gLb7bLHIc5vxhkrDkSfxJJdMmGwA9YbKlhj+ELtbitsuBK8oTe8NmZsCuCwChVl/Y/MrZ1KqYMwLXGyQ/B4tfcoLJjg/AMN/t/7F7IrBGOMDiAVZTOcqF4OnPSey1U7WhFZKxoYKo1dACATJMhXLTf/v92UXKDhYKWgXxi7m2y7gZncLPHpUEBkhituhiTda0f5k9oIF3nEUIGNi79TQxulzj8rNHFdeCqvmURB+7ikI/6PwXIUN+tmghmE08sFO7qCkqy9rE7GWEcpqeX3qGVPRPhxjjrkDi6MMhr6/en4oUjN0P2QRMh0O+4GCRJrRyuyx5b0SM/ggUiwtlh5AV5EipK6okhXkzxzYaSgCwLALP URrxzQIU j0ClQsys4P6OVNkt9pQq6PaC11OlDIpHnu5oYSHsT+LCOrD3Jo5JizUESAloif6IhSMZVDd+U8AO5wRDBc8ckil4uJQvuKfYpHeWl1jRVSMm+8SkCsH3qnp6tqivDgy+B1yyV97ini6tPBEHqWK7/63s+bFZo1JVoKXgIjoCo1xBL9YM0zfaH7963Z4Qiu33a6rPoc6hqePv12HrZv0veir4jo8gO0LC3WgFIPN0pvRl1Sy0l7/OAxZ8xFORzQ+fi6uFMHNR9XH3X3PRiSc9tpVkGclDZjk2CVox5Col2Pwe1ZkulH2/8E1T8S9EyzuuuorPnJAJhhlOOJ/4vBVkPfstydsPQdBizooVVZ493VGY9j24RDsiIeu+3YVwGy9cFYZrRthna97dEf9o= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000186, 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 --- mm/filemap.c | 12 ++++++++++++ mm/readahead.c | 13 +++++++++++++ 2 files changed, 25 insertions(+) diff --git a/mm/filemap.c b/mm/filemap.c index 196779e8e396..68ea596f6905 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3151,6 +3151,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) { @@ -3219,6 +3227,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 9a807727d809..b42792c20605 100644 --- a/mm/readahead.c +++ b/mm/readahead.c @@ -128,6 +128,7 @@ #include #include #include +#include #include "internal.h" @@ -544,6 +545,14 @@ void page_cache_sync_ra(struct readahead_control *ractl, unsigned long max_pages, contig_count; pgoff_t prev_index, miss; + /* + * 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 (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 @@ -622,6 +631,10 @@ void page_cache_async_ra(struct readahead_control *ractl, if (!ra->ra_pages) return; + /* See the comment in page_cache_sync_ra. */ + if (fsnotify_file_has_pre_content_watches(ractl->file)) + return; + /* * Same bit is used for PG_readahead and PG_reclaim. */