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 32346184133; Tue, 30 Apr 2024 17:59:01 +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=1714499942; cv=none; b=A3xw3+EAsGNerUkMLcwwAoTiqXfDEz41ZiK7e9TC0X2YddMbDKb0zgTO61j2P2Vs/FdNmlyR6kXsZin3Kxq7lS3kf//yAZcBA4F55TgDWss2jDnEKWDBCAGoO+Bte1nIXx9p9MbWd1Gdj4dF04tiBi22zgy6uC7QkaSOLvdqJcg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714499942; c=relaxed/simple; bh=Wvx/3pXiVZjsGrp+teOKlOLjuKUzaKF+KK8AcSH3HgY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=enZ0LF0CXcTzWmMKTFmyy6GYdG617XZcrlGRszSxkKbZ+BZlVCch+i0iuqNWf+n0ZvKx75Sxb8SLiBvD/x2+srkE6LAq6PQtn6o1ZCzk9YOvTQZ6OMCusdXDAbNAdSQ+hj4lslCbs5xMB9uyiVyxT3avvuKeowPEQGtaTfr9UQ0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=qOO7OhOn; 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="qOO7OhOn" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 885D1C4AF17; Tue, 30 Apr 2024 17:59:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714499941; bh=Wvx/3pXiVZjsGrp+teOKlOLjuKUzaKF+KK8AcSH3HgY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qOO7OhOn9XLshqvaybfK7bFe0eJuH5Av0Ybf7MV/Jn0CiLYmY5I92Qg9TjhhLzs/I 8RigUH/4VhbXPXQ1zHER+H8/A7eWLNO1FyAmMrwM7Mt8mbXoP5DqNcBsE7wpnsyZm7 z5F0POfbb+8Y/R4sNXBsEGjc54hFHz1tMTHH5pD6YjI0gu0mPRG+bW7p0UgMHmbDFp 6KXbDW269CXDV18gkJeHpjaH6t+BDnRoQbuUVpomshG9CqI51PUo7Uu8enRAIBdEjr I0y1gGib+X9gJHN9kC1jshrY42KUzGeQy15KvxWB1tmK7kKsTNny44JhQcZqnaHF6l DuEHWNnBGn2WQ== From: Puranjay Mohan To: 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 , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Paul Walmsley , Palmer Dabbelt , Albert Ou , bpf@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Pu Lehui Cc: puranjay12@gmail.com Subject: [PATCH bpf-next v2 2/2] riscv, bpf: inline bpf_get_smp_processor_id() Date: Tue, 30 Apr 2024 17:58:34 +0000 Message-Id: <20240430175834.33152-3-puranjay@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240430175834.33152-1-puranjay@kernel.org> References: <20240430175834.33152-1-puranjay@kernel.org> 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: 8bit Inline the calls to bpf_get_smp_processor_id() in the riscv bpf jit. RISCV saves the pointer to the CPU's task_struct in the TP (thread pointer) register. This makes it trivial to get the CPU's processor id. As thread_info is the first member of task_struct, we can read the processor id from TP + offsetof(struct thread_info, cpu). RISCV64 JIT output for `call bpf_get_smp_processor_id` ====================================================== Before After -------- ------- auipc t1,0x848c ld a5,32(tp) jalr 604(t1) mv a5,a0 Benchmark using [1] on Qemu. ./benchs/run_bench_trigger.sh glob-arr-inc arr-inc hash-inc +---------------+------------------+------------------+--------------+ | Name | Before | After | % change | |---------------+------------------+------------------+--------------| | glob-arr-inc | 1.077 ± 0.006M/s | 1.336 ± 0.010M/s | + 24.04% | | arr-inc | 1.078 ± 0.002M/s | 1.332 ± 0.015M/s | + 23.56% | | hash-inc | 0.494 ± 0.004M/s | 0.653 ± 0.001M/s | + 32.18% | +---------------+------------------+------------------+--------------+ NOTE: This benchmark includes changes from this patch and the previous patch that implemented the per-cpu insn. [1] https://github.com/anakryiko/linux/commit/8dec900975ef Signed-off-by: Puranjay Mohan --- arch/riscv/net/bpf_jit_comp64.c | 26 ++++++++++++++++++++++++++ include/linux/filter.h | 1 + kernel/bpf/core.c | 11 +++++++++++ kernel/bpf/verifier.c | 2 ++ 4 files changed, 40 insertions(+) diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_comp64.c index 99d7006f1420..5789b7afae47 100644 --- a/arch/riscv/net/bpf_jit_comp64.c +++ b/arch/riscv/net/bpf_jit_comp64.c @@ -1493,6 +1493,22 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn, struct rv_jit_context *ctx, bool fixed_addr; u64 addr; + /* Inline calls to bpf_get_smp_processor_id() + * + * RV_REG_TP holds the address of the current CPU's task_struct and thread_info is + * at offset 0 in task_struct. + * Load cpu from thread_info: + * Set R0 to ((struct thread_info *)(RV_REG_TP))->cpu + * + * This replicates the implementation of raw_smp_processor_id() on RISCV + */ + if (insn->src_reg == 0 && insn->imm == BPF_FUNC_get_smp_processor_id) { + /* Load current CPU number in R0 */ + emit_ld(bpf_to_rv_reg(BPF_REG_0, ctx), offsetof(struct thread_info, cpu), + RV_REG_TP, ctx); + break; + } + mark_call(ctx); ret = bpf_jit_get_func_addr(ctx->prog, insn, extra_pass, &addr, &fixed_addr); @@ -2062,3 +2078,13 @@ bool bpf_jit_supports_percpu_insn(void) { return true; } + +bool bpf_jit_inlines_helper_call(s32 imm) +{ + switch (imm) { + case BPF_FUNC_get_smp_processor_id: + return true; + } + + return false; +} diff --git a/include/linux/filter.h b/include/linux/filter.h index 7a27f19bf44d..3e19bb62ed1a 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -993,6 +993,7 @@ u64 __bpf_call_base(u64 r1, u64 r2, u64 r3, u64 r4, u64 r5); struct bpf_prog *bpf_int_jit_compile(struct bpf_prog *prog); void bpf_jit_compile(struct bpf_prog *prog); bool bpf_jit_needs_zext(void); +bool bpf_jit_inlines_helper_call(s32 imm); bool bpf_jit_supports_subprog_tailcalls(void); bool bpf_jit_supports_percpu_insn(void); bool bpf_jit_supports_kfunc_call(void); diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 99b8b1c9a248..aa59af9f9bd9 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -2941,6 +2941,17 @@ bool __weak bpf_jit_needs_zext(void) return false; } +/* Return true if the JIT inlines the call to the helper corresponding to + * the imm. + * + * The verifier will not patch the insn->imm for the call to the helper if + * this returns true. + */ +bool __weak bpf_jit_inlines_helper_call(s32 imm) +{ + return false; +} + /* Return TRUE if the JIT backend supports mixing bpf2bpf and tailcalls. */ bool __weak bpf_jit_supports_subprog_tailcalls(void) { diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 5d42db05315e..e78f766d7f91 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -20013,6 +20013,8 @@ static int do_misc_fixups(struct bpf_verifier_env *env) goto next_insn; } + if (bpf_jit_inlines_helper_call(insn->imm)) + goto next_insn; if (insn->imm == BPF_FUNC_get_route_realm) prog->dst_needed = 1; if (insn->imm == BPF_FUNC_get_prandom_u32) -- 2.40.1 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 CE952C4345F for ; Tue, 30 Apr 2024 17:59:13 +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:References:In-Reply-To: Message-Id:Date: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=e9k+w5kZQHMaJoSvadS0laZHZGMg3wB8dosdNnAzzK0=; b=DOJzF3u72ASLu/ 99Wjtqa5pDbNz4B0/GFIx6SYnyaGaaX2SoYVFW6eefQ6sOAFsWVkkqI0AlI94/VVUKOZNfpOt4JH7 VVB779BxAuLHzdM65v0Q3mmzmUK3/9DS8IaU4Zez4iByQMWzmTT6vxWcW8nf++P5/1Fj96c+Nnriv zCw1uMz1HdfncsfTz2ww7XCjW8g+pd+eimjBR2Myiv/thn252oGOfNy1nP/pyogyNuWKsuxh0PqKR BljkQxsucFjcgwRVSQ8+3x9zelTn9MND57MQhYdifq66K2Fb69yG4Pcfm8mx0vxrGpaLCc2Buave1 JMBsFKNk7dtMUCQ5E2hQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1s1rkz-00000007Vrq-3ARV; Tue, 30 Apr 2024 17:59:09 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1s1rks-00000007Vot-3a26 for linux-riscv@lists.infradead.org; Tue, 30 Apr 2024 17:59:04 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 4012C6173A; Tue, 30 Apr 2024 17:59:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 885D1C4AF17; Tue, 30 Apr 2024 17:59:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714499941; bh=Wvx/3pXiVZjsGrp+teOKlOLjuKUzaKF+KK8AcSH3HgY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qOO7OhOn9XLshqvaybfK7bFe0eJuH5Av0Ybf7MV/Jn0CiLYmY5I92Qg9TjhhLzs/I 8RigUH/4VhbXPXQ1zHER+H8/A7eWLNO1FyAmMrwM7Mt8mbXoP5DqNcBsE7wpnsyZm7 z5F0POfbb+8Y/R4sNXBsEGjc54hFHz1tMTHH5pD6YjI0gu0mPRG+bW7p0UgMHmbDFp 6KXbDW269CXDV18gkJeHpjaH6t+BDnRoQbuUVpomshG9CqI51PUo7Uu8enRAIBdEjr I0y1gGib+X9gJHN9kC1jshrY42KUzGeQy15KvxWB1tmK7kKsTNny44JhQcZqnaHF6l DuEHWNnBGn2WQ== From: Puranjay Mohan To: 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 , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , Paul Walmsley , Palmer Dabbelt , Albert Ou , bpf@vger.kernel.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Pu Lehui Cc: puranjay12@gmail.com Subject: [PATCH bpf-next v2 2/2] riscv, bpf: inline bpf_get_smp_processor_id() Date: Tue, 30 Apr 2024 17:58:34 +0000 Message-Id: <20240430175834.33152-3-puranjay@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240430175834.33152-1-puranjay@kernel.org> References: <20240430175834.33152-1-puranjay@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240430_105903_006861_BEA6BAC3 X-CRM114-Status: GOOD ( 17.62 ) 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 SW5saW5lIHRoZSBjYWxscyB0byBicGZfZ2V0X3NtcF9wcm9jZXNzb3JfaWQoKSBpbiB0aGUgcmlz Y3YgYnBmIGppdC4KClJJU0NWIHNhdmVzIHRoZSBwb2ludGVyIHRvIHRoZSBDUFUncyB0YXNrX3N0 cnVjdCBpbiB0aGUgVFAgKHRocmVhZApwb2ludGVyKSByZWdpc3Rlci4gVGhpcyBtYWtlcyBpdCB0 cml2aWFsIHRvIGdldCB0aGUgQ1BVJ3MgcHJvY2Vzc29yIGlkLgpBcyB0aHJlYWRfaW5mbyBpcyB0 aGUgZmlyc3QgbWVtYmVyIG9mIHRhc2tfc3RydWN0LCB3ZSBjYW4gcmVhZCB0aGUKcHJvY2Vzc29y IGlkIGZyb20gVFAgKyBvZmZzZXRvZihzdHJ1Y3QgdGhyZWFkX2luZm8sIGNwdSkuCgogICAgICAg ICAgUklTQ1Y2NCBKSVQgb3V0cHV0IGZvciBgY2FsbCBicGZfZ2V0X3NtcF9wcm9jZXNzb3JfaWRg CgkgID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQoKICAgICAgICAgICAgICAgIEJlZm9yZSAgICAgICAgICAgICAgICAgICAgICAgICAgIEFmdGVy CiAgICAgICAgICAgICAgIC0tLS0tLS0tICAgICAgICAgICAgICAgICAgICAgICAgIC0tLS0tLS0K CiAgICAgICAgIGF1aXBjICAgdDEsMHg4NDhjICAgICAgICAgICAgICAgICAgbGQgICAgYTUsMzIo dHApCiAgICAgICAgIGphbHIgICAgNjA0KHQxKQogICAgICAgICBtdiAgICAgIGE1LGEwCgpCZW5j aG1hcmsgdXNpbmcgWzFdIG9uIFFlbXUuCgouL2JlbmNocy9ydW5fYmVuY2hfdHJpZ2dlci5zaCBn bG9iLWFyci1pbmMgYXJyLWluYyBoYXNoLWluYwoKKy0tLS0tLS0tLS0tLS0tLSstLS0tLS0tLS0t LS0tLS0tLS0rLS0tLS0tLS0tLS0tLS0tLS0tKy0tLS0tLS0tLS0tLS0tKwp8ICAgICAgTmFtZSAg ICAgfCAgICAgQmVmb3JlICAgICAgIHwgICAgICAgQWZ0ZXIgICAgICB8ICAgJSBjaGFuZ2UgICB8 CnwtLS0tLS0tLS0tLS0tLS0rLS0tLS0tLS0tLS0tLS0tLS0tKy0tLS0tLS0tLS0tLS0tLS0tLSst LS0tLS0tLS0tLS0tLXwKfCBnbG9iLWFyci1pbmMgIHwgMS4wNzcgwrEgMC4wMDZNL3MgfCAxLjMz NiDCsSAwLjAxME0vcyB8ICAgKyAyNC4wNCUgICB8CnwgYXJyLWluYyAgICAgICB8IDEuMDc4IMKx IDAuMDAyTS9zIHwgMS4zMzIgwrEgMC4wMTVNL3MgfCAgICsgMjMuNTYlICAgfAp8IGhhc2gtaW5j ICAgICAgfCAwLjQ5NCDCsSAwLjAwNE0vcyB8IDAuNjUzIMKxIDAuMDAxTS9zIHwgICArIDMyLjE4 JSAgIHwKKy0tLS0tLS0tLS0tLS0tLSstLS0tLS0tLS0tLS0tLS0tLS0rLS0tLS0tLS0tLS0tLS0t LS0tKy0tLS0tLS0tLS0tLS0tKwoKTk9URTogVGhpcyBiZW5jaG1hcmsgaW5jbHVkZXMgY2hhbmdl cyBmcm9tIHRoaXMgcGF0Y2ggYW5kIHRoZSBwcmV2aW91cwogICAgICBwYXRjaCB0aGF0IGltcGxl bWVudGVkIHRoZSBwZXItY3B1IGluc24uCgpbMV0gaHR0cHM6Ly9naXRodWIuY29tL2FuYWtyeWlr by9saW51eC9jb21taXQvOGRlYzkwMDk3NWVmCgpTaWduZWQtb2ZmLWJ5OiBQdXJhbmpheSBNb2hh biA8cHVyYW5qYXlAa2VybmVsLm9yZz4KLS0tCiBhcmNoL3Jpc2N2L25ldC9icGZfaml0X2NvbXA2 NC5jIHwgMjYgKysrKysrKysrKysrKysrKysrKysrKysrKysKIGluY2x1ZGUvbGludXgvZmlsdGVy LmggICAgICAgICAgfCAgMSArCiBrZXJuZWwvYnBmL2NvcmUuYyAgICAgICAgICAgICAgIHwgMTEg KysrKysrKysrKysKIGtlcm5lbC9icGYvdmVyaWZpZXIuYyAgICAgICAgICAgfCAgMiArKwogNCBm aWxlcyBjaGFuZ2VkLCA0MCBpbnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvYXJjaC9yaXNjdi9u ZXQvYnBmX2ppdF9jb21wNjQuYyBiL2FyY2gvcmlzY3YvbmV0L2JwZl9qaXRfY29tcDY0LmMKaW5k ZXggOTlkNzAwNmYxNDIwLi41Nzg5YjdhZmFlNDcgMTAwNjQ0Ci0tLSBhL2FyY2gvcmlzY3YvbmV0 L2JwZl9qaXRfY29tcDY0LmMKKysrIGIvYXJjaC9yaXNjdi9uZXQvYnBmX2ppdF9jb21wNjQuYwpA QCAtMTQ5Myw2ICsxNDkzLDIyIEBAIGludCBicGZfaml0X2VtaXRfaW5zbihjb25zdCBzdHJ1Y3Qg YnBmX2luc24gKmluc24sIHN0cnVjdCBydl9qaXRfY29udGV4dCAqY3R4LAogCQlib29sIGZpeGVk X2FkZHI7CiAJCXU2NCBhZGRyOwogCisJCS8qIElubGluZSBjYWxscyB0byBicGZfZ2V0X3NtcF9w cm9jZXNzb3JfaWQoKQorCQkgKgorCQkgKiBSVl9SRUdfVFAgaG9sZHMgdGhlIGFkZHJlc3Mgb2Yg dGhlIGN1cnJlbnQgQ1BVJ3MgdGFza19zdHJ1Y3QgYW5kIHRocmVhZF9pbmZvIGlzCisJCSAqIGF0 IG9mZnNldCAwIGluIHRhc2tfc3RydWN0LgorCQkgKiBMb2FkIGNwdSBmcm9tIHRocmVhZF9pbmZv OgorCQkgKiAgICAgU2V0IFIwIHRvICgoc3RydWN0IHRocmVhZF9pbmZvICopKFJWX1JFR19UUCkp LT5jcHUKKwkJICoKKwkJICogVGhpcyByZXBsaWNhdGVzIHRoZSBpbXBsZW1lbnRhdGlvbiBvZiBy YXdfc21wX3Byb2Nlc3Nvcl9pZCgpIG9uIFJJU0NWCisJCSAqLworCQlpZiAoaW5zbi0+c3JjX3Jl ZyA9PSAwICYmIGluc24tPmltbSA9PSBCUEZfRlVOQ19nZXRfc21wX3Byb2Nlc3Nvcl9pZCkgewor CQkJLyogTG9hZCBjdXJyZW50IENQVSBudW1iZXIgaW4gUjAgKi8KKwkJCWVtaXRfbGQoYnBmX3Rv X3J2X3JlZyhCUEZfUkVHXzAsIGN0eCksIG9mZnNldG9mKHN0cnVjdCB0aHJlYWRfaW5mbywgY3B1 KSwKKwkJCQlSVl9SRUdfVFAsIGN0eCk7CisJCQlicmVhazsKKwkJfQorCiAJCW1hcmtfY2FsbChj dHgpOwogCQlyZXQgPSBicGZfaml0X2dldF9mdW5jX2FkZHIoY3R4LT5wcm9nLCBpbnNuLCBleHRy YV9wYXNzLAogCQkJCQkgICAgJmFkZHIsICZmaXhlZF9hZGRyKTsKQEAgLTIwNjIsMyArMjA3OCwx MyBAQCBib29sIGJwZl9qaXRfc3VwcG9ydHNfcGVyY3B1X2luc24odm9pZCkKIHsKIAlyZXR1cm4g dHJ1ZTsKIH0KKworYm9vbCBicGZfaml0X2lubGluZXNfaGVscGVyX2NhbGwoczMyIGltbSkKK3sK Kwlzd2l0Y2ggKGltbSkgeworCWNhc2UgQlBGX0ZVTkNfZ2V0X3NtcF9wcm9jZXNzb3JfaWQ6CisJ CXJldHVybiB0cnVlOworCX0KKworCXJldHVybiBmYWxzZTsKK30KZGlmZiAtLWdpdCBhL2luY2x1 ZGUvbGludXgvZmlsdGVyLmggYi9pbmNsdWRlL2xpbnV4L2ZpbHRlci5oCmluZGV4IDdhMjdmMTli ZjQ0ZC4uM2UxOWJiNjJlZDFhIDEwMDY0NAotLS0gYS9pbmNsdWRlL2xpbnV4L2ZpbHRlci5oCisr KyBiL2luY2x1ZGUvbGludXgvZmlsdGVyLmgKQEAgLTk5Myw2ICs5OTMsNyBAQCB1NjQgX19icGZf Y2FsbF9iYXNlKHU2NCByMSwgdTY0IHIyLCB1NjQgcjMsIHU2NCByNCwgdTY0IHI1KTsKIHN0cnVj dCBicGZfcHJvZyAqYnBmX2ludF9qaXRfY29tcGlsZShzdHJ1Y3QgYnBmX3Byb2cgKnByb2cpOwog dm9pZCBicGZfaml0X2NvbXBpbGUoc3RydWN0IGJwZl9wcm9nICpwcm9nKTsKIGJvb2wgYnBmX2pp dF9uZWVkc196ZXh0KHZvaWQpOworYm9vbCBicGZfaml0X2lubGluZXNfaGVscGVyX2NhbGwoczMy IGltbSk7CiBib29sIGJwZl9qaXRfc3VwcG9ydHNfc3VicHJvZ190YWlsY2FsbHModm9pZCk7CiBi b29sIGJwZl9qaXRfc3VwcG9ydHNfcGVyY3B1X2luc24odm9pZCk7CiBib29sIGJwZl9qaXRfc3Vw cG9ydHNfa2Z1bmNfY2FsbCh2b2lkKTsKZGlmZiAtLWdpdCBhL2tlcm5lbC9icGYvY29yZS5jIGIv a2VybmVsL2JwZi9jb3JlLmMKaW5kZXggOTliOGIxYzlhMjQ4Li5hYTU5YWY5ZjliZDkgMTAwNjQ0 Ci0tLSBhL2tlcm5lbC9icGYvY29yZS5jCisrKyBiL2tlcm5lbC9icGYvY29yZS5jCkBAIC0yOTQx LDYgKzI5NDEsMTcgQEAgYm9vbCBfX3dlYWsgYnBmX2ppdF9uZWVkc196ZXh0KHZvaWQpCiAJcmV0 dXJuIGZhbHNlOwogfQogCisvKiBSZXR1cm4gdHJ1ZSBpZiB0aGUgSklUIGlubGluZXMgdGhlIGNh bGwgdG8gdGhlIGhlbHBlciBjb3JyZXNwb25kaW5nIHRvCisgKiB0aGUgaW1tLgorICoKKyAqIFRo ZSB2ZXJpZmllciB3aWxsIG5vdCBwYXRjaCB0aGUgaW5zbi0+aW1tIGZvciB0aGUgY2FsbCB0byB0 aGUgaGVscGVyIGlmCisgKiB0aGlzIHJldHVybnMgdHJ1ZS4KKyAqLworYm9vbCBfX3dlYWsgYnBm X2ppdF9pbmxpbmVzX2hlbHBlcl9jYWxsKHMzMiBpbW0pCit7CisJcmV0dXJuIGZhbHNlOworfQor CiAvKiBSZXR1cm4gVFJVRSBpZiB0aGUgSklUIGJhY2tlbmQgc3VwcG9ydHMgbWl4aW5nIGJwZjJi cGYgYW5kIHRhaWxjYWxscy4gKi8KIGJvb2wgX193ZWFrIGJwZl9qaXRfc3VwcG9ydHNfc3VicHJv Z190YWlsY2FsbHModm9pZCkKIHsKZGlmZiAtLWdpdCBhL2tlcm5lbC9icGYvdmVyaWZpZXIuYyBi L2tlcm5lbC9icGYvdmVyaWZpZXIuYwppbmRleCA1ZDQyZGIwNTMxNWUuLmU3OGY3NjZkN2Y5MSAx MDA2NDQKLS0tIGEva2VybmVsL2JwZi92ZXJpZmllci5jCisrKyBiL2tlcm5lbC9icGYvdmVyaWZp ZXIuYwpAQCAtMjAwMTMsNiArMjAwMTMsOCBAQCBzdGF0aWMgaW50IGRvX21pc2NfZml4dXBzKHN0 cnVjdCBicGZfdmVyaWZpZXJfZW52ICplbnYpCiAJCQlnb3RvIG5leHRfaW5zbjsKIAkJfQogCisJ CWlmIChicGZfaml0X2lubGluZXNfaGVscGVyX2NhbGwoaW5zbi0+aW1tKSkKKwkJCWdvdG8gbmV4 dF9pbnNuOwogCQlpZiAoaW5zbi0+aW1tID09IEJQRl9GVU5DX2dldF9yb3V0ZV9yZWFsbSkKIAkJ CXByb2ctPmRzdF9uZWVkZWQgPSAxOwogCQlpZiAoaW5zbi0+aW1tID09IEJQRl9GVU5DX2dldF9w cmFuZG9tX3UzMikKLS0gCjIuNDAuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fCmxpbnV4LXJpc2N2IG1haWxpbmcgbGlzdApsaW51eC1yaXNjdkBsaXN0 cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGlu Zm8vbGludXgtcmlzY3YK