From patchwork Mon Jul 31 17:03:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13335118 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 A61BCC001DC for ; Mon, 31 Jul 2023 17:04:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D8686280070; Mon, 31 Jul 2023 13:04:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D0ABA6B0180; Mon, 31 Jul 2023 13:04:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BA9FC6B0181; Mon, 31 Jul 2023 13:04:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id A7BF36B017F for ; Mon, 31 Jul 2023 13:04:16 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 5D4F540645 for ; Mon, 31 Jul 2023 17:04:16 +0000 (UTC) X-FDA: 81072530112.11.9DB790C Received: from mail-yb1-f178.google.com (mail-yb1-f178.google.com [209.85.219.178]) by imf22.hostedemail.com (Postfix) with ESMTP id 03ADBC00B8 for ; Mon, 31 Jul 2023 17:03:50 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=HGhOeQ1T; spf=pass (imf22.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.178 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=1690823031; 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=uNVCmnQN0ufsotHop6mLPsVoSXSsgvYy2QMaIqEOqi4=; b=LRX6nkS7BWsepdnLDNkmZpE1Rr//3xMWvJrGDhxaLEZXBNpUL0qp0GjPAkuT7dptN9udZR o87hal9F1eAajArKgsUfnVJ7xapBuMqtDZJoPKqsCNS7Z+WluZUz+fu31ZbslHGL/fSLKp rAgYT36CydWzHWUIJuaztXKpET3WpOk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1690823031; a=rsa-sha256; cv=none; b=Uc8cYWFMXto4nO3OwernkS+S+odcc3pZEKHXvumDm2ViNRfXghbBbmblwMicZr8Tx3/zew oZ6gyqZhWhl3vj4GxwEQNduRvMay/OqIUZHxzjvWMGEQLOYvd1BYW5gbvPbqrtaYkioiD1 UM/Fq3J63297jgZudWgG3rJs/Lcjx/g= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=HGhOeQ1T; spf=pass (imf22.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.219.178 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-yb1-f178.google.com with SMTP id 3f1490d57ef6-cfcebc33d04so4865293276.2 for ; Mon, 31 Jul 2023 10:03:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690823030; x=1691427830; 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=uNVCmnQN0ufsotHop6mLPsVoSXSsgvYy2QMaIqEOqi4=; b=HGhOeQ1TmAKeV2HnCN1WTfuLUUGtIM4rPFVA9FLFfXc9y1teMeCMXYfLrn52VreEZa +8fuD8Eo9GHKIiGXji1nVJr6hJp1UgozAoPycNtpjPeWKRtcHWia112SYBPlfjErevM1 f1KBsm+b9biDP/8hsnmQLIxx1WqbIsap7/B5vxAAg5UayZGm1/xCMe4ANNoVXkXqO5f9 zYPLJX2R/yJdpXd33yeHG335BLgfWD5asDdFJsvc7qa94OZvu247hqr11p/tySJkF1N3 XZqqjnjnJwS4MTyfAeLK5z9Se8l+uTUdMKVbakuD0ppwzC8LFvwdJ3Q2bHVnQ+Hr6zUD fqZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690823030; x=1691427830; 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=uNVCmnQN0ufsotHop6mLPsVoSXSsgvYy2QMaIqEOqi4=; b=Qr4axqqB3k0cpVmbJP7Hi2VxLzHMBM/T0Sn0G42zL8wTl3ctmH7PCSbRNm/UIOVHdK 8aguTvND82unmix4jiHATtCpV0H2MYlb0S0n3+4tTTun1BhCFuN8zC2aKOh0FurvkDzC FKkUxdAUQWWvBuX6bOcuPIFyYGG6zpgW+vrxqirNKIJ52yFWExmN/Faut7gPJ7gkk1C7 NGWwFrqm/E9NsU4Rg0S0pilxxPfJ0mHE/NqZoC7ePacmY2QuHCY2auJJVjxR45UjIadp qPfl0dL3YJRav4N7T1SBDH6ipKvOp4WHtJyajizxL5DPDx4f8pIFCNjiFHbTHlHyV8Mr Fptw== X-Gm-Message-State: ABy/qLa+iEsuXSCqVuA2I/PqkM6LxFD+lZJO+2iir/GqOF+j8t2fou2M /dS2nbw0pF3ieeOqem/ZpV4= X-Google-Smtp-Source: APBJJlEF5eMDgJhVfaLglGwfP9JkFsRVPWZwav0NLe508KhOsIkmqr6LHjKMWH59Isg1gKZnQYYAJw== X-Received: by 2002:a25:ae5c:0:b0:c73:9f38:2b3a with SMTP id g28-20020a25ae5c000000b00c739f382b3amr9095220ybe.48.1690823029862; Mon, 31 Jul 2023 10:03:49 -0700 (PDT) Received: from unknowna0e70b2ca394.attlocal.net ([2600:1700:2f7d:1800::16]) by smtp.googlemail.com with ESMTPSA id x31-20020a25ac9f000000b00c832ad2e2eesm2511833ybi.60.2023.07.31.10.03.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jul 2023 10:03: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, Hugh Dickins , "Vishal Moola (Oracle)" , Mike Rapoport Subject: [PATCH mm-unstable v8 06/31] mm: Convert ptlock_ptr() to use ptdescs Date: Mon, 31 Jul 2023 10:03:07 -0700 Message-Id: <20230731170332.69404-7-vishal.moola@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230731170332.69404-1-vishal.moola@gmail.com> References: <20230731170332.69404-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 03ADBC00B8 X-Rspam-User: X-Stat-Signature: 1spurfc4i3wd3qkyepiiqso7br7op3c1 X-Rspamd-Server: rspam03 X-HE-Tag: 1690823030-595889 X-HE-Meta: U2FsdGVkX19iwmalQjVCesQI0mMTzfDvHkkI86MF5c2jGRnBVrUpZvJtAf8evR7zzTwj+PbeoQbsl9vwyOPw+TScO2fpHd5w/TiT9AN0nWFPAl+luwfybICPqaMK0esgZ8yu4S0j6J2HiBV6LgAnBrJVzpkiWqQTwdJCX2CT4vT804h5Dxcr0VGAelbFN57U/gwuZnd10yGF/nrIxwSQqku3M0acNpa3uZ8NVZMQeHtEabfBST1YFl0ULBB2QVO90LHLtibCZnkEzp2OIhydVc8heCYCaJ8R92ljmxGofrWUKS7TyBfM740A6o0ab89fSl18crWnXoi9bNLIi/D7IOBFHOdSTzf1WRbInsN53QTYk3eCmk+6FkL1tC8KEEFw8R7OA2Qz08m48i3jG/hquYazjKT7KrM2HCTQaeJJO2NBG7FXEy6vAk4DpYjKe3UAotxWd0/K/CbEk62MriadRNgVLxW2y/LF/VVTusfg10ilUxmhbAIDhd9Qj+V7AAo8zw8DPLvwXkQDJb74FdxdXoihJ5blMcAIN8lEXedKRd03VBZVZnSHksQFXieSGt07MhTXpOpi6tHXnvAuPZrIYWLuCsqXNkggFmLeQVcCW5YIrwgLkPAPEUtpCnjI+15qUirNuhBJthx62CmJx3CxIKVW9Qm2lIgGMpmzUQa9XZcztK4JU1GSU93fUDn+ZbaEx+JovA3vVG7ltSdfm5zjrLbdAyutvdqbZZk9Nr6Vwdfn5fUVK3jn2Gzlm4zTFy8tG2qMThiDOxXJaQOyffBNruZXm8YWB7yWwk4ihaG/9dUpPcK8UCTNR9QkboHVumlGaZaLf6CV7/5z0UtYNRrr+U4XL2AY4U1cLZSEsNrnPfaXOPy+MXIax52pNkvdaVgrqIepH4rutSq6as0vq2FTnB3L6U29g1Hb8hnj6X5dpCggEC0Int+p5naAGkHUdqmJy6Ap0HNu6wjk6Z0jN3g wVYzcc4N Dw4w/qypt/cWuV3aJBqBDdF3xU0SOLXSf9iYDYX5tzji8pzVlU5jk9kh3qIMeKQ/h2RjYb25VfFwNxKAqjYfhJmm+scHATPIvllWXf3hoEXpPjIElM6tOBTChbwQZ/Hcg4J7X63n5lY5S06I5m+Aszzu4xWWJfv1KpKWD+RTlLc/lWCVFeo77PMVNCV6vQGQ5zwirWKvZTQuWGevUI/D+9RUREM3wXayCVplS0bDDHsbFxBtXqTib4CtY815gimULZG9XAxASZ+0uRj3F1MNebgmdNZiNbBe841mDBFPlzNdfDBe5EPQX4GZ4xPtJGfSGOpSY7SNRA501lr65kkQLypbqXTy7NoF1wj9hojnxYXxidM86R9ZERLKv3xwlTIkuRnvcV3JXmhqiIoFGBxevPZVapBvhonD74w9Qm6w2dylRAcQ3X+QH2IB90PnJV6Q9qO9Ap9pySOiaMSDgfra6rgPl2DGVpQ0vnDQyh7ook59VWxo4EYDbgaxlmej42jayAvvVOEVvRSJkUij5xo59gXdC80TP8ee3NbN7RJdGKy2HsYoItJO2WdFY6v5MCKkSAbC3AGbY240HXuPSlp/u8vRV+JA7mvHvBJFJdITCv1avS9WEK2kEtBYZh3qk5wdMHU+uSRsECa7xYpo= 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) Acked-by: Mike Rapoport (IBM) --- arch/x86/xen/mmu_pv.c | 2 +- include/linux/mm.h | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/x86/xen/mmu_pv.c b/arch/x86/xen/mmu_pv.c index e0a975165de7..8796ec310483 100644 --- a/arch/x86/xen/mmu_pv.c +++ b/arch/x86/xen/mmu_pv.c @@ -667,7 +667,7 @@ static spinlock_t *xen_pte_lock(struct page *page, struct mm_struct *mm) spinlock_t *ptl = NULL; #if USE_SPLIT_PTE_PTLOCKS - ptl = ptlock_ptr(page); + ptl = ptlock_ptr(page_ptdesc(page)); spin_lock_nest_lock(ptl, &mm->page_table_lock); #endif diff --git a/include/linux/mm.h b/include/linux/mm.h index b3fce0bfe201..c155f82dd2cc 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2844,9 +2844,9 @@ void __init ptlock_cache_init(void); bool ptlock_alloc(struct ptdesc *ptdesc); extern void ptlock_free(struct page *page); -static inline spinlock_t *ptlock_ptr(struct page *page) +static inline spinlock_t *ptlock_ptr(struct ptdesc *ptdesc) { - return page->ptl; + return ptdesc->ptl; } #else /* ALLOC_SPLIT_PTLOCKS */ static inline void ptlock_cache_init(void) @@ -2862,15 +2862,15 @@ static inline void ptlock_free(struct page *page) { } -static inline spinlock_t *ptlock_ptr(struct page *page) +static inline spinlock_t *ptlock_ptr(struct ptdesc *ptdesc) { - return &page->ptl; + return &ptdesc->ptl; } #endif /* ALLOC_SPLIT_PTLOCKS */ static inline spinlock_t *pte_lockptr(struct mm_struct *mm, pmd_t *pmd) { - return ptlock_ptr(pmd_page(*pmd)); + return ptlock_ptr(page_ptdesc(pmd_page(*pmd))); } static inline bool ptlock_init(struct page *page) @@ -2885,7 +2885,7 @@ static inline bool ptlock_init(struct page *page) VM_BUG_ON_PAGE(*(unsigned long *)&page->ptl, page); if (!ptlock_alloc(page_ptdesc(page))) return false; - spin_lock_init(ptlock_ptr(page)); + spin_lock_init(ptlock_ptr(page_ptdesc(page))); return true; } @@ -2971,7 +2971,7 @@ static inline struct ptdesc *pmd_ptdesc(pmd_t *pmd) static inline spinlock_t *pmd_lockptr(struct mm_struct *mm, pmd_t *pmd) { - return ptlock_ptr(ptdesc_page(pmd_ptdesc(pmd))); + return ptlock_ptr(pmd_ptdesc(pmd)); } static inline bool pmd_ptlock_init(struct page *page)