From patchwork Sat Nov 4 03:55:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 161524 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp1450941vqu; Fri, 3 Nov 2023 20:56:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHWgGe9mgCKnaQRGWBAMBu+lfP6y+35XKSD5f1oDVgdO1TqAxiPJZKYpPwks8Y8bwxay5VG X-Received: by 2002:a17:903:187:b0:1cc:47c1:c2cb with SMTP id z7-20020a170903018700b001cc47c1c2cbmr6531412plg.2.1699070191378; Fri, 03 Nov 2023 20:56:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699070191; cv=none; d=google.com; s=arc-20160816; b=ShRG48fGXEh/Zk0DvFIweLFCD/6f8ndD/uZ+IsZtlaQHSindGQvTKkB7lPVw1/jAKQ 1tYPS3lQa0+16RAofH+WB6NUX9ty67VjC9WbxSM+m28Y9TeHJZc8H8dxA531C5JixDs0 Oewkl1P+AI2PWU9DBFj1fIsaF19AmoH4vGNOhVZ0hJRTjLrb0R/RsPmQTPWBC/oTZoHo ADvPllT1D0eczj3gJytPHmagGU8aDgUiVdNmrGc5H5HSqc3eDx+pluRHmCNjBB6iAfAY Egqc3iUFSeWIkzvFTVBs9vDArRRfAvdfhGFR6PD31Va8KuWWZN1AW8Z39n8fA30cPenm q9rA== 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=DR0NwF5aoEPfBIrGPy27I4jQhGFlovTU4h4vQaXGQfk=; fh=kUj/5waaepfljbNx30rj2BALdV0u/mUCTaFWThlgquQ=; b=d/sYwjr41PmT0N/JwKh4s83PitL1sTifBH4B560POaaRO3d9hzlDf1fAy21WhhL2pD +pRKiKlBKZJSS8ymG7WUV2HYrSG7srqnw1bGvtnifZc/LqV9VokncX3dn7bX6rOvd0L1 TJNDV6pf2F+V7uvedo/Xrq34KATfWwoo+o3xFpaGBUpdBWqe56bekgpxA23qmVzlSTdV zaLa65FlmGCQn8tKc1wAoVicjESC+kM+xS62nG2UneMAuLu0k5EMeEcsvuKmylEJ7M6C 2q28cmObXUE8NgWC9f0gZnNgRlHwfaQ+PDyIXI4RvbR+te8gZhqJ6oGTbnSSqW86E2BC ZmfQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id q22-20020a170902b11600b001cc11902882si2797982plr.641.2023.11.03.20.56.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 20:56:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id D4BA581ED52C; Fri, 3 Nov 2023 20:56:25 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378032AbjKDD4L (ORCPT + 35 others); Fri, 3 Nov 2023 23:56:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234193AbjKDDzs (ORCPT ); Fri, 3 Nov 2023 23:55:48 -0400 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81CFBD53; Fri, 3 Nov 2023 20:55:45 -0700 (PDT) Received: from dggpemm100001.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4SMkKl453TzvQCR; Sat, 4 Nov 2023 11:55:39 +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; Sat, 4 Nov 2023 11:55:43 +0800 From: Kefeng Wang To: Andrew Morton CC: , , Matthew Wilcox , David Hildenbrand , , Kefeng Wang Subject: [PATCH v2 07/10] mm: memory: use a folio in do_set_pmd() Date: Sat, 4 Nov 2023 11:55:19 +0800 Message-ID: <20231104035522.2418660-8-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20231104035522.2418660-1-wangkefeng.wang@huawei.com> References: <20231104035522.2418660-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-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Fri, 03 Nov 2023 20:56:26 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781604225094735841 X-GMAIL-MSGID: 1781604225094735841 Use a folio in do_set_pmd(), which is a preparetion for converting mm counter functions to take a folio. Signed-off-by: Kefeng Wang --- mm/memory.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index 806568f9605b..ac247850919a 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4318,12 +4318,13 @@ vm_fault_t do_set_pmd(struct vm_fault *vmf, struct page *page) unsigned long haddr = vmf->address & HPAGE_PMD_MASK; pmd_t entry; vm_fault_t ret = VM_FAULT_FALLBACK; + struct folio *folio; if (!transhuge_vma_suitable(vma, haddr)) return ret; - page = compound_head(page); - if (compound_order(page) != HPAGE_PMD_ORDER) + folio = page_folio(page); + if (folio_order(folio) != HPAGE_PMD_ORDER) return ret; /*