From patchwork Mon May 1 19:28:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vishal Moola X-Patchwork-Id: 13227927 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 4A47BC77B73 for ; Mon, 1 May 2023 19:28:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 018BD280007; Mon, 1 May 2023 15:28:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id F0882280001; Mon, 1 May 2023 15:28:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D09D1280007; Mon, 1 May 2023 15:28:48 -0400 (EDT) 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 C1CEA280001 for ; Mon, 1 May 2023 15:28:48 -0400 (EDT) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 77AD6160824 for ; Mon, 1 May 2023 19:28:48 +0000 (UTC) X-FDA: 80742673536.15.4F36F9E Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by imf23.hostedemail.com (Postfix) with ESMTP id A14FF140016 for ; Mon, 1 May 2023 19:28:46 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=ORzYAt4f; spf=pass (imf23.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.210.176 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=1682969326; 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=dsNph+IH8G9kAdlfpPDvdsVRvR3y4GWwc24n4bCHoNE=; b=Mu9kQZA/il0Q9J23DIaNRZcsZG1xghKxGnAVTF45ame07fHpw0r8atkfE9yPE5wL4S6svp GgZsJGSN+rdjKW9M6uTX/UMNtonqRJqC0Meps4xm8cGq8ub8ztFksR19+M/wgwMUNDEQ9V TnNjrBCDGFGLx7c6OT0xoOdlizdKezc= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=ORzYAt4f; spf=pass (imf23.hostedemail.com: domain of vishal.moola@gmail.com designates 209.85.210.176 as permitted sender) smtp.mailfrom=vishal.moola@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682969326; a=rsa-sha256; cv=none; b=BlJ1vQ6qWTlwep3VMC1MVcljU4SwP8o8MDQ8MRqvs8itVOtlD6tbFcAgO1WBEVdMfUyz/E OOrYS4qVN+ZRL7MgpwMGdT/YxgHM20hIsl05RjrlQP+kl6u8JsOEZcT9be/P5PEOiW/EFP Pcn0k4ZQkumbM324O7bPBqPcNoepMRs= Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-63b67a26069so3354686b3a.0 for ; Mon, 01 May 2023 12:28:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1682969325; x=1685561325; 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=dsNph+IH8G9kAdlfpPDvdsVRvR3y4GWwc24n4bCHoNE=; b=ORzYAt4fgaepA0jj/nxqG5QCQUnwh7Hd86B8NHpvgQ9XS5bxCw6FjAddYAhSWVBGhs RguloM+rsX2sX5k8L8jQmcK3uoCnItaXGukxO2sNFKQkHNbJapaDcmG0iMAuRZwI8f8t xe4tIz8OOyBZAi/AlwagFAtmsldgUDQdHIa2vdidJh9lpo3fAW1D+2jPZJhQXOxhvdZs c4hk+WfixJsxNAANDMRcuNKXIxHiA6rEY6QaL0IGeoKtL1JoS6dBJBARbulTJ6NVKxdj 8lac9J2KQ3hHBoBfb7fQ//alN+wtsMCP7K7b5tVdh9EZXnnMD2pBGWAPXyEldDpkm7ax zAvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682969325; x=1685561325; 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=dsNph+IH8G9kAdlfpPDvdsVRvR3y4GWwc24n4bCHoNE=; b=bFDbbp1fFWsNoos16nulH2YsZzzkL/d2qhMc3r/FYoVJgYIeB7QblfmAi5yJRh38kS zcOvPn3X40hTwi6QVEM0hZzoGk2bAX3DLjl7QTYdbCoJZYE/6AJObIHNvQnIaddXPFO+ DugjNFiOWLb7wQ9pXIjHmcS+fzq/j44hZ7CpFFao3yOplJJAIcGlFPs7uMz4L42aTB9O Z9e5kVHz0GBvpTHeGq39dTUsEFC3r7s6my5bNiuNsapRw+32SqyJLGgJEaIhJNlmprBy ydq67ZfoyV3rrVK1zz4cUyZ650gj3HmXFy2wx5iBw3DnYm/rKc6y5IrVlQyrr4t41ZDT TQGA== X-Gm-Message-State: AC+VfDwGnesxRkuRHXnWIZZxKsRp9utMcN9UOeBAAs2JyUsvYK3qtdXI Un3Q7+znfIqw6jMC+vhKfV8= X-Google-Smtp-Source: ACHHUZ6Hyp/uTZNVOfbVle27YVii8Y9q7eyatfM6y5VDboeAGhZWSkyjhlYeOczpnOUzLbM+Y5y88w== X-Received: by 2002:a17:902:da90:b0:1a9:b902:84b9 with SMTP id j16-20020a170902da9000b001a9b90284b9mr18090785plx.24.1682969325399; Mon, 01 May 2023 12:28:45 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 May 2023 12:28:45 -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)" , Dave Hansen Subject: [PATCH v2 08/34] mm: Convert ptlock_ptr() to use ptdescs Date: Mon, 1 May 2023 12:28:03 -0700 Message-Id: <20230501192829.17086-9-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-Rspamd-Queue-Id: A14FF140016 X-Stat-Signature: 4sypip9nmrj9eim1nbi67h9j4yxguheq X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1682969326-104220 X-HE-Meta: U2FsdGVkX1+3lxobw3Mx/Rwv6FoGjhchgldBp4zVNvpC7glkFaO+eCp+aLPnPOU32hxwJ9eOdkd5HG5CF9omIpDgw4Y8JxbjB8i1ZLVt+jipi2t0O9h2IdGu7DfFGwkTO7Op61SviM/mKG0et+lX5xQH1nGV1n/IxMw7cx9XCg/Oh04kvCzBnjsWcW84EhuqzQBwjDd3SDhRa4GppVFZwkCdD4o4ZJhhNM0XuzjIx8lcNJw5p4Yhk1TiWmzvRv7ZBdSX5y393fsVzAQsbGjQsiSyaQmZpQKGTsQNFyIjeqMCaZhJXfH8HQOv6j/pAV7Vdrbj+UtjY0OIUv3ksSyj7k0LOn8E4bzJvu0pPfAj/Ez5FxX1vU0JfsQuteKjA3UVPsNvYKg83290NW5IwYWm1NYsGHSAwcM7CxxBlcfL3CDNIuYsXwEopW4wvVetG4QXNKYVtOUCKYUUhD66g0Oa1bT16Xdu6dr1Y2uV9lXVBWD4HWsOr1gWSY0mSrOH/is3WrIjdoLZsdf8Ywmpa7IK6cObGPYvprpFgXLKQSb7vFVXXH5RhmfnPOSQSQzufeaR2f1mPhdxaY9E8Z0r5PYVBSRajN55dBZ10Ioh9vKY9eEibkxk1nST0BdH8Co1Sc5+3prk8rgkk6lmpcqMR8HXMH39glWDfielw+sMumOVVln9tedAyNilUUZ6fqBDFvw4SOblas/qc7HnmnD0J6i7G//wt6sFVEaEFZVQHqXEPCi1GIZ/12ksznVbHS3/qXirGZF+qJ3Pi2ncM1HARrQK04ZHC/yLNITRcGenh9a3nPbrfm+GLAgxJA9Xe9XJFG0gC+yXCffBKTgfcR8XMnKVpUpBrXsVKQiQXYfbXjLWq9yhsO9nWPExUbbWyoSzvG1FCduc4yfvTbikDk0jqC5Mm0hg1DGeOYb7TAlcIgZzysBkhz6wMbbv/WT181MnS0sKwVfWVfVVA7tuwzvLlk4 XwvQeTXC jCvQ1TkiffZ73fD7zZ7+Sw0rokafAVFRi0wpbL5UKIePxwdw33NYCD/TbzQlQFsB8/7W3GFRyQHZvYDzU1wAd3cX48LDT1zI0KCEeCM7UMoO+L4KFa+uzS9/w5pY3GGa1jAAiZJkPOSnt8/y3NISjmdkgftecbB+qYwap/PoSGKogAb1azLq/9KLTtVt7pO8WO1n2xoA2L7oQxJRrwR1mQ54cLuv1GBg21qVaVtirjVHwGGrQmQ2yOb0j4wceYTrOY1uv93qgzdbJe4L38d3ywBxa7pCSHHQ3/ZXAJBTT8SoaQsZJu6DLh+kCjAf+K9ray/CgvM6N5Kb8A+e0uTI9e4a9zI4B7RlOZf6orTVR/L8FElHouFQhDhU0+vgpYVdiud3HZ7djq7hDrkZT1nl6dcbW30C7TWILIr8FwGFKz40sIXUf1BUX0CmEX8DBWPjoxjWMaECI7ctRKWR3Hpuc+stO2WthJ1D74JM1apuARW2rL4sLQ12wwf8msysMriQqwPX5lXoNBGaHc0XTI0w30pzh0/ry3w23n6VikxS1gbrB0WsmZWSipBL/9E/Afe3D+rqyncCoTMjOBYI= 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) --- 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 fdc91deece7e..a1c9f8dcbb5a 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 565da5f39376..49fdc1199bd4 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2789,9 +2789,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) @@ -2807,15 +2807,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) @@ -2830,7 +2830,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; } @@ -2900,7 +2900,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)