From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 CDE4615A4BE; Fri, 26 Apr 2024 17:06:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714151214; cv=none; b=G6EqKaWlLDX/az60WElUzdFuBVDWpt4yc1Wu3oFQFLE3YK+UHgjnRH33y+ymahleR5a9KVvIoOeW5tQio6yjOMt3CHgrBCeMhRpPuSD64yclDgpL5GExrvMKw/MmPFojCu0+MZxotELw85WY1ekhucVKtbcL3llqjxLXRgcVJZg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714151214; c=relaxed/simple; bh=09NdAbWR/BLtK6lbUCey7vstmTIMgsOSSq3Yz9q528c=; h=From:To:Cc:Subject:In-Reply-To:References:Date:Message-ID: MIME-Version:Content-Type; b=TsRWJB6ox4Ve0doRImsPR8x38QUgRTm2Mj+jejywju1LV7SJAViMEYndi3WtO1u/80xkFlL9t9wfR/rYFU3BHAifLXXNNKHeo8PbE5x+XEjSxlM8NOpumZ9Q5ETknNY+NX04wfiyrOV/xvVWfxvkX9Xgh14Hwcj1z1FbNmR0/q4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XcUaN9qs; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XcUaN9qs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0D857C116B1; Fri, 26 Apr 2024 17:06:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714151214; bh=09NdAbWR/BLtK6lbUCey7vstmTIMgsOSSq3Yz9q528c=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=XcUaN9qshZw1p9fPgu+96aFUN619FikB2yN0B0sbB6zqz5ientRrM+j2M6bfYAxDz jDQmc8jTsMe51HVJH7QrZPSo1yNawnWcnQsmLr1/Rzenjb1669QGNKl7gY5PV+WXIs X1XlKQoD6jK5OANOk42v3gDLQOGtqlwa7LlAsl029gzhMiFWtS165mtrlyUjwwSB+n ByJvXQO2YlTq1/xUn63kqrNk42eBPmC+nbgQQx6iBdFV6JPF6rjr6F0g8GZcrFaKmB XWpDP8neWaOA/cqvabzHOF6WB+6hzBYTZxZ2PS7kMujUFpm52XuSyD0RFl1m7mqAE1 8jZ/nQOnfLPYw== From: Puranjay Mohan To: Andrii Nakryiko Cc: Catalin Marinas , Will Deacon , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Zi Shen Lim , Xu Kuohai , Florent Revest , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Subject: Re: [PATCH bpf-next v3 2/2] bpf, arm64: inline bpf_get_smp_processor_id() helper In-Reply-To: References: <20240426121349.97651-1-puranjay@kernel.org> <20240426121349.97651-3-puranjay@kernel.org> Date: Fri, 26 Apr 2024 17:06:51 +0000 Message-ID: Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Andrii Nakryiko writes: > On Fri, Apr 26, 2024 at 5:14=E2=80=AFAM Puranjay Mohan wrote: >> >> As ARM64 JIT now implements BPF_MOV64_PERCPU_REG instruction, inline >> bpf_get_smp_processor_id(). >> >> ARM64 uses the per-cpu variable cpu_number to store the cpu id. >> >> Here is how the BPF and ARM64 JITed assembly changes after this commit: >> >> BPF >> =3D=3D=3D=3D=3D >> BEFORE AFTER >> -------- ------- >> >> int cpu =3D bpf_get_smp_processor_id(); int cpu =3D bpf_get_sm= p_processor_id(); >> (85) call bpf_get_smp_processor_id#229032 (18) r0 =3D 0xffff800082= 072008 >> (bf) r0 =3D &(void __per= cpu *)(r0) >> (61) r0 =3D *(u32 *)(r0 = +0) >> >> ARM64 JIT >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> >> BEFORE AFTER >> -------- ------- >> >> int cpu =3D bpf_get_smp_processor_id(); int cpu =3D bpf_get_sm= p_processor_id(); >> mov x10, #0xfffffffffffff4d0 mov x7, #0xffff8000f= fffffff >> movk x10, #0x802b, lsl #16 movk x7, #0x8207, lsl= #16 >> movk x10, #0x8000, lsl #32 movk x7, #0x2008 >> blr x10 mrs x10, tpidr_el1 >> add x7, x0, #0x0 add x7, x7, x10 >> ldr w7, [x7] >> >> Performance improvement using benchmark[1] >> >> BEFORE AFTER >> -------- ------- >> >> glob-arr-inc : 23.817 =C2=B1 0.019M/s glob-arr-inc : 24.631= =C2=B1 0.027M/s >> arr-inc : 23.253 =C2=B1 0.019M/s arr-inc : 23.742= =C2=B1 0.023M/s >> hash-inc : 12.258 =C2=B1 0.010M/s hash-inc : 12.625= =C2=B1 0.004M/s >> >> [1] https://github.com/anakryiko/linux/commit/8dec900975ef >> >> Signed-off-by: Puranjay Mohan >> Acked-by: Andrii Nakryiko >> --- >> kernel/bpf/verifier.c | 24 +++++++++++++++++------- >> 1 file changed, 17 insertions(+), 7 deletions(-) >> >> diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c >> index 4e474ef44e9c..6ff4e63b2ef2 100644 >> --- a/kernel/bpf/verifier.c >> +++ b/kernel/bpf/verifier.c >> @@ -20273,20 +20273,31 @@ static int do_misc_fixups(struct bpf_verifier_= env *env) >> goto next_insn; >> } >> >> -#ifdef CONFIG_X86_64 >> /* Implement bpf_get_smp_processor_id() inline. */ >> if (insn->imm =3D=3D BPF_FUNC_get_smp_processor_id && >> prog->jit_requested && bpf_jit_supports_percpu_insn(= )) { >> /* BPF_FUNC_get_smp_processor_id inlining is an >> - * optimization, so if pcpu_hot.cpu_number is ev= er >> + * optimization, so if cpu_number_addr is ever >> * changed in some incompatible and hard to supp= ort >> * way, it's fine to back out this inlining logic >> */ >> - insn_buf[0] =3D BPF_MOV32_IMM(BPF_REG_0, (u32)(u= nsigned long)&pcpu_hot.cpu_number); >> - insn_buf[1] =3D BPF_MOV64_PERCPU_REG(BPF_REG_0, = BPF_REG_0); >> - insn_buf[2] =3D BPF_LDX_MEM(BPF_W, BPF_REG_0, BP= F_REG_0, 0); >> - cnt =3D 3; >> + u64 cpu_number_addr; >> >> +#if defined(CONFIG_X86_64) >> + cpu_number_addr =3D (u64)&pcpu_hot.cpu_number; >> +#elif defined(CONFIG_ARM64) >> + cpu_number_addr =3D (u64)&cpu_number; >> +#else >> + goto next_insn; >> +#endif >> + struct bpf_insn ld_cpu_number_addr[2] =3D { >> + BPF_LD_IMM64(BPF_REG_0, cpu_number_addr) >> + }; > > here we are violating C89 requirement to have a single block of > variable declarations by mixing variables and statements. I'm > surprised this is not triggering any build errors on !arm64 && > !x86_64. > > I think we can declare this BPF_LD_IMM64 instruction with zero "addr". > And then update > > ld_cpu_number_addr[0].imm =3D (u32)cpu_number_addr; > ld_cpu_number_addr[1].imm =3D (u32)(cpu_number_addr >> 32); > > WDYT? > > nit: I'd rename ld_cpu_number_addr to ld_insn or something short like that I agree with you, What do you think about the following diff: --- 8< --- -#ifdef CONFIG_X86_64 /* Implement bpf_get_smp_processor_id() inline. */ if (insn->imm =3D=3D BPF_FUNC_get_smp_processor_id && prog->jit_requested && bpf_jit_supports_percpu_insn()) { /* BPF_FUNC_get_smp_processor_id inlining is an - * optimization, so if pcpu_hot.cpu_number is ever + * optimization, so if cpu_number_addr is ever * changed in some incompatible and hard to support * way, it's fine to back out this inlining logic */ - insn_buf[0] =3D BPF_MOV32_IMM(BPF_REG_0, (u32)(unsi= gned long)&pcpu_hot.cpu_number); - insn_buf[1] =3D BPF_MOV64_PERCPU_REG(BPF_REG_0, BPF= _REG_0); - insn_buf[2] =3D BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_R= EG_0, 0); - cnt =3D 3; + u64 cpu_number_addr; + struct bpf_insn ld_insn[2] =3D { + BPF_LD_IMM64(BPF_REG_0, 0) + }; + +#if defined(CONFIG_X86_64) + cpu_number_addr =3D (u64)&pcpu_hot.cpu_number; +#elif defined(CONFIG_ARM64) + cpu_number_addr =3D (u64)&cpu_number; +#else + goto next_insn; +#endif + ld_insn[0].imm =3D (u32)cpu_number_addr; + ld_insn[1].imm =3D (u32)(cpu_number_addr >> 32); + insn_buf[0] =3D ld_insn[0]; + insn_buf[1] =3D ld_insn[1]; + insn_buf[2] =3D BPF_MOV64_PERCPU_REG(BPF_REG_0, BPF= _REG_0); + insn_buf[3] =3D BPF_LDX_MEM(BPF_W, BPF_REG_0, BPF_R= EG_0, 0); + cnt =3D 4; new_prog =3D bpf_patch_insn_data(env, i + delta, in= sn_buf, cnt); if (!new_prog) @@ -20296,7 +20310,6 @@ static int do_misc_fixups(struct bpf_verifier_env *= env) insn =3D new_prog->insnsi + i + delta; goto next_insn; } -#endif /* Implement bpf_get_func_arg inline. */ --- >8--- Thanks, Puranjay 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 5715CC4345F for ; Fri, 26 Apr 2024 17:07:16 +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:MIME-Version:Message-ID:Date:References :In-Reply-To:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=NbttDQkNYM2mYPwraDafdjVlGfbZJUG03DBoDvEanUE=; b=35fJuMFfYUOf7i farP43hA49a8uqoLRb/sDx9MwzrSe16XttmW303CJr9c1qTZKCP8z7LYKkIfc5w482od8yvOkigD3 HmR7cXryIWOxXh9PGT0s2sirAqTWN/wWqoBOeHKz2Odsyt/uNqaq5PuSMeMkiyiID46xBH5YZhbmp KYH/AVGfFiw59oU5pO/wu+bQfoeES7tAWDsEnZNlnq1dFRLELLD77F9D9VjVCwz2VOzmvTwgOkwJw X+iQPWxboeaJ5C2N0yy15HvPkLBveRTVdrRWznja0HntvPbL5jzASnVsZxDAdJU6Jc3szXlS1xi9R lj2VPLWVBRwGaVOC91mA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s0P2K-0000000DOCo-1MOy; Fri, 26 Apr 2024 17:07:00 +0000 Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s0P2H-0000000DOC4-05oE for linux-arm-kernel@lists.infradead.org; Fri, 26 Apr 2024 17:06:59 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 26703CE1CCC; Fri, 26 Apr 2024 17:06:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0D857C116B1; Fri, 26 Apr 2024 17:06:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714151214; bh=09NdAbWR/BLtK6lbUCey7vstmTIMgsOSSq3Yz9q528c=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=XcUaN9qshZw1p9fPgu+96aFUN619FikB2yN0B0sbB6zqz5ientRrM+j2M6bfYAxDz jDQmc8jTsMe51HVJH7QrZPSo1yNawnWcnQsmLr1/Rzenjb1669QGNKl7gY5PV+WXIs X1XlKQoD6jK5OANOk42v3gDLQOGtqlwa7LlAsl029gzhMiFWtS165mtrlyUjwwSB+n ByJvXQO2YlTq1/xUn63kqrNk42eBPmC+nbgQQx6iBdFV6JPF6rjr6F0g8GZcrFaKmB XWpDP8neWaOA/cqvabzHOF6WB+6hzBYTZxZ2PS7kMujUFpm52XuSyD0RFl1m7mqAE1 8jZ/nQOnfLPYw== From: Puranjay Mohan To: Andrii Nakryiko Cc: Catalin Marinas , Will Deacon , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Zi Shen Lim , Xu Kuohai , Florent Revest , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Subject: Re: [PATCH bpf-next v3 2/2] bpf, arm64: inline bpf_get_smp_processor_id() helper In-Reply-To: References: <20240426121349.97651-1-puranjay@kernel.org> <20240426121349.97651-3-puranjay@kernel.org> Date: Fri, 26 Apr 2024 17:06:51 +0000 Message-ID: MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240426_100657_711285_4F822C54 X-CRM114-Status: GOOD ( 19.34 ) 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 QW5kcmlpIE5ha3J5aWtvIDxhbmRyaWkubmFrcnlpa29AZ21haWwuY29tPiB3cml0ZXM6Cgo+IE9u IEZyaSwgQXByIDI2LCAyMDI0IGF0IDU6MTTigK9BTSBQdXJhbmpheSBNb2hhbiA8cHVyYW5qYXlA a2VybmVsLm9yZz4gd3JvdGU6Cj4+Cj4+IEFzIEFSTTY0IEpJVCBub3cgaW1wbGVtZW50cyBCUEZf TU9WNjRfUEVSQ1BVX1JFRyBpbnN0cnVjdGlvbiwgaW5saW5lCj4+IGJwZl9nZXRfc21wX3Byb2Nl c3Nvcl9pZCgpLgo+Pgo+PiBBUk02NCB1c2VzIHRoZSBwZXItY3B1IHZhcmlhYmxlIGNwdV9udW1i ZXIgdG8gc3RvcmUgdGhlIGNwdSBpZC4KPj4KPj4gSGVyZSBpcyBob3cgdGhlIEJQRiBhbmQgQVJN NjQgSklUZWQgYXNzZW1ibHkgY2hhbmdlcyBhZnRlciB0aGlzIGNvbW1pdDoKPj4KPj4gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBCUEYKPj4gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgID09PT09Cj4+ICAgICAgICAgICAgICAgQkVGT1JFICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQUZURVIKPj4gICAgICAgICAgICAg IC0tLS0tLS0tICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC0tLS0tLS0KPj4K Pj4gaW50IGNwdSA9IGJwZl9nZXRfc21wX3Byb2Nlc3Nvcl9pZCgpOyAgICAgICAgICAgaW50IGNw dSA9IGJwZl9nZXRfc21wX3Byb2Nlc3Nvcl9pZCgpOwo+PiAoODUpIGNhbGwgYnBmX2dldF9zbXBf cHJvY2Vzc29yX2lkIzIyOTAzMiAgICAgICAoMTgpIHIwID0gMHhmZmZmODAwMDgyMDcyMDA4Cj4+ ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChiZikgcjAg PSAmKHZvaWQgX19wZXJjcHUgKikocjApCj4+ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICg2MSkgcjAgPSAqKHUzMiAqKShyMCArMCkKPj4KPj4gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBBUk02NCBKSVQKPj4gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgID09PT09PT09PT09Cj4+Cj4+ICAgICAgICAgICAgICAg QkVGT1JFICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgQUZURVIKPj4gICAg ICAgICAgICAgIC0tLS0tLS0tICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC0t LS0tLS0KPj4KPj4gaW50IGNwdSA9IGJwZl9nZXRfc21wX3Byb2Nlc3Nvcl9pZCgpOyAgICAgICAg ICAgaW50IGNwdSA9IGJwZl9nZXRfc21wX3Byb2Nlc3Nvcl9pZCgpOwo+PiBtb3YgICAgIHgxMCwg IzB4ZmZmZmZmZmZmZmZmZjRkMCAgICAgICAgICAgICAgICBtb3YgICAgIHg3LCAjMHhmZmZmODAw MGZmZmZmZmZmCj4+IG1vdmsgICAgeDEwLCAjMHg4MDJiLCBsc2wgIzE2ICAgICAgICAgICAgICAg ICAgIG1vdmsgICAgeDcsICMweDgyMDcsIGxzbCAjMTYKPj4gbW92ayAgICB4MTAsICMweDgwMDAs IGxzbCAjMzIgICAgICAgICAgICAgICAgICAgbW92ayAgICB4NywgIzB4MjAwOAo+PiBibHIgICAg IHgxMCAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtcnMgICAgIHgxMCwgdHBp ZHJfZWwxCj4+IGFkZCAgICAgeDcsIHgwLCAjMHgwICAgICAgICAgICAgICAgICAgICAgICAgICAg IGFkZCAgICAgeDcsIHg3LCB4MTAKPj4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgbGRyICAgICB3NywgW3g3XQo+Pgo+PiBQZXJmb3JtYW5jZSBpbXByb3Zl bWVudCB1c2luZyBiZW5jaG1hcmtbMV0KPj4KPj4gICAgICAgICAgICAgIEJFRk9SRSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIEFGVEVSCj4+ICAgICAgICAgICAgIC0tLS0t LS0tICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIC0tLS0tLS0KPj4KPj4gZ2xv Yi1hcnItaW5jICAgOiAgIDIzLjgxNyDCsSAwLjAxOU0vcyAgICAgIGdsb2ItYXJyLWluYyAgIDog ICAyNC42MzEgwrEgMC4wMjdNL3MKPj4gYXJyLWluYyAgICAgICAgOiAgIDIzLjI1MyDCsSAwLjAx OU0vcyAgICAgIGFyci1pbmMgICAgICAgIDogICAyMy43NDIgwrEgMC4wMjNNL3MKPj4gaGFzaC1p bmMgICAgICAgOiAgIDEyLjI1OCDCsSAwLjAxME0vcyAgICAgIGhhc2gtaW5jICAgICAgIDogICAx Mi42MjUgwrEgMC4wMDRNL3MKPj4KPj4gWzFdIGh0dHBzOi8vZ2l0aHViLmNvbS9hbmFrcnlpa28v bGludXgvY29tbWl0LzhkZWM5MDA5NzVlZgo+Pgo+PiBTaWduZWQtb2ZmLWJ5OiBQdXJhbmpheSBN b2hhbiA8cHVyYW5qYXlAa2VybmVsLm9yZz4KPj4gQWNrZWQtYnk6IEFuZHJpaSBOYWtyeWlrbyA8 YW5kcmlpQGtlcm5lbC5vcmc+Cj4+IC0tLQo+PiAga2VybmVsL2JwZi92ZXJpZmllci5jIHwgMjQg KysrKysrKysrKysrKysrKystLS0tLS0tCj4+ICAxIGZpbGUgY2hhbmdlZCwgMTcgaW5zZXJ0aW9u cygrKSwgNyBkZWxldGlvbnMoLSkKPj4KPj4gZGlmZiAtLWdpdCBhL2tlcm5lbC9icGYvdmVyaWZp ZXIuYyBiL2tlcm5lbC9icGYvdmVyaWZpZXIuYwo+PiBpbmRleCA0ZTQ3NGVmNDRlOWMuLjZmZjRl NjNiMmVmMiAxMDA2NDQKPj4gLS0tIGEva2VybmVsL2JwZi92ZXJpZmllci5jCj4+ICsrKyBiL2tl cm5lbC9icGYvdmVyaWZpZXIuYwo+PiBAQCAtMjAyNzMsMjAgKzIwMjczLDMxIEBAIHN0YXRpYyBp bnQgZG9fbWlzY19maXh1cHMoc3RydWN0IGJwZl92ZXJpZmllcl9lbnYgKmVudikKPj4gICAgICAg ICAgICAgICAgICAgICAgICAgZ290byBuZXh0X2luc247Cj4+ICAgICAgICAgICAgICAgICB9Cj4+ Cj4+IC0jaWZkZWYgQ09ORklHX1g4Nl82NAo+PiAgICAgICAgICAgICAgICAgLyogSW1wbGVtZW50 IGJwZl9nZXRfc21wX3Byb2Nlc3Nvcl9pZCgpIGlubGluZS4gKi8KPj4gICAgICAgICAgICAgICAg IGlmIChpbnNuLT5pbW0gPT0gQlBGX0ZVTkNfZ2V0X3NtcF9wcm9jZXNzb3JfaWQgJiYKPj4gICAg ICAgICAgICAgICAgICAgICBwcm9nLT5qaXRfcmVxdWVzdGVkICYmIGJwZl9qaXRfc3VwcG9ydHNf cGVyY3B1X2luc24oKSkgewo+PiAgICAgICAgICAgICAgICAgICAgICAgICAvKiBCUEZfRlVOQ19n ZXRfc21wX3Byb2Nlc3Nvcl9pZCBpbmxpbmluZyBpcyBhbgo+PiAtICAgICAgICAgICAgICAgICAg ICAgICAgKiBvcHRpbWl6YXRpb24sIHNvIGlmIHBjcHVfaG90LmNwdV9udW1iZXIgaXMgZXZlcgo+ PiArICAgICAgICAgICAgICAgICAgICAgICAgKiBvcHRpbWl6YXRpb24sIHNvIGlmIGNwdV9udW1i ZXJfYWRkciBpcyBldmVyCj4+ICAgICAgICAgICAgICAgICAgICAgICAgICAqIGNoYW5nZWQgaW4g c29tZSBpbmNvbXBhdGlibGUgYW5kIGhhcmQgdG8gc3VwcG9ydAo+PiAgICAgICAgICAgICAgICAg ICAgICAgICAgKiB3YXksIGl0J3MgZmluZSB0byBiYWNrIG91dCB0aGlzIGlubGluaW5nIGxvZ2lj Cj4+ICAgICAgICAgICAgICAgICAgICAgICAgICAqLwo+PiAtICAgICAgICAgICAgICAgICAgICAg ICBpbnNuX2J1ZlswXSA9IEJQRl9NT1YzMl9JTU0oQlBGX1JFR18wLCAodTMyKSh1bnNpZ25lZCBs b25nKSZwY3B1X2hvdC5jcHVfbnVtYmVyKTsKPj4gLSAgICAgICAgICAgICAgICAgICAgICAgaW5z bl9idWZbMV0gPSBCUEZfTU9WNjRfUEVSQ1BVX1JFRyhCUEZfUkVHXzAsIEJQRl9SRUdfMCk7Cj4+ IC0gICAgICAgICAgICAgICAgICAgICAgIGluc25fYnVmWzJdID0gQlBGX0xEWF9NRU0oQlBGX1cs IEJQRl9SRUdfMCwgQlBGX1JFR18wLCAwKTsKPj4gLSAgICAgICAgICAgICAgICAgICAgICAgY250 ID0gMzsKPj4gKyAgICAgICAgICAgICAgICAgICAgICAgdTY0IGNwdV9udW1iZXJfYWRkcjsKPj4K Pj4gKyNpZiBkZWZpbmVkKENPTkZJR19YODZfNjQpCj4+ICsgICAgICAgICAgICAgICAgICAgICAg IGNwdV9udW1iZXJfYWRkciA9ICh1NjQpJnBjcHVfaG90LmNwdV9udW1iZXI7Cj4+ICsjZWxpZiBk ZWZpbmVkKENPTkZJR19BUk02NCkKPj4gKyAgICAgICAgICAgICAgICAgICAgICAgY3B1X251bWJl cl9hZGRyID0gKHU2NCkmY3B1X251bWJlcjsKPj4gKyNlbHNlCj4+ICsgICAgICAgICAgICAgICAg ICAgICAgIGdvdG8gbmV4dF9pbnNuOwo+PiArI2VuZGlmCj4+ICsgICAgICAgICAgICAgICAgICAg ICAgIHN0cnVjdCBicGZfaW5zbiBsZF9jcHVfbnVtYmVyX2FkZHJbMl0gPSB7Cj4+ICsgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgQlBGX0xEX0lNTTY0KEJQRl9SRUdfMCwgY3B1X251bWJl cl9hZGRyKQo+PiArICAgICAgICAgICAgICAgICAgICAgICB9Owo+Cj4gaGVyZSB3ZSBhcmUgdmlv bGF0aW5nIEM4OSByZXF1aXJlbWVudCB0byBoYXZlIGEgc2luZ2xlIGJsb2NrIG9mCj4gdmFyaWFi bGUgZGVjbGFyYXRpb25zIGJ5IG1peGluZyB2YXJpYWJsZXMgYW5kIHN0YXRlbWVudHMuIEknbQo+ IHN1cnByaXNlZCB0aGlzIGlzIG5vdCB0cmlnZ2VyaW5nIGFueSBidWlsZCBlcnJvcnMgb24gIWFy bTY0ICYmCj4gIXg4Nl82NC4KPgo+IEkgdGhpbmsgd2UgY2FuIGRlY2xhcmUgdGhpcyBCUEZfTERf SU1NNjQgaW5zdHJ1Y3Rpb24gd2l0aCB6ZXJvICJhZGRyIi4KPiBBbmQgdGhlbiB1cGRhdGUKPgo+ IGxkX2NwdV9udW1iZXJfYWRkclswXS5pbW0gPSAodTMyKWNwdV9udW1iZXJfYWRkcjsKPiBsZF9j cHVfbnVtYmVyX2FkZHJbMV0uaW1tID0gKHUzMikoY3B1X251bWJlcl9hZGRyID4+IDMyKTsKPgo+ IFdEWVQ/Cj4KPiBuaXQ6IEknZCByZW5hbWUgbGRfY3B1X251bWJlcl9hZGRyIHRvIGxkX2luc24g b3Igc29tZXRoaW5nIHNob3J0IGxpa2UgdGhhdAoKSSBhZ3JlZSB3aXRoIHlvdSwKV2hhdCBkbyB5 b3UgdGhpbmsgYWJvdXQgdGhlIGZvbGxvd2luZyBkaWZmOgoKLS0tIDg8IC0tLQoKLSNpZmRlZiBD T05GSUdfWDg2XzY0CiAgICAgICAgICAgICAgICAvKiBJbXBsZW1lbnQgYnBmX2dldF9zbXBfcHJv Y2Vzc29yX2lkKCkgaW5saW5lLiAqLwogICAgICAgICAgICAgICAgaWYgKGluc24tPmltbSA9PSBC UEZfRlVOQ19nZXRfc21wX3Byb2Nlc3Nvcl9pZCAmJgogICAgICAgICAgICAgICAgICAgIHByb2ct PmppdF9yZXF1ZXN0ZWQgJiYgYnBmX2ppdF9zdXBwb3J0c19wZXJjcHVfaW5zbigpKSB7CiAgICAg ICAgICAgICAgICAgICAgICAgIC8qIEJQRl9GVU5DX2dldF9zbXBfcHJvY2Vzc29yX2lkIGlubGlu aW5nIGlzIGFuCi0gICAgICAgICAgICAgICAgICAgICAgICAqIG9wdGltaXphdGlvbiwgc28gaWYg cGNwdV9ob3QuY3B1X251bWJlciBpcyBldmVyCisgICAgICAgICAgICAgICAgICAgICAgICAqIG9w dGltaXphdGlvbiwgc28gaWYgY3B1X251bWJlcl9hZGRyIGlzIGV2ZXIKICAgICAgICAgICAgICAg ICAgICAgICAgICogY2hhbmdlZCBpbiBzb21lIGluY29tcGF0aWJsZSBhbmQgaGFyZCB0byBzdXBw b3J0CiAgICAgICAgICAgICAgICAgICAgICAgICAqIHdheSwgaXQncyBmaW5lIHRvIGJhY2sgb3V0 IHRoaXMgaW5saW5pbmcgbG9naWMKICAgICAgICAgICAgICAgICAgICAgICAgICovCi0gICAgICAg ICAgICAgICAgICAgICAgIGluc25fYnVmWzBdID0gQlBGX01PVjMyX0lNTShCUEZfUkVHXzAsICh1 MzIpKHVuc2lnbmVkIGxvbmcpJnBjcHVfaG90LmNwdV9udW1iZXIpOwotICAgICAgICAgICAgICAg ICAgICAgICBpbnNuX2J1ZlsxXSA9IEJQRl9NT1Y2NF9QRVJDUFVfUkVHKEJQRl9SRUdfMCwgQlBG X1JFR18wKTsKLSAgICAgICAgICAgICAgICAgICAgICAgaW5zbl9idWZbMl0gPSBCUEZfTERYX01F TShCUEZfVywgQlBGX1JFR18wLCBCUEZfUkVHXzAsIDApOwotICAgICAgICAgICAgICAgICAgICAg ICBjbnQgPSAzOworICAgICAgICAgICAgICAgICAgICAgICB1NjQgY3B1X251bWJlcl9hZGRyOwor ICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3QgYnBmX2luc24gbGRfaW5zblsyXSA9IHsKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBCUEZfTERfSU1NNjQoQlBGX1JFR18wLCAwKQor ICAgICAgICAgICAgICAgICAgICAgICB9OworCisjaWYgZGVmaW5lZChDT05GSUdfWDg2XzY0KQor ICAgICAgICAgICAgICAgICAgICAgICBjcHVfbnVtYmVyX2FkZHIgPSAodTY0KSZwY3B1X2hvdC5j cHVfbnVtYmVyOworI2VsaWYgZGVmaW5lZChDT05GSUdfQVJNNjQpCisgICAgICAgICAgICAgICAg ICAgICAgIGNwdV9udW1iZXJfYWRkciA9ICh1NjQpJmNwdV9udW1iZXI7CisjZWxzZQorICAgICAg ICAgICAgICAgICAgICAgICBnb3RvIG5leHRfaW5zbjsKKyNlbmRpZgorICAgICAgICAgICAgICAg ICAgICAgICBsZF9pbnNuWzBdLmltbSA9ICh1MzIpY3B1X251bWJlcl9hZGRyOworICAgICAgICAg ICAgICAgICAgICAgICBsZF9pbnNuWzFdLmltbSA9ICh1MzIpKGNwdV9udW1iZXJfYWRkciA+PiAz Mik7CisgICAgICAgICAgICAgICAgICAgICAgIGluc25fYnVmWzBdID0gbGRfaW5zblswXTsKKyAg ICAgICAgICAgICAgICAgICAgICAgaW5zbl9idWZbMV0gPSBsZF9pbnNuWzFdOworICAgICAgICAg ICAgICAgICAgICAgICBpbnNuX2J1ZlsyXSA9IEJQRl9NT1Y2NF9QRVJDUFVfUkVHKEJQRl9SRUdf MCwgQlBGX1JFR18wKTsKKyAgICAgICAgICAgICAgICAgICAgICAgaW5zbl9idWZbM10gPSBCUEZf TERYX01FTShCUEZfVywgQlBGX1JFR18wLCBCUEZfUkVHXzAsIDApOworICAgICAgICAgICAgICAg ICAgICAgICBjbnQgPSA0OwoKICAgICAgICAgICAgICAgICAgICAgICAgbmV3X3Byb2cgPSBicGZf cGF0Y2hfaW5zbl9kYXRhKGVudiwgaSArIGRlbHRhLCBpbnNuX2J1ZiwgY250KTsKICAgICAgICAg ICAgICAgICAgICAgICAgaWYgKCFuZXdfcHJvZykKQEAgLTIwMjk2LDcgKzIwMzEwLDYgQEAgc3Rh dGljIGludCBkb19taXNjX2ZpeHVwcyhzdHJ1Y3QgYnBmX3ZlcmlmaWVyX2VudiAqZW52KQogICAg ICAgICAgICAgICAgICAgICAgICBpbnNuICAgICAgPSBuZXdfcHJvZy0+aW5zbnNpICsgaSArIGRl bHRhOwogICAgICAgICAgICAgICAgICAgICAgICBnb3RvIG5leHRfaW5zbjsKICAgICAgICAgICAg ICAgIH0KLSNlbmRpZgogICAgICAgICAgICAgICAgLyogSW1wbGVtZW50IGJwZl9nZXRfZnVuY19h cmcgaW5saW5lLiAqLwoKLS0tID44LS0tCgpUaGFua3MsClB1cmFuamF5CgpfX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpsaW51eC1hcm0ta2VybmVsIG1haWxp bmcgbGlzdApsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5vcmcKaHR0cDovL2xpc3Rz LmluZnJhZGVhZC5vcmcvbWFpbG1hbi9saXN0aW5mby9saW51eC1hcm0ta2VybmVsCg==