From patchwork Mon May 1 19:28:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Vishal Moola (Oracle)" X-Patchwork-Id: 13227930 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 93193C77B7C for ; Mon, 1 May 2023 19:28:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D809528000A; Mon, 1 May 2023 15:28:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D3207280001; Mon, 1 May 2023 15:28:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF82F28000A; Mon, 1 May 2023 15:28:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id AF0B1280001 for ; Mon, 1 May 2023 15:28:52 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 7DE6B406CA for ; Mon, 1 May 2023 19:28:52 +0000 (UTC) X-FDA: 80742673704.10.5E55585 Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by imf09.hostedemail.com (Postfix) with ESMTP id A2441140003 for ; Mon, 1 May 2023 19:28:50 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=lB3Z6fcb; spf=pass (imf09.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.215.182 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682969330; 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=qTcYn70jypAxoGiZWNhXW/f3wJ7PRfT+UBBqvcdtR7Y=; b=7tOY8iphY7kxwuEbhwgbuXPR/eyzemItZLVoa8Lvww5DAQatjs7KG6UI3l+xqGTuS9jzU5 gTjyfrDldzNXjKUZH+KN5Jed9pkg8Sd1ht/pnnQBqDlJDS239wLNEfIZe6qPgNmGSTaNVA qcXPbytoY0coJOwCbjxir1hay65yyUQ= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682969330; a=rsa-sha256; cv=none; b=ydtDZbf0IX99XpBtbEJGEmNIi8bP8g/uk3Ki17GrpF8yURKnKsIlToAjOjPp4uca2b/rTO pkdfpiE6lIs3FD3GzwGNZuAJQvhqTN3k0M5uvMeEoYKJlUI2AG8HPtJJvfLfov2iXxavI5 5G7UcUiKDDg6dP8C2veLOapx61cJut0= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=lB3Z6fcb; spf=pass (imf09.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.215.182 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-517bdc9e81dso1430177a12.1 for ; Mon, 01 May 2023 12:28:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682969329; x=1685561329; 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=qTcYn70jypAxoGiZWNhXW/f3wJ7PRfT+UBBqvcdtR7Y=; b=lB3Z6fcbmN3PCDkgSSAUdLyGGv/N+aWg88Xq/3YBAOLHjjeKvsEOyPJ7qOvQJsTwm/ r41UWIzlQ/5Ax+ha7xRNy8kdIkTNxjA3q1QX8n9bXAh3z/8wB6GEn84UnvlT4jKe1qmu sQyc9OGXZjTePH+r4Y6e6ozh0UMlJ+VYjsnu2YRncxwQaVJ+Cf7Nqth6cXAsabwTRyMX v6eeeBBdHDjqYX6OiT4X4zQkg5l42dCb/DNQDsMWC1atimcSE8JSmejQfjKp+N8Ip6uu zd2ZsR9jcfUX1/JB5xCLWPO6fdSMIACYocvg6A/MPAxkpU5nLiRN3WCB2A8Uz52//cN+ kz+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682969329; x=1685561329; 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=qTcYn70jypAxoGiZWNhXW/f3wJ7PRfT+UBBqvcdtR7Y=; b=lpa1KSyR4UZ15hgaY3zfsXXoL0pNOeOjncRgo7yMAEk4f+41Sk8b+/bf+8othBlCfi qruuZAW3g2g17Oxt4YyOLy92sr6WAJA6lcj2DZ6RBjdS9x/Pf0wRcjTHS75ziote/FjX vwN2YJdSA2pq+EB19D0DloApok2qPfuwgxsfJd9OwYprB1NL/Z3vGV9L0GpnzuwiY6bO Ag0SIbtzNd4pQY1QKN/2iDr1wDDL8q+Fh+IFdN8tXPl7D58Hf8f4CF1ovH2LqvEeS2Q1 k8ymdwB6PVNPT11zh99sQgusAaFl80/bxv6AkWdm2GHUyBJ4QxdhUr8n7vJ0tFG0RKgD 0YvQ== X-Gm-Message-State: AC+VfDyQqEdWEf8vcgx4ZfLK8pJdWmmSgLHBvtlV0DCE199sK1z0q/H8 wQlVHNV32SwV8asx1IsDVUQ= X-Google-Smtp-Source: ACHHUZ6RkKtjORSVVTbvqSb/nEXqQaQ9JTIasvSEW6m9mcivHjmudekwdvS8zsaYUeAaqoCEzf8v6w== X-Received: by 2002:a17:903:24c:b0:1a6:4a64:4d27 with SMTP id j12-20020a170903024c00b001a64a644d27mr17386318plh.40.1682969329458; Mon, 01 May 2023 12:28:49 -0700 (PDT) Received: from fedora.hsd1.ca.comcast.net ([2601:644:937f:7f20::9a2c]) by smtp.googlemail.com with ESMTPSA id u8-20020a170902bf4800b0019c13d032d8sm18175622pls.253.2023.05.01.12.28.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 May 2023 12:28:49 -0700 (PDT) From: "Vishal Moola (Oracle)" To: Andrew Morton , Matthew Wilcox Cc: linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.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, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, xen-devel@lists.xenproject.org, kvm@vger.kernel.org, "Vishal Moola (Oracle)" Subject: [PATCH v2 11/34] mm: Convert pmd_ptlock_free() to use ptdescs Date: Mon, 1 May 2023 12:28:06 -0700 Message-Id: <20230501192829.17086-12-vishal.moola@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230501192829.17086-1-vishal.moola@gmail.com> References: <20230501192829.17086-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Queue-Id: A2441140003 X-Rspamd-Server: rspam09 X-Stat-Signature: abeh49gqubz7iny4d6asyjxagbdf3uzr X-HE-Tag: 1682969330-562524 X-HE-Meta: U2FsdGVkX1+B32bW+0zY2uWsfMEdYk8C13bOiCtM166P+Y1/ufpyQcjvHkWxxg9eCItbJAmS8+vvuXbKzSjTK+UhqDVtsdSvCzyktsQR/x1GJT7CtgUauTPG2/nCbSgu9PKjhsj/ezLVE68VlU3U3owwxG0vhLramslvcUS3InMhd4X8/KtAfxn4cN1c2estT/WaZoyO0YYR2xadBV5P/Mo4Nl9zPfzx8+lB7rsopQV1cGd/RBSP2H9IvCUf7lfylu00+e/pb4IT7WKw2inaEX8gyaJZxcowo/HNgIhlpuzUvQr832i9TpXM6ydH6oTHrsqZr34oiiBokaT4Ov9DOl1mkLSPYkzOfSp4iFlcgu35YE3EGLWYq28N0sL2g6uPAuz0nKO/ONEMgJezNpRwh2FYEuUQcvBTr3eprWD5iQ7dgmJ6zfHfSJiy0RnJEqNzgBxor2bshzaF4dZJeZqO8OliAjmm0YFM0dcYoTeQCcRRu53FSzrltr+aRKMuxM1hNB2bbpSOKyAbGOaqS/oIosRDD60PmLHZ8eyxDdmcjmcwnzhzpLpjR1nk5egnA+2LiX3ytlMsqG4aiUA/Uzcb2tcV0o7Rr7vUqL9LGXcQ3KPTSP0AtlvF6qiCq0VG0o2FaTjY+G4jHiLkCZ6RDjpiV8cTmL6d0LvCKk8M6meJJJv1ns3vehPAnoI3Jx39FmyS4rwgYx12FtcBl2adv6lzziXgpukjcrdoo0TeHBUD0BvIUsDK+lT1Zw+LIK9C1Rzl4V3/G6PzTJ7VnR5ukEVy3b0bj45GkrNri0/tyBN291MDsggNLOjDI0y4VFAERSwQMwQEtSz0iu6fSWtAkijwuFEmlCbDWEZjS859UIFGvvakFV7p7/r9UYWoxkMFnZGvu2csWv+qsR9XeCW5mcbEqvs4kOtRhSoyQByBPOS46c2UyaUYw1tMjV8Kmp7E+miav6ob562UrRSQgEa/gms LEr2f1nz f7Sho0KIHLB5XObIg40G8RivLOVQ8R9siaZlDBPn9YrkALkme0Fc107lxj3FJYM7d4A6cO+v+9YLmm9xxAxqckYwQ/fAfilvOnGzl75XNGP6b2ydBwyOAAA4LV7y7PEGaNdypDos9CEKoWwz+cVQn366KyJrFoautJE3hOEQss+/VDDaJRmJ19Dfu2wPDJNW+fX9sbwSXuLBj8YtF7E5ShBMrGp7/P61w2rarQqMLo8AFCs2+ipPvL0cs4SHMlnnJEzDbpd5E4Ht8H4UbG3ROv7Ha710RyoPmEL8fdIyIQxdI+txztdXVQ399VF37QNNuWMwALLp34YAqFOEQJdWi9CNXV20pQd5+CZT9RtvqbMlQ14e7w2PNd19hb+o+xoroCq6W8X09q7AdgOz3tluc4CG1EYPeriJVwqWejD+tPTglQC30Mm6D9AIeM7AMCsSok2xZDVTwGd80xV7JQi+AutA4MGMFS10UHM6KbBb9oXadMi+cVj8mV4v4RdSh74sImnkKnaBgclRR1S3iRWF2XmVKs0GRX0HsueZJ7/6IGWNhVpMlJrl6tWFRMCRFn5uZsNwBC9fZM9O2GVA= 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: This removes some direct accesses to struct page, working towards splitting out struct ptdesc from struct page. Signed-off-by: Vishal Moola (Oracle) --- include/linux/mm.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index bbd44f43e375..a2a1bca84ada 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2911,12 +2911,12 @@ static inline bool pmd_ptlock_init(struct ptdesc *ptdesc) return ptlock_init(ptdesc); } -static inline void pmd_ptlock_free(struct page *page) +static inline void pmd_ptlock_free(struct ptdesc *ptdesc) { #ifdef CONFIG_TRANSPARENT_HUGEPAGE - VM_BUG_ON_PAGE(page->pmd_huge_pte, page); + VM_BUG_ON_PAGE(ptdesc->pmd_huge_pte, ptdesc_page(ptdesc)); #endif - ptlock_free(page); + ptlock_free(ptdesc_page(ptdesc)); } #define pmd_huge_pte(mm, pmd) (pmd_ptdesc(pmd)->pmd_huge_pte) @@ -2929,7 +2929,7 @@ static inline spinlock_t *pmd_lockptr(struct mm_struct *mm, pmd_t *pmd) } static inline bool pmd_ptlock_init(struct ptdesc *ptdesc) { return true; } -static inline void pmd_ptlock_free(struct page *page) {} +static inline void pmd_ptlock_free(struct ptdesc *ptdesc) {} #define pmd_huge_pte(mm, pmd) ((mm)->pmd_huge_pte) @@ -2953,7 +2953,7 @@ static inline bool pgtable_pmd_page_ctor(struct page *page) static inline void pgtable_pmd_page_dtor(struct page *page) { - pmd_ptlock_free(page); + pmd_ptlock_free(page_ptdesc(page)); __ClearPageTable(page); dec_lruvec_page_state(page, NR_PAGETABLE); }