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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EF1DC47096 for ; Thu, 3 Jun 2021 13:59:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1559E613AA for ; Thu, 3 Jun 2021 13:59:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231209AbhFCOBO (ORCPT ); Thu, 3 Jun 2021 10:01:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230114AbhFCOBM (ORCPT ); Thu, 3 Jun 2021 10:01:12 -0400 Received: from ustc.edu.cn (email6.ustc.edu.cn [IPv6:2001:da8:d800::8]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 83F78C06174A for ; Thu, 3 Jun 2021 06:59:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mail.ustc.edu.cn; s=dkim; h=Received:Date:From:To:Cc:Subject: Message-ID:In-Reply-To:References:MIME-Version:Content-Type: Content-Transfer-Encoding; bh=2lajeQP1++NkLXsw13lGJiGVOormNEytLR e9zH5ul5I=; b=vHlDDfyzjmmivtzjm/nj5J+24RQYk0JgSZ9lks+9qm4h9QwBRK 53cmpwKHsc9XyYoixbfvXmwVcnOeTaAqlnzgpmg1OZQ0BeicRI2PEnEvQaWA8FqA gUPS7nOC8PJGKqLeRi6XH77ZOQRwiWRxx5u8W/jmzkYw1pLRbEK1Dqvdk= Received: from xhacker (unknown [101.86.20.15]) by newmailweb.ustc.edu.cn (Coremail) with SMTP id LkAmygCHjoon4LhgCF6JAA--.38078S2; Thu, 03 Jun 2021 21:59:03 +0800 (CST) Date: Thu, 3 Jun 2021 21:53:37 +0800 From: Jisheng Zhang To: Anup Patel , Alex Ghiti Cc: Paul Walmsley , Palmer Dabbelt , Albert Ou , Jisheng Zhang , Christoph Hellwig , Zong Li , linux-riscv , "linux-kernel@vger.kernel.org List" Subject: Re: [PATCH v3 1/3] riscv: Factorize xip and !xip kernel address conversion macros Message-ID: <20210603215337.4da052e2@xhacker> In-Reply-To: References: <20210603082749.1256129-1-alex@ghiti.fr> <20210603082749.1256129-2-alex@ghiti.fr> <20210603202748.2775f739@xhacker> <64cdb4f9-06f0-59b9-acf9-6fc298db37d7@ghiti.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: LkAmygCHjoon4LhgCF6JAA--.38078S2 X-Coremail-Antispam: 1UD129KBjvJXoWxtFW8JrW8ur4xZw4UJFyUtrb_yoW7WF1rpr 1DGFnrKFWfXryYk3yqv3s09as5twnrGryagrsrK34rZa4qyF1xWF4jqw13uryqqFWUXF4f Zry7Gr1a9w1jqwUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkvb7Iv0xC_tr1lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I 8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI 64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8Jw Am72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IY64vIr41lFIxGxcIEc7CjxVA2Y2ka0xkIwI1l 42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJV WUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAK I48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r 4UMIIF0xvE42xK8VAvwI8IcIk0rVWrZr1j6s0DMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF 0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07j8GYLUUUUU= X-CM-SenderInfo: xmv2xttqjtqzxdloh3xvwfhvlgxou0/ Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 3 Jun 2021 18:46:47 +0530 Anup Patel wrote: > On Thu, Jun 3, 2021 at 6:27 PM Alex Ghiti wrote: > > > > Hi Jisheng, Hi, > > > > Le 3/06/2021 =C3=A0 14:27, Jisheng Zhang a =C3=A9crit : =20 > > > On Thu, 3 Jun 2021 10:27:47 +0200 > > > Alexandre Ghiti wrote: > > > =20 > > >> To simplify the kernel address conversion code, make the same defini= tion of > > >> kernel_mapping_pa_to_va and kernel_mapping_va_to_pa compatible for b= oth xip > > >> and !xip kernel by defining XIP_OFFSET to 0 in !xip kernel. > > >> > > >> Signed-off-by: Alexandre Ghiti > > >> --- > > >> arch/riscv/include/asm/page.h | 14 +++----------- > > >> arch/riscv/include/asm/pgtable.h | 2 ++ > > >> 2 files changed, 5 insertions(+), 11 deletions(-) > > >> > > >> diff --git a/arch/riscv/include/asm/page.h b/arch/riscv/include/asm/= page.h > > >> index 6a7761c86ec2..6e004d8fda4d 100644 > > >> --- a/arch/riscv/include/asm/page.h > > >> +++ b/arch/riscv/include/asm/page.h > > >> @@ -93,9 +93,7 @@ extern unsigned long va_pa_offset; > > >> #ifdef CONFIG_64BIT > > >> extern unsigned long va_kernel_pa_offset; > > >> #endif > > >> -#ifdef CONFIG_XIP_KERNEL > > >> extern unsigned long va_kernel_xip_pa_offset; > > >> -#endif > > >> extern unsigned long pfn_base; > > >> #define ARCH_PFN_OFFSET (pfn_base) > > >> #else > > >> @@ -103,6 +101,7 @@ extern unsigned long pfn_base; > > >> #ifdef CONFIG_64BIT > > >> #define va_kernel_pa_offset 0 > > >> #endif > > >> +#define va_kernel_xip_pa_offset 0 > > >> #define ARCH_PFN_OFFSET (PAGE_OFFSET >> PAGE_SHIFT) > > >> #endif /* CONFIG_MMU */ > > >> > > >> @@ -110,29 +109,22 @@ extern unsigned long kernel_virt_addr; > > >> > > >> #ifdef CONFIG_64BIT > > >> #define linear_mapping_pa_to_va(x) ((void *)((unsigned long)(x) + = va_pa_offset)) > > >> -#ifdef CONFIG_XIP_KERNEL > > >> #define kernel_mapping_pa_to_va(y) ({ = \ > > >> unsigned long _y =3D y; = \ > > >> (_y >=3D CONFIG_PHYS_RAM_BASE) ? =20 > > > > > > This CONFIG_PHYS_RAM_BASE is only available for XIP, could result in a > > > compiler error for !XIP? =20 > > > > You're right, I have this patch in my branch and forgot to squash it > > =20 > > > > > > I'm also concerned with the unecessary overhead of kernel_mapping_pa_= to_va() > > > for !XIP case, there's a "if" condition branch, and extra symbol: va_= kernel_xip_pa_offset =20 > > > > I understand your concerns even if I don't find that the overhead is > > that important here, I prefer the readability improvement. I can always For readability, we still can avoid introducing va_kernel_xip_pa_offset symbol by simply define va_kernel_xip_pa_offset as 0 if XIP as you did for XIP_OFFSET PS: this may need a preparation patch: http://lists.infradead.org/pipermail/linux-riscv/2021-June/006802.html > > add unlikely/likely builtin to improve things or completely remove this > > patch if others agree with you. =20 >=20 > I would also prefer readable code for long-term maintainability. Currentl= y, > the nested "#ifdefs" are increasing causing developers to easily break > untested combinations. >=20 > Regards, > Anup >=20 > > > > Thanks, > > > > Alex > > =20 > > > =20 > > >> (void *)((unsigned long)(_y) + va_kernel_pa_offset + XI= P_OFFSET) : \ > > >> (void *)((unsigned long)(_y) + va_kernel_xip_pa_offset)= ; \ > > >> }) > > >> -#else > > >> -#define kernel_mapping_pa_to_va(x) ((void *)((unsigned long)(x) + = va_kernel_pa_offset)) > > >> -#endif > > >> #define __pa_to_va_nodebug(x) linear_mapping_pa_to_va= (x) > > >> > > >> #define linear_mapping_va_to_pa(x) ((unsigned long)(x) - va_pa_off= set) > > >> -#ifdef CONFIG_XIP_KERNEL > > >> #define kernel_mapping_va_to_pa(y) ({ = \ > > >> unsigned long _y =3D y; = \ > > >> (_y < kernel_virt_addr + XIP_OFFSET) ? = \ > > >> ((unsigned long)(_y) - va_kernel_xip_pa_offset) : = \ > > >> ((unsigned long)(_y) - va_kernel_pa_offset - XIP_OFFSET= ); \ > > >> }) =20 > > > > > > Similar as kernel_mapping_pa_to_va(), an overhead of "if" condition b= ranch > > > for !XIP and extra va_kernel_xip_pa_offset symbol. > > > =20 > > >> -#else > > >> -#define kernel_mapping_va_to_pa(x) ((unsigned long)(x) - va_kernel= _pa_offset) > > >> -#endif > > >> + > > >> #define __va_to_pa_nodebug(x) ({ = \ > > >> unsigned long _x =3D x; = \ > > >> (_x < kernel_virt_addr) ? = \ > > >> @@ -141,7 +133,7 @@ extern unsigned long kernel_virt_addr; > > >> #else > > >> #define __pa_to_va_nodebug(x) ((void *)((unsigned long) (x) + va_= pa_offset)) > > >> #define __va_to_pa_nodebug(x) ((unsigned long)(x) - va_pa_offset) > > >> -#endif > > >> +#endif /* CONFIG_64BIT */ > > >> > > >> #ifdef CONFIG_DEBUG_VIRTUAL > > >> extern phys_addr_t __virt_to_phys(unsigned long x); > > >> diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/a= sm/pgtable.h > > >> index bde8ce3bfe7c..d98e931a31e5 100644 > > >> --- a/arch/riscv/include/asm/pgtable.h > > >> +++ b/arch/riscv/include/asm/pgtable.h > > >> @@ -77,6 +77,8 @@ > > >> > > >> #ifdef CONFIG_XIP_KERNEL > > >> #define XIP_OFFSET SZ_8M > > >> +#else > > >> +#define XIP_OFFSET 0 > > >> #endif > > >> > > >> #ifndef __ASSEMBLY__ =20 > > > > > > > > > > > > _______________________________________________ > > > linux-riscv mailing list > > > linux-riscv@lists.infradead.org > > > http://lists.infradead.org/mailman/listinfo/linux-riscv > > > =20 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 X-Spam-Level: X-Spam-Status: No, score=-14.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D816C47082 for ; Thu, 3 Jun 2021 13:59:51 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 5808F613EE for ; Thu, 3 Jun 2021 13:59:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5808F613EE Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=mail.ustc.edu.cn Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org 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:MIME-Version:References:In-Reply-To: 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=BwvkFP/UG6Eyn4P9RaClLL3OwgixeLuWzBpG+nRYa2g=; b=AXPg8OZiF1OX4y 31DQGEpK/CHTxtVkqqFWQFngzR1QDtPeqVitIj6Q4MoP0ROsISaaebJhBXXOa+/vTVo78lt79I7q/ bzc8w1GPI5vgkWJrrjQWlfVzGeauKsy5IHmTaGwbud0LUbF54S3pv1A25xWZf20aMcVPmSs5PjzoS ectNP3Pi8VV1J5daXZdo1dx5y6CDJDVKaD6e+NAWTaP2h0b83U7SD93HQJl7Ot/J7hq43ZuTsK+nG xKMgn13BBb3YU5aSkai94hD1GskF0Zi6ACw66bkR413o/gsaQpJcmuSyqtaOEhZ+WCzp+Yzby9xWM X+eoWwIieKBXa+HoVE8w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lonsf-0091zn-Tm; Thu, 03 Jun 2021 13:59:29 +0000 Received: from email6.ustc.edu.cn ([2001:da8:d800::8] helo=ustc.edu.cn) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lonsZ-0091xU-HV for linux-riscv@lists.infradead.org; Thu, 03 Jun 2021 13:59:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mail.ustc.edu.cn; s=dkim; h=Received:Date:From:To:Cc:Subject: Message-ID:In-Reply-To:References:MIME-Version:Content-Type: Content-Transfer-Encoding; bh=2lajeQP1++NkLXsw13lGJiGVOormNEytLR e9zH5ul5I=; b=vHlDDfyzjmmivtzjm/nj5J+24RQYk0JgSZ9lks+9qm4h9QwBRK 53cmpwKHsc9XyYoixbfvXmwVcnOeTaAqlnzgpmg1OZQ0BeicRI2PEnEvQaWA8FqA gUPS7nOC8PJGKqLeRi6XH77ZOQRwiWRxx5u8W/jmzkYw1pLRbEK1Dqvdk= Received: from xhacker (unknown [101.86.20.15]) by newmailweb.ustc.edu.cn (Coremail) with SMTP id LkAmygCHjoon4LhgCF6JAA--.38078S2; Thu, 03 Jun 2021 21:59:03 +0800 (CST) Date: Thu, 3 Jun 2021 21:53:37 +0800 From: Jisheng Zhang To: Anup Patel , Alex Ghiti Cc: Paul Walmsley , Palmer Dabbelt , Albert Ou , Jisheng Zhang , Christoph Hellwig , Zong Li , linux-riscv , "linux-kernel@vger.kernel.org List" Subject: Re: [PATCH v3 1/3] riscv: Factorize xip and !xip kernel address conversion macros Message-ID: <20210603215337.4da052e2@xhacker> In-Reply-To: References: <20210603082749.1256129-1-alex@ghiti.fr> <20210603082749.1256129-2-alex@ghiti.fr> <20210603202748.2775f739@xhacker> <64cdb4f9-06f0-59b9-acf9-6fc298db37d7@ghiti.fr> MIME-Version: 1.0 X-CM-TRANSID: LkAmygCHjoon4LhgCF6JAA--.38078S2 X-Coremail-Antispam: 1UD129KBjvJXoWxtFW8JrW8ur4xZw4UJFyUtrb_yoW7WF1rpr 1DGFnrKFWfXryYk3yqv3s09as5twnrGryagrsrK34rZa4qyF1xWF4jqw13uryqqFWUXF4f Zry7Gr1a9w1jqwUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUkvb7Iv0xC_tr1lb4IE77IF4wAFF20E14v26r4j6ryUM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I 8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI 64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8Jw Am72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IY64vIr41lFIxGxcIEc7CjxVA2Y2ka0xkIwI1l 42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJV WUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAK I48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r 4UMIIF0xvE42xK8VAvwI8IcIk0rVWrZr1j6s0DMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF 0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07j8GYLUUUUU= X-CM-SenderInfo: xmv2xttqjtqzxdloh3xvwfhvlgxou0/ X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210603_065924_331512_7FD3F67A X-CRM114-Status: GOOD ( 28.52 ) X-BeenThere: linux-riscv@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-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org T24gVGh1LCAzIEp1biAyMDIxIDE4OjQ2OjQ3ICswNTMwCkFudXAgUGF0ZWwgPGFudXBAYnJhaW5m YXVsdC5vcmc+IHdyb3RlOgoKPiBPbiBUaHUsIEp1biAzLCAyMDIxIGF0IDY6MjcgUE0gQWxleCBH aGl0aSA8YWxleEBnaGl0aS5mcj4gd3JvdGU6Cj4gPgo+ID4gSGkgSmlzaGVuZywKCkhpLAoKPiA+ Cj4gPiBMZSAzLzA2LzIwMjEgw6AgMTQ6MjcsIEppc2hlbmcgWmhhbmcgYSDDqWNyaXQgOiAgCj4g PiA+IE9uIFRodSwgIDMgSnVuIDIwMjEgMTA6Mjc6NDcgKzAyMDAKPiA+ID4gQWxleGFuZHJlIEdo aXRpIDxhbGV4QGdoaXRpLmZyPiB3cm90ZToKPiA+ID4gIAo+ID4gPj4gVG8gc2ltcGxpZnkgdGhl IGtlcm5lbCBhZGRyZXNzIGNvbnZlcnNpb24gY29kZSwgbWFrZSB0aGUgc2FtZSBkZWZpbml0aW9u IG9mCj4gPiA+PiBrZXJuZWxfbWFwcGluZ19wYV90b192YSBhbmQga2VybmVsX21hcHBpbmdfdmFf dG9fcGEgY29tcGF0aWJsZSBmb3IgYm90aCB4aXAKPiA+ID4+IGFuZCAheGlwIGtlcm5lbCBieSBk ZWZpbmluZyBYSVBfT0ZGU0VUIHRvIDAgaW4gIXhpcCBrZXJuZWwuCj4gPiA+Pgo+ID4gPj4gU2ln bmVkLW9mZi1ieTogQWxleGFuZHJlIEdoaXRpIDxhbGV4QGdoaXRpLmZyPgo+ID4gPj4gLS0tCj4g PiA+PiAgIGFyY2gvcmlzY3YvaW5jbHVkZS9hc20vcGFnZS5oICAgIHwgMTQgKysrLS0tLS0tLS0t LS0KPiA+ID4+ICAgYXJjaC9yaXNjdi9pbmNsdWRlL2FzbS9wZ3RhYmxlLmggfCAgMiArKwo+ID4g Pj4gICAyIGZpbGVzIGNoYW5nZWQsIDUgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCj4g PiA+Pgo+ID4gPj4gZGlmZiAtLWdpdCBhL2FyY2gvcmlzY3YvaW5jbHVkZS9hc20vcGFnZS5oIGIv YXJjaC9yaXNjdi9pbmNsdWRlL2FzbS9wYWdlLmgKPiA+ID4+IGluZGV4IDZhNzc2MWM4NmVjMi4u NmUwMDRkOGZkYTRkIDEwMDY0NAo+ID4gPj4gLS0tIGEvYXJjaC9yaXNjdi9pbmNsdWRlL2FzbS9w YWdlLmgKPiA+ID4+ICsrKyBiL2FyY2gvcmlzY3YvaW5jbHVkZS9hc20vcGFnZS5oCj4gPiA+PiBA QCAtOTMsOSArOTMsNyBAQCBleHRlcm4gdW5zaWduZWQgbG9uZyB2YV9wYV9vZmZzZXQ7Cj4gPiA+ PiAgICNpZmRlZiBDT05GSUdfNjRCSVQKPiA+ID4+ICAgZXh0ZXJuIHVuc2lnbmVkIGxvbmcgdmFf a2VybmVsX3BhX29mZnNldDsKPiA+ID4+ICAgI2VuZGlmCj4gPiA+PiAtI2lmZGVmIENPTkZJR19Y SVBfS0VSTkVMCj4gPiA+PiAgIGV4dGVybiB1bnNpZ25lZCBsb25nIHZhX2tlcm5lbF94aXBfcGFf b2Zmc2V0Owo+ID4gPj4gLSNlbmRpZgo+ID4gPj4gICBleHRlcm4gdW5zaWduZWQgbG9uZyBwZm5f YmFzZTsKPiA+ID4+ICAgI2RlZmluZSBBUkNIX1BGTl9PRkZTRVQgICAgICAgICAgICAocGZuX2Jh c2UpCj4gPiA+PiAgICNlbHNlCj4gPiA+PiBAQCAtMTAzLDYgKzEwMSw3IEBAIGV4dGVybiB1bnNp Z25lZCBsb25nIHBmbl9iYXNlOwo+ID4gPj4gICAjaWZkZWYgQ09ORklHXzY0QklUCj4gPiA+PiAg ICNkZWZpbmUgdmFfa2VybmVsX3BhX29mZnNldCAgICAgICAgMAo+ID4gPj4gICAjZW5kaWYKPiA+ ID4+ICsjZGVmaW5lIHZhX2tlcm5lbF94aXBfcGFfb2Zmc2V0IDAKPiA+ID4+ICAgI2RlZmluZSBB UkNIX1BGTl9PRkZTRVQgICAgICAgICAgICAoUEFHRV9PRkZTRVQgPj4gUEFHRV9TSElGVCkKPiA+ ID4+ICAgI2VuZGlmIC8qIENPTkZJR19NTVUgKi8KPiA+ID4+Cj4gPiA+PiBAQCAtMTEwLDI5ICsx MDksMjIgQEAgZXh0ZXJuIHVuc2lnbmVkIGxvbmcga2VybmVsX3ZpcnRfYWRkcjsKPiA+ID4+Cj4g PiA+PiAgICNpZmRlZiBDT05GSUdfNjRCSVQKPiA+ID4+ICAgI2RlZmluZSBsaW5lYXJfbWFwcGlu Z19wYV90b192YSh4KSAoKHZvaWQgKikoKHVuc2lnbmVkIGxvbmcpKHgpICsgdmFfcGFfb2Zmc2V0 KSkKPiA+ID4+IC0jaWZkZWYgQ09ORklHX1hJUF9LRVJORUwKPiA+ID4+ICAgI2RlZmluZSBrZXJu ZWxfbWFwcGluZ19wYV90b192YSh5KSAoeyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBcCj4gPiA+PiAgICAgIHVuc2lnbmVkIGxvbmcgX3kgPSB5OyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAo+ID4g Pj4gICAgICAoX3kgPj0gQ09ORklHX1BIWVNfUkFNX0JBU0UpID8gIAo+ID4gPgo+ID4gPiBUaGlz IENPTkZJR19QSFlTX1JBTV9CQVNFIGlzIG9ubHkgYXZhaWxhYmxlIGZvciBYSVAsIGNvdWxkIHJl c3VsdCBpbiBhCj4gPiA+IGNvbXBpbGVyIGVycm9yIGZvciAhWElQPyAgCj4gPgo+ID4gWW91J3Jl IHJpZ2h0LCBJIGhhdmUgdGhpcyBwYXRjaCBpbiBteSBicmFuY2ggYW5kIGZvcmdvdCB0byBzcXVh c2ggaXQKPiA+ICAKPiA+ID4KPiA+ID4gSSdtIGFsc28gY29uY2VybmVkIHdpdGggdGhlIHVuZWNl c3Nhcnkgb3ZlcmhlYWQgb2Yga2VybmVsX21hcHBpbmdfcGFfdG9fdmEoKQo+ID4gPiBmb3IgIVhJ UCBjYXNlLCB0aGVyZSdzIGEgImlmIiBjb25kaXRpb24gYnJhbmNoLCBhbmQgZXh0cmEgc3ltYm9s OiB2YV9rZXJuZWxfeGlwX3BhX29mZnNldCAgCj4gPgo+ID4gSSB1bmRlcnN0YW5kIHlvdXIgY29u Y2VybnMgZXZlbiBpZiBJIGRvbid0IGZpbmQgdGhhdCB0aGUgb3ZlcmhlYWQgaXMKPiA+IHRoYXQg aW1wb3J0YW50IGhlcmUsIEkgcHJlZmVyIHRoZSByZWFkYWJpbGl0eSBpbXByb3ZlbWVudC4gSSBj YW4gYWx3YXlzCgpGb3IgcmVhZGFiaWxpdHksIHdlIHN0aWxsIGNhbiBhdm9pZCBpbnRyb2R1Y2lu ZyB2YV9rZXJuZWxfeGlwX3BhX29mZnNldApzeW1ib2wgYnkgc2ltcGx5IGRlZmluZSB2YV9rZXJu ZWxfeGlwX3BhX29mZnNldCBhcyAwIGlmIFhJUCBhcyB5b3UgZGlkCmZvciBYSVBfT0ZGU0VUCgpQ UzogdGhpcyBtYXkgbmVlZCBhIHByZXBhcmF0aW9uIHBhdGNoOgpodHRwOi8vbGlzdHMuaW5mcmFk ZWFkLm9yZy9waXBlcm1haWwvbGludXgtcmlzY3YvMjAyMS1KdW5lLzAwNjgwMi5odG1sCgo+ID4g YWRkIHVubGlrZWx5L2xpa2VseSBidWlsdGluIHRvIGltcHJvdmUgdGhpbmdzIG9yIGNvbXBsZXRl bHkgcmVtb3ZlIHRoaXMKPiA+IHBhdGNoIGlmIG90aGVycyBhZ3JlZSB3aXRoIHlvdS4gIAo+IAo+ IEkgd291bGQgYWxzbyBwcmVmZXIgcmVhZGFibGUgY29kZSBmb3IgbG9uZy10ZXJtIG1haW50YWlu YWJpbGl0eS4gQ3VycmVudGx5LAo+IHRoZSBuZXN0ZWQgIiNpZmRlZnMiIGFyZSBpbmNyZWFzaW5n IGNhdXNpbmcgZGV2ZWxvcGVycyB0byBlYXNpbHkgYnJlYWsKPiB1bnRlc3RlZCBjb21iaW5hdGlv bnMuCj4gCj4gUmVnYXJkcywKPiBBbnVwCj4gCj4gPgo+ID4gVGhhbmtzLAo+ID4KPiA+IEFsZXgK PiA+ICAKPiA+ID4gIAo+ID4gPj4gICAgICAgICAgICAgICh2b2lkICopKCh1bnNpZ25lZCBsb25n KShfeSkgKyB2YV9rZXJuZWxfcGFfb2Zmc2V0ICsgWElQX09GRlNFVCkgOiAgICAgIFwKPiA+ID4+ ICAgICAgICAgICAgICAodm9pZCAqKSgodW5zaWduZWQgbG9uZykoX3kpICsgdmFfa2VybmVsX3hp cF9wYV9vZmZzZXQpOyAgICAgICAgICAgICAgICBcCj4gPiA+PiAgICAgIH0pCj4gPiA+PiAtI2Vs c2UKPiA+ID4+IC0jZGVmaW5lIGtlcm5lbF9tYXBwaW5nX3BhX3RvX3ZhKHgpICAoKHZvaWQgKiko KHVuc2lnbmVkIGxvbmcpKHgpICsgdmFfa2VybmVsX3BhX29mZnNldCkpCj4gPiA+PiAtI2VuZGlm Cj4gPiA+PiAgICNkZWZpbmUgX19wYV90b192YV9ub2RlYnVnKHgpICAgICAgICAgICAgICBsaW5l YXJfbWFwcGluZ19wYV90b192YSh4KQo+ID4gPj4KPiA+ID4+ICAgI2RlZmluZSBsaW5lYXJfbWFw cGluZ192YV90b19wYSh4KSAoKHVuc2lnbmVkIGxvbmcpKHgpIC0gdmFfcGFfb2Zmc2V0KQo+ID4g Pj4gLSNpZmRlZiBDT05GSUdfWElQX0tFUk5FTAo+ID4gPj4gICAjZGVmaW5lIGtlcm5lbF9tYXBw aW5nX3ZhX3RvX3BhKHkpICh7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFwKPiA+ID4+ICAgICAgdW5zaWduZWQgbG9uZyBfeSA9IHk7ICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAo+ID4gPj4gICAgICAoX3kgPCBr ZXJuZWxfdmlydF9hZGRyICsgWElQX09GRlNFVCkgPyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBcCj4gPiA+PiAgICAgICAgICAgICAgKCh1bnNpZ25lZCBsb25nKShfeSkgLSB2YV9r ZXJuZWxfeGlwX3BhX29mZnNldCkgOiAgICAgICAgICAgICAgIFwKPiA+ID4+ICAgICAgICAgICAg ICAoKHVuc2lnbmVkIGxvbmcpKF95KSAtIHZhX2tlcm5lbF9wYV9vZmZzZXQgLSBYSVBfT0ZGU0VU KTsgICAgICAgXAo+ID4gPj4gICAgICB9KSAgCj4gPiA+Cj4gPiA+IFNpbWlsYXIgYXMga2VybmVs X21hcHBpbmdfcGFfdG9fdmEoKSwgYW4gb3ZlcmhlYWQgb2YgImlmIiBjb25kaXRpb24gYnJhbmNo Cj4gPiA+IGZvciAhWElQIGFuZCBleHRyYSB2YV9rZXJuZWxfeGlwX3BhX29mZnNldCBzeW1ib2wu Cj4gPiA+ICAKPiA+ID4+IC0jZWxzZQo+ID4gPj4gLSNkZWZpbmUga2VybmVsX21hcHBpbmdfdmFf dG9fcGEoeCkgICgodW5zaWduZWQgbG9uZykoeCkgLSB2YV9rZXJuZWxfcGFfb2Zmc2V0KQo+ID4g Pj4gLSNlbmRpZgo+ID4gPj4gKwo+ID4gPj4gICAjZGVmaW5lIF9fdmFfdG9fcGFfbm9kZWJ1Zyh4 KSAgICAgICh7ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFwK PiA+ID4+ICAgICAgdW5zaWduZWQgbG9uZyBfeCA9IHg7ICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgXAo+ID4gPj4gICAgICAoX3ggPCBrZXJuZWxfdmly dF9hZGRyKSA/ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBc Cj4gPiA+PiBAQCAtMTQxLDcgKzEzMyw3IEBAIGV4dGVybiB1bnNpZ25lZCBsb25nIGtlcm5lbF92 aXJ0X2FkZHI7Cj4gPiA+PiAgICNlbHNlCj4gPiA+PiAgICNkZWZpbmUgX19wYV90b192YV9ub2Rl YnVnKHgpICAoKHZvaWQgKikoKHVuc2lnbmVkIGxvbmcpICh4KSArIHZhX3BhX29mZnNldCkpCj4g PiA+PiAgICNkZWZpbmUgX192YV90b19wYV9ub2RlYnVnKHgpICAoKHVuc2lnbmVkIGxvbmcpKHgp IC0gdmFfcGFfb2Zmc2V0KQo+ID4gPj4gLSNlbmRpZgo+ID4gPj4gKyNlbmRpZiAvKiBDT05GSUdf NjRCSVQgKi8KPiA+ID4+Cj4gPiA+PiAgICNpZmRlZiBDT05GSUdfREVCVUdfVklSVFVBTAo+ID4g Pj4gICBleHRlcm4gcGh5c19hZGRyX3QgX192aXJ0X3RvX3BoeXModW5zaWduZWQgbG9uZyB4KTsK PiA+ID4+IGRpZmYgLS1naXQgYS9hcmNoL3Jpc2N2L2luY2x1ZGUvYXNtL3BndGFibGUuaCBiL2Fy Y2gvcmlzY3YvaW5jbHVkZS9hc20vcGd0YWJsZS5oCj4gPiA+PiBpbmRleCBiZGU4Y2UzYmZlN2Mu LmQ5OGU5MzFhMzFlNSAxMDA2NDQKPiA+ID4+IC0tLSBhL2FyY2gvcmlzY3YvaW5jbHVkZS9hc20v cGd0YWJsZS5oCj4gPiA+PiArKysgYi9hcmNoL3Jpc2N2L2luY2x1ZGUvYXNtL3BndGFibGUuaAo+ ID4gPj4gQEAgLTc3LDYgKzc3LDggQEAKPiA+ID4+Cj4gPiA+PiAgICNpZmRlZiBDT05GSUdfWElQ X0tFUk5FTAo+ID4gPj4gICAjZGVmaW5lIFhJUF9PRkZTRVQgICAgICAgICBTWl84TQo+ID4gPj4g KyNlbHNlCj4gPiA+PiArI2RlZmluZSBYSVBfT0ZGU0VUICAgICAgICAgIDAKPiA+ID4+ICAgI2Vu ZGlmCj4gPiA+Pgo+ID4gPj4gICAjaWZuZGVmIF9fQVNTRU1CTFlfXyAgCj4gPiA+Cj4gPiA+Cj4g PiA+Cj4gPiA+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f Cj4gPiA+IGxpbnV4LXJpc2N2IG1haWxpbmcgbGlzdAo+ID4gPiBsaW51eC1yaXNjdkBsaXN0cy5p bmZyYWRlYWQub3JnCj4gPiA+IGh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlz dGluZm8vbGludXgtcmlzY3YKPiA+ID4gIAoKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpsaW51eC1yaXNjdiBtYWlsaW5nIGxpc3QKbGludXgtcmlzY3ZA bGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xp c3RpbmZvL2xpbnV4LXJpc2N2Cg==