From nobody Tue Feb 10 09:24:57 2026 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 2AA5BC77B7F for ; Thu, 11 May 2023 15:22:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238662AbjEKPWF (ORCPT ); Thu, 11 May 2023 11:22:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45828 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238612AbjEKPV4 (ORCPT ); Thu, 11 May 2023 11:21:56 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A59A0138; Thu, 11 May 2023 08:21:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683818512; x=1715354512; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=XR/zMIbG4Jcm24Yt1GRfoMUGo5dYfwoSu6slMdxjNv0=; b=jlXojrXqon1WWvbp+EcLZkFcoys1+84ZnRSwfMh/R3uCSRNCo2u/Kths 6FQzaD7kromafBDXORasEL+sclbnkMRuBJJYPzrgKn4RGmrdK0BJHIeF5 z+BmkW3oHyaztnJ+6g8eN6XhvJuZwvE01tcjqESo5cuKWo6rmKljKPZpp WKcmA7k0tpbWPwwgXhbulutpfH77AFa7ZB+ZZyVdxiIixMIW+n4aLJswT OdWVfYk6++m7+sOUxzILk7KpuIHkdHgyTNV33woEOvCJKqrMYJycSFxUA 8c7aE7RoWoVwo9j6n9ot6CGrPeZpyRWyyNbuPJwf5sFof755W8gplIkQi w==; X-IronPort-AV: E=McAfee;i="6600,9927,10707"; a="352760702" X-IronPort-AV: E=Sophos;i="5.99,266,1677571200"; d="scan'208";a="352760702" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 May 2023 08:20:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10707"; a="702782185" X-IronPort-AV: E=Sophos;i="5.99,266,1677571200"; d="scan'208";a="702782185" Received: from irvmail002.ir.intel.com ([10.43.11.120]) by fmsmga007.fm.intel.com with ESMTP; 11 May 2023 08:20:06 -0700 Received: from lincoln.igk.intel.com (lincoln.igk.intel.com [10.102.21.235]) by irvmail002.ir.intel.com (Postfix) with ESMTP id 6D7EE36C0E; Thu, 11 May 2023 16:20:05 +0100 (IST) From: Larysa Zaremba To: Quentin Monnet Cc: Larysa Zaremba , Stanislav Fomichev , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Hao Luo , Jiri Olsa , bpf@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next] bpftool: specify XDP Hints ifname when loading program Date: Thu, 11 May 2023 17:13:46 +0200 Message-Id: <20230511151345.7529-1-larysa.zaremba@intel.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add ability to specify a network interface used to resolve XDP Hints kfuncs when loading program through bpftool. Usage: bpftool prog load dev xdpmeta Signed-off-by: Larysa Zaremba --- tools/bpf/bpftool/prog.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index 91b6075b2db3..a9cb96d99277 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -1517,12 +1517,13 @@ static int load_with_options(int argc, char **argv,= bool first_prog_only) struct bpf_program *prog =3D NULL, *pos; unsigned int old_map_fds =3D 0; const char *pinmaps =3D NULL; + __u32 offload_ifindex =3D 0; bool auto_attach =3D false; + __u32 meta_ifindex =3D 0; struct bpf_object *obj; struct bpf_map *map; const char *pinfile; unsigned int i, j; - __u32 ifindex =3D 0; const char *file; int idx, err; =20 @@ -1614,17 +1615,25 @@ static int load_with_options(int argc, char **argv,= bool first_prog_only) map_replace[old_map_fds].fd =3D fd; old_map_fds++; } else if (is_prefix(*argv, "dev")) { + __u32 *cur_ifindex; + NEXT_ARG(); =20 - if (ifindex) { - p_err("offload device already specified"); + if (offload_ifindex || meta_ifindex) { + p_err("device already specified"); goto err_free_reuse_maps; } + if (is_prefix(*argv, "xdpmeta")) { + cur_ifindex =3D &meta_ifindex; + NEXT_ARG(); + } else { + cur_ifindex =3D &offload_ifindex; + } if (!REQ_ARGS(1)) goto err_free_reuse_maps; =20 - ifindex =3D if_nametoindex(*argv); - if (!ifindex) { + *cur_ifindex =3D if_nametoindex(*argv); + if (!(*cur_ifindex)) { p_err("unrecognized netdevice '%s': %s", *argv, strerror(errno)); goto err_free_reuse_maps; @@ -1671,7 +1680,12 @@ static int load_with_options(int argc, char **argv, = bool first_prog_only) goto err_close_obj; } =20 - bpf_program__set_ifindex(pos, ifindex); + if (prog_type =3D=3D BPF_PROG_TYPE_XDP && meta_ifindex) { + bpf_program__set_flags(pos, BPF_F_XDP_DEV_BOUND_ONLY); + bpf_program__set_ifindex(pos, meta_ifindex); + } else { + bpf_program__set_ifindex(pos, offload_ifindex); + } if (bpf_program__type(pos) !=3D prog_type) bpf_program__set_type(pos, prog_type); bpf_program__set_expected_attach_type(pos, expected_attach_type); @@ -1709,7 +1723,7 @@ static int load_with_options(int argc, char **argv, b= ool first_prog_only) idx =3D 0; bpf_object__for_each_map(map, obj) { if (bpf_map__type(map) !=3D BPF_MAP_TYPE_PERF_EVENT_ARRAY) - bpf_map__set_ifindex(map, ifindex); + bpf_map__set_ifindex(map, offload_ifindex); =20 if (j < old_map_fds && idx =3D=3D map_replace[j].idx) { err =3D bpf_map__reuse_fd(map, map_replace[j++].fd); --=20 2.35.3