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 A582BC83F03 for ; Fri, 4 Jul 2025 18:18:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 429CD6B8059; Fri, 4 Jul 2025 14:18:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3DB556B8067; Fri, 4 Jul 2025 14:18:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2CD566B8059; Fri, 4 Jul 2025 14:18:51 -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 143FC6B8059 for ; Fri, 4 Jul 2025 14:18:51 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id F3119B74CE for ; Fri, 4 Jul 2025 18:18:48 +0000 (UTC) X-FDA: 83627393136.23.0E8BFD8 Received: from mail-qk1-f176.google.com (mail-qk1-f176.google.com [209.85.222.176]) by imf07.hostedemail.com (Postfix) with ESMTP id 1E3D14000A for ; Fri, 4 Jul 2025 18:18:46 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="M7ZHGB/H"; spf=pass (imf07.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.222.176 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=1751653127; 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=SySL2jmSZf+IwbPGxTWXoVXdX1jiyaz28t5V3h6OpcI=; b=6TYiteYBekZ2Gh7gbZjGPH194WObMundWClZ+h6wZGSLKvNuLThVwFSsteYCcmalbTQcQf fIGOOE7KCnuielvLPt4VgI+sXosudym/QoqA4ZDFJFGGM6nAP2fx6MFRTtiraKiiSaGc75 IxbRAW1inevEcC8atHaHnhi5+vgsm90= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1751653127; a=rsa-sha256; cv=none; b=ICtFg0tgYA7WFFxdvmBsps+4tN7CeEDCS5qia9zZM9yDO+Lnu0XngxZKZPixgcBljVHunc 7YsMQo19iwlGAaqm2txZy4LtsLueYE2AEpa6ootwfL9U1xWJ9LsE5pfPwA9sCRJcDscPoE Jij62Tt4Jgnw5UjNE1z+koilp8Yj6z4= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="M7ZHGB/H"; spf=pass (imf07.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.222.176 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-qk1-f176.google.com with SMTP id af79cd13be357-7d098f7bd77so152087185a.0 for ; Fri, 04 Jul 2025 11:18:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751653124; x=1752257924; 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=SySL2jmSZf+IwbPGxTWXoVXdX1jiyaz28t5V3h6OpcI=; b=M7ZHGB/HkXTz7n5YHrvBlkmWyqQ1BA7z6aVd/wjtJGBwEMeei1D0UEh9rafq4Y0wAU PGsCV9OiGuvqOWEya5t84qTMzMvIxmbijGaymz2FRY8WCumBhAQY8Fx6HsvIPzaoYPOc ng94WRjsM6cBv8Ijomylw9oD+Y8+RCpO94mQOG3uIhsvwmzeFkwq/nVPoJSFGukjci/3 sMy7spSz4FClvLYq3Db4JuJrC5jd3pPUxQ706+/0c+xLI7WTU/8pblP1MKjDeTEXYk1/ gJ5xvnEBub1SqXssV7s7X7B3W1RgluxuvQWe1Y3gz0yOVYnjNNaaEKKFDPy14q2HUUCi etuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751653124; x=1752257924; 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=SySL2jmSZf+IwbPGxTWXoVXdX1jiyaz28t5V3h6OpcI=; b=QC0FEU+0F+g2BPDtbixqdejJwU7e6EGYHse3yifo90ekSVxr0LalKU0jpRrnKHlg00 GBa1T5kF+ojlsbEKrxb3YVua1jxuG1uJkWZqpS8urAz/2ihUGvQ462YfBG/lbfThTroQ InpjDurg2RYhnQD4Y+/6HokyDiXBu9LcSNBy+weZQh1Xm8NBgzLY4xF/eR5mqJYcD0EZ YslH33AizUldi/gOmZ4e864LRXxPkk+upUvMx4DSplLGWBwQ8nu35+dQgsAwuIpHKJSd pQtOFvrM4uIlIqdDIl++xBKo3rVzl745DcvQPPAAwXS0HhSJPX9pDpBQVk2YAUmNUv4F ieIw== X-Gm-Message-State: AOJu0YxTyIrdYx4TePlCVgxVV8E91c/77vP5jjzynTWsLZQhw2T7w4TK 51V7kaLSEHEyeMvD5Va0jgBU8JK+Z6zzsm9ZaAao1aGHa1/d5wvA6Shf+tOqxg+sdaY= X-Gm-Gg: ASbGnctdYaDs9BFcv8Hi1bEsEMmrMnH+sbqUUoNgNr9sQN8l7UZPCn0AMDC4wIqcnpv /LwRPnKOhQJMd/CQPiDGnP4RdusjFMW562KWCxEcvrdNP8bAGdLJtk3uwvMnXlkQu2REAsHioI9 Ce3bv2Bxx6TDYvGg1agDPbxFAoniO8ek3BuTmAsZLuI47NSCls4oWNoIL9Iqi9nLZbW4XyFhZv3 aHM3DANbLAmcX0GdTV89gnfsNeCp710VNEP8PqR/8jIQ6Pc9FptfLe0MD4vVg6ibVxnm2/pa4V6 a5COUX3pxxSUf9YQHVhcGZUENbbLNrpV7rPicG2+czFLU70K7zQCnO/R3c3BD5n479w= X-Google-Smtp-Source: AGHT+IGPsEESA1JToeYXhuEkFG+0ssxexxcX9oiBTKNbVP6yi9xfkhZnssssTwAiqhhq3LtkJSSg5Q== X-Received: by 2002:a05:620a:618b:b0:7d3:e56e:4fd8 with SMTP id af79cd13be357-7d5dc66a567mr493346285a.12.1751653124279; Fri, 04 Jul 2025 11:18:44 -0700 (PDT) Received: from KASONG-MC4 ([101.32.222.185]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7d5dbe7c188sm183300585a.59.2025.07.04.11.18.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 04 Jul 2025 11:18:41 -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 v4 9/9] mm/shmem, swap: fix major fault counting Date: Sat, 5 Jul 2025 02:17:48 +0800 Message-ID: <20250704181748.63181-10-ryncsn@gmail.com> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250704181748.63181-1-ryncsn@gmail.com> References: <20250704181748.63181-1-ryncsn@gmail.com> Reply-To: Kairui Song MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 1E3D14000A X-Stat-Signature: m5831pri88imz6bz649zuq1n88jegprw X-HE-Tag: 1751653126-813088 X-HE-Meta: U2FsdGVkX18Nqwad6KfT5iFBAgbDCpg1QTc36Ip8fkPA6dxiKFVnyoMGVdGCjEGDRaCdAhe56QNFjKXXI4Qlp9mqAgNlKPdhnAoIldNB9ttgQo6zWe8x8uWGLsb1NPPoGoCq1qudcyfdu/Lj9i7XnQZbt/qDGCwgzWoW0eMt3j/1eVGZtfHMOhbourKUa/l4zSkfuUqsqf/UEozCh/dVzJ9/0Zn8X5FKJxJj1M8IWwsATrf0amB7/GItAtxEYE6OBBsn0b7qiw460OSHiFBWxZZcXI5JfBtpl3AMkkSkGe0f9BALWHzZzzm+ruDpy7K4Nyi/CXxuv5H0MkCCB+Rr5HrIy8T6/CfnSkR4n2kfhyULfp6bh/wn4IeENxc1qgoainc3NCFF1jmOUyEs9BONLucGcBIM3+NKeLUlF4HOd5SGT2X8fTS1N7OcNzdNzX2kQzHBKUuUQr6iUb4JNIya5ErYRwAQYkDy0QIoOAeTN2JH+jb/O03FdMDgFQo+IbPkeQQa2somqUEHjmZu/0QjkROmgVx9VhkrvsybF8l2kWW8YhrWvRWvsoPVzICDuTtaF/AISSWtYwo8Ban0TkeDNOrcsR4j+O2NABS4AgMwQ0g9fXOYF6m9BkqsvLIKL76/RSR8ObM83+N4mUCN7U9PmjkhoUcolORi6Nih6y1PGS5t1BS8uEkos2YF2LEM1lful8GDnmY5VdiX2hbf7wYDI8gHrxXDTUfiQAhJRzOAWEOi9JmPvsPHBx4d8JYAn2hyFBis9qZMpRCEFwq5S6uszh0Bkz5jExz6VV0raChleWnM7AiqxCro4t9XFToQVrVwoB3hP3fQNq78FnqfRs9tIsDSBUAoRTTCx0soEvaHPjxh0Xen331nY6rfnUShK+ohq6bUBNuwSCBBYxzMdoNHE3ShlaTswp60hAOeNkazVBOh202//k+GZBBlP1p2MugSl8RORoI5Cy1gsrbT1Ma fgdc7c3j hgBRQouLnAU/A8saV2hN30KAxjjf8O5G91+R1vUYtoINpWBvs9215EqET9DGQcc9Hq1MeHCyv12CTk9DKG1p0m0h0SL3xS+nTI5uZ5rIgS6b0iLKk3GY1bLsWJh+DifI/0DU0o2K+Vphaqtm0Vpr+yq+UWxecqjm8iGuoVY8ihJihzzmNJ1vr7SBO9Hh+a14JNo67sSw7ppl/Tr3fxjQ8NI605UwkJYo30fFoMJOcaFPLLoivUlFTDVYRLQ6pj/Feq/3rvBIOnmd5LrDMRSco8rV+d8s3w05TSrZ/vCoUP/RDQ1BmZdqGNL8Gp7WT1Cnz5hFhDynrhHiHoKMMk+oGaS3HdR7ps0KQ0bDYJ+mOY8dVunudIccr5XKXp/ii953dmTc3sq7mU6Udnxd4pb+LpsZl9iV3WHo/+eBuHnIz//z5CuE4BGhesAhDV8PJ71wQODGvqVvN+RztzbMaKvpc9Nu9csfjttOPkhaLeIS1mcRKQqr8Fh7V78zVyUn4b14HCj27gsWpBWxXyHNcigAXGOzJx1dlnMMwhuD8dZnrPptnw4/oXtam7QVglQ0YMGlpFXQoG76K4L50jXomqjBVf/QhZdGO1CA0l5Hoy1OPIwXzLpNT5sQBlFbGhJR9X8jNJ0nb 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 | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 646b1db9501c..b03b5bf2df38 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2321,12 +2321,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_swapin_direct(inode, vma, index, swap, @@ -2346,6 +2340,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