From patchwork Wed Mar 27 13:51:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= X-Patchwork-Id: 1067034 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AWO/yinB"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44TqFD6g5gz9sR4 for ; Thu, 28 Mar 2019 00:52:32 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728565AbfC0Nwc (ORCPT ); Wed, 27 Mar 2019 09:52:32 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:34740 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726233AbfC0Nwc (ORCPT ); Wed, 27 Mar 2019 09:52:32 -0400 Received: by mail-pf1-f193.google.com with SMTP id b3so8378315pfd.1; Wed, 27 Mar 2019 06:52:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xZpv6NK64CD6OdA1XcmtXF3jGqebAHR/to3SIbQQ1GA=; b=AWO/yinBMa4bXz4VurJCwqeqtHSAeHPm4tOqeBxS9EbfvtseUnpIhUqNSGIb+iptdo tvVIDtL2wzTvOpnMfh9NGNP3w6elSeuklXSJKIZPoFBBV4SW5o21iintxXzQMS73yyFj ZXm5xjSfIItdux4YVhe1aKPRUiAlEMNIhAzlVOIMcDZi+wsb6FRXW3nvS7l1Sk7KDXWI snorSFmLDVPT13qakS9GIQW3AJNm62E0sDoq4NPl59PgYUXbe5FOeqRzBx+cHtS9KyhR oMo2CtQ7iVcNc3rNzwK4BlzCCUDj3GeovgKUDreKRtD7FqQohzcybI98r3UU4g/qeIug 5g+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=xZpv6NK64CD6OdA1XcmtXF3jGqebAHR/to3SIbQQ1GA=; b=Yh2Ez4HyAFbtI/tJFC1OxE6RnGqGhiYtSnzdPxsnenMFU351AmjzK8xPHV/KrY6Rzm 0IP2/gQlJpl8bUQGEk3haDgTnkeICOjDWj+RBm81V/wji/Rh1milJnEvrsbMtdL501L5 T8h5bXeZeaR5KeUhGoXKE3ZWwMur4MhIgTNhIO07EEq/z0qPP5D+BTiIXcFuGKQ3vLfl k0Zb3gXyz1uvu7s6deImzkHwiGFQEo7HLD6rxZbFFoIRpFJPd5mty4wcfwvDwpvQPiQf n6fRhEJkb7QJ+xOOIZphYnRfUexPs4UuPmYeaNWNtzagPqF3ltqhPJhBoH1mhNu31LoO QVsA== X-Gm-Message-State: APjAAAVIbFD/zZBk0HAa+iC2vrCmFeH+4GzwxebTR+vITjp9i1ItEoGB KQZ3R7Q+4TkL6l1kzflaGhg= X-Google-Smtp-Source: APXvYqyFuQs16MTdXPVVjzAFij2YhI44jtOSeEnXOPIiTbjzEXB9SxFj8PQ4Xez7+Ori81xlL5qMTA== X-Received: by 2002:a62:1193:: with SMTP id 19mr35018782pfr.82.1553694751783; Wed, 27 Mar 2019 06:52:31 -0700 (PDT) Received: from btopel-mobl.ger.intel.com ([134.134.139.83]) by smtp.gmail.com with ESMTPSA id d15sm6823571pfo.34.2019.03.27.06.52.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 06:52:31 -0700 (PDT) From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= To: ast@kernel.org, daniel@iogearbox.net, netdev@vger.kernel.org Cc: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , magnus.karlsson@intel.com, bpf@vger.kernel.org, xiaolong.ye@intel.com, qi.z.zhang@intel.com Subject: [PATCH bpf 1/2] libbpf: add xsk.h to install_headers target Date: Wed, 27 Mar 2019 14:51:13 +0100 Message-Id: <20190327135114.17026-2-bjorn.topel@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190327135114.17026-1-bjorn.topel@gmail.com> References: <20190327135114.17026-1-bjorn.topel@gmail.com> MIME-Version: 1.0 Sender: bpf-owner@vger.kernel.org Precedence: bulk List-Id: netdev.vger.kernel.org From: Björn Töpel The xsk.h header file was missing from the insteall_headers target in the Makefile. This patch simply adds xsk.h to the set of installed headers. Fixes: 1cad07884239 ("libbpf: add support for using AF_XDP sockets") Reported-by: Bruce Richardson Signed-off-by: Björn Töpel --- tools/lib/bpf/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index 5bf8e52c41fc..279589c29983 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -222,6 +222,7 @@ install_headers: $(call do_install,bpf.h,$(prefix)/include/bpf,644); \ $(call do_install,libbpf.h,$(prefix)/include/bpf,644); $(call do_install,btf.h,$(prefix)/include/bpf,644); + $(call do_install,xsk.h,$(prefix)/include/bpf,644); install: install_lib From patchwork Wed Mar 27 13:51:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= X-Patchwork-Id: 1067036 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UrZ12Ype"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44TqFL14dHz9sRj for ; Thu, 28 Mar 2019 00:52:37 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728197AbfC0Nwh (ORCPT ); Wed, 27 Mar 2019 09:52:37 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:36886 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726233AbfC0Nwg (ORCPT ); Wed, 27 Mar 2019 09:52:36 -0400 Received: by mail-pl1-f194.google.com with SMTP id q6so3356396pll.4; Wed, 27 Mar 2019 06:52:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3JdAwqw+SZU37QvtZnlrcjekP9weXgvvYemjbEx20cs=; b=UrZ12Ypex7bJLF7qmkEVFB/PSyN6HQij7XZAOsknZ4bxjZVSsz8+oHydbF4iy8cEUr aRqv8GPuZmccdzLBuXK+p4TDIoJuawewXIunhw9/KhuwUb4LFz7AKW60k0Q7l3pQ5J7A slxotPuRHe+QroACI1hgdqaMpORHxQu2IF21cvfHsCLuCfb/9fKTXmYvOPIToHWxFK+X uIlCkVmRq9sy/D1fCd7zHCgBtDvF8FE8Cx5iW1XyxhWwMPPNxTJ2CoCm1io9ZRnlQMih HTIYw+jq/kML1ZvPMn3TLtM3DIFdjO2lTeBjqIwJ9HBOKyGvKwXbgdyprWgHax35ckt3 OoLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3JdAwqw+SZU37QvtZnlrcjekP9weXgvvYemjbEx20cs=; b=lee7bxrBLaGvCgoyDAiHpidZ5YBU2rOpYg8NgU6SU45q/S4UWv+ndRq4F9LUr0GydY BdWwD8LGq1Q3+B6yHovzUuCAAwHrMdxinC2iy6qlaEksC+KiQBUIEXDWPTNuhtjs6zyB P9I+8q+JOyk2oEZU1NNfhTmDOqI/eIjruIriKgFW7wPJ4mQ4uu3iDsJGGFcUg5sGIscX d5BYLEf3kysMqvcRuOCLUV9QHZ+SfGkcfkxUJlp5Rz1i4qD8PFjUgBUmk8t06DFhQ2t0 P2z8jOM6rcAR5/Q4tDpywwbPMcYsINo0ZBsGcpVI1+D8qox+aMTGdzsV4IUhspwAACuw KUNQ== X-Gm-Message-State: APjAAAXFbvcAWyL/EcipJTyYHMepik+SNf4vcmh2vdk4kwf4zfXPqoz1 AYWtBpTTeAE/gMooqgi4zco= X-Google-Smtp-Source: APXvYqwcPGBRSJNX+T6/6aPzRnKutqul4XGrRBk7dw40IgN5RR7bMNvqsEjU1A8lIsANEaQl7VPdNQ== X-Received: by 2002:a17:902:9306:: with SMTP id bc6mr36134663plb.59.1553694756298; Wed, 27 Mar 2019 06:52:36 -0700 (PDT) Received: from btopel-mobl.ger.intel.com ([134.134.139.83]) by smtp.gmail.com with ESMTPSA id d15sm6823571pfo.34.2019.03.27.06.52.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 06:52:35 -0700 (PDT) From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= To: ast@kernel.org, daniel@iogearbox.net, netdev@vger.kernel.org Cc: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , magnus.karlsson@intel.com, bpf@vger.kernel.org, xiaolong.ye@intel.com, qi.z.zhang@intel.com Subject: [PATCH bpf 2/2] libbpf: add libelf dependency to shared library build Date: Wed, 27 Mar 2019 14:51:14 +0100 Message-Id: <20190327135114.17026-3-bjorn.topel@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190327135114.17026-1-bjorn.topel@gmail.com> References: <20190327135114.17026-1-bjorn.topel@gmail.com> MIME-Version: 1.0 Sender: bpf-owner@vger.kernel.org Precedence: bulk List-Id: netdev.vger.kernel.org From: Björn Töpel When libbpf was built was a shared library, libelf was not included in the linking phase. Since libelf is an internal depedency to libbpf, libeld should be included. This patch adds '-lelf' to resolve that. Fixes: 1b76c13e4b36 ("bpf tools: Introduce 'bpf' library and add bpf feature check") Suggested-by: Luca Boccassi Signed-off-by: Björn Töpel --- tools/lib/bpf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index 279589c29983..7beec4d5b522 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -177,7 +177,7 @@ $(OUTPUT)libbpf.so: $(OUTPUT)libbpf.so.$(LIBBPF_VERSION) $(OUTPUT)libbpf.so.$(LIBBPF_VERSION): $(BPF_IN) $(QUIET_LINK)$(CC) --shared -Wl,-soname,libbpf.so.$(VERSION) \ - -Wl,--version-script=$(VERSION_SCRIPT) $^ -o $@ + -Wl,--version-script=$(VERSION_SCRIPT) $^ -lelf -o $@ @ln -sf $(@F) $(OUTPUT)libbpf.so @ln -sf $(@F) $(OUTPUT)libbpf.so.$(VERSION)