From patchwork Fri Jun 24 06:06:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Loftus, Ciara" X-Patchwork-Id: 113393 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DB8C9A0032; Fri, 24 Jun 2022 08:06:54 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8F3EA40A87; Fri, 24 Jun 2022 08:06:54 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id 11FB440A82 for ; Fri, 24 Jun 2022 08:06:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656050813; x=1687586813; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=SaUrrzygj6/DaRlMdhc3HBebQ6vOpkOwMjcYZjPOPBY=; b=MymX6xEeW/SaSFMsa/BQZnDb0wMq4NZSrhYxb+kMgZePpQGU3xp+Cc3V 8WnSd3z/04D14g9wzAN+3GSTeLGUj+o7dIlAUyRq1T1mOuUdzdz8e0GX9 Be9Ga9S9udrcicmfDhJ/aiiNxptJfuOV2UG9v1kbNnLucVXU03wPvJ+zW gItJ6QvwtYKh2N78GsgEx1DNe2bWHF3xDScakCT1xZ6eFAP+4TVLwkIOE UFf2l2Oek5yeboHojbzEAEv1OzMIEoz/UsK4ugPxZjL6+UITkXBjdDb4E LuI5BWp0OrFZkCNj5TDcVIZtyt3jJs+FUX8SJ45+mm+hxcqHvEspdFxDr Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="367250715" X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="367250715" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 23:06:51 -0700 X-IronPort-AV: E=Sophos;i="5.92,218,1650956400"; d="scan'208";a="615866646" Received: from silpixa00401086.ir.intel.com ([10.55.128.124]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 23:06:50 -0700 From: Ciara Loftus To: dev@dpdk.org Cc: thomas@monjalon.net, ferruh.yigit@xilinx.com, Ciara Loftus Subject: [PATCH] net/af_xdp: limit libbpf version to <= v0.7.0 Date: Fri, 24 Jun 2022 06:06:34 +0000 Message-Id: <20220624060634.295136-1-ciara.loftus@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Linking with libbpf v0.8.0 causes deprication warnings. As a temporary measure, prevent linking with libbpf versions v0.8.0 and greater. This limitation should be removed in the future when appropriate compatibility measures are introduced. Signed-off-by: Ciara Loftus --- doc/guides/nics/af_xdp.rst | 3 ++- drivers/net/af_xdp/meson.build | 7 ++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/doc/guides/nics/af_xdp.rst b/doc/guides/nics/af_xdp.rst index 56681c8365..46738e089d 100644 --- a/doc/guides/nics/af_xdp.rst +++ b/doc/guides/nics/af_xdp.rst @@ -43,7 +43,8 @@ Prerequisites This is a Linux-specific PMD, thus the following prerequisites apply: * A Linux Kernel (version > v4.18) with XDP sockets configuration enabled; -* Both libxdp >=v1.2.2 and libbpf libraries installed, or, libbpf <=v0.6.0 +* Both libxdp >=v1.2.2 and libbpf <=v0.7.0 libraries installed, or, libbpf + <=v0.6.0. * If using libxdp, it requires an environment variable called LIBXDP_OBJECT_PATH to be set to the location of where libxdp placed its bpf object files. This is usually in /usr/local/lib/bpf or /usr/local/lib64/bpf. diff --git a/drivers/net/af_xdp/meson.build b/drivers/net/af_xdp/meson.build index 1e0de23705..52862e90a1 100644 --- a/drivers/net/af_xdp/meson.build +++ b/drivers/net/af_xdp/meson.build @@ -10,10 +10,7 @@ endif sources = files('rte_eth_af_xdp.c') xdp_dep = dependency('libxdp', version : '>=1.2.2', required: false, method: 'pkg-config') -bpf_dep = dependency('libbpf', required: false, method: 'pkg-config') -if not bpf_dep.found() - bpf_dep = cc.find_library('bpf', required: false) -endif +bpf_dep = dependency('libbpf', version : '<=0.7.0', required: false, method: 'pkg-config') if cc.has_header('linux/if_xdp.h') if xdp_dep.found() and cc.has_header('xdp/xsk.h') @@ -29,7 +26,7 @@ if cc.has_header('linux/if_xdp.h') endif else build = false - reason = 'missing dependency, libbpf' + reason = 'missing dependency, libbpf <= v0.7.0' endif elif bpf_dep.found() and cc.has_header('bpf/xsk.h') and cc.has_header('bpf/bpf.h') # libxdp not found. Rely solely on libbpf for xsk functionality