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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9D3CFC54E41 for ; Thu, 7 Mar 2024 03:06:30 +0000 (UTC) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=cm0mjv3w; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=jWRpT9PN; dkim-atps=neutral Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4TqvMn2KfCz3vb1 for ; Thu, 7 Mar 2024 14:06:29 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=cm0mjv3w; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=jWRpT9PN; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=redhat.com (client-ip=170.10.133.124; helo=us-smtp-delivery-124.mimecast.com; envelope-from=peterx@redhat.com; receiver=lists.ozlabs.org) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4TqvLy2hwkz3c2K for ; Thu, 7 Mar 2024 14:05:44 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709780741; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PkR96+oCUTcXVjSNgBM5A0Wxc2Bmtn+g3wn0Jg6Nemc=; b=cm0mjv3wJzG0dwW2M4qsaj3+TXmSrPfeLRoFozBD5lFxPl0TMVhBD9CNeX77OaLZwXdW2c 4H+kxqWeWzFjtrsLVoEdFHmnVbl0e3+hk0meFXHEJW5Qpow8ualtSXEf36mJ28aZmZ3ZiQ I4urq9vrfL0Ce0WJseHctzQICIaksEc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709780742; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PkR96+oCUTcXVjSNgBM5A0Wxc2Bmtn+g3wn0Jg6Nemc=; b=jWRpT9PNJnuXXjCM0SOav9EFoFRCn6jdgNxW65VVVPgsXZv/rTpqDLZx36NirL8ZVvUCg8 5/utDqm8QdacjmgH/6AqjjOxK8OdPtGUr/4KDUAQFGhHKvKQPYnxwKmeDolSy+nAdfI1I7 YDL34dgG0+43rVwpzuYPWsEaSiRdAT4= Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-600-_IzLPiCiOd2h-_HYgLHEKw-1; Wed, 06 Mar 2024 22:05:37 -0500 X-MC-Unique: _IzLPiCiOd2h-_HYgLHEKw-1 Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-6dbd919aba8so112077b3a.0 for ; Wed, 06 Mar 2024 19:05:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709780736; x=1710385536; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=PkR96+oCUTcXVjSNgBM5A0Wxc2Bmtn+g3wn0Jg6Nemc=; b=kFBIUv7VV4ahuHTNg6YQBKYeH0ttT7Zn3Ffc3YQv0B5gOsPEX42DByficlIDqbf71W 5ssGPZ/EoDHlLlKs9sjtNAmtsDfzCy72ysu+CqeQTFcmwWRhTsZQo5IwU1X2SKT8V5kK 6+K6Nx45+HjwfUveIj0eE40tzSNc52oIECRLFCt8h3rSskaaAOEZhhcpUob+6YmF+Uu6 0x8aj7axM4VoZhi/3yheg70CMiNWYMN5V64W6EfcbmLZxAEVN93i4IyS1832D5RJ30YR FV5tAKkyiYWuWXySfFS7wmbzaLAzuCeR4yXXeThPvY3rxkE4PMZL6Pv533E5/omApqwH HvEw== X-Forwarded-Encrypted: i=1; AJvYcCWfS8GcL5c9ftveRXtREarpExqUXoa3aCyBsHibsLMBvDeuo80OaUojVhYHeJPzL2LymWJsmeD3QU9UrrGsE81mkdNB8g8RMYzLYcTQRQ== X-Gm-Message-State: AOJu0Yzbp5l/+ICnQkZP52SuicMOVlOq250Xz+VNnmIAJY/BnaeBhi5w fk1BVpnAKUQz6RLO4poSyO6/zB+/IuapcNSmy/hfUQrvI9Pvhdau9z5UM6bs1GtJbxK0u6vCIbG sdLRCbGUYpEzylyXN+Y9l1VO2OaHTFeM/U6/fOQ9N4UoHuEl4KAsykc/RXiB/LpE= X-Received: by 2002:a05:6a00:cce:b0:6e6:c6f:dc7e with SMTP id b14-20020a056a000cce00b006e60c6fdc7emr1026113pfv.3.1709780736640; Wed, 06 Mar 2024 19:05:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IEkCBHVN9ZAc+1XyRReKazlag268zheivJJl2EtGptHK/Yo1IMFuR7cjV0MKh9sysGGci92ug== X-Received: by 2002:a05:6a00:cce:b0:6e6:c6f:dc7e with SMTP id b14-20020a056a000cce00b006e60c6fdc7emr1026089pfv.3.1709780736228; Wed, 06 Mar 2024 19:05:36 -0800 (PST) Received: from x1n ([43.228.180.230]) by smtp.gmail.com with ESMTPSA id n11-20020a056a000d4b00b006e65720e892sm568324pfv.94.2024.03.06.19.05.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 19:05:35 -0800 (PST) Date: Thu, 7 Mar 2024 11:05:21 +0800 From: Peter Xu To: Michael Ellerman Subject: Re: [PATCH RFC 09/13] mm/powerpc: Redefine pXd_huge() with pXd_leaf() Message-ID: References: <20240306104147.193052-1-peterx@redhat.com> <20240306104147.193052-10-peterx@redhat.com> <87v85zo6w7.fsf@mail.lhotse> MIME-Version: 1.0 In-Reply-To: <87v85zo6w7.fsf@mail.lhotse> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, x86@kernel.org, Muchun Song , Nicholas Piggin , linux-kernel@vger.kernel.org, Matthew Wilcox , "Naveen N. Rao" , "Aneesh Kumar K.V" , linux-mm@kvack.org, Jason Gunthorpe , sparclinux@vger.kernel.org, Andrew Morton , linuxppc-dev@lists.ozlabs.org, Mike Rapoport Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Wed, Mar 06, 2024 at 11:56:56PM +1100, Michael Ellerman wrote: > peterx@redhat.com writes: > > From: Peter Xu > > > > PowerPC book3s 4K mostly has the same definition on both, except pXd_huge() > > constantly returns 0 for hash MMUs. AFAICT that is fine to be removed, > > because pXd_huge() reflects a hugetlb entry, while it's own hugetlb pgtable > > lookup function (__find_linux_pte() shared by all powerpc code) already use > > pXd_leaf() irrelevant of the MMU type. It means pXd_leaf() should work all > > fine with hash MMU pgtables or something could already went wrong. > > Yes I think that's correct. > > 4K Hash MMU doesn't support any hugepage size at PMD or PUD level (the > geometry is wrong), so pmd/pud_huge() were written with that in mind, > ie. they are hard coded to return false. > > But it should be OK to use pmd/pud_leaf(), they will actually look for > _PAGE_PTE, but it should never be set for 4K Hash. > > See eg. arch/powerpc/include/asm/book3s/64/hash-4k.h: > > static inline pmd_t hash__pmd_mkhuge(pmd_t pmd) > { > BUG(); > return pmd; > } Good to get confirmation on this, thanks, Michael. These explanations also look better than what I wrote, I'll amend the commit message. > > > The goal should be that we will have one API pXd_leaf() to detect all kinds > > of huge mappings. AFAICT we need to use the pXd_leaf() impl (rather than > > pXd_huge() ones) to make sure ie. THPs on hash MMU will also return true. > > > > This helps to simplify a follow up patch to drop pXd_huge() treewide. > > > > Cc: Michael Ellerman > > Cc: Nicholas Piggin > > Cc: Christophe Leroy > > Cc: "Aneesh Kumar K.V" > > Cc: "Naveen N. Rao" > > Cc: linuxppc-dev@lists.ozlabs.org > > Signed-off-by: Peter Xu > > --- > > arch/powerpc/include/asm/book3s/64/pgtable-4k.h | 14 ++------------ > > 1 file changed, 2 insertions(+), 12 deletions(-) > > > > diff --git a/arch/powerpc/include/asm/book3s/64/pgtable-4k.h b/arch/powerpc/include/asm/book3s/64/pgtable-4k.h > > index 48f21820afe2..92545981bb49 100644 > > --- a/arch/powerpc/include/asm/book3s/64/pgtable-4k.h > > +++ b/arch/powerpc/include/asm/book3s/64/pgtable-4k.h > > @@ -8,22 +8,12 @@ > > #ifdef CONFIG_HUGETLB_PAGE > > static inline int pmd_huge(pmd_t pmd) > > { > > - /* > > - * leaf pte for huge page > > - */ > > - if (radix_enabled()) > > - return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE)); > > - return 0; > > + return pmd_leaf(pmd); > > } > > > > static inline int pud_huge(pud_t pud) > > { > > - /* > > - * leaf pte for huge page > > - */ > > - if (radix_enabled()) > > - return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PTE)); > > - return 0; > > + return pud_leaf(pud); > > } > > This doesn't actually compile though. > > arch/powerpc/include/asm/book3s/64/pgtable-4k.h:11:16: error: implicit declaration of function ‘pmd_leaf’; did you mean ‘pgd_clear’? [-Werror=implicit-function-declaration] > > etc. > > To make it compile we'd need to relocate the pmd/pud_leaf() definitions: > > diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h > index df66dce8306f..fd7180fded75 100644 > --- a/arch/powerpc/include/asm/book3s/64/pgtable.h > +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h > @@ -262,6 +262,18 @@ extern unsigned long __kernel_io_end; > > extern struct page *vmemmap; > extern unsigned long pci_io_base; > + > +#define pmd_leaf pmd_leaf > +static inline bool pmd_leaf(pmd_t pmd) > +{ > + return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE)); > +} > + > +#define pud_leaf pud_leaf > +static inline bool pud_leaf(pud_t pud) > +{ > + return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PTE)); > +} > #endif /* __ASSEMBLY__ */ > > #include > @@ -1436,20 +1448,5 @@ static inline bool is_pte_rw_upgrade(unsigned long old_val, unsigned long new_va > return false; > } > > -/* > - * Like pmd_huge(), but works regardless of config options > - */ > -#define pmd_leaf pmd_leaf > -static inline bool pmd_leaf(pmd_t pmd) > -{ > - return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE)); > -} > - > -#define pud_leaf pud_leaf > -static inline bool pud_leaf(pud_t pud) > -{ > - return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PTE)); > -} > - > #endif /* __ASSEMBLY__ */ > #endif /* _ASM_POWERPC_BOOK3S_64_PGTABLE_H_ */ Thanks for the help, I'll fix that. I'm wondering when syzbot will start to feed my series into the testers; I do still rely on those feedbacks on compilation issues with such treewide changes, but so far I didn't yet receive any reports. I've also attached the new patch directly here in case of any further comment. Thanks, ==========8<=========== >From 9e75aef2141170f241577e7786aaa4bbbfd93360 Mon Sep 17 00:00:00 2001 From: Peter Xu Date: Wed, 6 Mar 2024 14:49:48 +0800 Subject: [PATCH] mm/powerpc: Redefine pXd_huge() with pXd_leaf() PowerPC book3s 4K mostly has the same definition on both, except pXd_huge() constantly returns 0 for hash MMUs. As Michael Ellerman pointed out [1], it is safe to check _PAGE_PTE on hash MMUs, as the bit will never be set so it will keep returning false. As a reference, __p[mu]d_mkhuge() will trigger a BUG_ON trying to create such huge mappings for 4K hash MMUs. Meanwhile, the major powerpc hugetlb pgtable walker __find_linux_pte(), already used pXd_leaf() to check hugetlb mappings. The goal should be that we will have one API pXd_leaf() to detect all kinds of huge mappings. AFAICT we need to use the pXd_leaf() impl (rather than pXd_huge() ones) to make sure ie. THPs on hash MMU will also return true. This helps to simplify a follow up patch to drop pXd_huge() treewide. NOTE: *_leaf() definition need to be moved before the inclusion of asm/book3s/64/pgtable-4k.h, which defines pXd_huge() with it. [1] https://lore.kernel.org/r/87v85zo6w7.fsf@mail.lhotse Cc: Michael Ellerman Cc: Nicholas Piggin Cc: Christophe Leroy Cc: "Aneesh Kumar K.V" Cc: "Naveen N. Rao" Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Peter Xu --- .../include/asm/book3s/64/pgtable-4k.h | 14 ++-------- arch/powerpc/include/asm/book3s/64/pgtable.h | 27 +++++++++---------- 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/arch/powerpc/include/asm/book3s/64/pgtable-4k.h b/arch/powerpc/include/asm/book3s/64/pgtable-4k.h index 48f21820afe2..92545981bb49 100644 --- a/arch/powerpc/include/asm/book3s/64/pgtable-4k.h +++ b/arch/powerpc/include/asm/book3s/64/pgtable-4k.h @@ -8,22 +8,12 @@ #ifdef CONFIG_HUGETLB_PAGE static inline int pmd_huge(pmd_t pmd) { - /* - * leaf pte for huge page - */ - if (radix_enabled()) - return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE)); - return 0; + return pmd_leaf(pmd); } static inline int pud_huge(pud_t pud) { - /* - * leaf pte for huge page - */ - if (radix_enabled()) - return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PTE)); - return 0; + return pud_leaf(pud); } /* diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h index df66dce8306f..fd7180fded75 100644 --- a/arch/powerpc/include/asm/book3s/64/pgtable.h +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h @@ -262,6 +262,18 @@ extern unsigned long __kernel_io_end; extern struct page *vmemmap; extern unsigned long pci_io_base; + +#define pmd_leaf pmd_leaf +static inline bool pmd_leaf(pmd_t pmd) +{ + return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE)); +} + +#define pud_leaf pud_leaf +static inline bool pud_leaf(pud_t pud) +{ + return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PTE)); +} #endif /* __ASSEMBLY__ */ #include @@ -1436,20 +1448,5 @@ static inline bool is_pte_rw_upgrade(unsigned long old_val, unsigned long new_va return false; } -/* - * Like pmd_huge(), but works regardless of config options - */ -#define pmd_leaf pmd_leaf -static inline bool pmd_leaf(pmd_t pmd) -{ - return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE)); -} - -#define pud_leaf pud_leaf -static inline bool pud_leaf(pud_t pud) -{ - return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PTE)); -} - #endif /* __ASSEMBLY__ */ #endif /* _ASM_POWERPC_BOOK3S_64_PGTABLE_H_ */ -- 2.44.0 -- Peter Xu From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DF6254C83 for ; Thu, 7 Mar 2024 03:05:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709780742; cv=none; b=aAvasWQh7W+ZSwLYkXRvI5lTQc94YDpzHet43rkl37V5iU3E9Z3+r9rBsToisgN9lDAd9G/iSYREE0uooPxcjqHFl0eVKi/pHHHdxp6wCCaZp+Lq92iW+DjFsTcOtw4Ao1gVNcB+prz5xgxcWcFvby0WJKqs+XlVWC6NYKsLPrc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709780742; c=relaxed/simple; bh=aTfnNVOzuTStvs0tdoETXdWCW8y9BVUMXLGNAwHRpZg=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=RMaX2+zMu7LdSvbK7wZU3JGYC2cB864zqr7ISRCiHhLIo0jTo+n3qCsY/zZWAdu2wuhFoW6m55dU4HzYftYuDTSRgl/MdQkLPYsAE2ggansLCkfW7cGEXdSYFpOwnfcWcfUqSjv7MuYc3b4f1+3I4mkFhdDrlyRfIPurCzH7/QY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=GVtYZ27h; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="GVtYZ27h" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709780739; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PkR96+oCUTcXVjSNgBM5A0Wxc2Bmtn+g3wn0Jg6Nemc=; b=GVtYZ27hOned6302mTfm4cRb4FJ6q43zFKebqHzBlOk8RNEhYDXJeGGKqJiF6BKU28r5Ep SoKAyyZHrEHk5HnnjM+F37CE1yZsO4ADVqZ6p0py9F0H1Qt2e7jIwWGEGijD2D+6HpTdd4 SHVaChCnVTm63r/x+orBBOdWlUBaM74= Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-542-vM2SwN0DPWGo7A3WMBPrNA-1; Wed, 06 Mar 2024 22:05:37 -0500 X-MC-Unique: vM2SwN0DPWGo7A3WMBPrNA-1 Received: by mail-pf1-f198.google.com with SMTP id d2e1a72fcca58-6dbd919aba8so112072b3a.0 for ; Wed, 06 Mar 2024 19:05:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709780736; x=1710385536; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=PkR96+oCUTcXVjSNgBM5A0Wxc2Bmtn+g3wn0Jg6Nemc=; b=UQeHHIW0udYYbBjyYoAMhJ4HQ91pyw3XN714OHt3NZaxV3hnh9ThsW53iLBt5I0hfd iocNwt7WRfLhUpITerzyRwpIfS9yoQ+gBw8xKzwIqQFg9MLVP4dGyHa711h7/jA0VtFv itp5j0lbj25CoBaUNijfrB9Q28QASWBv4BizCmtFbr6D5os35d1jxmAr/B9Ol0cPuOsV qFsrWHQmyzL6hn6LKQYJt+1n0AqojYbdwRLoQCh5WeXPqYfoDcORp6SloHIpSG8J5NdN C581H0qAlb22wXrBacPRzplMGcxxbOSj2RqD6S7wPUHevuVG3QQnEXwq/3Q5v9R2yV/T DMlA== X-Forwarded-Encrypted: i=1; AJvYcCVTp0TEkaWJ9bZjIsD55OJidHRQhp7RPb3t3y41IqwmNy4vUB5eibNQdY99MR9mMEhvpvNqXwjP0QpeO6I6n87K0xq7A/UXYMDwog== X-Gm-Message-State: AOJu0YxvoZlqQ731iPsxK9VfmRo96nz4/zs3EsHDvmVDRxpGh53BY9B+ uoVi9oDgDRGaiOnRZSgZy1RnT1vtqhRUXepGWleMT6Qq7Da/FVgNcLgfEth1L9lfYmzLGhzycbe KEL8LC/hDow1+DkYYLbkYrEuNHPnf+gE2i87PIxvnHIpho8QESjPrsW4aVdg= X-Received: by 2002:a05:6a00:cce:b0:6e6:c6f:dc7e with SMTP id b14-20020a056a000cce00b006e60c6fdc7emr1026108pfv.3.1709780736635; Wed, 06 Mar 2024 19:05:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IEkCBHVN9ZAc+1XyRReKazlag268zheivJJl2EtGptHK/Yo1IMFuR7cjV0MKh9sysGGci92ug== X-Received: by 2002:a05:6a00:cce:b0:6e6:c6f:dc7e with SMTP id b14-20020a056a000cce00b006e60c6fdc7emr1026089pfv.3.1709780736228; Wed, 06 Mar 2024 19:05:36 -0800 (PST) Received: from x1n ([43.228.180.230]) by smtp.gmail.com with ESMTPSA id n11-20020a056a000d4b00b006e65720e892sm568324pfv.94.2024.03.06.19.05.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 19:05:35 -0800 (PST) Date: Thu, 7 Mar 2024 11:05:21 +0800 From: Peter Xu To: Michael Ellerman Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Andrew Morton , Muchun Song , Jason Gunthorpe , Matthew Wilcox , Mike Rapoport , Christophe Leroy , x86@kernel.org, sparclinux@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Nicholas Piggin , "Aneesh Kumar K.V" , "Naveen N. Rao" Subject: Re: [PATCH RFC 09/13] mm/powerpc: Redefine pXd_huge() with pXd_leaf() Message-ID: References: <20240306104147.193052-1-peterx@redhat.com> <20240306104147.193052-10-peterx@redhat.com> <87v85zo6w7.fsf@mail.lhotse> Precedence: bulk X-Mailing-List: sparclinux@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <87v85zo6w7.fsf@mail.lhotse> On Wed, Mar 06, 2024 at 11:56:56PM +1100, Michael Ellerman wrote: > peterx@redhat.com writes: > > From: Peter Xu > > > > PowerPC book3s 4K mostly has the same definition on both, except pXd_huge() > > constantly returns 0 for hash MMUs. AFAICT that is fine to be removed, > > because pXd_huge() reflects a hugetlb entry, while it's own hugetlb pgtable > > lookup function (__find_linux_pte() shared by all powerpc code) already use > > pXd_leaf() irrelevant of the MMU type. It means pXd_leaf() should work all > > fine with hash MMU pgtables or something could already went wrong. > > Yes I think that's correct. > > 4K Hash MMU doesn't support any hugepage size at PMD or PUD level (the > geometry is wrong), so pmd/pud_huge() were written with that in mind, > ie. they are hard coded to return false. > > But it should be OK to use pmd/pud_leaf(), they will actually look for > _PAGE_PTE, but it should never be set for 4K Hash. > > See eg. arch/powerpc/include/asm/book3s/64/hash-4k.h: > > static inline pmd_t hash__pmd_mkhuge(pmd_t pmd) > { > BUG(); > return pmd; > } Good to get confirmation on this, thanks, Michael. These explanations also look better than what I wrote, I'll amend the commit message. > > > The goal should be that we will have one API pXd_leaf() to detect all kinds > > of huge mappings. AFAICT we need to use the pXd_leaf() impl (rather than > > pXd_huge() ones) to make sure ie. THPs on hash MMU will also return true. > > > > This helps to simplify a follow up patch to drop pXd_huge() treewide. > > > > Cc: Michael Ellerman > > Cc: Nicholas Piggin > > Cc: Christophe Leroy > > Cc: "Aneesh Kumar K.V" > > Cc: "Naveen N. Rao" > > Cc: linuxppc-dev@lists.ozlabs.org > > Signed-off-by: Peter Xu > > --- > > arch/powerpc/include/asm/book3s/64/pgtable-4k.h | 14 ++------------ > > 1 file changed, 2 insertions(+), 12 deletions(-) > > > > diff --git a/arch/powerpc/include/asm/book3s/64/pgtable-4k.h b/arch/powerpc/include/asm/book3s/64/pgtable-4k.h > > index 48f21820afe2..92545981bb49 100644 > > --- a/arch/powerpc/include/asm/book3s/64/pgtable-4k.h > > +++ b/arch/powerpc/include/asm/book3s/64/pgtable-4k.h > > @@ -8,22 +8,12 @@ > > #ifdef CONFIG_HUGETLB_PAGE > > static inline int pmd_huge(pmd_t pmd) > > { > > - /* > > - * leaf pte for huge page > > - */ > > - if (radix_enabled()) > > - return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE)); > > - return 0; > > + return pmd_leaf(pmd); > > } > > > > static inline int pud_huge(pud_t pud) > > { > > - /* > > - * leaf pte for huge page > > - */ > > - if (radix_enabled()) > > - return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PTE)); > > - return 0; > > + return pud_leaf(pud); > > } > > This doesn't actually compile though. > > arch/powerpc/include/asm/book3s/64/pgtable-4k.h:11:16: error: implicit declaration of function ‘pmd_leaf’; did you mean ‘pgd_clear’? [-Werror=implicit-function-declaration] > > etc. > > To make it compile we'd need to relocate the pmd/pud_leaf() definitions: > > diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h > index df66dce8306f..fd7180fded75 100644 > --- a/arch/powerpc/include/asm/book3s/64/pgtable.h > +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h > @@ -262,6 +262,18 @@ extern unsigned long __kernel_io_end; > > extern struct page *vmemmap; > extern unsigned long pci_io_base; > + > +#define pmd_leaf pmd_leaf > +static inline bool pmd_leaf(pmd_t pmd) > +{ > + return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE)); > +} > + > +#define pud_leaf pud_leaf > +static inline bool pud_leaf(pud_t pud) > +{ > + return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PTE)); > +} > #endif /* __ASSEMBLY__ */ > > #include > @@ -1436,20 +1448,5 @@ static inline bool is_pte_rw_upgrade(unsigned long old_val, unsigned long new_va > return false; > } > > -/* > - * Like pmd_huge(), but works regardless of config options > - */ > -#define pmd_leaf pmd_leaf > -static inline bool pmd_leaf(pmd_t pmd) > -{ > - return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE)); > -} > - > -#define pud_leaf pud_leaf > -static inline bool pud_leaf(pud_t pud) > -{ > - return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PTE)); > -} > - > #endif /* __ASSEMBLY__ */ > #endif /* _ASM_POWERPC_BOOK3S_64_PGTABLE_H_ */ Thanks for the help, I'll fix that. I'm wondering when syzbot will start to feed my series into the testers; I do still rely on those feedbacks on compilation issues with such treewide changes, but so far I didn't yet receive any reports. I've also attached the new patch directly here in case of any further comment. Thanks, ==========8<=========== >From 9e75aef2141170f241577e7786aaa4bbbfd93360 Mon Sep 17 00:00:00 2001 From: Peter Xu Date: Wed, 6 Mar 2024 14:49:48 +0800 Subject: [PATCH] mm/powerpc: Redefine pXd_huge() with pXd_leaf() PowerPC book3s 4K mostly has the same definition on both, except pXd_huge() constantly returns 0 for hash MMUs. As Michael Ellerman pointed out [1], it is safe to check _PAGE_PTE on hash MMUs, as the bit will never be set so it will keep returning false. As a reference, __p[mu]d_mkhuge() will trigger a BUG_ON trying to create such huge mappings for 4K hash MMUs. Meanwhile, the major powerpc hugetlb pgtable walker __find_linux_pte(), already used pXd_leaf() to check hugetlb mappings. The goal should be that we will have one API pXd_leaf() to detect all kinds of huge mappings. AFAICT we need to use the pXd_leaf() impl (rather than pXd_huge() ones) to make sure ie. THPs on hash MMU will also return true. This helps to simplify a follow up patch to drop pXd_huge() treewide. NOTE: *_leaf() definition need to be moved before the inclusion of asm/book3s/64/pgtable-4k.h, which defines pXd_huge() with it. [1] https://lore.kernel.org/r/87v85zo6w7.fsf@mail.lhotse Cc: Michael Ellerman Cc: Nicholas Piggin Cc: Christophe Leroy Cc: "Aneesh Kumar K.V" Cc: "Naveen N. Rao" Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Peter Xu --- .../include/asm/book3s/64/pgtable-4k.h | 14 ++-------- arch/powerpc/include/asm/book3s/64/pgtable.h | 27 +++++++++---------- 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/arch/powerpc/include/asm/book3s/64/pgtable-4k.h b/arch/powerpc/include/asm/book3s/64/pgtable-4k.h index 48f21820afe2..92545981bb49 100644 --- a/arch/powerpc/include/asm/book3s/64/pgtable-4k.h +++ b/arch/powerpc/include/asm/book3s/64/pgtable-4k.h @@ -8,22 +8,12 @@ #ifdef CONFIG_HUGETLB_PAGE static inline int pmd_huge(pmd_t pmd) { - /* - * leaf pte for huge page - */ - if (radix_enabled()) - return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE)); - return 0; + return pmd_leaf(pmd); } static inline int pud_huge(pud_t pud) { - /* - * leaf pte for huge page - */ - if (radix_enabled()) - return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PTE)); - return 0; + return pud_leaf(pud); } /* diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h index df66dce8306f..fd7180fded75 100644 --- a/arch/powerpc/include/asm/book3s/64/pgtable.h +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h @@ -262,6 +262,18 @@ extern unsigned long __kernel_io_end; extern struct page *vmemmap; extern unsigned long pci_io_base; + +#define pmd_leaf pmd_leaf +static inline bool pmd_leaf(pmd_t pmd) +{ + return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE)); +} + +#define pud_leaf pud_leaf +static inline bool pud_leaf(pud_t pud) +{ + return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PTE)); +} #endif /* __ASSEMBLY__ */ #include @@ -1436,20 +1448,5 @@ static inline bool is_pte_rw_upgrade(unsigned long old_val, unsigned long new_va return false; } -/* - * Like pmd_huge(), but works regardless of config options - */ -#define pmd_leaf pmd_leaf -static inline bool pmd_leaf(pmd_t pmd) -{ - return !!(pmd_raw(pmd) & cpu_to_be64(_PAGE_PTE)); -} - -#define pud_leaf pud_leaf -static inline bool pud_leaf(pud_t pud) -{ - return !!(pud_raw(pud) & cpu_to_be64(_PAGE_PTE)); -} - #endif /* __ASSEMBLY__ */ #endif /* _ASM_POWERPC_BOOK3S_64_PGTABLE_H_ */ -- 2.44.0 -- Peter Xu 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8BF33C54E41 for ; Thu, 7 Mar 2024 03:05:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5gseJE3nul6/Z2AABHhGorPcYVbdsX5Cngah2GsCt68=; b=j/lzkjWjbS/F+F +f19Yhvjw5S+ykNuhDHeDwQbUHW9QKYMbi7bloBC3DBqwQ6LnY3L5j8UyoA7I5zjbQLhaM5JOYv50 JeCT6Y0oI1YuLJR6lWj5LFL5IQF0SCIRdn02QieQ/U7NbPzTKtawfS75smscjERrusjHf9C6uQhC7 m10gUzS+6QgVgDxrFMXCgeHelQOEH5SWraFiQ77WU7kQxz8DKS/MtWNimCd0I9cwB8aYxEKs5Zwuc 0tuqY+xKG/fWeaF2j1Povjc9LLS0cjfq2oaW+hSvf8QXxO1A8OrCxpPbOaG6Uc+isMdSPQnMATc+G K5UFBWg+lUdUjjYPFSjg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1ri44m-00000002lwd-1KoB; Thu, 07 Mar 2024 03:05:44 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1ri44i-00000002lv0-47ka for linux-arm-kernel@lists.infradead.org; Thu, 07 Mar 2024 03:05:42 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709780739; h=from:from: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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PkR96+oCUTcXVjSNgBM5A0Wxc2Bmtn+g3wn0Jg6Nemc=; b=GVtYZ27hOned6302mTfm4cRb4FJ6q43zFKebqHzBlOk8RNEhYDXJeGGKqJiF6BKU28r5Ep SoKAyyZHrEHk5HnnjM+F37CE1yZsO4ADVqZ6p0py9F0H1Qt2e7jIwWGEGijD2D+6HpTdd4 SHVaChCnVTm63r/x+orBBOdWlUBaM74= Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-542-a3HtZwedNDaqqmnLRZScIg-1; Wed, 06 Mar 2024 22:05:37 -0500 X-MC-Unique: a3HtZwedNDaqqmnLRZScIg-1 Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-6dbd919aba8so112082b3a.0 for ; Wed, 06 Mar 2024 19:05:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709780737; x=1710385537; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=PkR96+oCUTcXVjSNgBM5A0Wxc2Bmtn+g3wn0Jg6Nemc=; b=kKKjg6X1VZc9ljN6Mr9QBMVqzfMl0vA5hpunG3oN1VhbhdfrzgjARkd8FmCADZYJ1C eQSzgGnTgv5SatBNFRaAOA8QSD7spkKh68+eT4UdMNP0g4iFxCauyCXb0rf1CfP7xbWN A7+BYvQmsPDLcaZjcERTacesyCw3BIO+r3Uch8o8SXh9Tbeuz+2J4Rt6RGma8k+jxMsj tkZwPGEZriLZxB3yYC5v+kLKIkwzC5qepgFWrcIShFIDyQvDRVLxbIoB38kyqQKDRxjx CsvL8NyOPdVIGC+LBLj8vU8u9e8sh/UAHtofsbMay35uoZOyKPZw58TOMBELWZEn/wxm 7ahA== X-Forwarded-Encrypted: i=1; AJvYcCVN7zadmlBcXtJSfHt9rkhl0gO3tEUDCqf/cZn16Jd0Z/JsXtl6gNlYDQVJpzns3Uy8djX+JXe8i58+QleFkXiaUf3skTSJ4G6Fhxm1sK/QkuHWNK0= X-Gm-Message-State: AOJu0Yzfxz9rFvVIqCLNyj80lH8yimHTNYavWq90PVBAGHmY7413/EC7 K1LGCK+9mZL8kelvkZPJ6G9I383d+z3791pv9H7mRVy2bj+M8i3HB2BiU4gatx3Wk8wuFRJpyoX SZNiN2TnSBL1iIXrZXct3QCyhZNQcjDx8576GU3bC4Ju/MvZuPGzyKHl4j9kjV7MeBAflQtRt X-Received: by 2002:a05:6a00:cce:b0:6e6:c6f:dc7e with SMTP id b14-20020a056a000cce00b006e60c6fdc7emr1026117pfv.3.1709780736642; Wed, 06 Mar 2024 19:05:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IEkCBHVN9ZAc+1XyRReKazlag268zheivJJl2EtGptHK/Yo1IMFuR7cjV0MKh9sysGGci92ug== X-Received: by 2002:a05:6a00:cce:b0:6e6:c6f:dc7e with SMTP id b14-20020a056a000cce00b006e60c6fdc7emr1026089pfv.3.1709780736228; Wed, 06 Mar 2024 19:05:36 -0800 (PST) Received: from x1n ([43.228.180.230]) by smtp.gmail.com with ESMTPSA id n11-20020a056a000d4b00b006e65720e892sm568324pfv.94.2024.03.06.19.05.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 19:05:35 -0800 (PST) Date: Thu, 7 Mar 2024 11:05:21 +0800 From: Peter Xu To: Michael Ellerman Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, Andrew Morton , Muchun Song , Jason Gunthorpe , Matthew Wilcox , Mike Rapoport , Christophe Leroy , x86@kernel.org, sparclinux@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Nicholas Piggin , "Aneesh Kumar K.V" , "Naveen N. Rao" Subject: Re: [PATCH RFC 09/13] mm/powerpc: Redefine pXd_huge() with pXd_leaf() Message-ID: References: <20240306104147.193052-1-peterx@redhat.com> <20240306104147.193052-10-peterx@redhat.com> <87v85zo6w7.fsf@mail.lhotse> MIME-Version: 1.0 In-Reply-To: <87v85zo6w7.fsf@mail.lhotse> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240306_190541_209892_0C7FC031 X-CRM114-Status: GOOD ( 39.29 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org T24gV2VkLCBNYXIgMDYsIDIwMjQgYXQgMTE6NTY6NTZQTSArMTEwMCwgTWljaGFlbCBFbGxlcm1h biB3cm90ZToKPiBwZXRlcnhAcmVkaGF0LmNvbSB3cml0ZXM6Cj4gPiBGcm9tOiBQZXRlciBYdSA8 cGV0ZXJ4QHJlZGhhdC5jb20+Cj4gPgo+ID4gUG93ZXJQQyBib29rM3MgNEsgbW9zdGx5IGhhcyB0 aGUgc2FtZSBkZWZpbml0aW9uIG9uIGJvdGgsIGV4Y2VwdCBwWGRfaHVnZSgpCj4gPiBjb25zdGFu dGx5IHJldHVybnMgMCBmb3IgaGFzaCBNTVVzLiAgQUZBSUNUIHRoYXQgaXMgZmluZSB0byBiZSBy ZW1vdmVkLAo+ID4gYmVjYXVzZSBwWGRfaHVnZSgpIHJlZmxlY3RzIGEgaHVnZXRsYiBlbnRyeSwg d2hpbGUgaXQncyBvd24gaHVnZXRsYiBwZ3RhYmxlCj4gPiBsb29rdXAgZnVuY3Rpb24gKF9fZmlu ZF9saW51eF9wdGUoKSBzaGFyZWQgYnkgYWxsIHBvd2VycGMgY29kZSkgYWxyZWFkeSB1c2UKPiA+ IHBYZF9sZWFmKCkgaXJyZWxldmFudCBvZiB0aGUgTU1VIHR5cGUuICBJdCBtZWFucyBwWGRfbGVh ZigpIHNob3VsZCB3b3JrIGFsbAo+ID4gZmluZSB3aXRoIGhhc2ggTU1VIHBndGFibGVzIG9yIHNv bWV0aGluZyBjb3VsZCBhbHJlYWR5IHdlbnQgd3JvbmcuCj4gCj4gWWVzIEkgdGhpbmsgdGhhdCdz IGNvcnJlY3QuCj4gCj4gNEsgSGFzaCBNTVUgZG9lc24ndCBzdXBwb3J0IGFueSBodWdlcGFnZSBz aXplIGF0IFBNRCBvciBQVUQgbGV2ZWwgKHRoZQo+IGdlb21ldHJ5IGlzIHdyb25nKSwgc28gcG1k L3B1ZF9odWdlKCkgd2VyZSB3cml0dGVuIHdpdGggdGhhdCBpbiBtaW5kLAo+IGllLiB0aGV5IGFy ZSBoYXJkIGNvZGVkIHRvIHJldHVybiBmYWxzZS4KPiAKPiBCdXQgaXQgc2hvdWxkIGJlIE9LIHRv IHVzZSBwbWQvcHVkX2xlYWYoKSwgdGhleSB3aWxsIGFjdHVhbGx5IGxvb2sgZm9yCj4gX1BBR0Vf UFRFLCBidXQgaXQgc2hvdWxkIG5ldmVyIGJlIHNldCBmb3IgNEsgSGFzaC4KPiAKPiBTZWUgZWcu IGFyY2gvcG93ZXJwYy9pbmNsdWRlL2FzbS9ib29rM3MvNjQvaGFzaC00ay5oOgo+IAo+IHN0YXRp YyBpbmxpbmUgcG1kX3QgaGFzaF9fcG1kX21raHVnZShwbWRfdCBwbWQpCj4gewo+IAlCVUcoKTsK PiAJcmV0dXJuIHBtZDsKPiB9CgpHb29kIHRvIGdldCBjb25maXJtYXRpb24gb24gdGhpcywgdGhh bmtzLCBNaWNoYWVsLiAgVGhlc2UgZXhwbGFuYXRpb25zIGFsc28KbG9vayBiZXR0ZXIgdGhhbiB3 aGF0IEkgd3JvdGUsIEknbGwgYW1lbmQgdGhlIGNvbW1pdCBtZXNzYWdlLgoKPiAKPiA+IFRoZSBn b2FsIHNob3VsZCBiZSB0aGF0IHdlIHdpbGwgaGF2ZSBvbmUgQVBJIHBYZF9sZWFmKCkgdG8gZGV0 ZWN0IGFsbCBraW5kcwo+ID4gb2YgaHVnZSBtYXBwaW5ncy4gIEFGQUlDVCB3ZSBuZWVkIHRvIHVz ZSB0aGUgcFhkX2xlYWYoKSBpbXBsIChyYXRoZXIgdGhhbgo+ID4gcFhkX2h1Z2UoKSBvbmVzKSB0 byBtYWtlIHN1cmUgaWUuIFRIUHMgb24gaGFzaCBNTVUgd2lsbCBhbHNvIHJldHVybiB0cnVlLgo+ ID4KPiA+IFRoaXMgaGVscHMgdG8gc2ltcGxpZnkgYSBmb2xsb3cgdXAgcGF0Y2ggdG8gZHJvcCBw WGRfaHVnZSgpIHRyZWV3aWRlLgo+ID4KPiA+IENjOiBNaWNoYWVsIEVsbGVybWFuIDxtcGVAZWxs ZXJtYW4uaWQuYXU+Cj4gPiBDYzogTmljaG9sYXMgUGlnZ2luIDxucGlnZ2luQGdtYWlsLmNvbT4K PiA+IENjOiBDaHJpc3RvcGhlIExlcm95IDxjaHJpc3RvcGhlLmxlcm95QGNzZ3JvdXAuZXU+Cj4g PiBDYzogIkFuZWVzaCBLdW1hciBLLlYiIDxhbmVlc2gua3VtYXJAa2VybmVsLm9yZz4KPiA+IENj OiAiTmF2ZWVuIE4uIFJhbyIgPG5hdmVlbi5uLnJhb0BsaW51eC5pYm0uY29tPgo+ID4gQ2M6IGxp bnV4cHBjLWRldkBsaXN0cy5vemxhYnMub3JnCj4gPiBTaWduZWQtb2ZmLWJ5OiBQZXRlciBYdSA8 cGV0ZXJ4QHJlZGhhdC5jb20+Cj4gPiAtLS0KPiA+ICBhcmNoL3Bvd2VycGMvaW5jbHVkZS9hc20v Ym9vazNzLzY0L3BndGFibGUtNGsuaCB8IDE0ICsrLS0tLS0tLS0tLS0tCj4gPiAgMSBmaWxlIGNo YW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMTIgZGVsZXRpb25zKC0pCj4gPgo+ID4gZGlmZiAtLWdp dCBhL2FyY2gvcG93ZXJwYy9pbmNsdWRlL2FzbS9ib29rM3MvNjQvcGd0YWJsZS00ay5oIGIvYXJj aC9wb3dlcnBjL2luY2x1ZGUvYXNtL2Jvb2szcy82NC9wZ3RhYmxlLTRrLmgKPiA+IGluZGV4IDQ4 ZjIxODIwYWZlMi4uOTI1NDU5ODFiYjQ5IDEwMDY0NAo+ID4gLS0tIGEvYXJjaC9wb3dlcnBjL2lu Y2x1ZGUvYXNtL2Jvb2szcy82NC9wZ3RhYmxlLTRrLmgKPiA+ICsrKyBiL2FyY2gvcG93ZXJwYy9p bmNsdWRlL2FzbS9ib29rM3MvNjQvcGd0YWJsZS00ay5oCj4gPiBAQCAtOCwyMiArOCwxMiBAQAo+ ID4gICNpZmRlZiBDT05GSUdfSFVHRVRMQl9QQUdFCj4gPiAgc3RhdGljIGlubGluZSBpbnQgcG1k X2h1Z2UocG1kX3QgcG1kKQo+ID4gIHsKPiA+IC0JLyoKPiA+IC0JICogbGVhZiBwdGUgZm9yIGh1 Z2UgcGFnZQo+ID4gLQkgKi8KPiA+IC0JaWYgKHJhZGl4X2VuYWJsZWQoKSkKPiA+IC0JCXJldHVy biAhIShwbWRfcmF3KHBtZCkgJiBjcHVfdG9fYmU2NChfUEFHRV9QVEUpKTsKPiA+IC0JcmV0dXJu IDA7Cj4gPiArCXJldHVybiBwbWRfbGVhZihwbWQpOwo+ID4gIH0KPiA+ICAKPiA+ICBzdGF0aWMg aW5saW5lIGludCBwdWRfaHVnZShwdWRfdCBwdWQpCj4gPiAgewo+ID4gLQkvKgo+ID4gLQkgKiBs ZWFmIHB0ZSBmb3IgaHVnZSBwYWdlCj4gPiAtCSAqLwo+ID4gLQlpZiAocmFkaXhfZW5hYmxlZCgp KQo+ID4gLQkJcmV0dXJuICEhKHB1ZF9yYXcocHVkKSAmIGNwdV90b19iZTY0KF9QQUdFX1BURSkp Owo+ID4gLQlyZXR1cm4gMDsKPiA+ICsJcmV0dXJuIHB1ZF9sZWFmKHB1ZCk7Cj4gPiAgfQo+IAo+ IFRoaXMgZG9lc24ndCBhY3R1YWxseSBjb21waWxlIHRob3VnaC4KPiAKPiAgIGFyY2gvcG93ZXJw Yy9pbmNsdWRlL2FzbS9ib29rM3MvNjQvcGd0YWJsZS00ay5oOjExOjE2OiBlcnJvcjogaW1wbGlj aXQgZGVjbGFyYXRpb24gb2YgZnVuY3Rpb24g4oCYcG1kX2xlYWbigJk7IGRpZCB5b3UgbWVhbiDi gJhwZ2RfY2xlYXLigJk/IFstV2Vycm9yPWltcGxpY2l0LWZ1bmN0aW9uLWRlY2xhcmF0aW9uXQo+ IAo+IGV0Yy4KPiAKPiBUbyBtYWtlIGl0IGNvbXBpbGUgd2UnZCBuZWVkIHRvIHJlbG9jYXRlIHRo ZSBwbWQvcHVkX2xlYWYoKSBkZWZpbml0aW9uczoKPiAKPiBkaWZmIC0tZ2l0IGEvYXJjaC9wb3dl cnBjL2luY2x1ZGUvYXNtL2Jvb2szcy82NC9wZ3RhYmxlLmggYi9hcmNoL3Bvd2VycGMvaW5jbHVk ZS9hc20vYm9vazNzLzY0L3BndGFibGUuaAo+IGluZGV4IGRmNjZkY2U4MzA2Zi4uZmQ3MTgwZmRl ZDc1IDEwMDY0NAo+IC0tLSBhL2FyY2gvcG93ZXJwYy9pbmNsdWRlL2FzbS9ib29rM3MvNjQvcGd0 YWJsZS5oCj4gKysrIGIvYXJjaC9wb3dlcnBjL2luY2x1ZGUvYXNtL2Jvb2szcy82NC9wZ3RhYmxl LmgKPiBAQCAtMjYyLDYgKzI2MiwxOCBAQCBleHRlcm4gdW5zaWduZWQgbG9uZyBfX2tlcm5lbF9p b19lbmQ7Cj4gCj4gIGV4dGVybiBzdHJ1Y3QgcGFnZSAqdm1lbW1hcDsKPiAgZXh0ZXJuIHVuc2ln bmVkIGxvbmcgcGNpX2lvX2Jhc2U7Cj4gKwo+ICsjZGVmaW5lIHBtZF9sZWFmIHBtZF9sZWFmCj4g K3N0YXRpYyBpbmxpbmUgYm9vbCBwbWRfbGVhZihwbWRfdCBwbWQpCj4gK3sKPiArICAgICAgIHJl dHVybiAhIShwbWRfcmF3KHBtZCkgJiBjcHVfdG9fYmU2NChfUEFHRV9QVEUpKTsKPiArfQo+ICsK PiArI2RlZmluZSBwdWRfbGVhZiBwdWRfbGVhZgo+ICtzdGF0aWMgaW5saW5lIGJvb2wgcHVkX2xl YWYocHVkX3QgcHVkKQo+ICt7Cj4gKyAgICAgICByZXR1cm4gISEocHVkX3JhdyhwdWQpICYgY3B1 X3RvX2JlNjQoX1BBR0VfUFRFKSk7Cj4gK30KPiAgI2VuZGlmIC8qIF9fQVNTRU1CTFlfXyAqLwo+ IAo+ICAjaW5jbHVkZSA8YXNtL2Jvb2szcy82NC9oYXNoLmg+Cj4gQEAgLTE0MzYsMjAgKzE0NDgs NSBAQCBzdGF0aWMgaW5saW5lIGJvb2wgaXNfcHRlX3J3X3VwZ3JhZGUodW5zaWduZWQgbG9uZyBv bGRfdmFsLCB1bnNpZ25lZCBsb25nIG5ld192YQo+ICAgICAgICAgcmV0dXJuIGZhbHNlOwo+ICB9 Cj4gCj4gLS8qCj4gLSAqIExpa2UgcG1kX2h1Z2UoKSwgYnV0IHdvcmtzIHJlZ2FyZGxlc3Mgb2Yg Y29uZmlnIG9wdGlvbnMKPiAtICovCj4gLSNkZWZpbmUgcG1kX2xlYWYgcG1kX2xlYWYKPiAtc3Rh dGljIGlubGluZSBib29sIHBtZF9sZWFmKHBtZF90IHBtZCkKPiAtewo+IC0gICAgICAgcmV0dXJu ICEhKHBtZF9yYXcocG1kKSAmIGNwdV90b19iZTY0KF9QQUdFX1BURSkpOwo+IC19Cj4gLQo+IC0j ZGVmaW5lIHB1ZF9sZWFmIHB1ZF9sZWFmCj4gLXN0YXRpYyBpbmxpbmUgYm9vbCBwdWRfbGVhZihw dWRfdCBwdWQpCj4gLXsKPiAtICAgICAgIHJldHVybiAhIShwdWRfcmF3KHB1ZCkgJiBjcHVfdG9f YmU2NChfUEFHRV9QVEUpKTsKPiAtfQo+IC0KPiAgI2VuZGlmIC8qIF9fQVNTRU1CTFlfXyAqLwo+ ICAjZW5kaWYgLyogX0FTTV9QT1dFUlBDX0JPT0szU182NF9QR1RBQkxFX0hfICovCgpUaGFua3Mg Zm9yIHRoZSBoZWxwLCBJJ2xsIGZpeCB0aGF0LiAgSSdtIHdvbmRlcmluZyB3aGVuIHN5emJvdCB3 aWxsIHN0YXJ0CnRvIGZlZWQgbXkgc2VyaWVzIGludG8gdGhlIHRlc3RlcnM7IEkgZG8gc3RpbGwg cmVseSBvbiB0aG9zZSBmZWVkYmFja3Mgb24KY29tcGlsYXRpb24gaXNzdWVzIHdpdGggc3VjaCB0 cmVld2lkZSBjaGFuZ2VzLCBidXQgc28gZmFyIEkgZGlkbid0IHlldApyZWNlaXZlIGFueSByZXBv cnRzLgoKSSd2ZSBhbHNvIGF0dGFjaGVkIHRoZSBuZXcgcGF0Y2ggZGlyZWN0bHkgaGVyZSBpbiBj YXNlIG9mIGFueSBmdXJ0aGVyCmNvbW1lbnQuCgpUaGFua3MsCgo9PT09PT09PT09ODw9PT09PT09 PT09PQpGcm9tIDllNzVhZWYyMTQxMTcwZjI0MTU3N2U3Nzg2YWFhNGJiYmZkOTMzNjAgTW9uIFNl cCAxNyAwMDowMDowMCAyMDAxCkZyb206IFBldGVyIFh1IDxwZXRlcnhAcmVkaGF0LmNvbT4KRGF0 ZTogV2VkLCA2IE1hciAyMDI0IDE0OjQ5OjQ4ICswODAwClN1YmplY3Q6IFtQQVRDSF0gbW0vcG93 ZXJwYzogUmVkZWZpbmUgcFhkX2h1Z2UoKSB3aXRoIHBYZF9sZWFmKCkKClBvd2VyUEMgYm9vazNz IDRLIG1vc3RseSBoYXMgdGhlIHNhbWUgZGVmaW5pdGlvbiBvbiBib3RoLCBleGNlcHQgcFhkX2h1 Z2UoKQpjb25zdGFudGx5IHJldHVybnMgMCBmb3IgaGFzaCBNTVVzLiAgQXMgTWljaGFlbCBFbGxl cm1hbiBwb2ludGVkIG91dCBbMV0sCml0IGlzIHNhZmUgdG8gY2hlY2sgX1BBR0VfUFRFIG9uIGhh c2ggTU1VcywgYXMgdGhlIGJpdCB3aWxsIG5ldmVyIGJlIHNldCBzbwppdCB3aWxsIGtlZXAgcmV0 dXJuaW5nIGZhbHNlLgoKQXMgYSByZWZlcmVuY2UsIF9fcFttdV1kX21raHVnZSgpIHdpbGwgdHJp Z2dlciBhIEJVR19PTiB0cnlpbmcgdG8gY3JlYXRlCnN1Y2ggaHVnZSBtYXBwaW5ncyBmb3IgNEsg aGFzaCBNTVVzLiAgTWVhbndoaWxlLCB0aGUgbWFqb3IgcG93ZXJwYyBodWdldGxiCnBndGFibGUg d2Fsa2VyIF9fZmluZF9saW51eF9wdGUoKSwgYWxyZWFkeSB1c2VkIHBYZF9sZWFmKCkgdG8gY2hl Y2sgaHVnZXRsYgptYXBwaW5ncy4KClRoZSBnb2FsIHNob3VsZCBiZSB0aGF0IHdlIHdpbGwgaGF2 ZSBvbmUgQVBJIHBYZF9sZWFmKCkgdG8gZGV0ZWN0IGFsbCBraW5kcwpvZiBodWdlIG1hcHBpbmdz LiAgQUZBSUNUIHdlIG5lZWQgdG8gdXNlIHRoZSBwWGRfbGVhZigpIGltcGwgKHJhdGhlciB0aGFu CnBYZF9odWdlKCkgb25lcykgdG8gbWFrZSBzdXJlIGllLiBUSFBzIG9uIGhhc2ggTU1VIHdpbGwg YWxzbyByZXR1cm4gdHJ1ZS4KClRoaXMgaGVscHMgdG8gc2ltcGxpZnkgYSBmb2xsb3cgdXAgcGF0 Y2ggdG8gZHJvcCBwWGRfaHVnZSgpIHRyZWV3aWRlLgoKTk9URTogKl9sZWFmKCkgZGVmaW5pdGlv biBuZWVkIHRvIGJlIG1vdmVkIGJlZm9yZSB0aGUgaW5jbHVzaW9uIG9mCmFzbS9ib29rM3MvNjQv cGd0YWJsZS00ay5oLCB3aGljaCBkZWZpbmVzIHBYZF9odWdlKCkgd2l0aCBpdC4KClsxXSBodHRw czovL2xvcmUua2VybmVsLm9yZy9yLzg3djg1em82dzcuZnNmQG1haWwubGhvdHNlCgpDYzogTWlj aGFlbCBFbGxlcm1hbiA8bXBlQGVsbGVybWFuLmlkLmF1PgpDYzogTmljaG9sYXMgUGlnZ2luIDxu cGlnZ2luQGdtYWlsLmNvbT4KQ2M6IENocmlzdG9waGUgTGVyb3kgPGNocmlzdG9waGUubGVyb3lA Y3Nncm91cC5ldT4KQ2M6ICJBbmVlc2ggS3VtYXIgSy5WIiA8YW5lZXNoLmt1bWFyQGtlcm5lbC5v cmc+CkNjOiAiTmF2ZWVuIE4uIFJhbyIgPG5hdmVlbi5uLnJhb0BsaW51eC5pYm0uY29tPgpDYzog bGludXhwcGMtZGV2QGxpc3RzLm96bGFicy5vcmcKU2lnbmVkLW9mZi1ieTogUGV0ZXIgWHUgPHBl dGVyeEByZWRoYXQuY29tPgotLS0KIC4uLi9pbmNsdWRlL2FzbS9ib29rM3MvNjQvcGd0YWJsZS00 ay5oICAgICAgICB8IDE0ICsrLS0tLS0tLS0KIGFyY2gvcG93ZXJwYy9pbmNsdWRlL2FzbS9ib29r M3MvNjQvcGd0YWJsZS5oICB8IDI3ICsrKysrKysrKy0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdl ZCwgMTQgaW5zZXJ0aW9ucygrKSwgMjcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvYXJjaC9w b3dlcnBjL2luY2x1ZGUvYXNtL2Jvb2szcy82NC9wZ3RhYmxlLTRrLmggYi9hcmNoL3Bvd2VycGMv aW5jbHVkZS9hc20vYm9vazNzLzY0L3BndGFibGUtNGsuaAppbmRleCA0OGYyMTgyMGFmZTIuLjky NTQ1OTgxYmI0OSAxMDA2NDQKLS0tIGEvYXJjaC9wb3dlcnBjL2luY2x1ZGUvYXNtL2Jvb2szcy82 NC9wZ3RhYmxlLTRrLmgKKysrIGIvYXJjaC9wb3dlcnBjL2luY2x1ZGUvYXNtL2Jvb2szcy82NC9w Z3RhYmxlLTRrLmgKQEAgLTgsMjIgKzgsMTIgQEAKICNpZmRlZiBDT05GSUdfSFVHRVRMQl9QQUdF CiBzdGF0aWMgaW5saW5lIGludCBwbWRfaHVnZShwbWRfdCBwbWQpCiB7Ci0JLyoKLQkgKiBsZWFm IHB0ZSBmb3IgaHVnZSBwYWdlCi0JICovCi0JaWYgKHJhZGl4X2VuYWJsZWQoKSkKLQkJcmV0dXJu ICEhKHBtZF9yYXcocG1kKSAmIGNwdV90b19iZTY0KF9QQUdFX1BURSkpOwotCXJldHVybiAwOwor CXJldHVybiBwbWRfbGVhZihwbWQpOwogfQogCiBzdGF0aWMgaW5saW5lIGludCBwdWRfaHVnZShw dWRfdCBwdWQpCiB7Ci0JLyoKLQkgKiBsZWFmIHB0ZSBmb3IgaHVnZSBwYWdlCi0JICovCi0JaWYg KHJhZGl4X2VuYWJsZWQoKSkKLQkJcmV0dXJuICEhKHB1ZF9yYXcocHVkKSAmIGNwdV90b19iZTY0 KF9QQUdFX1BURSkpOwotCXJldHVybiAwOworCXJldHVybiBwdWRfbGVhZihwdWQpOwogfQogCiAv KgpkaWZmIC0tZ2l0IGEvYXJjaC9wb3dlcnBjL2luY2x1ZGUvYXNtL2Jvb2szcy82NC9wZ3RhYmxl LmggYi9hcmNoL3Bvd2VycGMvaW5jbHVkZS9hc20vYm9vazNzLzY0L3BndGFibGUuaAppbmRleCBk ZjY2ZGNlODMwNmYuLmZkNzE4MGZkZWQ3NSAxMDA2NDQKLS0tIGEvYXJjaC9wb3dlcnBjL2luY2x1 ZGUvYXNtL2Jvb2szcy82NC9wZ3RhYmxlLmgKKysrIGIvYXJjaC9wb3dlcnBjL2luY2x1ZGUvYXNt L2Jvb2szcy82NC9wZ3RhYmxlLmgKQEAgLTI2Miw2ICsyNjIsMTggQEAgZXh0ZXJuIHVuc2lnbmVk IGxvbmcgX19rZXJuZWxfaW9fZW5kOwogCiBleHRlcm4gc3RydWN0IHBhZ2UgKnZtZW1tYXA7CiBl eHRlcm4gdW5zaWduZWQgbG9uZyBwY2lfaW9fYmFzZTsKKworI2RlZmluZSBwbWRfbGVhZiBwbWRf bGVhZgorc3RhdGljIGlubGluZSBib29sIHBtZF9sZWFmKHBtZF90IHBtZCkKK3sKKwlyZXR1cm4g ISEocG1kX3JhdyhwbWQpICYgY3B1X3RvX2JlNjQoX1BBR0VfUFRFKSk7Cit9CisKKyNkZWZpbmUg cHVkX2xlYWYgcHVkX2xlYWYKK3N0YXRpYyBpbmxpbmUgYm9vbCBwdWRfbGVhZihwdWRfdCBwdWQp Cit7CisJcmV0dXJuICEhKHB1ZF9yYXcocHVkKSAmIGNwdV90b19iZTY0KF9QQUdFX1BURSkpOwor fQogI2VuZGlmIC8qIF9fQVNTRU1CTFlfXyAqLwogCiAjaW5jbHVkZSA8YXNtL2Jvb2szcy82NC9o YXNoLmg+CkBAIC0xNDM2LDIwICsxNDQ4LDUgQEAgc3RhdGljIGlubGluZSBib29sIGlzX3B0ZV9y d191cGdyYWRlKHVuc2lnbmVkIGxvbmcgb2xkX3ZhbCwgdW5zaWduZWQgbG9uZyBuZXdfdmEKIAly ZXR1cm4gZmFsc2U7CiB9CiAKLS8qCi0gKiBMaWtlIHBtZF9odWdlKCksIGJ1dCB3b3JrcyByZWdh cmRsZXNzIG9mIGNvbmZpZyBvcHRpb25zCi0gKi8KLSNkZWZpbmUgcG1kX2xlYWYgcG1kX2xlYWYK LXN0YXRpYyBpbmxpbmUgYm9vbCBwbWRfbGVhZihwbWRfdCBwbWQpCi17Ci0JcmV0dXJuICEhKHBt ZF9yYXcocG1kKSAmIGNwdV90b19iZTY0KF9QQUdFX1BURSkpOwotfQotCi0jZGVmaW5lIHB1ZF9s ZWFmIHB1ZF9sZWFmCi1zdGF0aWMgaW5saW5lIGJvb2wgcHVkX2xlYWYocHVkX3QgcHVkKQotewot CXJldHVybiAhIShwdWRfcmF3KHB1ZCkgJiBjcHVfdG9fYmU2NChfUEFHRV9QVEUpKTsKLX0KLQog I2VuZGlmIC8qIF9fQVNTRU1CTFlfXyAqLwogI2VuZGlmIC8qIF9BU01fUE9XRVJQQ19CT09LM1Nf NjRfUEdUQUJMRV9IXyAqLwotLSAKMi40NC4wCgotLSAKUGV0ZXIgWHUKCgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxp bmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3Rz LmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==