From mboxrd@z Thu Jan 1 00:00:00 1970 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 A3114C27C75 for ; Thu, 13 Jun 2024 07:39:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2E4116B009C; Thu, 13 Jun 2024 03:39:22 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 26D346B00A0; Thu, 13 Jun 2024 03:39:22 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0BF956B00A1; Thu, 13 Jun 2024 03:39:22 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id DFE446B009C for ; Thu, 13 Jun 2024 03:39:21 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 584231C2D80 for ; Thu, 13 Jun 2024 07:39:21 +0000 (UTC) X-FDA: 82225064922.02.EDD2CDC Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf22.hostedemail.com (Postfix) with ESMTP id 2017BC000B for ; Thu, 13 Jun 2024 07:39:18 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Hk6IrMmN; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=dKuE2pVb; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Hk6IrMmN; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=dKuE2pVb; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf22.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.130 as permitted sender) smtp.mailfrom=osalvador@suse.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718264358; a=rsa-sha256; cv=none; b=71+gPoncmJ/RutRM61q6f8G8bdsIyp2DRSXxGULLni/wINKJRsR5pIohxcyu6C7cbods5C 805Rz3H+lOadNcOGP8E5BBUbx3jPTqxA4mTc4pdcns9Xv0GLJwllU3AhiT7z5QeHZHXF/2 0GDe3HjFt+J9ll5bzVE3dIMk4BFmyDk= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Hk6IrMmN; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=dKuE2pVb; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=Hk6IrMmN; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=dKuE2pVb; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf22.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.130 as permitted sender) smtp.mailfrom=osalvador@suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1718264358; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=PJr/sVqqibP7odVJAVm3G5KXSTQ5G/aztZXaBj/Ps0Q=; b=8HGkvOjKzotNUeQrViXphwsEFee8V8wRpPEkJR3MrVRttI9s7a2xEtL6neC2QCvp/BhxMc tFT2Umv5k4YWOcs/7vo60DNHGnCplkW1lEiX4991ScCHli6Sz2AXwqyYoasQ5ufbUfk+5m Kvjrp2LaL5CNu+EYOFHcFR229NyuaoE= Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 597463504D; Thu, 13 Jun 2024 07:39:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1718264357; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=PJr/sVqqibP7odVJAVm3G5KXSTQ5G/aztZXaBj/Ps0Q=; b=Hk6IrMmNmmk6+OnKpC5t1Fwcg7VYXLsRjctko2pjEjG1EzMMSOoNexWIbKwg0b0ubAm3U0 9WntOMQY0sGnUitsr5bPygUGELIHnkDV8sfwZOLwW5F65fgvvAAvXVxyQvOFpSndpRI91P xFx5oThb/plGx5nZfuL2Qsh2ftPuzJc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1718264357; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=PJr/sVqqibP7odVJAVm3G5KXSTQ5G/aztZXaBj/Ps0Q=; b=dKuE2pVb2zgiX6DotLeuAj+BGf1xKCV69k885AFnTmtuD7zIla+rVE9LmjHStNJiy8nkZ9 0Z2ts9tc2MNb5FAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1718264357; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=PJr/sVqqibP7odVJAVm3G5KXSTQ5G/aztZXaBj/Ps0Q=; b=Hk6IrMmNmmk6+OnKpC5t1Fwcg7VYXLsRjctko2pjEjG1EzMMSOoNexWIbKwg0b0ubAm3U0 9WntOMQY0sGnUitsr5bPygUGELIHnkDV8sfwZOLwW5F65fgvvAAvXVxyQvOFpSndpRI91P xFx5oThb/plGx5nZfuL2Qsh2ftPuzJc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1718264357; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=PJr/sVqqibP7odVJAVm3G5KXSTQ5G/aztZXaBj/Ps0Q=; b=dKuE2pVb2zgiX6DotLeuAj+BGf1xKCV69k885AFnTmtuD7zIla+rVE9LmjHStNJiy8nkZ9 0Z2ts9tc2MNb5FAA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id D4EBD13A87; Thu, 13 Jun 2024 07:39:16 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id V9lyMSSiamZ9TQAAD6G6ig (envelope-from ); Thu, 13 Jun 2024 07:39:16 +0000 Date: Thu, 13 Jun 2024 09:39:15 +0200 From: Oscar Salvador To: Christophe Leroy Cc: Andrew Morton , Jason Gunthorpe , Peter Xu , Michael Ellerman , Nicholas Piggin , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH v5 16/18] powerpc/64s: Use contiguous PMD/PUD instead of HUGEPD Message-ID: References: <92a741b0358fc100ad331760181f66e82781052b.1717955559.git.christophe.leroy@csgroup.eu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <92a741b0358fc100ad331760181f66e82781052b.1717955559.git.christophe.leroy@csgroup.eu> X-Rspamd-Action: no action X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 2017BC000B X-Stat-Signature: 4azntdiuaqtpnm5y319a5zw5uur4473n X-Rspam-User: X-HE-Tag: 1718264358-666547 X-HE-Meta: U2FsdGVkX18QSwZjjwtAEDcuDqXUIYlYiJAAadA+SAEQIo/cGpnJaSAKcJJVQmWRnzkdBUnqBtvV0a+B85+fIZJv5Y1fovhdMcgOEu+TPniBESI7yn1gJQhtRsMRB+Bm/Zu2zDlMULdYpcH1OJqQyo0O/wqVFdH+xDMfX/DEEmuHPOvjaif+PsNsIRF0SCBmvOBZZOVzy8NxpWFwvQL2LcHyvOn4YaSwjgsYjrt1Vm2MXcPkHSUcRURl/yFWgBMnmifwPUmslxu4AQsV6rDxXmI8q+8jMD+ql1rvjmacKIhFLMB7M8JG+hosQ80fLWUrKji7wWF1VVZMKGVI58SjqwB1rNsopI5xcTT8BN/nyZikBcbnh2AmJ2dGcpuF6UmLIe20oU1jon95WSzUfkID0dJD+tSSIDA1BeLci/fq+7BgroS8dygAzjO+hunDP5smFVj/AnPXjBDoNu6mEiPex7TIVNGxvh4xPnoUMQYZWiC9sBLDDT0/ck3jqJXBeX81I6Tn8bdkl4KSFUnHqCkNuJvBk47TYirF5sOZctaBYCH4NIce3uCtWOwe3fd4SEO7MgYse8asnHx6CcHcpYU+Z2SCEYoUlKZrUDzs7UmQUn6A/OzY/VRJeR+9cAPufCyLmj+Xf31/9w8wNe8dezhZKMdJURRFOZYHh/i1RRRjK1si5wiMycrP2j/hVRFtqMuAiqyCPs4LDD3iDFLfWXoiOypoD9zxPdV1do88myAgQz036rWJ7qdTAbI+lDE93tDdhCCyYDjpQtcjkn5WHo29P5cf9PhbqIeDcPGX+87U9bLjy5OPJHpINO7/trAAh3ze7Aac5AL66gMABQ4IhMrr+91Xof9x1pVsdzefNZC6sAMgB/pzEZn0/z1fdyZSeYFVCjevLkGPCOEedLfGd6Mc4f+07f//jTuMkaD8jCo5gU8x7B+5os+9qaBrQtOCHeiPSXGBMsrP2sc1Ik8wNju 8bNY6gCE D8s3jDf6eXSKmcY4e2zR93UI2HWDMtxuQWb/2YkjOzfqZsmbEK1PGYC2HSEe/rSTRnTB3m0XibnU61+NOPKfHDA+0lQgwIqj2PqqM9uls0XyqvYAuiLhc7R6OLQX7zoSjAHIYBMZPkAv6G0P4DNPr3imCNeIwmwFA09ClqYntMEp4l1ykKJ8WtC1cv1tdFKHmhLdqmOJjJAnz5VwttyUywb/g/DEKwxCNKucIFQrJ8WLkmQCEGGMbI4ZANXPYyAb6u3UrbffYr5iChWnwMqsJF8Q2VGM3mCiHEmawUU/NlW08QpU= 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: List-Subscribe: List-Unsubscribe: On Mon, Jun 10, 2024 at 07:55:01AM +0200, Christophe Leroy wrote: > On book3s/64, the only user of hugepd is hash in 4k mode. > > All other setups (hash-64, radix-4, radix-64) use leaf PMD/PUD. > > Rework hash-4k to use contiguous PMD and PUD instead. > > In that setup there are only two huge page sizes: 16M and 16G. > > 16M sits at PMD level and 16G at PUD level. > > pte_update doesn't know page size, lets use the same trick as > hpte_need_flush() to get page size from segment properties. That's > not the most efficient way but let's do that until callers of > pte_update() provide page size instead of just a huge flag. > > Signed-off-by: Christophe Leroy > --- ... > +static inline unsigned long hash__pte_update(struct mm_struct *mm, > + unsigned long addr, > + pte_t *ptep, unsigned long clr, > + unsigned long set, > + int huge) > +{ > + unsigned long old; > + > + old = hash__pte_update_one(ptep, clr, set); > + > + if (IS_ENABLED(CONFIG_PPC_4K_PAGES) && huge) { > + unsigned int psize = get_slice_psize(mm, addr); > + int nb, i; > + > + if (psize == MMU_PAGE_16M) > + nb = SZ_16M / PMD_SIZE; > + else if (psize == MMU_PAGE_16G) > + nb = SZ_16G / PUD_SIZE; > + else > + nb = 1; Although that might be a safe default, it might carry consequences down the road? It might not, but if we reach that, something went wrong, so I would put a WARN_ON_ONCE at least. > --- a/arch/powerpc/mm/book3s64/hugetlbpage.c > +++ b/arch/powerpc/mm/book3s64/hugetlbpage.c > @@ -53,6 +53,16 @@ int __hash_page_huge(unsigned long ea, unsigned long access, unsigned long vsid, > /* If PTE permissions don't match, take page fault */ > if (unlikely(!check_pte_access(access, old_pte))) > return 1; > + /* > + * If hash-4k, hugepages use seeral contiguous PxD entries > + * so bail out and let mm make the page young or dirty > + */ > + if (IS_ENABLED(CONFIG_PPC_4K_PAGES)) { > + if (!(old_pte & _PAGE_ACCESSED)) > + return 1; > + if ((access & _PAGE_WRITE) && !(old_pte & _PAGE_DIRTY)) > + return 1; > + } You mentioned that we need to bail out otherwise only the first PxD would be updated. In the comment you say that mm will take care of making the page young or dirty. Does this mean that the PxDs underneath will not have its bits updated? -- Oscar Salvador SUSE Labs