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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 704DAC7EE25 for ; Fri, 9 Jun 2023 00:09:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237661AbjFIAJT (ORCPT ); Thu, 8 Jun 2023 20:09:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237629AbjFIAJS (ORCPT ); Thu, 8 Jun 2023 20:09:18 -0400 Received: from bird.elm.relay.mailchannels.net (bird.elm.relay.mailchannels.net [23.83.212.17]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85E0A2733 for ; Thu, 8 Jun 2023 17:09:17 -0700 (PDT) X-Sender-Id: dreamhost|x-authsender|kjlx@templeofstupid.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id B0E5D140D9E for ; Fri, 9 Jun 2023 00:09:16 +0000 (UTC) Received: from pdx1-sub0-mail-a313.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 4CF601411AE for ; Fri, 9 Jun 2023 00:09:16 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1686269356; a=rsa-sha256; cv=none; b=nlkN5GW24ZFFbUiMb/QEbAoBYFfjiXh4s25v1BFVA21ZJhoxbRgEQhlRjUsxOJlYvyQPNE PS9HWx00ll9C6JiNtwUxzlNNsmbfmtCzti+TSoVBmQpELWomvfvD5mSHGbVhnkGh3wllUF SUb/0mIEGAB4G8/bbDQ9fFqogLH9c4Fyv+tDXmoQwEyLjUaKuta87rC5Z4uEPEtVzj6KkX UcftZGyQThignNbZNKOB431OEm+YZF30rG+FSof1CUtaf2GyLO3pkMI4IHxwOyemG7xTR2 ujMVGBZc1oVjo5bmQlCWRpIaEF6T6IFVTjT4HUA9AoY8l4GYZiXjV16hK/CPTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1686269356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=lQJUql2528Cy+DS6D/lrrawtBMQvuJVlQtJ26lBfYIk=; b=3q07sYL0yhADPaWaRsFZbuEACUmvjvsI845fcdVP/YygL23iin5lsXqTat8l6kGnsVpZqi 6FDbUJiwXn/q5Lfzq8hz8wAqG/x1REoNm1JXZaPKaDWj+ONrnWrltRzgkaOFg9+7+1Kfyw 3uF+z/69iDQyRswavU6tSQiz64hPD/OXYOo0LBWbfcMFwJQ81n1pxWlNMdoa6IXwLC/LCp utbjIh5zMZ4eCXz8CWcnbZxyUNDtVv+XV9nExXNtTF9uRIL4aRBN+3qzdbLSo5nbCC7BjI WtonKG0hH/9q38feRmgeXbqtNe1bbb59EBgomCWuE0nFHYmnVJjise7f0I5R6Q== ARC-Authentication-Results: i=1; rspamd-6f5cfd578c-b5r78; auth=pass smtp.auth=dreamhost smtp.mailfrom=kjlx@templeofstupid.com X-Sender-Id: dreamhost|x-authsender|kjlx@templeofstupid.com X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|kjlx@templeofstupid.com X-MailChannels-Auth-Id: dreamhost X-Average-Print: 2e77ff4d2653fc89_1686269356531_2892472446 X-MC-Loop-Signature: 1686269356531:758589605 X-MC-Ingress-Time: 1686269356531 Received: from pdx1-sub0-mail-a313.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.126.30.49 (trex/6.8.1); Fri, 09 Jun 2023 00:09:16 +0000 Received: from kmjvbox (c-73-93-64-36.hsd1.ca.comcast.net [73.93.64.36]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kjlx@templeofstupid.com) by pdx1-sub0-mail-a313.dreamhost.com (Postfix) with ESMTPSA id 4QchJq480Pz1n8 for ; Thu, 8 Jun 2023 17:09:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=templeofstupid.com; s=dreamhost; t=1686269355; bh=lQJUql2528Cy+DS6D/lrrawtBMQvuJVlQtJ26lBfYIk=; h=Date:From:To:Cc:Subject:Content-Type:Content-Transfer-Encoding; b=dDoHPKhVC+rSbuXrQXH1ctahyAjgA25ZAMjDsDW+522psbJy33cRsO9a2Cg/4XYOi Ltrq5G01Y8FBynl/M4J7Vkd2TZtyVkvfX5p5/NuGhPauvEr5fCwwfu8xzC/sb8vZqG PipsXZb9CtdoVe3oOri82oo52gIu8s+CmmhxOwWw= Received: from johansen (uid 1000) (envelope-from kjlx@templeofstupid.com) id e0042 by kmjvbox (DragonFly Mail Agent v0.12); Thu, 08 Jun 2023 17:09:14 -0700 Date: Thu, 8 Jun 2023 17:09:14 -0700 From: Krister Johansen To: Alexei Starovoitov Cc: bpf , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan , LKML , "open list:KERNEL SELFTEST FRAMEWORK" , stable Subject: Re: [PATCH bpf v2 2/2] bpf: ensure main program has an extable Message-ID: <20230609000914.GA4980@templeofstupid.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Thu, Jun 08, 2023 at 03:01:36PM -0700, Alexei Starovoitov wrote: > On Wed, Jun 7, 2023 at 2:04 PM Krister Johansen wrote: > > Cc: stable@vger.kernel.org > > Fixes: 1c2a088a6626 ("bpf: x64: add JIT support for multi-function programs") > > Signed-off-by: Krister Johansen > > --- > > kernel/bpf/verifier.c | 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c > > index 5871aa78d01a..d6939db9fbf9 100644 > > --- a/kernel/bpf/verifier.c > > +++ b/kernel/bpf/verifier.c > > @@ -17242,6 +17242,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->extable = func[0]->aux->extable; > > Why not to do this hunk and what I suggested earlier: start from func=1 ? > That will address double ksym insertion that Yonghong mentioned. Sure thing. Yonghong and you have convinced me. I'll send out a v3 with all changes requested so far. -K