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 86B69C83F09 for ; Thu, 10 Jul 2025 03:38:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 28E886B00B0; Wed, 9 Jul 2025 23:38:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 23FA76B00B1; Wed, 9 Jul 2025 23:38:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 132546B00B4; Wed, 9 Jul 2025 23:38:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 008A36B00B0 for ; Wed, 9 Jul 2025 23:38:07 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id A318DB90FE for ; Thu, 10 Jul 2025 03:38:07 +0000 (UTC) X-FDA: 83646946614.01.1AC9599 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by imf12.hostedemail.com (Postfix) with ESMTP id C09E040002 for ; Thu, 10 Jul 2025 03:38:05 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=hrUIpV+z; spf=pass (imf12.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.214.178 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=1752118685; 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=PG6G7XY0O+9uIkct7WB8iHIg0l6kV6jMS3CA4vYZotw=; b=QoDJ+XfncSCXy24xLdp1JOAL27WkV4Nxz2RrxBB/4HMqyTVrGEujo/fivWjhL+8zZA69B3 swj0Nf6gCGoav/b54nPWn0/HcMGRrtGuNEhcxxWYB7/YdiwJlYfH+Jtzu1hl3a7LxX9AWn qmoarq2YhuB0iuY7hHbuIHQp0msH1rg= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1752118685; a=rsa-sha256; cv=none; b=CCtSJlWFZCAN5JEkg/soYClSJF//o2PB++ylrq3kfbL9g+xwO0/sEQz0BzGmkOTHPGdOxc r97oJwBKcxFxdQEm56hJQibv25gyyRo/JiswD2es9BC9KL+LvS20D7qQVxmmchY7ON3HLq Lx/nwC70OFatM5Z1JC8JTcN3IkMKjv4= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=hrUIpV+z; spf=pass (imf12.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.214.178 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-23c8a5053c2so5384395ad.1 for ; Wed, 09 Jul 2025 20:38:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752118683; x=1752723483; 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=PG6G7XY0O+9uIkct7WB8iHIg0l6kV6jMS3CA4vYZotw=; b=hrUIpV+ziA18mlMizCG5w7xndLP4lx2D2dDv5p1+8uCYs60WSOdCxzSO9DUPwx3qxu r43YhD2WoKJeSUVlfdhhnaQz3XAGsql4PEKzfaeTsxXETNULbNyZ0gOyinu1++Elr09K Ni0BD/aefomi6SwujcgCnUjn44XeyZ9id1QBu6XmOcSxo++sB3WLllbx0oS5mdM3+XAE 9yH9W1GXXZ2B9wALQcagyvRxOIiaK0Ah0Pp34VZFEV0RfoeKxc8uOPMAUmbzLo4gE3jF NAfeaT5hAsNzapmeksA5RSDngwO8ZiUN0+wuDMhHx/upTnGATXX1u2iltl044c9TMs0n SfEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752118683; x=1752723483; 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=PG6G7XY0O+9uIkct7WB8iHIg0l6kV6jMS3CA4vYZotw=; b=PvoZLyR1GqJMESPcNla5sKGo/w3xIvYANc9PkJjT5SxmA5uXhbIhbghSfzCL5X5tGu W6CnJE2q2sMvdtHLfE96bO7L7JCuKxUSJBJ2aq2c7Eij2vS2alXFhJyVXopcHRWwG4VT yZsvGwmL6TvEuTJFKkx+26ajTIBbPF6mI4z2fILYA9m5sfWPEW+tq7ofgy6LT+Of03hY C1xkfB+xH4mfpkc5Il9injc7sVMoA9YH/Qf947dKOOYPkYs3QTbavkmpg8QgKnJjnTuV VXbE1E3p1w0hPqw+6od2EJgBB7WwIdMYX4NnMLUJhdLacFYdYTpfPSoKCTPXsVNOZN5i /SxQ== X-Gm-Message-State: AOJu0Yzk0TrBCbDHWBnh/lx5w187eZ0nIsTABXa6WCJeMoDcDxQryRJE s9D06wn+WCE1mtGTNg9ujKHNtOVgaJVM3CE5G+iV6mjP5uS9skMahafJSzuIh8MUGxI= X-Gm-Gg: ASbGncstlmUmuzd9frvinDlxYkfY25GIVqG2SNMpV77+0ucV4RAn9cX8asUNSnkFeFl B8Gr6WrMFLLVSXB49JR1XKCSCKcdmJbxIJ0HVXNZA07ywKi6+cyIU8SIpxycE4Zo9jIZW8Qydsv qrsqawj6Pv2rEBocai5GwPcWCker7RkMe4O5SvfdV//SUejJyZx3E1a9XrX1XwKoVQBAknzgo+y MLBZ2B4qDScaADENTPT6TqBzMls6ZJOb5Bw1vtoJc7Et1wTufLH66IyQrWiF8ypjinScB3rfjH3 7sr28xsg9ZG9AqCGcjxnX2u4o3dboyJLTZV3vzKDYfJlcWSSJfkO5Xp6vwL+avZU5irTHcf2gCh 8 X-Google-Smtp-Source: AGHT+IHozr62v9ePpXEaXv6sB9HPchLtnTfJld5jCJZniq/y3YK5++iP1p4EdsFnAZw3QPWZfbZC+w== X-Received: by 2002:a17:903:3b83:b0:236:9726:7264 with SMTP id d9443c01a7336-23ddb191fecmr91457465ad.5.1752118683220; Wed, 09 Jul 2025 20:38:03 -0700 (PDT) Received: from KASONG-MC4 ([43.132.141.20]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-31c300689aasm3716320a91.13.2025.07.09.20.37.59 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 09 Jul 2025 20:38:02 -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 v5 8/8] mm/shmem, swap: fix major fault counting Date: Thu, 10 Jul 2025 11:37:06 +0800 Message-ID: <20250710033706.71042-9-ryncsn@gmail.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250710033706.71042-1-ryncsn@gmail.com> References: <20250710033706.71042-1-ryncsn@gmail.com> Reply-To: Kairui Song MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: C09E040002 X-Stat-Signature: udxrrtb6wsqq63qubsnzoh5einoshbso X-HE-Tag: 1752118685-549065 X-HE-Meta: U2FsdGVkX19bvGo+Bb9RZb8QdenLz7XgFQydD33bn8V20sfT5Vu+ufuf2tIyplAwBbNSNblbD6knLodHruWx0/QmPofcBz0mxdKzVA9xJQa+RyQ1SBn9hQzHL7t2ZcbiWqQz0gIo6n1FvGQCJPxOiCuW3Mo8J+7C0861Fq21Kka9oYVmXmdvMTLT1mBnJNO16RXUwtcFXvuEzB7N1ADi7Xif3bJaKZqWUZd8vm8rRAJuOvTI3f3eeEqS0ifq2oTvAdEF/YY97sWAzpeMZ8D3fSstweUtjRfJGvgktmolQJBZJ3Ex3LKJZPgJgdHAFYfRzhNVlM0J37OpNS9ZOAS6QCjkTt4lZONgE1tphRN9B29mu9F2LCRXTfslG594jTAI9Fl8IAAB2ycRQjuI1p65lIrUtVE4jyYaAYOR0JTZ2IEMmh5ugMPNo6TvPYILqlvWS4OLGsjLxhKAAAgLVGFF89p+3DJT3DIM05hm9QeEQxNKTzx56K5yBxaLEFLG/G34qQr31aDPCMzckqXI7mWrDiMVsrfSTEXFraHUurMiqqx2EblQzC7O1+JOLdEPJoiR2lrCf30bokw66vwbvYFFcjx4mK7WKwGBE3mpLAhs3TX/OhXlX+i+M0mSDdXhyHPIXOxx67PDp6nb8HGNP2xEpgOQslGCAnu4A0ebvRKSeclw4qpazFunbzg4KDA78IBtDjeIf4WbFhWSiJxPavAnrOe5bpdwubEYxPx7lQygIE0Y9tRm94zO/8IAG/B0VT0VVGHhVoyZTpod2LAE1wd/IgP/wz4KNii7Q691AlVYaBX1+CzaPFaq80FlVXlgxzCU5Vc2lQ7kzftCuCaSwPZclJmlB7gXAMSVw0uyibfZcABGFZ+MzsTBHrELz3EsykV0nZS2d+yd/zPRDNuzJC6UicV7Eie1dHLsR97eSJaQI5IK7Al852e0gRCseIIAtyqcNGa3ADJj9cTqPMsENPV kXMoqhxy m+ttpviaWAusydjfkD1BrZdWa4JO4yAHQ7lE0S/kr1B2s4wFnWNBqAWOfjqaeHNUR3kKj0sr6dWJvFu3MUaZV1w0JQEMsYz817IEvqTSY7wqOY5+Q+n5H1mApBJvA/RJMDBoFneoB85Qn/AD3AY+fuBpKsZBdUnmowoFgD4Xmh+D+S1w4CCFx7uywRkRnqvL3Hs1dFEZqT4+EZ/CdknpVRoiZPRCtcW4ti69WZCVF+2459keMjMo5bTMX6qbvLp8ImQD9ldaaAB0ybUjkEJEAv4wSa6+00rKR4OAhZWbwPeKz3UxxHhzNmURLA4bQgilRoOWJZ9rnE43wJR90m7zmrGY4Cre8qmJTsh/s6PTTRHGZ7/ye3RSN9AfZY/m9xv9nGOlJo2wPIEvZ/bCuyI2BwpXwsCTGuE/nqsG82GCtYHtbRFjH8YsGzbg05AxHPHhxAQKe8A/iKzwqcgtyG5FbOsk55CQsHYipZvT2rSyOX1P6EeY7O1U9N2BuxlnQMAHGBjgg+YvSx8ClK4qgHVVqRcJSCJjSwgEvvs657nrTAUjh+csR5gV66lEQRXuYoBWMTpeACWbW9g6MGUJj3Om/Q6V2Kg== 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 Reviewed-by: Baolin Wang --- mm/shmem.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 9c50607ac455..f97c4e9f821d 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2319,13 +2319,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 skipping swap cache & readhaed */ folio = shmem_swap_alloc_folio(inode, vma, index, @@ -2344,6 +2337,11 @@ static int shmem_swapin_folio(struct inode *inode, pgoff_t index, goto failed; } } + if (fault_type) { + *fault_type |= VM_FAULT_MAJOR; + count_vm_event(PGMAJFAULT); + count_memcg_event_mm(fault_mm, PGMAJFAULT); + } } if (order > folio_order(folio)) { /* -- 2.50.0