From patchwork Mon Mar 4 11:07:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qi Zheng X-Patchwork-Id: 13580427 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 724B9C5478C for ; Mon, 4 Mar 2024 11:08:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 036896B0083; Mon, 4 Mar 2024 06:08:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F278D6B0088; Mon, 4 Mar 2024 06:08:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DC8FA6B0089; Mon, 4 Mar 2024 06:08:24 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id C76FD6B0083 for ; Mon, 4 Mar 2024 06:08:24 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 7F0511C095F for ; Mon, 4 Mar 2024 11:08:24 +0000 (UTC) X-FDA: 81859082928.12.4C63F0F Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by imf01.hostedemail.com (Postfix) with ESMTP id D543E4000F for ; Mon, 4 Mar 2024 11:08:22 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="RfTUjtN/"; spf=pass (imf01.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.215.179 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=1709550502; 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=2RLTgvH0qYoneoQ+N+6ayDYFDcXGD4luCEt+X8Py56w=; b=kI8gCeVEtZ4VSUnVMg5JTivLDBa3QdsxFZmlIGUxcRyjpqpA4zRoSTr4uEeWejEQLLHDlV zHZZNJ4py6IlBvajQIAdKmzF2XA63mlYne2JQBBGOk3J87aZeqGK4yAQP/Fy5TlTKW3wJ1 wnm5vu4R2bpcXOoqAE4QRdLUjSDf5I4= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b="RfTUjtN/"; spf=pass (imf01.hostedemail.com: domain of zhengqi.arch@bytedance.com designates 209.85.215.179 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=1709550502; a=rsa-sha256; cv=none; b=J2ElAegNrpR+v1DyfjNINPeE7tjc5PaH2X2SVrwtJD6EAQuhoF3tW8fJ3J4Ekwn+fZ8DER 7PTUvIhQl/i7lkHsdrtjDMCTtB8Avr7sBQdGfP/2xFyOb0FALdERACOsOfynwtHyp5WLML VNpV9XVvjNn0ULrKatNNx9Z3R36KQTo= Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-5cfb8126375so673488a12.1 for ; Mon, 04 Mar 2024 03:08:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1709550502; x=1710155302; 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=2RLTgvH0qYoneoQ+N+6ayDYFDcXGD4luCEt+X8Py56w=; b=RfTUjtN/sY1nvlEFaZzfxswBLVWk7/r/AHFY4e94xdMBA+v6rxb/oN/K8ieGa49i0S Xghfm3dgJ455FxqZQaGQPp1dCPNMrvEAFSssJfHF8bkxSrJREXZY2bv0eRubSxrRqVWe EyXDALaWXZbVN/Vv/vrpzpcFO5tDDA8siptsaNG7j+yOcz15kVZiZ/meSFFLLFebJkGY uza5Drm4b02RiisayyBfppEzQ/ui54i0ypxisRd931CjNcjqFPEHrwIaBey810jM+meX Yx4nZi9chruIVeyHptjSzaC94OU+hquFg/T20/x4Ndi2mTk+zuSOo6GQYLtZARFHCEM2 Oguw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709550502; x=1710155302; 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=2RLTgvH0qYoneoQ+N+6ayDYFDcXGD4luCEt+X8Py56w=; b=gqjf4pHdz45s+GqL7PQs1WfBtR6tre2ACwOe7KdehCKvMHPWhNiLPFdOKxDZA2vd3S jJuk+16772jMQEUacLDvDh6ct6C/4NcZwzXPQvdravX6wO8jCS0oY4kjdQsQrbNc3z/m +lAf29fTUTVh3YsRpM9KBRQpKrIVahi/k5B8frRQvCGvgWDzb3qmtPQs5OCJYEjCp+Ys J0vydPw6oQUb0ZUV7a5n5nPpSSPvmXaI1G6IRwKlpH3m5l/ltRl+FxZHM7c2LQAFZ4x9 NuerniAqYbaT/tOd8iam0p1+Uw+tMWdoPzEZFLq1jXd5k3CIzMabCPEJE+kJwiD0SI3x 2hLA== X-Gm-Message-State: AOJu0Yxzs3tphTSXCVZDBSHkX8I259wDPm1v5pI23hnYXfQXiSIf8RQR XbJJdndWkVXNyQUaTHVDYu8mD5SH8v7qy1/h3fmg9eQgWkbbofs1OXUgHD8VjPI= X-Google-Smtp-Source: AGHT+IFBOOIUNI94cOhOoYb8AwpERd5isoTBK9odWtV+MEuzyzhHwVrtYw8sFJceXMlJR9tIyeo1cQ== X-Received: by 2002:a05:6a20:1b30:b0:1a1:480e:7711 with SMTP id ch48-20020a056a201b3000b001a1480e7711mr5045368pzb.0.1709550501853; Mon, 04 Mar 2024 03:08:21 -0800 (PST) Received: from C02DW0BEMD6R.bytedance.net ([203.208.167.154]) by smtp.gmail.com with ESMTPSA id y5-20020a17090aca8500b0029b59bf77b4sm587410pjt.42.2024.03.04.03.08.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 03:08:21 -0800 (PST) From: Qi Zheng To: akpm@linux-foundation.org, vishal.moola@gmail.com, hughd@google.com, david@redhat.com, rppt@kernel.org, willy@infradead.org, muchun.song@linux.dev Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qi Zheng , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , kvm@vger.kernel.org, linux-s390@vger.kernel.org Subject: [PATCH 3/3] s390: supplement for ptdesc conversion Date: Mon, 4 Mar 2024 19:07:20 +0800 Message-Id: <04beaf3255056ffe131a5ea595736066c1e84756.1709541697.git.zhengqi.arch@bytedance.com> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Queue-Id: D543E4000F X-Rspam-User: X-Stat-Signature: ysjo7rumirj6z9g5aj7xbr617jwo7o5e X-Rspamd-Server: rspam01 X-HE-Tag: 1709550502-839467 X-HE-Meta: U2FsdGVkX185sscNKOnakhyl52iRKMUuY1QcgJEsUruASBgu/Kqv3/YhbggDGQvZQLH5Xf8pObqw/uRnbJFhi9fzL7nD3Srt6BSccU09ArrIAkdvT1lVhbULu5E8lChQ4jGZQl3BdiNxt58VUmGlHxGaCF9DtdRJUueTnMDAPZKht6bTJT9GHwDwKtnZWU1zDjxrCa8qOV4CimzeoRfmZecXFmFWDED6p90xr2w2fpp+ZYCZqzhrpkaIJaVrJHp427btoB+0Fwb+q2uG8h5Uxruy9cMhkG2bfO/GG+tYkHhA/UbhC+7LOyKDc8YQvip2xGYTiQR2Hsehok/FDI9Mbm9obpLCxZ3EUKFirj7RWbeMnQjhC+1x437hCJfkpDepB7ZMdT6KY+jqydDzfuAmtHOMoIDqqvDtdoEed6g9LyactVrYLLh1ZivIRPjjLjll1PuP1dC139XJ0TuTW0Fcc8Dkr0fNqYSdCzHpKOpELbswy2hkIUlet6UaggwgHNdbP3xSJLbI37DVGWSP3qG46Wr4sRlMBZ6UEsiO3kWMsH7ryckCV6fAat+x6Zo+fuUCYuXBLBU25anaog9AsRbuoKIMx90njIApHIQHdT0TmEDdJK7tHHZ4jAv5nMJ30IUb6fsnlQ2FHJXc7MAh5yktA/TAomEJGXkD9wry2JLoy5hw6XELKRX1jA0xeDPF2fnYaaIOQ6zCmUM3xI+RKdFWRwTpJUmohJOfYv/gPNDB7CFQTvN1RmHkgFXVSgsTuLiZqJQ4gtx6lSm/zlj6S4ENo6kcZqv6XP2/4exfa7Qr0zVWPKdu9bB6zJGDN/cKaMCMO+dhBoNwDaHxutTd4KObppqGGFXI/SMsfkKNcYk/xe7TeuWGdmFEA8KX63BG2PK3MNGzELquuHxZHc/nIeYJDH+0JuaPVoLnew3SWJS6+a6uGgLANFhio0IIWFwT2c2oVYgMBFzZigAkLZoZBVg qvkZDiJs QnNSFUVS+atGSesZrYKunRId4RbCWSBLcvOjSRZKRQIz6FLqV2hLolZRlg4na5obs++9U5d3qIKuQWjSoiQvEcTaG88ULz7D8Ih5oe4QweenSu/KIndPjBhcomi83DGc0cmsjfIrpmQrR6FEcyLvc468w8GBx+mD5WnoY2sCkpBFAAq/dtFHh6F0acoM7+zPeWifPIE6naBXLVK8= X-Bogosity: Ham, tests=bogofilter, spamicity=0.001414, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: After commit 6326c26c1514 ("s390: convert various pgalloc functions to use ptdescs"), there are still some positions that use page->{lru, index} instead of ptdesc->{pt_list, pt_index}. In order to make the use of ptdesc->{pt_list, pt_index} clearer, it would be better to convert them as well. Signed-off-by: Qi Zheng Cc: Christian Borntraeger Cc: Janosch Frank Cc: Claudio Imbrenda Cc: David Hildenbrand Cc: kvm@vger.kernel.org Cc: linux-s390@vger.kernel.org --- arch/s390/include/asm/pgalloc.h | 4 ++-- arch/s390/mm/gmap.c | 38 +++++++++++++++++---------------- arch/s390/mm/pgalloc.c | 8 +++---- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/arch/s390/include/asm/pgalloc.h b/arch/s390/include/asm/pgalloc.h index 502d655fe6ae..7b84ef6dc4b6 100644 --- a/arch/s390/include/asm/pgalloc.h +++ b/arch/s390/include/asm/pgalloc.h @@ -23,9 +23,9 @@ unsigned long *crst_table_alloc(struct mm_struct *); void crst_table_free(struct mm_struct *, unsigned long *); unsigned long *page_table_alloc(struct mm_struct *); -struct page *page_table_alloc_pgste(struct mm_struct *mm); +struct ptdesc *page_table_alloc_pgste(struct mm_struct *mm); void page_table_free(struct mm_struct *, unsigned long *); -void page_table_free_pgste(struct page *page); +void page_table_free_pgste(struct ptdesc *ptdesc); extern int page_table_allocate_pgste; static inline void crst_table_init(unsigned long *crst, unsigned long entry) diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c index 8da39deb56ca..4d2674f89322 100644 --- a/arch/s390/mm/gmap.c +++ b/arch/s390/mm/gmap.c @@ -206,9 +206,11 @@ static void gmap_free(struct gmap *gmap) /* Free additional data for a shadow gmap */ if (gmap_is_shadow(gmap)) { + struct ptdesc *ptdesc; + /* Free all page tables. */ - list_for_each_entry_safe(page, next, &gmap->pt_list, lru) - page_table_free_pgste(page); + list_for_each_entry_safe(ptdesc, next, &gmap->pt_list, pt_list) + page_table_free_pgste(ptdesc); gmap_rmap_radix_tree_free(&gmap->host_to_rmap); /* Release reference to the parent */ gmap_put(gmap->parent); @@ -1348,7 +1350,7 @@ static void gmap_unshadow_pgt(struct gmap *sg, unsigned long raddr) { unsigned long *ste; phys_addr_t sto, pgt; - struct page *page; + struct ptdesc *ptdesc; BUG_ON(!gmap_is_shadow(sg)); ste = gmap_table_walk(sg, raddr, 1); /* get segment pointer */ @@ -1361,9 +1363,9 @@ static void gmap_unshadow_pgt(struct gmap *sg, unsigned long raddr) *ste = _SEGMENT_ENTRY_EMPTY; __gmap_unshadow_pgt(sg, raddr, __va(pgt)); /* Free page table */ - page = phys_to_page(pgt); - list_del(&page->lru); - page_table_free_pgste(page); + ptdesc = page_ptdesc(phys_to_page(pgt)); + list_del(&ptdesc->pt_list); + page_table_free_pgste(ptdesc); } /** @@ -1377,7 +1379,7 @@ static void gmap_unshadow_pgt(struct gmap *sg, unsigned long raddr) static void __gmap_unshadow_sgt(struct gmap *sg, unsigned long raddr, unsigned long *sgt) { - struct page *page; + struct ptdesc *ptdesc; phys_addr_t pgt; int i; @@ -1389,9 +1391,9 @@ static void __gmap_unshadow_sgt(struct gmap *sg, unsigned long raddr, sgt[i] = _SEGMENT_ENTRY_EMPTY; __gmap_unshadow_pgt(sg, raddr, __va(pgt)); /* Free page table */ - page = phys_to_page(pgt); - list_del(&page->lru); - page_table_free_pgste(page); + ptdesc = page_ptdesc(phys_to_page(pgt)); + list_del(&ptdesc->pt_list); + page_table_free_pgste(ptdesc); } } @@ -2058,19 +2060,19 @@ int gmap_shadow_pgt(struct gmap *sg, unsigned long saddr, unsigned long pgt, { unsigned long raddr, origin; unsigned long *table; - struct page *page; + struct ptdesc *ptdesc; phys_addr_t s_pgt; int rc; BUG_ON(!gmap_is_shadow(sg) || (pgt & _SEGMENT_ENTRY_LARGE)); /* Allocate a shadow page table */ - page = page_table_alloc_pgste(sg->mm); - if (!page) + ptdesc = page_table_alloc_pgste(sg->mm); + if (!ptdesc) return -ENOMEM; - page->index = pgt & _SEGMENT_ENTRY_ORIGIN; + ptdesc->pt_index = pgt & _SEGMENT_ENTRY_ORIGIN; if (fake) - page->index |= GMAP_SHADOW_FAKE_TABLE; - s_pgt = page_to_phys(page); + ptdesc->pt_index |= GMAP_SHADOW_FAKE_TABLE; + s_pgt = page_to_phys(ptdesc_page(ptdesc)); /* Install shadow page table */ spin_lock(&sg->guest_table_lock); table = gmap_table_walk(sg, saddr, 1); /* get segment pointer */ @@ -2088,7 +2090,7 @@ int gmap_shadow_pgt(struct gmap *sg, unsigned long saddr, unsigned long pgt, /* mark as invalid as long as the parent table is not protected */ *table = (unsigned long) s_pgt | _SEGMENT_ENTRY | (pgt & _SEGMENT_ENTRY_PROTECT) | _SEGMENT_ENTRY_INVALID; - list_add(&page->lru, &sg->pt_list); + list_add(&ptdesc->pt_list, &sg->pt_list); if (fake) { /* nothing to protect for fake tables */ *table &= ~_SEGMENT_ENTRY_INVALID; @@ -2114,7 +2116,7 @@ int gmap_shadow_pgt(struct gmap *sg, unsigned long saddr, unsigned long pgt, return rc; out_free: spin_unlock(&sg->guest_table_lock); - page_table_free_pgste(page); + page_table_free_pgste(ptdesc); return rc; } diff --git a/arch/s390/mm/pgalloc.c b/arch/s390/mm/pgalloc.c index 008e487c94a6..abb629d7e131 100644 --- a/arch/s390/mm/pgalloc.c +++ b/arch/s390/mm/pgalloc.c @@ -135,7 +135,7 @@ int crst_table_upgrade(struct mm_struct *mm, unsigned long end) #ifdef CONFIG_PGSTE -struct page *page_table_alloc_pgste(struct mm_struct *mm) +struct ptdesc *page_table_alloc_pgste(struct mm_struct *mm) { struct ptdesc *ptdesc; u64 *table; @@ -147,12 +147,12 @@ struct page *page_table_alloc_pgste(struct mm_struct *mm) memset64(table, _PAGE_INVALID, PTRS_PER_PTE); memset64(table + PTRS_PER_PTE, 0, PTRS_PER_PTE); } - return ptdesc_page(ptdesc); + return ptdesc; } -void page_table_free_pgste(struct page *page) +void page_table_free_pgste(struct ptdesc *ptdesc) { - pagetable_free(page_ptdesc(page)); + pagetable_free(ptdesc); } #endif /* CONFIG_PGSTE */