From patchwork Mon May 2 05:31:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: NeilBrown X-Patchwork-Id: 12833821 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 26636C433EF for ; Mon, 2 May 2022 05:31:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 997356B0072; Mon, 2 May 2022 01:31:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 947CF6B0073; Mon, 2 May 2022 01:31:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 80E0D6B0074; Mon, 2 May 2022 01:31:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.26]) by kanga.kvack.org (Postfix) with ESMTP id 6D8496B0072 for ; Mon, 2 May 2022 01:31:39 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 506B22ADF1 for ; Mon, 2 May 2022 05:31:39 +0000 (UTC) X-FDA: 79419680718.19.BAD38C5 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf26.hostedemail.com (Postfix) with ESMTP id EA3AB140027 for ; Mon, 2 May 2022 05:31:36 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id C0A1C210DC; Mon, 2 May 2022 05:31:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1651469497; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RF5hphk24deK65AGu5WyqI/YJJF5CbaXHTx2KyZd5nY=; b=V7xwBv2HyXRXQPhmPO6zT68fBGpr3WRX7lzuSafd054enRFqTzedm72CDEO6cuOKeOTu+a 26P4BYmBSeMRkyV8T4E4foWG5gVqL1+Ms//uYa29SnQwySxRwmkFW5WUgAHyKB0mZulSEp bcafF+UAE1v5tE279o4yFyRszqXFau4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1651469497; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RF5hphk24deK65AGu5WyqI/YJJF5CbaXHTx2KyZd5nY=; b=Jt66QJgQIwodUNF/OYO4SNN2N1mbLESh2AagPEZ51DVAQrU7oe4/OH0AF1iAH5aqMVPrxh y+fDyrls7K3oc4Dg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id A43D613491; Mon, 2 May 2022 05:31:34 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id TxKDE7Zsb2KUTQAAMHmgww (envelope-from ); Mon, 02 May 2022 05:31:34 +0000 MIME-Version: 1.0 From: "NeilBrown" To: "Andrew Morton" , "Miaohe Lin" Cc: "Geert Uytterhoeven" , "Christoph Hellwig" , linux-nfs@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Matthew Wilcox Subject: [PATCH v2] MM: handle THP in swap_*page_fs() - count_vm_events() In-reply-to: <165146746627.24404.2324091720943354711@noble.neil.brown.name> References: <165146746627.24404.2324091720943354711@noble.neil.brown.name> Date: Mon, 02 May 2022 15:31:29 +1000 Message-id: <165146948934.24404.5909750610552745025@noble.neil.brown.name> X-Rspam-User: X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: EA3AB140027 X-Stat-Signature: 7qsyn7bgoe9zct1d8ob1b9io9q4whsbq Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=V7xwBv2H; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=Jt66QJgQ; spf=pass (imf26.hostedemail.com: domain of neilb@suse.de designates 195.135.220.28 as permitted sender) smtp.mailfrom=neilb@suse.de; dmarc=pass (policy=none) header.from=suse.de X-HE-Tag: 1651469496-938349 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: We need to use count_swpout_vm_event() for sio_write_complete() to get correct counting. Note that THP swap in (if it ever happens) is current accounted 1 for each page, whether HUGE or normal. This is different from swap-out accounting. This patch should be squashed into MM: handle THP in swap_*page_fs() Reported-by: Miaohe Lin Signed-off-by: NeilBrown Reviewed-by: Miaohe Lin --- mm/page_io.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mm/page_io.c b/mm/page_io.c index d636a3531cad..1b8075ef3418 100644 --- a/mm/page_io.c +++ b/mm/page_io.c @@ -280,8 +280,10 @@ static void sio_write_complete(struct kiocb *iocb, long ret) set_page_dirty(page); ClearPageReclaim(page); } - } else - count_vm_events(PSWPOUT, sio->pages); + } else { + for (p = 0; p < sio->pages; p++) + count_swpout_vm_event(sio->bvec[p].bv_page); + } for (p = 0; p < sio->pages; p++) end_page_writeback(sio->bvec[p].bv_page);