From mboxrd@z Thu Jan 1 00:00:00 1970 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 F1D15E77188 for ; Mon, 30 Dec 2024 09:11:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 819BF6B009C; Mon, 30 Dec 2024 04:11:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7CA1A6B00AB; Mon, 30 Dec 2024 04:11:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 61CE56B00AC; Mon, 30 Dec 2024 04:11:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 44A456B009C for ; Mon, 30 Dec 2024 04:11:50 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 0725E1A12A4 for ; Mon, 30 Dec 2024 09:11:50 +0000 (UTC) X-FDA: 82951054704.17.9BFE97A Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by imf17.hostedemail.com (Postfix) with ESMTP id C5A2D40008 for ; Mon, 30 Dec 2024 09:11:12 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=YkuFxYDn; spf=pass (imf17.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1735549887; 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:dkim-signature; bh=Uxx1VFA8X6F1Vml9+szJuo78n9B3sJITH2LTRfnVDm8=; b=4FN0OVJFB8inIKtR4X8jKiE5g9rfdlrZJnfUBTDJ83RM7RjwqPllWImGv8f2kw7bsgyEYa gMi5zJR1YRblRrHuDi8HHsZVWc3Mab2/E7H98KMm0DhIcf+fQBi0m2gpTOmGUV5NaUhL1n 2CK9A7w+RhTB19Kde+7XS/f+7yEiZXQ= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=YkuFxYDn; spf=pass (imf17.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.214.172 as permitted sender) smtp.mailfrom=zhengqi.arch@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1735549887; a=rsa-sha256; cv=none; b=aDUuGeC9CuQ0Tpmrqiv+D0NrH7wnn2PzkJqniS7XVBoxzeTzbYQPIMfojovyx/l7/ewitl LpVV8gbbaNit8wW7wlTF5H1JxK/ccCgO0yUTMSmYGtAbGdqs4D/gqO6iyYDRKCkcYT2Cxn Gp2TnqHs0+z+lYgJGo2OZaCa/jM6hio= Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-21636268e43so17207085ad.2 for ; Mon, 30 Dec 2024 01:11:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1735549907; x=1736154707; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Uxx1VFA8X6F1Vml9+szJuo78n9B3sJITH2LTRfnVDm8=; b=YkuFxYDn2hW10XzdLCWHTRFwpv0RwEOYX1QwHl9hwPwHFmBXpeyQ4t1KNBNmv53MSt SsotFRjlP+rL6sbYMe5ACm2YPRjVqpAMkTdXItOiCKlfGss0xUawnhLiStXeFBOohqYt zdEchGoe/jRxciwkzKX1wVbdkpJkJ7NuFVn9slHh2KxlqcdlW00Mept9aAVJ0ZQRSWaY 6a+MFE+BjcyE23iMigvQ8TSTXY6rnAAiTDSDdKp3SNJm9NDcB5Af/AcmDqVLoBB6DjhR eDr92j+SfQ1nCAlg0Mblv/65PrfRfjQynby9XiqDJJculyu+mdeRXt7+ARFdRyV1bXUt xNEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1735549907; x=1736154707; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Uxx1VFA8X6F1Vml9+szJuo78n9B3sJITH2LTRfnVDm8=; b=L8kA+xP1RR3vbjZ/BS1JVkRu82CVwf0mZHybH1datyvsTUNwecrToR1NYeudtotB6g UcfB/jws/S6j+HSwjMtSaatHiD+h6x5SNZOB+fhLiERkyjWmRcs1QhbExJic70OQk6J7 IibzB9qP6BMan2O4c0WeJfR7r7rDq1RKX56kV6kHsi3XUVVM88ogCkys2p8urDIY9uCI o7LhwDL9vHRyF8UPJaCi7UL+REv7/mMqnK/CC+TiLORvHTWsNKMIzGjQGF1QgbroSLb5 q5N7Dc+LHPBdQ/aD9vYRZvp0C4qKwtXx1x7jQQLL1679kMpq01nnk6uX9piGgW3ro9+R M/qA== X-Gm-Message-State: AOJu0YwanBQpSCwLEXh3r+2nM8+9jQjb/XD3zVQ38aMVElEXHumpTZlB TGAJozQJqo0eR3bYHpDYNMlh/BDjdso5NA6LGzi/aX7n6agStebJjm6sSkqEqfc= X-Gm-Gg: ASbGncvv9nv+rAKCbpApEkXxyQ8N7psxRCmXTRv0zn1DcFzArKhV3mD9J0hODP5QzYM JFjL2VxBxzQk2PyLYP4qmMVg8lYsXFs1PzhTCmy/ADpGUBgz6QPpKwO+1PlyTgdmTdZIl5yMQYD b8W5JEZlS/xVmcsl5bRCOdtawLFk++FIopPQpAzwfxX30KBD/3erBzNFj8L60s/i/0OcxLpUW4g nC1XzSwhfMUk5guQ2gULU2Qq6dW+eFlF5vFHPDEYqpy34zQqrD2oMK2wkVX+xQqD4fPiXaXYLnZ 3Q66X7FEIw6R7QN2QDqaHA== X-Google-Smtp-Source: AGHT+IH6enLQBRxhPiyC+b4rbFoH6ZPXIb+9j2XLkfNoZdfNkkGtY/WgMqtF7HfldrPWQopcc9iyNw== X-Received: by 2002:a05:6a20:4308:b0:1e0:c8d9:3382 with SMTP id adf61e73a8af0-1e5e0847084mr55644198637.45.1735549906952; Mon, 30 Dec 2024 01:11:46 -0800 (PST) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.150]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-842aba72f7csm17057841a12.4.2024.12.30.01.11.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2024 01:11:46 -0800 (PST) From: Qi Zheng To: peterz@infradead.org, agordeev@linux.ibm.com, kevin.brodsky@arm.com, palmer@dabbelt.com, tglx@linutronix.de, david@redhat.com, jannh@google.com, hughd@google.com, yuzhao@google.com, willy@infradead.org, muchun.song@linux.dev, vbabka@kernel.org, lorenzo.stoakes@oracle.com, akpm@linux-foundation.org, rientjes@google.com, vishal.moola@gmail.com, arnd@arndb.de, will@kernel.org, aneesh.kumar@kernel.org, npiggin@gmail.com, dave.hansen@linux.intel.com, rppt@kernel.org, ryan.roberts@arm.com Cc: linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, linux-arch@vger.kernel.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-openrisc@vger.kernel.org, linux-sh@vger.kernel.org, linux-um@lists.infradead.org, Qi Zheng Subject: [PATCH v4 15/15] mm: pgtable: introduce generic pagetable_dtor_free() Date: Mon, 30 Dec 2024 17:07:50 +0800 Message-Id: X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C5A2D40008 X-Stat-Signature: rxxn3zapk3w5utxk1xes4drx6skhfp4k X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1735549872-299817 X-HE-Meta: U2FsdGVkX19HPvjQmdA5E/5cEXg6au+kcu0li9ozrNxbv6Y0aK7itonr9JhnyG3eY6te4pJeVdPv5YSimyOxOwtiSJmEStrDYi45/rrzdlAdDiN+9epoAqLny1p/G6q4ZPVyDy3Y7wfr6sHUAtF2bF08X8KJrIy8WTRABn9ZTihvybgZx1ASTBU6MwgZlnYdJxTDn7MMONf+Es85BaJF+hSOwyx7Y/JI2aLmXzX68Qn+bmitnZAMrvn939UJsD40NvfCm4GRA+FOso28Ym8lt7tGVtLmVsuPY4TAiY8MbibDvzYl3aqY25aR8WGi57FK/tGaGziUWx9+x3KOLFrjwMzJdGFFrH0P8zWr2pyGZtTl3atPjHTpMJ78XH63m1Xp/DgxztU5dbroFspR6IRLMXD6eepZ1PPqRvRTDrFwePqu27llY1xWwv13eV2VPjwfR+1Yd7ShaSnXwG5ew9WqNKbaU6L+fcQ/uvwpQD0BMrC2pBOu+dAlED7UlvUbVttV1keeh1kYtzfDIYxpQeL+eHqyK2pmVwrzdNB/36CojlFvt5+fkeqSwJ3dhJZxe+ATsfB5r+OEB4Q6/8cvuXKu9qrx27JVG5pRLVlQ8z9cmL5zZKe8q+619/gRCJ71qXW7Lg1DIk4vU6ZLgkdkQu66Gd92mxZZbStApQ5mv1Zj8+2IEXK3czdhqk6n3WCgWrlRDqX2428tVoR+k086glnKc7as3cpVTl2Aq/iZHPvJWtdWfC9mC4asmfItKY+Qjql/8Pmb37w0XsAsUbWMaPyRz8SIC2/HDTH68Es9h0PdK2lvDkpWBeyhoHRPn+tvgKcLnPIPz5WKM2PzPdrlqFFN1SGbRld6PUsvLByIpNDKyyP3PffPiBWBtzexojGAICWivXpqwj0CzKcs231PDwClrkCqRybU7j6LxTVnqU45nRhwtdLYQxqcQnJuZin8Qnp8rbbe5iqPxUGA26zQ7r5 Wt9yasBE iw1aX8YOWvZSKoFhWFTqF+Q9Wfot3ke+OuLlQdx15agBSYXS1K7La4ke5MAZ7OH6k5SuXE46pMLgI/pvZzlwKtuIAe76pdSmSSY7mdFxS3Q2s4zXJVWX1Ek7wBJLxvuBDJ1zeVlccPRuypJY0cgNNeDBDPVCB3ZbiBzhsFHso8TZAHRU0vnn1MOIT8RcpjEz7zUmV96nBI4+LRORiGO7frBB0ztcqg0DruNw3vOxij9BAcGirm1lGdJuWqhOjqS9ri6FXqVrKJiMuZeliqKW4mZlR+ajPHzs8Sg+4ZxMC+DxZ91Gjv5PVW7hKDf15BkDKrJn8JMyL2atrohL/xMvebPcZwM+ZMzLyQPpNf/aEhWTtmrd1h5IaDtLxsHeB0ekwl5hdEmO9UXK+wM8qcraSTy8J++QAdn8t8eMv0I0Z3KMhYyOCnpqeMJeMvF5TsbjZ+GxM6HYTBK2E08TYKPv1+oZgCP4Mt+7+x1uORrGkdI1QkDk= 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: List-Subscribe: List-Unsubscribe: The pte_free(), pmd_free(), __pud_free() and __p4d_free() in asm-generic/pgalloc.h and the generic __tlb_remove_table() are basically the same, so let's introduce pagetable_dtor_free() to deduplicate them. In addition, the pagetable_dtor_free() in s390 does the same thing, so let's s390 also calls generic pagetable_dtor_free(). Signed-off-by: Qi Zheng Suggested-by: Peter Zijlstra (Intel) --- arch/s390/mm/pgalloc.c | 6 ------ include/asm-generic/pgalloc.h | 12 ++++-------- include/asm-generic/tlb.h | 3 +-- include/linux/mm.h | 6 ++++++ 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/arch/s390/mm/pgalloc.c b/arch/s390/mm/pgalloc.c index 3e002dea6278f..a4e7619020931 100644 --- a/arch/s390/mm/pgalloc.c +++ b/arch/s390/mm/pgalloc.c @@ -180,12 +180,6 @@ unsigned long *page_table_alloc(struct mm_struct *mm) return table; } -static void pagetable_dtor_free(struct ptdesc *ptdesc) -{ - pagetable_dtor(ptdesc); - pagetable_free(ptdesc); -} - void page_table_free(struct mm_struct *mm, unsigned long *table) { struct ptdesc *ptdesc = virt_to_ptdesc(table); diff --git a/include/asm-generic/pgalloc.h b/include/asm-generic/pgalloc.h index 4afb346eae255..e3977ddca15e4 100644 --- a/include/asm-generic/pgalloc.h +++ b/include/asm-generic/pgalloc.h @@ -109,8 +109,7 @@ static inline void pte_free(struct mm_struct *mm, struct page *pte_page) { struct ptdesc *ptdesc = page_ptdesc(pte_page); - pagetable_dtor(ptdesc); - pagetable_free(ptdesc); + pagetable_dtor_free(ptdesc); } @@ -153,8 +152,7 @@ static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd) struct ptdesc *ptdesc = virt_to_ptdesc(pmd); BUG_ON((unsigned long)pmd & (PAGE_SIZE-1)); - pagetable_dtor(ptdesc); - pagetable_free(ptdesc); + pagetable_dtor_free(ptdesc); } #endif @@ -202,8 +200,7 @@ static inline void __pud_free(struct mm_struct *mm, pud_t *pud) struct ptdesc *ptdesc = virt_to_ptdesc(pud); BUG_ON((unsigned long)pud & (PAGE_SIZE-1)); - pagetable_dtor(ptdesc); - pagetable_free(ptdesc); + pagetable_dtor_free(ptdesc); } #ifndef __HAVE_ARCH_PUD_FREE @@ -248,8 +245,7 @@ static inline void __p4d_free(struct mm_struct *mm, p4d_t *p4d) struct ptdesc *ptdesc = virt_to_ptdesc(p4d); BUG_ON((unsigned long)p4d & (PAGE_SIZE-1)); - pagetable_dtor(ptdesc); - pagetable_free(ptdesc); + pagetable_dtor_free(ptdesc); } #ifndef __HAVE_ARCH_P4D_FREE diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h index 69de47c7ef3c5..a96d4b440f3da 100644 --- a/include/asm-generic/tlb.h +++ b/include/asm-generic/tlb.h @@ -213,8 +213,7 @@ static inline void __tlb_remove_table(void *table) { struct ptdesc *ptdesc = (struct ptdesc *)table; - pagetable_dtor(ptdesc); - pagetable_free(ptdesc); + pagetable_dtor_free(ptdesc); } #endif diff --git a/include/linux/mm.h b/include/linux/mm.h index cad11fa10c192..94078c488e904 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -3001,6 +3001,12 @@ static inline void pagetable_dtor(struct ptdesc *ptdesc) lruvec_stat_sub_folio(folio, NR_PAGETABLE); } +static inline void pagetable_dtor_free(struct ptdesc *ptdesc) +{ + pagetable_dtor(ptdesc); + pagetable_free(ptdesc); +} + static inline bool pagetable_pte_ctor(struct ptdesc *ptdesc) { struct folio *folio = ptdesc_folio(ptdesc); -- 2.20.1