From patchwork Tue Sep 26 00:52:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 13398594 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 05775E6FE31 for ; Tue, 26 Sep 2023 01:11:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 319118D005C; Mon, 25 Sep 2023 21:11:54 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2A1C48D002E; Mon, 25 Sep 2023 21:11:54 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 11C2B8D005C; Mon, 25 Sep 2023 21:11:54 -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 ED7C78D0005 for ; Mon, 25 Sep 2023 21:11:53 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id C9BBF40D4C for ; Tue, 26 Sep 2023 01:11:53 +0000 (UTC) X-FDA: 81276971706.01.1668978 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf16.hostedemail.com (Postfix) with ESMTP id 393CF18000F for ; Tue, 26 Sep 2023 01:11:50 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695690712; 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=DXDkkBvU79MWZKI+0442dVxorWxgJcWylyLHViP7wEs=; b=Ij0N9rzDYtNXtMbyc5z2Ym/UoI35fcLiXVw0dPHOxtqsPdsYcF3gUAd36YxBoIOSGD8fgy Zu0Ny8YVmdhdb8PPqMHVl359WOed5NZiSs3ccscCQfnj0eVNxkGvoVyedXKgCwMErZryRN W2fIF1GXPwDba5PyEMxeL8mymerNb3Y= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695690712; a=rsa-sha256; cv=none; b=Fq5hGti/dcK8Q92QXM2IAefFksu8PZOSL5Xh8fDNcMX3FyfQFhbAe029Fh3Xsa3v7GDOSJ e5Psap61moOa+ZvBiUdVEl34JXTdMdHL00Za8P7Pj+Zh5u9XCungbSiN2gI4aj881d9kz1 M6xGxgMkpsZfO8WTiAipZY8Kmd35GLI= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of wangkefeng.wang@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=wangkefeng.wang@huawei.com; dmarc=pass (policy=quarantine) header.from=huawei.com Received: from dggpemm100001.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Rvh2B6SqZztT0Z; Tue, 26 Sep 2023 08:48:50 +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; Tue, 26 Sep 2023 08:53:10 +0800 From: Kefeng Wang To: Andrew Morton CC: Mike Rapoport , Matthew Wilcox , David Hildenbrand , , , , Zi Yan , Kefeng Wang Subject: [PATCH -next 6/9] mm: make wp_page_reuse() and finish_mkwrite_fault() to take a folio Date: Tue, 26 Sep 2023 08:52:51 +0800 Message-ID: <20230926005254.2861577-7-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20230926005254.2861577-1-wangkefeng.wang@huawei.com> References: <20230926005254.2861577-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm100001.china.huawei.com (7.185.36.93) X-CFilter-Loop: Reflected X-Stat-Signature: 6bdzx8t9u5gxujzi4wztdpy4zjsktqs7 X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 393CF18000F X-Rspam-User: X-HE-Tag: 1695690710-688750 X-HE-Meta: U2FsdGVkX18KUjHPf5mmW54L27BRblj6VRXqJWUg64SbUzZ8KBNlxOscz6WJUBTGm40n47aV5X1I6exAw8FZjHK0phCecLUcFJhh42UgoeheHE4/ZMTQmya6J8C3gjKOXIqdYOqFuGJy9hCm/Qwdu54AokYfAxRyym/VpTkUlQql85XN9Yq2OqMQwTLXl1HwRXvCTas+/uly+V4P/O/yfYV1wbXMpHLM6wKLkSqun8meqD7Qdc5ZqNCNYwq19scfLdWs44WY2V5keByUkUeEgkT3nUTHE1h8DaxffClHpZ+mc8xkwcJlbzt8VUYGnJUfmYVGcV8nuBvjjvfV0WrwLruqI0173KYoZQN5fxvPf2rqI1Rj2bJ3Rzel1yeIWESfWattyUD/WQbXPrTeaJKhI7jq2C4M6egyGp1AiyWFFu5pVaClQOF5GouiT8SCA024e7r4mwmU314jOwsxlFbo2lu0+OUuDEvQpBkh1JlqRxGfr8TGvlHC/HElj07I/gy4eS5pm//fzQhpLGawD6665CqOmK0iRYElCeeC4EGn1aC9Yz1Slm89N47UoBiBNbzVkXLUDvCdcFaFk8i4FzlDTcWcyzb1YzPI/7tI4jVjSZ/q2kdwftEjKZD5og7cMkC/1VEDhXTjyqap9BFcK0bTkKOUzoffDUtZRCqDYFnD4tQx3fg/o/PFXiZVM9BFJMcBSwc3MxV+p+IQG7srAknoDeOkE2qhybX7oLOAjSKhHEjPtsvBHiSGja/3gbyUvPg0/k/jLftAZQTjObnWYeTkVoTG7fZ6GQNpI9dwn6X2UnjtEdfrWKJHdW0hmG/6kchj9HXboai2crGZ2qRO+Dfp6KKlzXvwFodkhGJUJn3sq510BpsgPDMhv14UiY30WoZv59pkn2eJiRWP5xm7vdG49geiAnbHMhyxmdBuPNWnRjIziWJBxFtv1MU+/R+kLc3ESw6/zgNEnffcjnWbH+K 1XAEyQZA 6KLq/k8iVpS3TQBJCdjXhBJish5rbS7TcpauDlZkEwtt4B9WoVTzsMKwKx1GY22TWa3ZFuImcooe6OpVsJRxR/fGIUWtJPrOhTz766ipOW4Z4UYyG/R1kwKO1XfekSIypqyzD6rvOB2r5+qc1dt01s/54hiSbM6x9i3v4ykEDru1ekcJgDNs93Qk5TS0X9EjN8twE 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: Make finish_mkwrite_fault() to a static function, and convert wp_page_reuse() and finish_mkwrite_fault() to take a folio in preparation for page_cpupid_xchg_last() to folio conversion. Signed-off-by: Kefeng Wang --- include/linux/mm.h | 1 - mm/memory.c | 37 ++++++++++++++++++++----------------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index aa7fdda1b56c..9933f6345e66 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1335,7 +1335,6 @@ void set_pte_range(struct vm_fault *vmf, struct folio *folio, struct page *page, unsigned int nr, unsigned long addr); vm_fault_t finish_fault(struct vm_fault *vmf); -vm_fault_t finish_mkwrite_fault(struct vm_fault *vmf); #endif /* diff --git a/mm/memory.c b/mm/memory.c index 5ab6e8d45a7d..119c40e4465e 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3014,23 +3014,24 @@ static vm_fault_t fault_dirty_shared_page(struct vm_fault *vmf) * case, all we need to do here is to mark the page as writable and update * any related book-keeping. */ -static inline void wp_page_reuse(struct vm_fault *vmf) +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(page && PageAnon(page) && !PageAnonExclusive(page)); + 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. - */ - if (page) - page_cpupid_xchg_last(page, (1 << LAST_CPUPID_SHIFT) - 1); + /* + * Clear the pages cpupid information as the existing + * information potentially belongs to a now completely + * unrelated process. + */ + page_cpupid_xchg_last(vmf->page, (1 << LAST_CPUPID_SHIFT) - 1); + } flush_cache_page(vma, vmf->address, pte_pfn(vmf->orig_pte)); entry = pte_mkyoung(vmf->orig_pte); @@ -3223,6 +3224,7 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) * writeable once the page is prepared * * @vmf: structure describing the fault + * @folio: the folio of vmf->page * * This function handles all that is needed to finish a write page fault in a * shared mapping due to PTE being read-only once the mapped page is prepared. @@ -3234,7 +3236,8 @@ static vm_fault_t wp_page_copy(struct vm_fault *vmf) * Return: %0 on success, %VM_FAULT_NOPAGE when PTE got changed before * we acquired PTE lock. */ -vm_fault_t finish_mkwrite_fault(struct vm_fault *vmf) +static vm_fault_t finish_mkwrite_fault(struct vm_fault *vmf, + struct folio *folio) { WARN_ON_ONCE(!(vmf->vma->vm_flags & VM_SHARED)); vmf->pte = pte_offset_map_lock(vmf->vma->vm_mm, vmf->pmd, vmf->address, @@ -3250,7 +3253,7 @@ vm_fault_t finish_mkwrite_fault(struct vm_fault *vmf) pte_unmap_unlock(vmf->pte, vmf->ptl); return VM_FAULT_NOPAGE; } - wp_page_reuse(vmf); + wp_page_reuse(vmf, folio); return 0; } @@ -3275,9 +3278,9 @@ static vm_fault_t wp_pfn_shared(struct vm_fault *vmf) ret = vma->vm_ops->pfn_mkwrite(vmf); if (ret & (VM_FAULT_ERROR | VM_FAULT_NOPAGE)) return ret; - return finish_mkwrite_fault(vmf); + return finish_mkwrite_fault(vmf, NULL); } - wp_page_reuse(vmf); + wp_page_reuse(vmf, NULL); return 0; } @@ -3305,14 +3308,14 @@ static vm_fault_t wp_page_shared(struct vm_fault *vmf, struct folio *folio) folio_put(folio); return tmp; } - tmp = finish_mkwrite_fault(vmf); + tmp = finish_mkwrite_fault(vmf, folio); if (unlikely(tmp & (VM_FAULT_ERROR | VM_FAULT_NOPAGE))) { folio_unlock(folio); folio_put(folio); return tmp; } } else { - wp_page_reuse(vmf); + wp_page_reuse(vmf, folio); folio_lock(folio); } ret |= fault_dirty_shared_page(vmf); @@ -3436,7 +3439,7 @@ static vm_fault_t do_wp_page(struct vm_fault *vmf) pte_unmap_unlock(vmf->pte, vmf->ptl); return 0; } - wp_page_reuse(vmf); + wp_page_reuse(vmf, folio); return 0; } copy: