From patchwork Tue Oct 1 11:33:06 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: 1169846 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="Cv3EZv85"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46jHFw1V7zz9sN1 for ; Tue, 1 Oct 2019 21:33:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726187AbfJALdX (ORCPT ); Tue, 1 Oct 2019 07:33:23 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:36597 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725839AbfJALdW (ORCPT ); Tue, 1 Oct 2019 07:33:22 -0400 Received: by mail-pf1-f195.google.com with SMTP id y22so7755025pfr.3; Tue, 01 Oct 2019 04:33:22 -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=peGT14BlsLdGabPKwMdnJuyKWVcTNuskR5BUm3mqwVE=; b=Cv3EZv85P/wXNkHY/o4sRYwi1M8/RSRsGDqTvlx9zSTd0Yb1mCe/7QGsxSoiaiuDRs i2p57ex/xJ9C5BUIO/ijWKBc0OkLuZ4t6vMc8xGGzACs0V+CZL7Pj3pZ7iNmc7104T4e uzCXYvk61G98nGk0iNA//vwK8H9WHc1li4TAIJpdBgqTBYs3dmVpEwiRurZxldc0WfQd 6y2zYEgiuRUWIhR2kPVZCihZ9s3bDGDFC3preokWl1BwpoFoteEQ5o7Eblb5UpMQgG0M i5g5ttqyqLWmAVHHgIXfRppIjribAJ/L97Trtmd6FPUDoeDGwIdbi+rVUNXMgoDjyLve 7AvA== 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=peGT14BlsLdGabPKwMdnJuyKWVcTNuskR5BUm3mqwVE=; b=SOUOW0NSDISsgrnfHCO1Mt46NHICkDb3fQwcTCt2LLsiQfHLE5xUUiFnopVExm5JfY yxAeorlxMhHj2fGND8K2NWXKWW2Ea2g/x6IYY+NjXjaC6zhErsBW7dY1SF+c1hFavPnZ 8msZ6udApYeu0/NWLHGgjEw3hMVvVEzxx27rDJL6ZEEY+0G+J/Qs3RHrzO/2Wx7wR2aS 4OvfoNc9PWjipr0NeoPPqdtZdgDR064nXzJdu3R1M7OvDRZy0J3KfZ80I9pBNBrQU2t3 8rrnIqaEUnlz064XrEgMKWGj8uJ8k1P+BuW1rXefg6AHVpsmwgjMlHcK+ait20FOyqpX +WmQ== X-Gm-Message-State: APjAAAVIEvRcQPPQs7CGZXN5oWhFgaMNi1tBpJ1DHdYsv2/fu/APgnOW 4dQvoYLYZpb7boIgu3uZZm8Pn22JMnrGVQ== X-Google-Smtp-Source: APXvYqzvLr6kMQTIDddPKpOuQOctyO+VyAYQpXpJ0k3fE5/Xqxw/THOnBn2LeidJp1GuUjqFzy96cQ== X-Received: by 2002:a63:501:: with SMTP id 1mr9935217pgf.290.1569929601631; Tue, 01 Oct 2019 04:33:21 -0700 (PDT) Received: from btopel-mobl.ger.intel.com ([192.55.55.41]) by smtp.gmail.com with ESMTPSA id a29sm16238634pfr.152.2019.10.01.04.33.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2019 04:33:21 -0700 (PDT) From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= To: linux-kernel@vger.kernel.org, acme@kernel.org Cc: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , netdev@vger.kernel.org, bpf@vger.kernel.org, ast@kernel.org, daniel@iogearbox.net, adrian.hunter@intel.com, jolsa@kernel.org, namhyung@kernel.org Subject: [PATCH 1/2] perf tools: Make usage of test_attr__* optional for perf-sys.h Date: Tue, 1 Oct 2019 13:33:06 +0200 Message-Id: <20191001113307.27796-2-bjorn.topel@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191001113307.27796-1-bjorn.topel@gmail.com> References: <20191001113307.27796-1-bjorn.topel@gmail.com> MIME-Version: 1.0 Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org From: Björn Töpel For users of perf-sys.h outside perf, e.g. samples/bpf/bpf_load.c, it's convenient not to depend on test_attr__*. After commit 91854f9a077e ("perf tools: Move everything related to sys_perf_event_open() to perf-sys.h"), all users of perf-sys.h will depend on test_attr__enabled and test_attr__open. This commit enables a user to define HAVE_ATTR_TEST to zero in order to omit the test dependency. Fixes: 91854f9a077e ("perf tools: Move everything related to sys_perf_event_open() to perf-sys.h") Signed-off-by: Björn Töpel Acked-by: Song Liu --- tools/perf/perf-sys.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/perf/perf-sys.h b/tools/perf/perf-sys.h index 63e4349a772a..15e458e150bd 100644 --- a/tools/perf/perf-sys.h +++ b/tools/perf/perf-sys.h @@ -15,7 +15,9 @@ void test_attr__init(void); void test_attr__open(struct perf_event_attr *attr, pid_t pid, int cpu, int fd, int group_fd, unsigned long flags); -#define HAVE_ATTR_TEST +#ifndef HAVE_ATTR_TEST +#define HAVE_ATTR_TEST 1 +#endif static inline int sys_perf_event_open(struct perf_event_attr *attr, @@ -27,7 +29,7 @@ sys_perf_event_open(struct perf_event_attr *attr, fd = syscall(__NR_perf_event_open, attr, pid, cpu, group_fd, flags); -#ifdef HAVE_ATTR_TEST +#if HAVE_ATTR_TEST if (unlikely(test_attr__enabled)) test_attr__open(attr, pid, cpu, fd, group_fd, flags); #endif From patchwork Tue Oct 1 11:33:07 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: 1169848 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="HRaTJrbn"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46jHG13cKFz9sPd for ; Tue, 1 Oct 2019 21:33:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726446AbfJALd2 (ORCPT ); Tue, 1 Oct 2019 07:33:28 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:44970 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732086AbfJALd1 (ORCPT ); Tue, 1 Oct 2019 07:33:27 -0400 Received: by mail-pg1-f196.google.com with SMTP id i14so9403410pgt.11; Tue, 01 Oct 2019 04:33:27 -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=09lI8sA7GBmAEMY2ZHF2GfLfirrTO8tbiRtZGHSh2eo=; b=HRaTJrbn7HI6PaiCQm9rKuYy1mccgKsXAOfaPFlYC1bvJUIysqgQ1PO51Yw7JlMNCU j4Ba/kpmHtiaHL/K1eLBDrIjETgKRAZgfXIaUtshwZKKPDTdw/rhFx4D/HzNpX4+2ab5 rI2TGfxxsOXPUwYB47r0K82qmnY2DVgoh0z4HlJghPktYRuWObIbqdLWalZH5zn0SmPI uj4Nre6CcOL+LoSaUkP2v9EK6sk6YBsbr2ujPHz7TNNP9us3o8XQMrYhXMTH3kfjIzJn BfduXWpI+DXhu36AXo7IX67AGF1fd8OcOT0s5OvXwRWNMkyTnsYsgRzPK1TbLmKvtvXa OZ8w== 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=09lI8sA7GBmAEMY2ZHF2GfLfirrTO8tbiRtZGHSh2eo=; b=MPaHDYhV28RJtgomv5ej6QKZ8JHtzqWdWErYwI0UL49rSnMXPTtQdl4KeOZPLeYD0d WG/6sTH9MIzolBIFFq0m0Asn18tzBn078AaszG5JJ2s7dTYJ2V85dEtURbgitTAmCkuz T9TnfX1OvH8RI9E/Zc2VFdBHrjtb+5ADX5JzPPDB8ltWs6ScmrI75cU/JgD0e6Dg1CLn aMtof9woU02oQe4+frCYDrJENfacZOUcdUDe4UAJGylGMezCRWy6lrpQL4Nj4Hi8fKEM YcldIq/gm+DTz62Qh4MTJmlFIt12mqGxovam85dSoCA7uTnmecaqaw/LE2/0cunzjeXK Azxg== X-Gm-Message-State: APjAAAWu1Cxpc7ZIEQPMm8OMrp7RsOokrwKqas5TOP4qKwsybVNAbn4v lwWt/8mGzdOJ2p4u4f7pp+vLd+H/+PoHpg== X-Google-Smtp-Source: APXvYqxI2XEKH6x0Vt6kBCMsXWh4Ts8VEMTFQ+fqehWx1Mwoq+Wby4LwhnS6ZWII8JzeEf4TjMwYcA== X-Received: by 2002:a17:90a:d98a:: with SMTP id d10mr4929715pjv.65.1569929606610; Tue, 01 Oct 2019 04:33:26 -0700 (PDT) Received: from btopel-mobl.ger.intel.com ([192.55.55.41]) by smtp.gmail.com with ESMTPSA id a29sm16238634pfr.152.2019.10.01.04.33.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2019 04:33:26 -0700 (PDT) From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= To: linux-kernel@vger.kernel.org, acme@kernel.org Cc: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , netdev@vger.kernel.org, bpf@vger.kernel.org, ast@kernel.org, daniel@iogearbox.net, adrian.hunter@intel.com, jolsa@kernel.org, namhyung@kernel.org Subject: [PATCH 2/2] samples/bpf: fix build by setting HAVE_ATTR_TEST to zero Date: Tue, 1 Oct 2019 13:33:07 +0200 Message-Id: <20191001113307.27796-3-bjorn.topel@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191001113307.27796-1-bjorn.topel@gmail.com> References: <20191001113307.27796-1-bjorn.topel@gmail.com> MIME-Version: 1.0 Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org From: Björn Töpel To remove that test_attr__{enabled/open} are used by perf-sys.h, we set HAVE_ATTR_TEST to zero. Signed-off-by: Björn Töpel Acked-by: Song Liu Tested-by: KP Singh --- samples/bpf/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index 1d9be26b4edd..42b571cde177 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -176,6 +176,7 @@ KBUILD_HOSTCFLAGS += -I$(srctree)/tools/lib/bpf/ KBUILD_HOSTCFLAGS += -I$(srctree)/tools/testing/selftests/bpf/ KBUILD_HOSTCFLAGS += -I$(srctree)/tools/lib/ -I$(srctree)/tools/include KBUILD_HOSTCFLAGS += -I$(srctree)/tools/perf +KBUILD_HOSTCFLAGS += -DHAVE_ATTR_TEST=0 HOSTCFLAGS_bpf_load.o += -I$(objtree)/usr/include -Wno-unused-variable