From patchwork Wed Feb 12 02:58:42 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liuye X-Patchwork-Id: 13970977 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 F3E20C021A2 for ; Wed, 12 Feb 2025 02:59:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3C19E6B0083; Tue, 11 Feb 2025 21:59:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 392536B0085; Tue, 11 Feb 2025 21:59:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2649C6B0089; Tue, 11 Feb 2025 21:59:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 04B2D6B0083 for ; Tue, 11 Feb 2025 21:59:09 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B747F1C9227 for ; Wed, 12 Feb 2025 02:59:09 +0000 (UTC) X-FDA: 83109786018.05.819AA2C Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232]) by imf01.hostedemail.com (Postfix) with ESMTP id 2193E4000C for ; Wed, 12 Feb 2025 02:59:06 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf01.hostedemail.com: domain of liuye@kylinos.cn designates 124.126.103.232 as permitted sender) smtp.mailfrom=liuye@kylinos.cn ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739329147; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=idBkeycCNzys1W5X6TJ4rs+qlFJe3NLEN7iyLA/Ew/c=; b=Ip12EIPRyBxokfn74ft/sl83iG81gvRfnfQ7n5wmitgjPNBs23uABLY5TaOFMQZGvWm+D5 hfT6TYUEz50HDntcTTv4pcsySAWT1KKGUyeFmKeGhN4P6g6So1z9AQhysSlNB2sbyl28Bw RxCMvSftMUxFAsTwyBjAOSqCPF8vvsI= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf01.hostedemail.com: domain of liuye@kylinos.cn designates 124.126.103.232 as permitted sender) smtp.mailfrom=liuye@kylinos.cn ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739329147; a=rsa-sha256; cv=none; b=ewQf9vJ8hi19yNIzWTTa36oDeeDWJsV4nSJtQ229XSNF8P07wQUVCEsiX/0L9SXA/AZAZ9 PkebKrE+vSpFeBk8siJ0VhB/KqQqe8hOSINlH+PdoDmuVFxaMaQOnCp4Eb2SQvYEDVj9gI MMrQXxIY/9oa/GrfTi0dhaIcaMP9pbQ= X-UUID: 4eb44d2ee8ed11efa216b1d71e6e1362-20250212 X-CTIC-Tags: HR_CC_COUNT, HR_CC_DOMAIN_COUNT, HR_CC_NAME, HR_CC_NO_NAME, HR_CTE_8B HR_CTT_MISS, HR_DATE_H, HR_DATE_WKD, HR_DATE_ZONE, HR_FROM_NAME HR_SJ_DIGIT_LEN, HR_SJ_LANG, HR_SJ_LEN, HR_SJ_LETTER, HR_SJ_NOR_SYM HR_SJ_PHRASE, HR_SJ_PHRASE_LEN, HR_SJ_WS, HR_TO_COUNT, HR_TO_DOMAIN_COUNT HR_TO_NO_NAME, DN_TRUSTED, SRC_TRUSTED, SA_TRUSTED, SA_EXISTED SN_TRUSTED, SN_EXISTED, SPF_NOPASS, DKIM_NOPASS, DMARC_NOPASS CIE_BAD, CIE_GOOD, CIE_GOOD_SPF, GTI_FG_BS, GTI_RG_INFO GTI_C_BU, AMN_T1, AMN_GOOD, AMN_C_TI, AMN_C_BU ABX_MISS_RDNS X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.45,REQID:30c93d93-f2fd-4b6a-ad32-cddf86305237,IP:10, URL:0,TC:0,Content:-5,EDM:-25,RT:0,SF:-5,FILE:0,BULK:0,RULE:Release_Ham,AC TION:release,TS:-25 X-CID-INFO: VERSION:1.1.45,REQID:30c93d93-f2fd-4b6a-ad32-cddf86305237,IP:10,UR L:0,TC:0,Content:-5,EDM:-25,RT:0,SF:-5,FILE:0,BULK:0,RULE:EDM_GE969F26,ACT ION:release,TS:-25 X-CID-META: VersionHash:6493067,CLOUDID:554b448c421ed6c24026b7b687b4ed6b,BulkI D:250212100238CDFLER86,BulkQuantity:3,Recheck:0,SF:17|19|25|38|45|66|78|81 |82|102,TC:nil,Content:0|50,EDM:1,IP:-2,URL:11|1,File:nil,RT:nil,Bulk:40,Q S:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0, ARC:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_SNR,TF_CID_SPAM_FAS,TF_CID_SPAM_FSD,TF_CID_SPAM_FSI, TF_CID_SPAM_ULN X-UUID: 4eb44d2ee8ed11efa216b1d71e6e1362-20250212 X-User: liuye@kylinos.cn Received: from localhost.localdomain [(223.70.253.31)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 999580327; Wed, 12 Feb 2025 10:58:59 +0800 From: Liu Ye To: brauner@kernel.org, dhowells@redhat.com, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Liu Ye Subject: [PATCH 1/2] mm/folio_queue: Delete __folio_order and use folio_order directly Date: Wed, 12 Feb 2025 10:58:42 +0800 Message-Id: <20250212025843.80283-2-liuye@kylinos.cn> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250212025843.80283-1-liuye@kylinos.cn> References: <20250212025843.80283-1-liuye@kylinos.cn> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: ekhdjmyeup6u5k9on4qtj1pbkbaopmco X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 2193E4000C X-HE-Tag: 1739329146-271702 X-HE-Meta: U2FsdGVkX1/9lmxf3Ou3+PBRV/ZvVDyB+r6Ct4UQ9zD5ireI31klbqLQ2NXfZoAGkQ2F1SgKLiDlDsdnNp2qY9j6e7XFuCQ/jeJdJMGamKHc0uCnH0H9KMHZlNu2eE+AF7968eoc+2aAwAM8kTWZvQdFWoO5W9GKrNXpPgHLUctF/SKhrLKy2jsW07zCsPPRuYkonSA/ePYwmcml8RxQoHLkpU1arDpkPf6zsXW5K4UxdKTGpWxK2iQlXvfZUXWDn1/uBM6RtGPFBtsAtzZMhFHIwqN7aN7/sr4+9lUHpsduiFZUbRS+IaZFaDozOUMcBUkGSW2fjb8c6T8keKE2gXJ+xjUcF+DnxpHLt4RyM9QcNZsTGx62gOvJE1aCLfgrajEdleNNsQJvAIyKhAVi0tEcqu1XmJioNna7VSNMWl05hCs1wJHEyDY4rDIGHySGRyr2TOY6EC9PlOcenbG80eMqU2oZQnlf7oN97pqlolt/e99YImDdMY3auntTlOnvaBiCEzN4fS5N35U+nCcgau4oznDxWb0jSHNJ4TFBg9fZVUNpkFZ27vEaQL+dUd8DwJfSOASJ0Q1iH1l6ditUXTeR+plVD62TmcmZxtWAFeYiTN/4g85rrgbbd8tCravmFfEHprePnUKIthpnnSXKMV5X9HnJWgc3KMND+FTS1GBhaoLgT0S/jgdVF9mYkX2o2IaaM+jCoNUgEU59hxhbGFkxkzoA+hadT//BiNOi2J4JwXSmFjZR8VSUhbZAA6o0v5CWfSKF37XV4ffUNfGFL/P0S8sLvGh01eWirUeRkHpSgOrQqslrZIr4pfc71IUm7Hxuj3jBKJX3AC/MF391ySLx3EPbtdfnulJwujs6K2LivhZS3sk1kLHLAej2LIGoCLTkAkV6HHkKwFbN2M7oqhSXXeEgfK3rSekPwOeJz6S6+EumKXpVE8xj5ioiaAlzJH30yBzUR0bQqGSdZB0 jyEKGbrp +VBZaSuYawUGFYT38LDnxylFaX3t2AreR74U30i2s9WfBND8n2zb8K1HRfT4r5p4mlud8PfsPV3Hqr+U= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000318, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: __folio_order is the same as folio_order, remove __folio_order and then just include mm.h and use folio_order directly. Signed-off-by: Liu Ye Reviewed-by: Shivank Garg Reviewed-by: Dev Jain Acked-by: David Howells --- include/linux/folio_queue.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/include/linux/folio_queue.h b/include/linux/folio_queue.h index 4d3f8074c137..45ad2408a80c 100644 --- a/include/linux/folio_queue.h +++ b/include/linux/folio_queue.h @@ -15,6 +15,7 @@ #define _LINUX_FOLIO_QUEUE_H #include +#include /* * Segment in a queue of running buffers. Each segment can hold a number of @@ -216,13 +217,6 @@ static inline void folioq_unmark3(struct folio_queue *folioq, unsigned int slot) clear_bit(slot, &folioq->marks3); } -static inline unsigned int __folio_order(struct folio *folio) -{ - if (!folio_test_large(folio)) - return 0; - return folio->_flags_1 & 0xff; -} - /** * folioq_append: Add a folio to a folio queue segment * @folioq: The segment to add to @@ -241,7 +235,7 @@ static inline unsigned int folioq_append(struct folio_queue *folioq, struct foli unsigned int slot = folioq->vec.nr++; folioq->vec.folios[slot] = folio; - folioq->orders[slot] = __folio_order(folio); + folioq->orders[slot] = folio_order(folio); return slot; } @@ -263,7 +257,7 @@ static inline unsigned int folioq_append_mark(struct folio_queue *folioq, struct unsigned int slot = folioq->vec.nr++; folioq->vec.folios[slot] = folio; - folioq->orders[slot] = __folio_order(folio); + folioq->orders[slot] = folio_order(folio); folioq_mark(folioq, slot); return slot; }