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:   Song Liu <songliubraving@fb.com>
To:     Song Liu <song@kernel.org>
CC:     bpf <bpf@vger.kernel.org>, Networking <netdev@vger.kernel.org>,
        open list <linux-kernel@vger.kernel.org>,
        Alexei Starovoitov <ast@kernel.org>,
        "Daniel Borkmann" <daniel@iogearbox.net>,
        Andrii Nakryiko <andrii@kernel.org>,
        "Kernel Team" <Kernel-team@fb.com>,
        Peter Zijlstra <peterz@infradead.org>, X86 ML <x86@kernel.org>,
        Ilya Leoshkevich <iii@linux.ibm.com>
Subject: Re: [PATCH v8 bpf-next 4/9] bpf: use prog->jited_len in
 bpf_prog_ksym_set_addr()
Thread-Topic: [PATCH v8 bpf-next 4/9] bpf: use prog->jited_len in
 bpf_prog_ksym_set_addr()
Thread-Index: AQHYGZq9nVwt+XlKf0qh6wdCOGZoSKyDsG6A
Date:   Fri, 4 Feb 2022 18:05:42 +0000
Message-ID: <22BEAA3B-202D-43F4-9427-C2BCC9957459@fb.com>
References: <20220201062803.2675204-1-song@kernel.org>
 <20220201062803.2675204-5-song@kernel.org>
 <CAPhsuW5uG98fPostcQYw9Kk9DTczOw6LJUJRb8NfiDVVgJcHwQ@mail.gmail.com>
In-Reply-To: <CAPhsuW5uG98fPostcQYw9Kk9DTczOw6LJUJRb8NfiDVVgJcHwQ@mail.gmail.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?XqcgMazyssTC9QOCqyBOk/sbxsk2WWELnNGqg3I0qCynpkyUCckhhL6Lyfqh?=
 =?us-ascii?Q?9+2Zmcoywdo6uIFEp5oTyzTQHWcFqz3o9pBbL0RQ3FOAa03yRbqtYdWflGju?=
 =?us-ascii?Q?Wg3rEbaV3IN8pY74aKujVgb83gQrvwPv19aX+m2IDDLvm6limMMvodSNlM+l?=
 =?us-ascii?Q?ba4Fs0X5uKmMs7zbReu5tqUPESYjr/fKsX/IQmyKWSteORu5fMi5B56Zl0Nt?=
 =?us-ascii?Q?oPDGnvzfc3pBKNpeBauOf9Wre5o3gYCK2IVhoLFMZfOIqyJPZSJfnj0Zg+AK?=
 =?us-ascii?Q?fsWCNHduL8beeo1av+Pk2+1bTrmlDGZS3FYnl0uG1oxzJhYEf4eDF6ogyE+d?=
 =?us-ascii?Q?fimRMDpBGgBfvy3ZoeLzF1iPMlsKkDADmXmk8kS4vjWn5ckOpWo2fDcnDPfa?=
 =?us-ascii?Q?HwAoeF9Jk3uQGegRWYI/cR65ZrzfGc7jY2SRCUmPBCx2RmaAVw2GPUnIsfwX?=
 =?us-ascii?Q?P01udESn2AjanODhBk0TePqk4UBPrZ5+i9lH86PckanFLCLkRiB826XTdKt+?=
 =?us-ascii?Q?tZnDEoQoJCrkuewNDoEpbU1A1j0Daf97B6Ta0hj73zpRetdRrx3KRGP/XKYx?=
 =?us-ascii?Q?O2ij7iS9bFHpw+Bo8U4z9FZcNwKfn9reJqiXnQq5jo78ccdm6Wr+5kEQAw4t?=
 =?us-ascii?Q?Ejq4EPSHWRwPkj2BSt5BtHEIvmVLYVkI65a57Yf9CmwU9maoMnTuej1Yn8iS?=
 =?us-ascii?Q?EKekYzC7f5WqLcNyfCCM+MHv9nSOnVWU1cfsTSpHWgt8Cwy9hIN4SUAdWME2?=
 =?us-ascii?Q?KwcQH5dqQYZs1ECeBmoBKnQEnH4nbn24OmSFYnlaKjAZiN+WIk2ywtCmil+o?=
 =?us-ascii?Q?7QgKdSUrR8Fiuw5FOJu9r87vIp9SKqOxZIEJ2XwxDReLcJm5p6vXoA6K/wRU?=
 =?us-ascii?Q?3xDuIgjjIaBLX3Mt91lM4dK1NWlMrmsEVwZoNTSTh5719oVkND1hIBp2dDuR?=
 =?us-ascii?Q?ZzFyI2H5b8yMrQCJpF5KUAIWvGqupVBQ/Ra+NQQXMiQE44E/H2yPsToHTLlM?=
 =?us-ascii?Q?+GnGZ+tCazM93nIWuNBBLe683pi7UreWfUjGcw0a3nDvzOi9fIYb3VxAtTkL?=
 =?us-ascii?Q?5oruSxuMrhGDDdSASbLdSj++1MVlio/Y2KvtAHEzqANVdwyhMH1B7gEDg+Li?=
 =?us-ascii?Q?2OjtdDYW3Ol1eFauEIi1DzSatDhylYubTmKwIj4saBxytZ7UUEIr78RnpRxn?=
 =?us-ascii?Q?A8twydMrOtswo1T+zEd0BV6GKDreX/uIliMUiKa16JPh3+FtPuBxWTuuShq3?=
 =?us-ascii?Q?YHYii6fO/7BiUD5a9TJ1GUTIiDexLypDL3a+/8fHfA+0g98OHkOqFH2TPqzn?=
 =?us-ascii?Q?9Uckh8D8HOOfZIMmFHjG8ndX8zmVtbopxvFgO7WIUHeaSaBHhqJ9/2VmEfmz?=
 =?us-ascii?Q?TPrY+qESVxtBspF1kKJaNhgf2hLgnOsmHR+Y485jHbWPhqcADNqCMecIMeAn?=
 =?us-ascii?Q?zkYk9JdAcUKrmrK0WKmgH/7ENjfUgZ9Xk+fhE0OiUQxZE5dcI9NYmRjAI44v?=
 =?us-ascii?Q?1DG7VOoPVvlbElQI8+Tm2FWP7jkXWg1FbcVSkk9WE30VVHRIi3L3HmbIkNQj?=
 =?us-ascii?Q?Y++m/EGyLcGHjEilW/+CODT+wql1NxKm+bzokC2Fb7XiKy+LOqJgQfCB5dNS?=
 =?us-ascii?Q?DxvD3tf4Sct51mbEs3jmR54KwQ/xGfshMqioHVEijS+z+8Y5h6pfqDDeDLvn?=
 =?us-ascii?Q?O1jjsA=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <305E7AE2D9B18A4D880C39901ACDB12A@namprd15.prod.outlook.com>
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SA1PR15MB5109.namprd15.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: e767f8a9-8acf-4c94-db63-08d9e808f55a
X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Feb 2022 18:05:42.2609
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 4j7KhbldNFsTxQKmcV/g4oqJ04fHghf4DX3tvdIWLrB+QYVAzCP/XXKCXJuzL/85lTt2oTrP81dcVTIfXs7xdw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR15MB4568
X-OriginatorOrg: fb.com
X-Proofpoint-GUID: WUoU6Qta06NFY-_hnFftRZ0O_3C3jzaI
X-Proofpoint-ORIG-GUID: WUoU6Qta06NFY-_hnFftRZ0O_3C3jzaI
X-Proofpoint-UnRewURL: 0 URL was un-rewritten
MIME-Version: 1.0
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.816,Hydra:6.0.425,FMLib:17.11.62.513
 definitions=2022-02-04_07,2022-02-03_01,2021-12-02_01
X-Proofpoint-Spam-Details: rule=fb_outbound_notspam policy=fb_outbound score=0 bulkscore=0
 adultscore=0 mlxlogscore=999 spamscore=0 lowpriorityscore=0 suspectscore=0
 clxscore=1015 impostorscore=0 mlxscore=0 malwarescore=0 phishscore=0
 priorityscore=1501 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2201110000 definitions=main-2202040099
X-FB-Internal: deliver
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> On Feb 3, 2022, at 11:41 PM, Song Liu <song@kernel.org> wrote:
> 
> On Mon, Jan 31, 2022 at 10:31 PM Song Liu <song@kernel.org> wrote:
>> 
>> Using prog->jited_len is simpler and more accurate than current
>> estimation (header + header->size).
>> 
>> Signed-off-by: Song Liu <song@kernel.org>
> 
> Hmm... CI [1] reports error on test_progs 159/tailcalls, and bisect points to
> this one. However, I couldn't figure out why this breaks tail call.
> round_up(PAGE_SIZE) does fix it though. But that won't be accurate, right?
> 
> Any suggestions on what could be the reason for these failures?
> 
> Thanks,
> Song
> 
> [1] https://github.com/kernel-patches/bpf/runs/5060194776?check_suite_focus=true

I guess this is the missing piece:


diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index 1ae41d0cf96c..bbef86cb4e72 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -13067,6 +13067,7 @@ static int jit_subprogs(struct bpf_verifier_env *env)

        prog->jited = 1;
        prog->bpf_func = func[0]->bpf_func;
+       prog->jited_len = func[0]->jited_len;
        prog->aux->func = func;
        prog->aux->func_cnt = env->subprog_cnt;
        bpf_prog_jit_attempt_done(prog);


Will send v9 with this. 

> 
>> ---
>> kernel/bpf/core.c | 5 +----
>> 1 file changed, 1 insertion(+), 4 deletions(-)
>> 
>> diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
>> index 14199228a6f0..e3fe53df0a71 100644
>> --- a/kernel/bpf/core.c
>> +++ b/kernel/bpf/core.c
>> @@ -537,13 +537,10 @@ long bpf_jit_limit_max __read_mostly;
>> static void
>> bpf_prog_ksym_set_addr(struct bpf_prog *prog)
>> {
>> -       const struct bpf_binary_header *hdr = bpf_jit_binary_hdr(prog);
>> -       unsigned long addr = (unsigned long)hdr;
>> -
>>        WARN_ON_ONCE(!bpf_prog_ebpf_jited(prog));
>> 
>>        prog->aux->ksym.start = (unsigned long) prog->bpf_func;
>> -       prog->aux->ksym.end   = addr + hdr->size;
>> +       prog->aux->ksym.end   = prog->aux->ksym.start + prog->jited_len;
>> }
>> 
>> static void
>> --
>> 2.30.2
>>