From patchwork Mon Jun 12 21:03:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13277352 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 20EDEC7EE43 for ; Mon, 12 Jun 2023 21:05:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A83A7940011; Mon, 12 Jun 2023 17:05:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A0BCB94000B; Mon, 12 Jun 2023 17:05:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 74CCF940011; Mon, 12 Jun 2023 17:05:05 -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 6063C94000B for ; Mon, 12 Jun 2023 17:05:05 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 20CAE16033C for ; Mon, 12 Jun 2023 21:05:05 +0000 (UTC) X-FDA: 80895325770.27.44DAAF0 Received: from mail-yw1-f173.google.com (mail-yw1-f173.google.com [209.85.128.173]) by imf18.hostedemail.com (Postfix) with ESMTP id 4C6BD1C0018 for ; Mon, 12 Jun 2023 21:05:03 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=CJYIsJwg; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf18.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.128.173 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686603903; 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=7hP9xC8dm7FmaxDqq4kyW1FngYvGoyLv+4GJfd5pZsk=; b=gSrwsO+R3povF54LAHVqw5j2AixBvrlxAiB2Zlfat87ngIYEtDG+Ne+HM7xmn3nxuhvkfN 4/iieI7MTZ08+vR9JZg8281jgvVm92F3PeTVk6W8NdUk3Y2Lvtgu0aSDFVoD9iZLBH7gwJ Ahs33D6B/2SkgOwEOhNyN0OzduObo44= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=CJYIsJwg; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf18.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.128.173 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686603903; a=rsa-sha256; cv=none; b=bP+/SxJobsfAIKFW5fv5O4G932PJK30jgjVnCTJPrZuc1frLARR3dCZFIoiwareYjNUB7B x1j5qtnPk44h98UZg9XHcWAxe509qduLKdsx/hpGGx0mlPAh9sRlN1kxdXBOz0ouA4xcVo iV6ZQZpodsTrtzkLh00VjXK+adBmbLg= Received: by mail-yw1-f173.google.com with SMTP id 00721157ae682-56cf34a3c72so28375657b3.1 for ; Mon, 12 Jun 2023 14:05:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686603902; x=1689195902; 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=7hP9xC8dm7FmaxDqq4kyW1FngYvGoyLv+4GJfd5pZsk=; b=CJYIsJwgfTu/y/lqnJP/t9il82a33oAqvZUzCAqj1B6hDybKBkJzlI1M4tHng7gsKh wjldrdty5LsQxwcte5A4qzxTSyPWsC3prP09MuDZHhuDdW+KkIuzhNtB1OGIf0fmEYwq PbjgzzODbpwoqx2q55Rq1VMyrgJdF+EsVRaRlosxhaI2WYgY5mJZUdNXguDU4uoU3hsT HNsA8NDHAaVm+vxqugHLiha5If8egzZBwoJM3N2OKUEJMszToVmHBrGqCteUXmcF8+W9 CJfXWgYf4SrrnrL4x4+oaqBHqtUA2nnqH+olViH9ENIys3R1pjxamFF3W5tG5eZyHhYN +FGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686603902; x=1689195902; 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=7hP9xC8dm7FmaxDqq4kyW1FngYvGoyLv+4GJfd5pZsk=; b=WQWTG7eEffV3fBw/pvJISFWmrDKBe8QgyaNSRdYxO3WCaWBKjXiH6JPGijtS3tS8Y3 0NAJN8ZZMMcv99SQhTF2oEK5fpJR8cviMJcA+Sgylmvz4ZliP5IecI9TL/5mEVJPXbvZ itMUUjNyRjh68GNMovDEWymvpecT37DSf4ZlK5f7Qfm8Bl9oGJBH8XEdfQiVB4xtTETn SjxDeU5v2VWSsx7ADaeNfeNk+LwPxwt0TJ3wAkZx/y+Q7GQWa4F1I+QY+aoLsjiWPRw9 NeIIJ7m9zQ8lD52NOSYaIDDCyKIaUnJubgSbVQA4U1i/v7N5bmlnCzvHZwsnLWP2UJPI 5gUg== X-Gm-Message-State: AC+VfDynY9Vcr4ZvAAHmv60yTJgyz4GEA8HmlSEXL8aEWsx+ZGd+J4xZ l9tCN/YX8sMY2Qusa8vcMDQ= X-Google-Smtp-Source: ACHHUZ5ktkx/ASoBV55sneLmyoKAwlH0/qlI6IE3eWY9yaMnSemMH48l10CKm48pG/hNrIF3qCc62g== X-Received: by 2002:a0d:d713:0:b0:56d:5286:51f5 with SMTP id z19-20020a0dd713000000b0056d528651f5mr1015907ywd.28.1686603902249; Mon, 12 Jun 2023 14:05:02 -0700 (PDT) Received: from unknowna0e70b2ca394.attlocal.net ([2600:1700:2f7d:1800::16]) by smtp.googlemail.com with ESMTPSA id s125-20020a817783000000b00569eb609458sm2757115ywc.81.2023.06.12.14.05.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jun 2023 14:05:01 -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)" Subject: [PATCH v4 08/34] mm: Convert ptlock_ptr() to use ptdescs Date: Mon, 12 Jun 2023 14:03:57 -0700 Message-Id: <20230612210423.18611-9-vishal.moola@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230612210423.18611-1-vishal.moola@gmail.com> References: <20230612210423.18611-1-vishal.moola@gmail.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4C6BD1C0018 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 54efy7qa9kgn1f96imkrwzet5bq1kc7u X-HE-Tag: 1686603903-870503 X-HE-Meta: U2FsdGVkX18DO8KQm4lJourC+iAG6nn8xVTQwB3zPfKvvuw0HRG4GMEOCFec6khxEYm3V0uIyxsTfQqATjaRU1qAzxxWxmVCdksQDB+K1hsh497U+jNCevOX1lWH+Ne3w8ieqSPsE2pQm5kkfGUBPDzU+L7AMoyVXtKZQGP02YhGSQayvHcYHgSkrWWo8duA86DyMtlEZMYxVocxPFPP92/FQNCHMc38uzIW44YXK6NpNo/KFJP56kYepY3pTfZKJRUSx4Xx0/HaNxYgcOP5VlJhY3HwcYgvVtWZcW/TnhSbquCGEHHK9UkZ4wl3Vg5MwpnIFso5CIiDBX7466RT166PBBjBnfKr9Y1qqgjByIBRmSGOyMUdOKSUUC3u28g4dnEoXy1hCULK47cWuuD3RV8JnTSm/jnQ2olSGXQAtc+l9zPbNR1+/lBaOhqcQA4D+6BDD0OCgkqyxOdN1dDGyZ5/2ai+LD7pzIj77iqPW05VJ0U92jxqZq6m0ZvqmjC3yL/PZbPP59m+7VSmfNVE4rgyFFT5rrucneae82DQtFVRwo6hRI+Wa9xugpOdBWR5dvDa+lh//DERxMd5hQ1bv93fP4/H0Cl7AlfDE2ct2DxvM0US+XWFDoBUx0QrAyZNVuIyxObmz5ceXPmTphppKsPc78Kd6Y2ddvVKlSPqJx08GO1loKYNa2X0f50+GJg3zz5dwaWsjfQQapajqb7H2tHtYRtSjkmdyKHHOzi2hWydAD4ovrlBtod7Hg1yqOImMUSvwJBRRYDmOGMo+oGUNMODXz/nCwVwMFoYgiwlGaSSIyXOXmYk7NRC1DanjktbIVWqclNV/O6xm11k9yP8KfhgLLg//mT/ubm9AUFqsiWMvGBiPLqHAZuNKyN/xlcplEXFnxbsYNfizLSc3gwyV6VREcW7owyhrnuxd6zOTQe+/8761YcQrTbwOOYYBxi5WsuEuZ0glC4WQNUtDAJ 7HFC1+W0 9HhCdQ3VcWdj4Xzhzlhadtr9qkpRfP4UyRkFHwZjKGTzW35f0cnOlxywW1a2GkukyJBsD+4FyM/KR9r2SMJxq39R6TlFCW9wNOgLruqR5UrfoQb2hoY9NXiE5AC4mbA45tnDK2mTBB5aOZrGOg8A4SzxVYOCmLQxurxiXdQ17g1IAVqXVfq+h+4zN4jcAbSJIQgjsJxYXT0QcsGgudJU+vJG+7vBx34Q28St/8+VF7rcygbVv8bjIicA+bM0z+hv8t/kEyE7A4YLg2GSbFsC/RWNpwpqAEyhCb4UMzo+kZYDBzlOLrY1f6bZabQBfLeQE9gbeQbmYlcvwMP2uvRKXDxgdddBb5lM4Kefo/GqMNHr0ekmSmhoR/x9+bNOIoSOCE6DVUxBrhEwqNvSc9FAOyO2D7Qwtvi4sfcmm1Sk963XyasKghOdXCqvZ1eB4tZ4VLRYV61AMZXjuLK0lwKRkJw23TjtK4CZvn/FpHm/Ono4Oxwykvo59EFJk8FgqI3zSW5BCXheQ1b9Bmnj3+rgll36dgQRx1hAkjlyqBGKedUmLBk3an4e1JHWGrH3v1w/GnlQtBI4+yR6cWEw= 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 b3b8d289b9ab..f469862e3ef4 100644 --- a/arch/x86/xen/mmu_pv.c +++ b/arch/x86/xen/mmu_pv.c @@ -651,7 +651,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 e6f1be2a405e..bb934d51390f 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2828,9 +2828,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) @@ -2846,15 +2846,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) @@ -2869,7 +2869,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; } @@ -2939,7 +2939,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)