From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 10B0841D637 for ; Thu, 27 Aug 2026 10:02:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787824976; cv=none; b=pP+j5tSJqxQwjnDh+XMtFIClD7E1Peg+H8F9oxevk5j7n49t5afidZWfXcELw2mdF+I2eTRmz6kzTjb+WE1W35EOwcZ4xXQcP8XpxphiZ/2x/7BmS1KnOKavUn+0+mR3VyP6zi0aBmo4BTIGDXXeM3ORSwFOb4tJZPRWaNBk4d4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787824976; c=relaxed/simple; bh=+JsS/wv7XR6N9uh4uo2a/6K05J5MWW3eChLg/XiaPkY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type; b=IEGJOYnERsJ+LaVMJ+no1fJ1zx/rXX9JKd07h+N5FMBB7KmkSU7yUay+M67EDN2TwQ0VsyVX3wn2coBzwhaX/WBDxPRJqXS/zU8FShV/rhk9uVUSw8Gztzeywmm1gIMK81yLtxvhPlWSv2xXXhGeBRbAiBwL9EtABV31EQVuw0o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=VKJazyJe; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=CA2iTlBt; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VKJazyJe"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="CA2iTlBt" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1787824964; 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; bh=H/c72MQdWufExTh7+4DDW9MBVDxBOFoBAW+G3h8roBs=; b=VKJazyJeCATiaVmy30gCgbTw2yrAYQ0JSvDYBmGw+ndlX6SNxeOfBHair0LecUovoAUrY7 okT47+RVFvV9rF9znYz5CTrzP11ivWgJvoDVigyLi5+eEIiloeN5U941C8SNfbdVakqEhH MrQWMzb9mdPfTLG7HJPFKh6iFyzW8UQ= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-484-5vm8jaTPNLe9J-1w6r5erA-1; Thu, 27 Aug 2026 06:02:43 -0400 X-MC-Unique: 5vm8jaTPNLe9J-1w6r5erA-1 X-Mimecast-MFC-AGG-ID: 5vm8jaTPNLe9J-1w6r5erA_1787824962 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-482e729ead9so119523f8f.0 for ; Thu, 27 Aug 2026 03:02:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1787824962; x=1788429762; darn=vger.kernel.org; h=content-transfer-encoding:content-type:mime-version:message-id:date :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to :content-type; bh=H/c72MQdWufExTh7+4DDW9MBVDxBOFoBAW+G3h8roBs=; b=CA2iTlBtExxXX3hFj0AliRg+l0/fakevO7M6hS7zeA5nzurut4VCfbkmeHwHuHy2mw 1J+X77bhVnhIXcqrDkKJ5/srQSAVTqiVogX/tv4gPdzEijRpEMEWml2Awvh2DExoRKLz SG2Pi8S0RlSkM+9pOfYd/I7aEYYJP0QI0ZqMtoCRK/bbWlQkMh8Wat3dJFLwBR2lHhIW 42mTy1eYp5YoOWZShGPT0vEvDKeCSnpaUcoUEN0ms1ya9SR/NGI4yt1cOqE2GDXKCdY5 JG5nkQGjyzOo89iyiMvSyWLAu8KqwGemx1vvYrG0LozSqimtDdwrNYPSnSYuS9EsGGJV 1Ofg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787824962; x=1788429762; h=content-transfer-encoding:content-type:mime-version:message-id:date :subject:cc:to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to:content-type; bh=H/c72MQdWufExTh7+4DDW9MBVDxBOFoBAW+G3h8roBs=; b=eKoIh5bT+aYVF9ZYEmwur2BbP8+QNZD8sDa30Fj7ipkkQSELSOxlWeV7DOClm8tc1d 3YJtipSPam+51nern03gl8GoHfO8ErjY2lkescmsCciveSdGIaBNz1SF0ciIQVOxSIV+ FiqmI4U39sI06xZj+PnWv/HIkX5Au7SZgpR3GBKWRXXkJywK4sKgrzioqARSvMoyvong oYZG+st0kSoyb9pbbX2HXbOOS0PX7JYWShGLweUYeHPeUe5Kl33JOWYYOJRq0owJU5gJ BANRHV7WzVOcPUqdGcgATw9QolxdNjkYxx5cIjdd72nq58KQ10xOCusLr25OArdCimA8 B27Q== X-Gm-Message-State: AFuF++loUxG5r3/5IGmLD/OG7O67ydfXVzRLW2a7Ss0wDNCsxU48IN9x O+s5bgo4FBUa3CkcBUDrscirZuqVZDCgGCieDDrv0is68vCzThWWa+44koLC9CPkF/0LHC9qIdg jhr3lLxPi4JnaZ2djUTWK1REsnuGOZptbDbLX97uYzuTS9vrdI+Oz/A== X-Gm-Gg: AR+sD12e5D1mWRdvoh2dBQl+xxcLdsGd5U5y7UWqZltAqxBjMORUOl8x6cwz9445/id t2X0QjEjbR7ldN/9woohkuBP9u7rFY+4xiRLTJm32fV89XAvbeMSYsVdX7mZ9kN1D+RG0zM0Wq1 J1x05KgfRrLvVNAupRIxmK7HOlTpZgQW7kmo8RG4gEWyZFBx4+HzBsPwv2Xer8/dK+QwJjVjL/3 A7ibi7l7S1ZdmNSSqH2XnzS49T1sDEm1ZcoRMZ+LGPNXaLTj5J5OZ5u4G4GxELIebe+JE+2m41V 0gNX2/ClhVr4W3bcZhcIT0qF8/Pp8xEehCQl0Vr4I6Xrp1DmCLKyuIo/K2R0j6rJmqXhX8Hla3F iYJQ+CCf+KXB7xcwRs2RoV6AVieI= X-Received: by 2002:a05:6000:27d1:b0:481:4f2a:bdb0 with SMTP id ffacd0b85a97d-482e2703aa9mr14038220f8f.18.1787824961709; Thu, 27 Aug 2026 03:02:41 -0700 (PDT) X-Received: by 2002:a05:6000:27d1:b0:481:4f2a:bdb0 with SMTP id ffacd0b85a97d-482e2703aa9mr14038128f8f.18.1787824961295; Thu, 27 Aug 2026 03:02:41 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk (alrua-x1.borgediget.toke.dk. [2a0c:4d80:42:443::2]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-482e279ecaesm8160863f8f.6.2026.08.27.03.02.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Aug 2026 03:02:40 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 8E1E7979E20; Thu, 27 Aug 2026 12:02:39 +0200 (CEST) From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Eduard Zingerman , Kumar Kartikeya Dwivedi , Martin KaFai Lau , Song Liu , Yonghong Song , Jiri Olsa , Emil Tsalapatis , Ihor Solodrai , "David S. Miller" , Jakub Kicinski , Jesper Dangaard Brouer , John Fastabend , Stanislav Fomichev , Lorenzo Bianconi , Toke Hoiland-Jorgensen Cc: bpf@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH bpf-next 1/2] libbpf: Move XDP frags flag to prog_flags Date: Thu, 27 Aug 2026 12:02:11 +0200 Message-ID: <20260827100214.169215-1-toke@redhat.com> X-Mailer: git-send-email 2.55.0 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 The libbpf section definition for XDP frags support stores the flags bit in the private section definition cookie from object open to load time. This has the unfortunate consequence that API consumers cannot see (or manipulate) the flag between object open and program load. In particular, libxdp has special handling of frags-enabled programs to make them compatible with the dispatcher. This doesn't work on XDP programs that enable frags through the 'xdp.frags' section definition because the flag is not visible through bpf_program__flags()[0]. Fix this by changing how libbpf loads the 'xdp.frags' section: instead of using the private section definition cookie, add a setup function to the section definition that stores the flag in the prog_flags field of struct bpf_program. [0] https://github.com/xdp-project/xdp-tools/issues/587 Fixes: 082c4bfba4f7 ("libbpf: Add SEC name for xdp frags programs") Signed-off-by: Toke Høiland-Jørgensen --- tools/lib/bpf/libbpf.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index b749c01742ee..7d6f0fe518d9 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -420,10 +420,8 @@ enum sec_def_flags { SEC_ATTACH_BTF = 4, /* BPF program type allows sleeping/blocking in kernel */ SEC_SLEEPABLE = 8, - /* BPF program support non-linear XDP buffer */ - SEC_XDP_FRAGS = 16, /* Setup proper attach type for usdt probes. */ - SEC_USDT = 32, + SEC_USDT = 16, }; struct bpf_sec_def { @@ -7879,6 +7877,12 @@ static int tracing_multi_mod_fd(struct bpf_program *prog, int *btf_obj_fd) return 0; } +static int setup_xdp_frags(struct bpf_program *prog, long cookie) +{ + prog->prog_flags |= BPF_F_XDP_HAS_FRAGS; + return 0; +} + /* this is called as prog->sec_def->prog_prepare_load_fn for libbpf-supported sec_defs */ static int libbpf_prepare_prog_load(struct bpf_program *prog, struct bpf_prog_load_opts *opts, long cookie) @@ -7892,9 +7896,6 @@ static int libbpf_prepare_prog_load(struct bpf_program *prog, if (def & SEC_SLEEPABLE) opts->prog_flags |= BPF_F_SLEEPABLE; - if (prog->type == BPF_PROG_TYPE_XDP && (def & SEC_XDP_FRAGS)) - opts->prog_flags |= BPF_F_XDP_HAS_FRAGS; - /* special check for usdt to use uprobe_multi link */ if ((def & SEC_USDT) && kernel_supports(prog->obj, FEAT_UPROBE_MULTI_LINK)) { /* for BPF_TRACE_UPROBE_MULTI, user might want to query expected_attach_type @@ -10182,11 +10183,11 @@ static const struct bpf_sec_def section_defs[] = { SEC_DEF("iter+", TRACING, BPF_TRACE_ITER, SEC_ATTACH_BTF, attach_iter), SEC_DEF("iter.s+", TRACING, BPF_TRACE_ITER, SEC_ATTACH_BTF | SEC_SLEEPABLE, attach_iter), SEC_DEF("syscall", SYSCALL, 0, SEC_SLEEPABLE), - SEC_DEF("xdp.frags/devmap", XDP, BPF_XDP_DEVMAP, SEC_XDP_FRAGS), + SEC_DEF("xdp.frags/devmap", XDP, BPF_XDP_DEVMAP, SEC_NONE, .prog_setup_fn = setup_xdp_frags), SEC_DEF("xdp/devmap", XDP, BPF_XDP_DEVMAP, SEC_ATTACHABLE), - SEC_DEF("xdp.frags/cpumap", XDP, BPF_XDP_CPUMAP, SEC_XDP_FRAGS), + SEC_DEF("xdp.frags/cpumap", XDP, BPF_XDP_CPUMAP, SEC_NONE, .prog_setup_fn = setup_xdp_frags), SEC_DEF("xdp/cpumap", XDP, BPF_XDP_CPUMAP, SEC_ATTACHABLE), - SEC_DEF("xdp.frags", XDP, BPF_XDP, SEC_XDP_FRAGS), + SEC_DEF("xdp.frags", XDP, BPF_XDP, SEC_NONE, .prog_setup_fn = setup_xdp_frags), SEC_DEF("xdp", XDP, BPF_XDP, SEC_ATTACHABLE_OPT), SEC_DEF("perf_event", PERF_EVENT, 0, SEC_NONE), SEC_DEF("lwt_in", LWT_IN, 0, SEC_NONE), -- 2.55.0