From mboxrd@z Thu Jan 1 00:00:00 1970 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 96C73C7EE31 for ; Fri, 27 Jun 2025 06:23:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3850B6B00A2; Fri, 27 Jun 2025 02:23:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 334B56B00A3; Fri, 27 Jun 2025 02:23:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2245C6B00A4; Fri, 27 Jun 2025 02:23:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 0D4EE6B00A2 for ; Fri, 27 Jun 2025 02:23:08 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 9117A1A0587 for ; Fri, 27 Jun 2025 06:23:07 +0000 (UTC) X-FDA: 83600188014.21.84A3CDE Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by imf13.hostedemail.com (Postfix) with ESMTP id A86FF20011 for ; Fri, 27 Jun 2025 06:23:05 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Sx7xF4PW; spf=pass (imf13.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.179 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751005385; a=rsa-sha256; cv=none; b=OTtHc0ucuXFqWNJbrVb2GpCYQ+KYca1hgATkmgbfG/eK/F4nVe4HSyjDrxNqbFolnLgJke MX6aWvTqBQWSblM01LpxNyT2rPpVibSYKY6EH1RlR6N5A3Fejn2mnjNMTagjWVKCyS1cys HRlMpDbZlp+hPVJcUUgzSJbDiWE0Mfs= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=Sx7xF4PW; spf=pass (imf13.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.210.179 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1751005385; h=from:from:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=0ktIgMB1madWBeIOKUq29bfqNvO0BwWDQ23jnFNNR2c=; b=okMaBtLco091+hCrL5Ju/ktP0zsB341GM8PhXFR1eYdupWqJMcuFGkod9IphQ3WUqarbXC dhpd2jG0BFUYXqBYXpHu6OnZowqqpHLJPehdxpIPh956daJQFlni4WsdyizzIxs5LT7PcW ssxGg1Gd3Ff5B1JrNMrSudN1y18+Pn8= Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-748d982e97cso1836841b3a.1 for ; Thu, 26 Jun 2025 23:23:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751005384; x=1751610184; darn=kvack.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=0ktIgMB1madWBeIOKUq29bfqNvO0BwWDQ23jnFNNR2c=; b=Sx7xF4PWYCZmj6DQ1O+KpbqCyKC/X4QyAcOaOioN6xiPuksdJ5vZG/PfeDl4C4Br/a Yux2MLwIvj+FybjlZb5I1DrKtnOE2pl0TYQt3+ZeH9tKYNr/0Q0CjQmLuE0DsdMHZED9 mRUhLDiOwhk+pRT7hv22GLXx4/7iW7BSAcq/QG6bVTMWXp0CJe72Aj8IvOOP5fvWri/A 6SZEfIZK2cph0YLZzjMpUffHYEPkxvDZHu6+S2b0WN+TUOWx3mzpsS0oL2bCNwI7sxtN Z+e6EsO7qyLmgPW2GjXcQxxj6q3MfXqVKJ/WMLNTvI31psLfj7xfa3xAqasrszosUs2t Wt0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751005384; x=1751610184; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=0ktIgMB1madWBeIOKUq29bfqNvO0BwWDQ23jnFNNR2c=; b=DaWjgvhbrECJRJHOd6Ak5vWpQHvJOdw5edSAAYR/QZ3qoE4pVNFxkJr7rTEiUKLLoI tmELEJRRpnZD+jtzcZbg8FDZQC7oc4xemlPfxp2YLCHiN17p0a8KbrVnhAiU7Dhdxw1j 7KadG5PTNBatxWBK6li0EqJ0KGiKFxZJeEwkcLaqP2xNzdhMKTr5vqxCiqQoxdAmf0jo LxjRJFUaZC0cth0r4q6I+f+Ixl8ZfNXgXBoajUNbrlgPCAVXUUgc6bYpYG/xcZdptkzt zqnB/vqFOzN4nJcBHbuKY97486tHjKRBkpiOagFUq+OwYOWzPF4TGtYqIQ7ZLJKYhSsL VECg== X-Gm-Message-State: AOJu0YwRefXCHXtE5Ys3MJXj0BuffAmx3Zc5rj6WyMMvFW+wfPLy901i ajfxlNbVv35nE8Ap1ZJD1P64RHybToQcobERLfN4rJrWnBN87qNVDxax7+C3LziIaXg= X-Gm-Gg: ASbGncuwPxq2x+n4QnjBpi+qzrzWEIPCpOtMW0PK91Ow7gwrwnjTyh9Ksg3Cgzxdjm6 fyF8cKzSzlH53741KffEnqRqt8L38MlKodBrHxWt2nNodeX3Ro2U0yrZFrpjXlaL7hiczv1boLy dn7aUIYqafM/shmyMyJAAckrMG+q6XRDivuS79xf/nSCEXs40CvwMvcrHETfr3PQGhF01qrQOai l3OB3zjS4WOftfHxlmwWOQS/spWCGdLfDCTUmMfBPYHEFqbld/eM5cm7SoGEkF1ekt5KVF1y9hR 5XbG423mIlJjV54vhhyRJAXFYHgCNW7NzgS9S1BvkJREZJWlqyi2UjmE2fPF/c4p6Rjp+/imMdK O X-Google-Smtp-Source: AGHT+IGBjDvPz8yY9PBgUeOwmtTrIoPYD/1q7xOCKAY9zvL2RpB2LlARU8Ly7a5Cg/HvE9F9I/zxCw== X-Received: by 2002:a05:6a21:600a:b0:1ee:d418:f764 with SMTP id adf61e73a8af0-220a16c9a36mr2649969637.38.1751005383692; Thu, 26 Jun 2025 23:23:03 -0700 (PDT) Received: from KASONG-MC4 ([43.132.141.21]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74af5409cb6sm1456212b3a.23.2025.06.26.23.23.00 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 26 Jun 2025 23:23:03 -0700 (PDT) From: Kairui Song To: linux-mm@kvack.org Cc: Andrew Morton , Hugh Dickins , Baolin Wang , Matthew Wilcox , Kemeng Shi , Chris Li , Nhat Pham , Baoquan He , Barry Song , linux-kernel@vger.kernel.org, Kairui Song Subject: [PATCH v3 6/7] mm/shmem, swap: fix major fault counting Date: Fri, 27 Jun 2025 14:20:19 +0800 Message-ID: <20250627062020.534-7-ryncsn@gmail.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250627062020.534-1-ryncsn@gmail.com> References: <20250627062020.534-1-ryncsn@gmail.com> Reply-To: Kairui Song MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: x58hscx7rqpap7dcrnq7d4uxn4hbh1eo X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: A86FF20011 X-Rspam-User: X-HE-Tag: 1751005385-280990 X-HE-Meta: U2FsdGVkX1/Xsz0+4Lm8GvcMXReaSDGAPStCSisfFqgIP1y3W2UsYtCy6xUvLrkvmSdn36CgrdrVW2zEcAl015vxF34MqCxFwb6PdqnPFKhLQ3a0PuEAkr91Y5zjuE98Veu8hwCNzerNmpahzrsMF8WOypc9kftqwQBuA8e+/AeHJLWE2VH+cYvz//6qy/+tB/ghZHxWLSlUVNOOHdG930dXP9rboxjeKZI1K5mBoLzuwZEiLL56z43jX2L5iphtixdVG3nJ6NFYXWXD7Jyc9+vEFwIkd++0+QaGv+vZawTAEoU6tIWXTwsKJLwSmdvdZTsFuRUqzt/0ev/nHgBWJ/8cXyunC0Pv+yhOHs5DhSscadNGZ9PIWdrYPYCOFAo27ZGcoUyh2a3v/TxNsgEm6foAfNZQdC4ZC1wj8/FGiDeHq7VXlO6CZXJhPAkzDqf+STvmb69hYgK2RfaI/iOPd1BFqyfpddhjaiqKWYXhSXXZwb/nmSdl3O0VrgHeys8Tlv1AChHQE2ou8NHDu4MOTUgw+5cK9Zph+jCCaSVq9l+xvLoNL1vxpSKbDQ7YWQ9qmDbEYhA6jcJLa2HddKDk98YrdYJkioI16S4392GypV3wFTSSU7n9b5Gz7gkEaV/plmB74hFVlB7tG+T7IO8jz1vrd/vhxVLQu2og+esyjGKU4XGceHN1Y8+lP/3m1A5eBVUwvtOafNiVae0SEM6C1U+A2ELscQR0oHOPcFP0dmw6ARcXW55ul7aDftMf/+hQrrMjyGG4Sz/kaTMITamfKOVm5RXodx6QBfsMWga9rznmjMN9lFPwyhe5MIewMyuXyYOfdIQV7d1hPrSy/wsGGoHDO4Pm5NNgggMqNdAxcC4OGQNr7EVimfq3xuHKqQEeO6h0Pf22owf5y3nXKkMewR+Lz8vcPcciSyaW+5aMLdguUmTT8wgKaGzdqzZgV60CRQIc/2sNLogSxZWXTqp dGm8HkZG rdFL0bInCw+E5+hZ30mCkbfZZYCZ3e4vYmjdSNpoPWvgHXJ8eAocH6+9e1UUUbIvYs8+/n6j8TDzxiPXkDDMXopyg823k0Zbz7QWrh0nx1XoBY39pXuFaRbxdos39OLG2PqssVblbBO6dSCiWvQq/FTuCI1JT0PK9MVlRjxNUkHEI68ZjePqwcZQBgaeNMs4wmEHX9iY6WpBZY2HQT3iwSU+NPoKFCWfWFa3YRntY9upS3h8s3v8SuKDNkKQ3uIYYux4i7gl9B4MK8j+ROUpXZU8Cu+4ln84YceoPVqxxIThBKEv8VJ3986bwyQTfeG3pU52XOpDSCsuUH94twmafwChSrazrUefqCrUXUQE3OT1DLEsCKBFqo3c5XREw4RFNBCiWYy69yDfkCstN/eqiCv8M9bgfiWEX5Wq3MAxV6lYYtYC8QXWKHhcTmLyJh2WBWJ7rXOzidw3NBtJ2+4aVsxmyWqLhkorFFoqTNqCnSY3YPFkOZ2ji2Aq70bc26ezTNRB0kwQOz15kAauydzfkWdesyrxnPZ8j6pAeDwWn2Poi8jOX7HgoH3j1nnWzbBYWcUyA32P1g/UULnI7zrYEmOX1HaIDvZiZQKZa X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: From: Kairui Song If the swapin failed, don't update the major fault count. There is a long existing comment for doing it this way, now with previous cleanups, we can finally fix it. Signed-off-by: Kairui Song --- mm/shmem.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 5f2641fd1be7..ea9a105ded5d 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2316,12 +2316,6 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, /* Look it up and read it in.. */ folio = swap_cache_get_folio(swap, NULL, 0); if (!folio) { - /* Or update major stats only when swapin succeeds?? */ - if (fault_type) { - *fault_type |= VM_FAULT_MAJOR; - count_vm_event(PGMAJFAULT); - count_memcg_event_mm(fault_mm, PGMAJFAULT); - } if (data_race(si->flags & SWP_SYNCHRONOUS_IO)) { /* Direct mTHP swapin without swap cache or readahead */ folio = shmem_swapin_direct(inode, vma, index, @@ -2341,6 +2335,11 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, } if (!folio) goto failed; + if (fault_type) { + *fault_type |= VM_FAULT_MAJOR; + count_vm_event(PGMAJFAULT); + count_memcg_event_mm(fault_mm, PGMAJFAULT); + } } /* * We need to split an existing large entry if swapin brought in a -- 2.50.0