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 68C03CDB47E for ; Fri, 13 Oct 2023 08:58:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1C1618E0019; Fri, 13 Oct 2023 04:58:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 14AF88E0018; Fri, 13 Oct 2023 04:58:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EB93C8E0019; Fri, 13 Oct 2023 04:58:37 -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 D6F5F8E0018 for ; Fri, 13 Oct 2023 04:58:37 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id A9E0B401C0 for ; Fri, 13 Oct 2023 08:58:37 +0000 (UTC) X-FDA: 81339837474.16.43CA858 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by imf05.hostedemail.com (Postfix) with ESMTP id 7EF88100003 for ; Fri, 13 Oct 2023 08:58:35 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf05.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.188 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=1697187516; 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=73qbkeRYK0UwEo09b8YO/gA+ZBZX23AWTiCUsRN78/g=; b=EaLanMra6F3WEOEve/4esEedIbbCpPNuPuftnb532baEoQur8piWE2iGqW5uFmFpFB1OYJ wDoht6zqf31+qxA0wtj4TIQrEh7Ag2LTNOtSCT/kkXI6oTi13FLYTxQ0ROycdmcPBFXLb1 VzEz6B8heJWNurJm86rEQ+4+FL+9ujs= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf05.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.188 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697187516; a=rsa-sha256; cv=none; b=vMwLzXJQdaVBLBrT7Bx2VxJJaw2eYfgTM3qbzXOogCEyuZbUDxzkEi2tJoBfDK97OyR1/F T2wyZFcg0miggjC+oYjYSGjlA6eGY/oiABtbc0XDQ6M3qdYDvr0yKrfXTrysSDzmG77YSL XICalWtZmTTvDj4YLQInB8STZDVOeqM= Received: from dggpemm100001.china.huawei.com (unknown [172.30.72.55]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4S6L0p5GHyzLqXs; Fri, 13 Oct 2023 16:54:34 +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.31; Fri, 13 Oct 2023 16:58:31 +0800 From: Kefeng Wang To: Andrew Morton CC: , , , , , Zi Yan , Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Kefeng Wang Subject: [PATCH -next v2 18/19] mm: use folio_xchg_last_cpupid() in wp_page_reuse() Date: Fri, 13 Oct 2023 16:56:02 +0800 Message-ID: <20231013085603.1227349-19-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20231013085603.1227349-1-wangkefeng.wang@huawei.com> References: <20231013085603.1227349-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: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm100001.china.huawei.com (7.185.36.93) X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 7EF88100003 X-Stat-Signature: mxctgxi8tf9jqmd6zas1tqm6ykactr4w X-HE-Tag: 1697187515-168954 X-HE-Meta: U2FsdGVkX185+ZZeorPtn6cV2yZUDwxkjNsYQJonlY5j/NSpiRUW+/208My9INlD7lmbb4LT1NyFl4xDRB3AEAHbcu2AKf1ZDhzA9QB75SF7DhFjXN+ltPSuOQm/VK1k9/Dcr+RXFBktIUBGvPcaaq9n4gbPXP8N8atqeUtvNi4P8OtW37o/P1+5K/WZUuv9QWmh1zaBtLzUcYXwBQB2Hy9CqmtAkJ4e4+WhRU1bviTOTZB8SuJD+u6BmrlPpoQ+VBfjZbLSYyOfqZgWI574V4hO93FG7P3h0ZNGgOva1nfjVFCxfpGXN6L9g4/CTVXkDwimwraOxDhxN5ewgmpW92ZIhtczemCz/4x0r/J+4t7tmRvhIyBgiP+eMUgmOJk/FtNXm7AZ3yDitISUflCgOcDQfgUYfOJ4ZrfT2WJl8pb+oLRVzrhx6XbTKLrvxbs5Wu+ulgEV03iC67+mUdIBr/Ty7nQKALNCHn1LcHXSA5RKpn22tMCu9bxmCXJK6+7b2BNn8Ulleu6k6SUC1DovD6W4cdKzdvu6tvlgra9OIHUyzxyEMpe+/CG3GcXnT/lFRXNMyg46bVRWq+7Y2DxoKLIJpzQzT05I2CTzJg6/1ctsMmDXBlZmJCZQlP/Y4kyN0fUnn/Bo5G/wQ2SHBHv9XtjHuySgbkhM4V0W/UjX/mUzBXICRewv/8UPfHQV4Yolwcb2/O7qBorhR2C7Pye2h1F/GQs2oYcUDnGJORzIIO67oZILQWYM8dJzKf5bB7cz8fhS0xsMHueAfN3hIfQY4787N1lr7msMqDSt7PV+nSlM0E26DhrvF55s98d49uJDAaDdsOjmiltkc8uy5T7YkQ1iYXdPmtUtKeFguS2jtpBj2GT04RmwY9INBxXaDJ43HDUQKKCp8gnadwZLywilOrFNN5nELiiiMdkNkIKoQMeGtJkEHdSTjae693Wm0QCvcfUbyF+TW6dgRfu2isy AVQQ9EVS WkIU1GcN5+PyQGMheHLZtTKp1PlCKPGc8T6XL65VEpzSfTCR0xGkmTeWsMCeqvPb7Cmvssr4I75/KkBH1hoVfopo2w81eCN6cEZZQJcBJGzH8qxAwQ7Nr2qE2YgbpqM5FI+tGsdsIRSVFNd6IVauP/05B7+cj5pMkwwa/jca/mH0O79hXo3RuchGt0YS/lH+PJ+vZ 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: Convert to use folio_xchg_last_cpupid() in wp_page_reuse(), and remove page variable. Signed-off-by: Kefeng Wang --- mm/memory.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 6b58ceb0961f..e85c009917b4 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3022,19 +3022,20 @@ static inline void wp_page_reuse(struct vm_fault *vmf, struct folio *folio) __releases(vmf->ptl) { struct vm_area_struct *vma = vmf->vma; - struct page *page = vmf->page; pte_t entry; VM_BUG_ON(!(vmf->flags & FAULT_FLAG_WRITE)); - VM_BUG_ON(folio && folio_test_anon(folio) && !PageAnonExclusive(page)); - /* - * Clear the pages cpupid information as the existing - * information potentially belongs to a now completely - * unrelated process. - */ - if (page) - page_cpupid_xchg_last(page, (1 << LAST_CPUPID_SHIFT) - 1); + if (folio) { + VM_BUG_ON(folio_test_anon(folio) && + !PageAnonExclusive(vmf->page)); + /* + * Clear the pages cpupid information as the existing + * information potentially belongs to a now completely + * unrelated process. + */ + folio_xchg_last_cpupid(folio, (1 << LAST_CPUPID_SHIFT) - 1); + } flush_cache_page(vma, vmf->address, pte_pfn(vmf->orig_pte)); entry = pte_mkyoung(vmf->orig_pte); -- 2.27.0