Message ID | 20240111111239.2453282-3-wangkefeng.wang@huawei.com (mailing list archive) |
---|---|
State | New |
Headers | show
Return-Path: <owner-linux-mm@kvack.org> 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 BA9B2C4725D for <linux-mm@archiver.kernel.org>; Thu, 11 Jan 2024 11:13:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B02266B0096; Thu, 11 Jan 2024 06:13:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A88936B0098; Thu, 11 Jan 2024 06:13:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9501F6B0099; Thu, 11 Jan 2024 06:13:39 -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 883B76B0096 for <linux-mm@kvack.org>; Thu, 11 Jan 2024 06:13:39 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 5789E16060D for <linux-mm@kvack.org>; Thu, 11 Jan 2024 11:13:39 +0000 (UTC) X-FDA: 81666769758.07.92A36AC Received: from szxga05-in.huawei.com (szxga05-in.huawei.com [45.249.212.191]) by imf14.hostedemail.com (Postfix) with ESMTP id 0852010001E for <linux-mm@kvack.org>; Thu, 11 Jan 2024 11:13:36 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf14.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1704971617; a=rsa-sha256; cv=none; b=6Q8mb3zq+vMxnnjapkj40y7bPldl1eGlo9DIRfh/bnQsCKdp3p3sqUv8wwIr4zeh0Br8ML lE6c0CnXrQ8XD+ADQHA1K6X8Gw1OrXRLHevjm0ibjwWTPR31AATtlZxhXUHRvcdDls40NC 6iwbiBwzkaIK3WSRcDPPpZMDXB7xu6c= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf14.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.191 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1704971617; h=from:from:sender:reply-to:subject:subject: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=FH2vFiBdBjF+ugH0m9h03lcbXnOe652tPxfxmnZBAtw=; b=18ZDMO/p9mfz0m/2qGU3YetILpYFZMT3ZylJl3uWPSPFDn8FSeFdlLxVby+zoW9BcaAh4B PhEBmx+T31lKPn3TH7oOaiMYVF0HKFq/4kqPfdSPCxzK6wing5I6CdoxF6SDZSvhjKLhRS 8lo2HZ3TrXRjVDVj0EKvtxxKVu6gXVI= Received: from mail.maildlp.com (unknown [172.19.163.17]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4T9hkq5dbGz1FJGQ; Thu, 11 Jan 2024 19:09:23 +0800 (CST) Received: from dggpemm100001.china.huawei.com (unknown [7.185.36.93]) by mail.maildlp.com (Postfix) with ESMTPS id 520FD1A0172; Thu, 11 Jan 2024 19:13:31 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by dggpemm100001.china.huawei.com (7.185.36.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.35; Thu, 11 Jan 2024 19:13:30 +0800 From: Kefeng Wang <wangkefeng.wang@huawei.com> To: Andrew Morton <akpm@linux-foundation.org>, <linux-mm@kvack.org> CC: <willy@infradead.org>, <david@redhat.com>, <linux-s390@vger.kernel.org>, <linux-perf-users@vger.kernel.org>, Kefeng Wang <wangkefeng.wang@huawei.com> Subject: [PATCH v2 2/8] s390: pgtable: use pfn_swap_entry_to_folio() in ptep_zap_swap_entry() Date: Thu, 11 Jan 2024 19:12:33 +0800 Message-ID: <20240111111239.2453282-3-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240111111239.2453282-1-wangkefeng.wang@huawei.com> References: <20240111111239.2453282-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggpemm100001.china.huawei.com (7.185.36.93) X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 0852010001E X-Stat-Signature: et3tz57s5q3xxe9h6fi1zkd6ryh3h3j4 X-Rspam-User: X-HE-Tag: 1704971616-394724 X-HE-Meta: U2FsdGVkX19FlO9u795BiS+FnsywhtwK6PFRGZk6Sd54Lk2kfn64QIXDo32AXCteUNDo9Vay+BYq4OwtRf8hcyftlqssF7MNOc/SMqpxu3rkp5mMCAl46IJQUUaRs8hc22vj3drL1xKPuIQt9914NMD38ISj9L+8zuL5460VYpXFZHTKZVGGMWTEkjpmCK8RpMuh6tc/dpqjpiilafUQsjgOzrS8Ip+WlRMlWzynIpGGRJymtJsbFpd8MsA7cCWf35TzuYLR37lmQkja2854wcWRTsbsgwV+9N8qWyjCiOw+STfbOgITDe+K8LzknOF6g/U+wyEeZlPx0Z0ytZ5SDQjwu9O7O2k5wNn9NHB3PFdBHEKqjOtktXLo6QctBhukWuaMBSSL+p8PNcXL8CVbTEnL2AXX4DLQd/rmJ4cTRljdmgKIjnqExYxgX4+D6pFLcKEjmmOqWJIh1utlCY8eDtEyddUKxiZtfHwSnTt7j1XD/azjiQKRyp0N1bT9uIRr5CwCltoMxEG/fRRXsgYfnM9ncF9gbM43mjLIGASVzK0D2YhvcYJzoLpoTzngWSYp+eZv1E3X1zjZBbTn9cISVbKoq1MXSsOxNB3m1d8+on054J9fB0twXTZW8qV0F7heRxxRbf+5YrpCi7CbiiCOwsqBtw8uwY18YII6xv3u7T/JpnTU6a2osYW0WcfapSiNnnWyr2s8WNmpktzfHl1IDn5TbpECQ/Ia1VmZlhXXPHd2DzMtwOmCcYTqTgWRRDgThfFDn7zMnNQs3WyupVAEmfuelIEJjoLO/KlzTHu4hVIf2HFjad9YId1On1NcozyiTALM0QzNlBk9pbIisk2BwZikAVlC2vfrS+h3yjrdSCQTtSSyyZx2bzHxFyzHsqzCzyBEOsXEeZJh1Gtug0B3TRnIrxrCWoIEo6K1eNatE3FflFWYF4j0k7WLlkp1WQ/uMQEHJaHHfu9iVs5J6FE B/SK0pLn GcPcmvV9urryW2Bc/ew3sSkZJVnUCSretgwnlxDp3u3lTCFQxpHa5LObkiKzkysgkDJwVDU9I4R3H6irPEC/PZDPIA3/EANZvSsliYdxixEZUt5IEXR9qWj5z/j+XoInidV7wsDMPFw7nOU5Es5BlORTaDSDH+p8w/QXQFxzs6yfGJWXns0YuaHcyvQGFG8jnmu6M 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: <linux-mm.kvack.org> List-Subscribe: <mailto:majordomo@kvack.org> List-Unsubscribe: <mailto:majordomo@kvack.org> |
Series |
mm: convert mm counter to take a folio
|
expand
|
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c index 99422926efe1..e8fc5c55968e 100644 --- a/arch/s390/mm/pgtable.c +++ b/arch/s390/mm/pgtable.c @@ -721,9 +721,9 @@ static void ptep_zap_swap_entry(struct mm_struct *mm, swp_entry_t entry) if (!non_swap_entry(entry)) dec_mm_counter(mm, MM_SWAPENTS); else if (is_migration_entry(entry)) { - struct page *page = pfn_swap_entry_to_page(entry); + struct folio *folio = pfn_swap_entry_to_folio(entry); - dec_mm_counter(mm, mm_counter(page)); + dec_mm_counter(mm, mm_counter(&folio->page)); } free_swap_and_cache(entry); }
Using pfn_swap_entry_to_folio() in ptep_zap_swap_entry(), which is preparetion for converting mm counter functions to take a folio. Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> --- arch/s390/mm/pgtable.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)