Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   =?utf-8?B?QmrDtnJuIFTDtnBlbA==?= <bjorn@kernel.org>
To:     Pu Lehui <pulehui@huawei.com>, Pu Lehui <pulehui@huaweicloud.com>,
        bpf@vger.kernel.org, linux-riscv@lists.infradead.org,
        linux-kernel@vger.kernel.org
Cc:     Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Andrii Nakryiko <andrii@kernel.org>,
        Martin KaFai Lau <martin.lau@linux.dev>,
        Song Liu <song@kernel.org>, Yonghong Song <yhs@fb.com>,
        John Fastabend <john.fastabend@gmail.com>,
        KP Singh <kpsingh@kernel.org>,
        Stanislav Fomichev <sdf@google.com>,
        Hao Luo <haoluo@google.com>, Jiri Olsa <jolsa@kernel.org>,
        Paul Walmsley <paul.walmsley@sifive.com>,
        Palmer Dabbelt <palmer@dabbelt.com>,
        Albert Ou <aou@eecs.berkeley.edu>
Subject: Re: [RFC PATCH bpf-next 3/4] riscv, bpf: Add bpf_arch_text_poke
 support for RV64
In-Reply-To: <713f9f26-da42-eda8-c804-338d61b1557c@huawei.com>
References: <20221219133736.1387008-1-pulehui@huaweicloud.com>
 <20221219133736.1387008-4-pulehui@huaweicloud.com>
 <87v8looypd.fsf@all.your.base.are.belong.to.us>
 <713f9f26-da42-eda8-c804-338d61b1557c@huawei.com>
Date:   Tue, 03 Jan 2023 09:21:54 +0100
Message-ID: <877cy4xc2l.fsf@all.your.base.are.belong.to.us>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Pu Lehui <pulehui@huawei.com> writes:

> On 2023/1/3 15:37, Bj=C3=B6rn T=C3=B6pel wrote:
>> Pu Lehui <pulehui@huaweicloud.com> writes:
>>=20
>>> diff --git a/arch/riscv/net/bpf_jit_comp64.c b/arch/riscv/net/bpf_jit_c=
omp64.c
>>> index bf4721a99a09..fa8b03c52463 100644
>>> --- a/arch/riscv/net/bpf_jit_comp64.c
>>> +++ b/arch/riscv/net/bpf_jit_comp64.c
>>=20
>>> @@ -1266,7 +1389,7 @@ int bpf_jit_emit_insn(const struct bpf_insn *insn=
, struct rv_jit_context *ctx,
>>>=20=20=20
>>>   void bpf_jit_build_prologue(struct rv_jit_context *ctx)
>>>   {
>>> -	int stack_adjust =3D 0, store_offset, bpf_stack_adjust;
>>> +	int i, stack_adjust =3D 0, store_offset, bpf_stack_adjust;
>>>   	bool is_main_prog =3D ctx->prog->aux->func_idx =3D=3D 0;
>>=20
>> This line magically appeared, and makes it hard to apply the series
>> without hacking the patches manually. Going forward, please supply a
>> base tree commit to the series (or a link to a complete git tree).
>>=20
>
> A rebase version has been resend as follow:
>
> https://lore.kernel.org/bpf/20221220021319.1655871-1-pulehui@huaweicloud.=
com/

Yes, but with the same issue:
https://lore.kernel.org/bpf/20221220021319.1655871-4-pulehui@huaweicloud.co=
m/

The "is_main_prog" line is still around in the resend.


Bj=C3=B6rn