From patchwork Sat Jul 1 03:28:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "zhangpeng (AS)" X-Patchwork-Id: 114944 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp10821995vqr; Fri, 30 Jun 2023 21:22:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7BDrR8GVVnLWu4yDXhFovNvYtZPpcYiIKPRkjNyAqfX+pDv3tkvj+qdJkB3XCwoSgqEMEO X-Received: by 2002:a05:620a:298a:b0:767:409f:bb04 with SMTP id r10-20020a05620a298a00b00767409fbb04mr6803944qkp.6.1688185324560; Fri, 30 Jun 2023 21:22:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688185324; cv=none; d=google.com; s=arc-20160816; b=GvmLRqzuqEhje298cVqQGeiw/TGaiaF6bg6D+lZcLm/l/pZVLcdZf0OIGGFWtNG8CG HMNM1Yi4VpLODMbGEw1qtrkvL7nutXjDCkiDFItqBSyJ9jRfBBSXAkm29cCf/jUgB+pD xb9pJAX1BtskfcDlqj05Babyktw0pkexYsi5l6Tt3SZuyacJWRmo1vX2bIrleALY+AAe u8GY3r8xbjGWdYvYohCxeUnyH7+x+BY3VoTtsMVUqlNxdnNR3iQoi0NYR24H5brNGbMH kPTuP/Ih0fvkYIGydgXPYsJgx3EkHANWSeHD5mDJUqkC4tIkpouheL6v7+dNW9ngQrpH p3Gg== 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=hrDDcmHnpynXqyvywojhzhzT6+fSNeluiHTRPRkvoKM=; fh=sseU4O+oqopp12EPmhxR3nh+ngQh6y4sT1gRFnXeDhs=; b=xlIuHla3ibVuKlts3m0hDxSDqdJFPEsACrs24CpAYcR707Nt8/hzYK0Ja/K0nYFdKF KgY4TuLDVcanmGoxpvLqT7DKvOHkJYCFr6FwaHMkoUxKWW2DwC7HNBDO71Nh+wagZQNA GkmSO5WhULS7ZoNH7RbtaNiV9slPgx0SnSCxw9hy82h0Gg7ZIbWRzhxt0mvRXkX5vXsQ PjrJQJotTjQ0Uh4bADmO+iCV7+hWC90Xfb5quOucuDV5EYZjk9fSf50lfAdHhlg/kBqj tVd/MbkcmxjJbf46IzByyWpw4QVpqnmI36W79jK4mcVSQvVswrqOtXycX/MFywEmFxRn kq0Q== 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 z11-20020aa7958b000000b0068269b1ebcbsi1579110pfj.394.2023.06.30.21.21.41; Fri, 30 Jun 2023 21:22:04 -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 S231205AbjGADgb (ORCPT + 99 others); Fri, 30 Jun 2023 23:36:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230494AbjGADer (ORCPT ); Fri, 30 Jun 2023 23:34:47 -0400 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FBEE297C for ; Fri, 30 Jun 2023 20:29:02 -0700 (PDT) Received: from kwepemm600020.china.huawei.com (unknown [172.30.72.56]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4QtHfh1HWqzLn4k; Sat, 1 Jul 2023 11:26:52 +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; Sat, 1 Jul 2023 11:28:59 +0800 From: Peng Zhang To: , , , CC: , , , ZhangPeng Subject: [PATCH v2 1/2] mm: use a folio in fault_dirty_shared_page() Date: Sat, 1 Jul 2023 11:28:52 +0800 Message-ID: <20230701032853.258697-2-zhangpeng362@huawei.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230701032853.258697-1-zhangpeng362@huawei.com> References: <20230701032853.258697-1-zhangpeng362@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.112.125] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) 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, 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?1770190614466203860?= X-GMAIL-MSGID: =?utf-8?q?1770190614466203860?= From: ZhangPeng We can replace four implicit calls to compound_head() with one by using folio. Signed-off-by: ZhangPeng Reviewed-by: Sidhartha Kumar Reviewed-by: Matthew Wilcox (Oracle) --- mm/memory.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 765e5d8ed1f4..9a2f4dab872f 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2968,20 +2968,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 + * Take a local copy of the address_space - folio.mapping may be zeroed + * by truncate after folio_unlock(). The address_space itself remains + * pinned by vma->vm_file's reference. We rely on folio_unlock()'s * release semantics to prevent the compiler from undoing this copying. */ - mapping = page_rmapping(page); - unlock_page(page); + mapping = folio_raw_mapping(folio); + folio_unlock(folio); if (!page_mkwrite) file_update_time(vma->vm_file);