From patchwork Fri Jun 30 12:13:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 114718 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp10345730vqr; Fri, 30 Jun 2023 06:05:08 -0700 (PDT) X-Google-Smtp-Source: APBJJlEe+NVC7KeTjNLt0Z/P7R+ZfQZ+oQDpZPpKQnj2LoGz62C0o+we9YdvC6pstm2XjdXhtiKE X-Received: by 2002:a17:902:6acc:b0:1b1:a9e7:5d4b with SMTP id i12-20020a1709026acc00b001b1a9e75d4bmr1925448plt.22.1688130307791; Fri, 30 Jun 2023 06:05:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688130307; cv=none; d=google.com; s=arc-20160816; b=UimeWhfj7UpZjmnYvlb7xByOif0pagRelxjfeoKmuXn4bbAzb04YvI9/kB2bw32d+J QnJDoP5abWQ0jpKGxRF1nqr1tBGQVAVPDMuhgVug3NUKNPK1qiKNQhXYG5Ha5keqe36p IOahv3BAXzjstCLEky268tlgv/xQ6RGYRw7Mp7OUXzIkl1TDvFt1WVUFFwvU3QYUx/+t XGa7LqrzVkZdsktW8dSB10fFo9QOQkPqJ21YUfpS8h0QABOoShMIKNFP6wQKN/KHpA0r HZPtWd+B+iHJB/Q3EGIdiIThpIRccLWcnErdO1VKSvdJyXMcV487RtUy2UhsLeceG/IR oB7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=MBZ7vvpVYusarV6ekdjHXkir2egpRNeipnLA+F+ZSxI=; fh=JTrvrbGtYtGElJnl173AUP1Npy20iXcoXGS/wWbJpCA=; b=G9iLFWhuQ2xbgvVoOmoQCLGwrbDE58IQxuoC03QM6ASaMqBbbIXb3F7xDwopVJQGYx DMhb3tfer9i9075HDIutSMtI0CGhcr4rn3NeXJM87sKUC6Jwezhaa+vIQheXDG8oN9Qr hyi0UR6o9N0fOTU6ZVMfvVx4h8S2eBstlbPVsPWgTdfHZGpGwPlhTcbufqJpkwINjnyQ W4dgwVV5j98O9R8oX+m+ArnZqshrKuLWGqoXJ/HmY1jy3wzBFUCk0L3xW6Mn02XD4stq kI37nDs3U4Fz/zfddAoF+f8RKGrMiZ48LacZVIPnFgDqRQL5aPi738zpEnKuMPWa5dwv R8tQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ij22-20020a170902ab5600b001ab2a0e3163si4751566plb.598.2023.06.30.06.04.53; Fri, 30 Jun 2023 06:05:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232744AbjF3MNc (ORCPT + 99 others); Fri, 30 Jun 2023 08:13:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232079AbjF3MNZ (ORCPT ); Fri, 30 Jun 2023 08:13:25 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31690170E for ; Fri, 30 Jun 2023 05:13:24 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.54]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4QsvMZ5K4JzTldR; Fri, 30 Jun 2023 20:12:26 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm600020.china.huawei.com (7.193.23.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 30 Jun 2023 20:13:21 +0800 From: Peng Zhang To: , CC: , , , , , ZhangPeng Subject: [PATCH 1/2] mm: remove page_rmapping() Date: Fri, 30 Jun 2023 20:13:09 +0800 Message-ID: <20230630121310.165700-2-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230630121310.165700-1-zhangpeng362@huawei.com> References: <20230630121310.165700-1-zhangpeng362@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600020.china.huawei.com (7.193.23.147) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770129886195000944?= X-GMAIL-MSGID: =?utf-8?q?1770132925514547659?= From: ZhangPeng After converting the last user to folio_raw_mapping(), we can safely remove the function. Signed-off-by: ZhangPeng Reviewed-by: Sidhartha Kumar --- include/linux/mm.h | 1 - mm/memory.c | 2 +- mm/util.c | 6 ------ 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 9ecb8b9c07f6..8c7eba7370b2 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2129,7 +2129,6 @@ static inline void *folio_address(const struct folio *folio) return page_address(&folio->page); } -extern void *page_rmapping(struct page *page); extern pgoff_t __page_file_index(struct page *page); /* diff --git a/mm/memory.c b/mm/memory.c index 21fab2727209..6921df44a99f 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2979,7 +2979,7 @@ static vm_fault_t fault_dirty_shared_page(struct vm_fault *vmf) * pinned by vma->vm_file's reference. We rely on unlock_page()'s * release semantics to prevent the compiler from undoing this copying. */ - mapping = page_rmapping(page); + mapping = folio_raw_mapping(page_folio(page)); unlock_page(page); if (!page_mkwrite) diff --git a/mm/util.c b/mm/util.c index dd12b9531ac4..5e9305189c3f 100644 --- a/mm/util.c +++ b/mm/util.c @@ -734,12 +734,6 @@ void *vcalloc(size_t n, size_t size) } EXPORT_SYMBOL(vcalloc); -/* Neutral page->mapping pointer to address_space or anon_vma or other */ -void *page_rmapping(struct page *page) -{ - return folio_raw_mapping(page_folio(page)); -} - struct anon_vma *folio_anon_vma(struct folio *folio) { unsigned long mapping = (unsigned long)folio->mapping; From patchwork Fri Jun 30 12:13:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 114711 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp10326520vqr; Fri, 30 Jun 2023 05:36:06 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4nUg6e3RPaN1whpqKtsI5DQAgnAETy8Sr+x5rq3FG62J0Nn34ZqHdc35Av6d+I2Bq7075k X-Received: by 2002:a05:6a20:7fa0:b0:10f:f672:6e6b with SMTP id d32-20020a056a207fa000b0010ff6726e6bmr2614209pzj.5.1688128566257; Fri, 30 Jun 2023 05:36:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688128566; cv=none; d=google.com; s=arc-20160816; b=B3/vw1ucPHx4OQTlMMfWW3m7Y07zotjDTHKD8RTb3EQI1N8mT3HBqf5vJAK5Y0uwdj jMvuW1ymBZgmRoOq+8JpFgJFRHPP8mLOdXWbqfQi/7B5Du85cSLbvbYtjGFXJreyMQC3 MUFppNvw6JpIi0bH0QC4bxM4jmlH14muFqfWK686cc+8KI//hL4QKfcWHByTKzoNQrtd T7ZdqTEGQUH2cuSkU5m8ymdIngJBKCneMqK+Kv84eaO1ebdMo9aKMLQEd/OSl4gq/Kj9 db/Bsd1qt3vCz6q8rlco0ekEqQr72DjJorxb215LENqRX0/nsEchl9hjxCCXIECaMJDt cxAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=v4G7xZ1P7BBK5tKU1+W2DUw6GoPY63Bhg9it6ICKAhw=; fh=JTrvrbGtYtGElJnl173AUP1Npy20iXcoXGS/wWbJpCA=; b=dHIEq6o+PAe8XwAuTzB6C+PWSkCXMvYPknsZCWO+OGvkq+LEiGWqfS9kpvuffFpcHm U/XqDGjNYBCtIMCydPnX4rOHBX67LoJPCrn7FWqEjY22XUMSBDKqqSu5I3TjOAI+dT6K 6XCq5BifwS0jxQj7AGfwqWxA6OVL2k4pF8RpcXmYbtR+X7Q7sbMWY/xwaUp/CS6j3NXb Ga58BP1i6slpsM3yiMR4WgWdvxC+AEOLn2ecLHooucU1aSpbo/sntlMPIAYlSMhWb8Xy 74oIDbDpvXrUFrZ7WFaJJMoe77ktBtqF61FEzt2cIUeyFSsqC6VBvT3btgCYc61DM+np ZNyQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d4-20020aa78e44000000b006546d0d5832si7222385pfr.183.2023.06.30.05.35.52; Fri, 30 Jun 2023 05:36:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232982AbjF3MNj (ORCPT + 99 others); Fri, 30 Jun 2023 08:13:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232425AbjF3MN1 (ORCPT ); Fri, 30 Jun 2023 08:13:27 -0400 Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C104171E for ; Fri, 30 Jun 2023 05:13:25 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.53]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4QsvMb2rGwzTlft; Fri, 30 Jun 2023 20:12:27 +0800 (CST) Received: from localhost.localdomain (10.175.112.125) by kwepemm600020.china.huawei.com (7.193.23.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Fri, 30 Jun 2023 20:13:21 +0800 From: Peng Zhang To: , CC: , , , , , ZhangPeng Subject: [PATCH 2/2] mm: use a folio in fault_dirty_shared_page() Date: Fri, 30 Jun 2023 20:13:10 +0800 Message-ID: <20230630121310.165700-3-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230630121310.165700-1-zhangpeng362@huawei.com> References: <20230630121310.165700-1-zhangpeng362@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600020.china.huawei.com (7.193.23.147) X-CFilter-Loop: Reflected X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770131099490165450?= X-GMAIL-MSGID: =?utf-8?q?1770131099490165450?= From: ZhangPeng We can replace four implicit calls to compound_head() with one by using folio. Signed-off-by: ZhangPeng Reviewed-by: Sidhartha Kumar --- mm/memory.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 6921df44a99f..73b03706451c 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2967,20 +2967,20 @@ static vm_fault_t fault_dirty_shared_page(struct vm_fault *vmf) { struct vm_area_struct *vma = vmf->vma; struct address_space *mapping; - struct page *page = vmf->page; + struct folio *folio = page_folio(vmf->page); bool dirtied; bool page_mkwrite = vma->vm_ops && vma->vm_ops->page_mkwrite; - dirtied = set_page_dirty(page); - VM_BUG_ON_PAGE(PageAnon(page), page); + dirtied = folio_mark_dirty(folio); + VM_BUG_ON_FOLIO(folio_test_anon(folio), folio); /* * Take a local copy of the address_space - page.mapping may be zeroed * by truncate after unlock_page(). The address_space itself remains * pinned by vma->vm_file's reference. We rely on unlock_page()'s * release semantics to prevent the compiler from undoing this copying. */ - mapping = folio_raw_mapping(page_folio(page)); - unlock_page(page); + mapping = folio_raw_mapping(folio); + folio_unlock(folio); if (!page_mkwrite) file_update_time(vma->vm_file);