From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752958AbdKENRQ (ORCPT ); Sun, 5 Nov 2017 08:17:16 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:47772 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752782AbdKENQm (ORCPT ); Sun, 5 Nov 2017 08:16:42 -0500 From: Roman Gushchin To: CC: Tejun Heo , Alexei Starovoitov , Daniel Borkmann , , , Roman Gushchin Subject: [PATCH v3 net-next 4/5] bpf: move cgroup_helpers from samples/bpf/ to tools/testing/selftesting/bpf/ Date: Sun, 5 Nov 2017 08:15:33 -0500 Message-ID: <20171105131534.25040-5-guro@fb.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171105131534.25040-1-guro@fb.com> References: <20171104.224008.1289480268047106418.davem@davemloft.net> <20171105131534.25040-1-guro@fb.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [2620:10d:c091:180::1:3064] X-ClientProxiedBy: DM3PR12CA0094.namprd12.prod.outlook.com (2603:10b6:0:55::14) To DM3PR15MB1082.namprd15.prod.outlook.com (2603:10b6:0:12::8) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 27a908eb-4c1a-4199-fbd1-08d5244f603a X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199);SRVR:DM3PR15MB1082; X-Microsoft-Exchange-Diagnostics: 1;DM3PR15MB1082;3:IZDaQbkUusVmBLej8pYbwZAW5L71iQS1wnJ+XrvUWwjBAGZ6ddXuIE9h6rrIcx/pC1yld4z2AhS49KY+hkF57WMZW+mFjGNzjSKockJd0nLnMMiwbXENU1QaTa7qXMz/wNwovBoQ7AVz04BY6KlONVqEnIHHU3KNcegfVEuSEqTIhnhAGns37mlToH6xWFNnWmkuHhBw/NwgIegKfTZSSUT3tFX9NvV320cfaZWBmnSCNvQDne2KMiSizUCSbe/2;25:yv8NQm+84PmDuFpkkSZsCBknLFxksTUOxcrpNLEmb7GnQY/I0KmEdAK3YZ702k5Da1zkjMy0PC97UaLkzP7motmksMNz6OT2j2PsUNS5sRCmF1J1is3YnDljRJLjlNEeaFmQt6vezK3f7qn42P5skQUOh4OiD+sHEL91RXcEDAW8C9uWtg0vW57yW883elavaM++fRy8cVd/h3Y9bkVqpRp4JMJUXHNfCmUlxD/grDf+Rm5mblJgb9xnwdmWRV+esCynlA+kos2970i58E4FrLPiZgCXgow0dvdWsx8JcrQNcE5RUI7Ji6tuGgDd9EwcOkrcc6RIIfherwB/Qn4b2w==;31:/gzJXXHnN7yK4PsRAawZi2vXx6Tk2G4MqeWRWZLt9apdWO3IZjLnyoBV8Nwcqtl8e5KsLOQXB3aDIlNGaMCL4BWQzeNXpjmpgxAeo1o7QZd8HiVgYdbMSDtt/CteUFc3WPOihYR/3u5b2a79UuKbpZLkgMFwxRnkyTCw2NUC8rG8WS7fCc/Gi5gpfEaJKzSpHZ7d0SXkcudbV0PuSqI3fWB/MOZMHavGeVOzSzaYdC8= X-MS-TrafficTypeDiagnostic: DM3PR15MB1082: X-Microsoft-Exchange-Diagnostics: 1;DM3PR15MB1082;20:/RaesO8so/MqXtqSxIkm88fnPyPuN9QlHJHanmyz1d8cmM8ZB7pG08j2k/FxWl02/Mb+zPcpRD8KD0IqK1vqTBJHzMnqd4NPqfHvPH8cpVqCqIRmHbCuIP7PpSnJCVijN+H407TOXO6DPgJ1czRh4QCJ2bIadIyH1RhF0fs35qFin3lDtgcwQRCNRcAYJ8t84b4QCoZzdIuSSQLEju59uiKt41dzleOKwG19FVU0eUCEnFAhCxgoHYXcMrWaybNXOt2sFesiKgG/Fvq0H8mw2F5T97Rd2RgqPKLWBJM99nl52xGk+y2iL2IDQkheJdp3PZl6STOKP7AsjQ81ujErcReSfjPFOOKgmouMINvKiPx99EhPNDrZz4qPsVLrhRu2bYYHHcYpr0/+ws6ZwXQH49x9noTnCa7B6z/0zFSV8aALjNo4W8dQcMcfkw82YRq7lcju/1nz5ROjfReGBx3XDCftz55Eqd14CMcZaUHKtfNQ95TCXzI6lu/mZYeN6O5n;4:DAhiUZt0iIKBMNW0BLn3iCEyiWVSA4PUVtJmAb1gcjWsmyQF2neIlPNfmHLJjfneRK2nQSyFyOf28dsFZ2K1oTojPo2965PWa1VTqQk23358lfNi8VVxaYjOVoaLNjZhMGgKh70haCHC+4H/gGW3T6koIhbjdWD39zpEnozO//CkK9mr+jV8q50JpcCTAqflooYCnUnpmDaVhh0Wo0cAde6ncxyXO9pU+QEp1BKqFDP3QTy+PnFFVns75SmxF144wHY6Q529ZrIjx6971pzht0vwgtrWfe1ceXeg6XbKviURp2q4REvvQQYL1TDskbDP X-Exchange-Antispam-Report-Test: UriScan:(67672495146484); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(11241501159)(6040450)(2401047)(5005006)(8121501046)(3231021)(100000703101)(100105400095)(3002001)(93006095)(93001095)(10201501046)(6041248)(20161123564025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123558100)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:DM3PR15MB1082;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:DM3PR15MB1082; X-Forefront-PRVS: 04825EA361 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(346002)(376002)(189002)(199003)(5660300001)(25786009)(316002)(305945005)(5890100001)(76176999)(6486002)(50466002)(50986999)(8936002)(6506006)(50226002)(4326008)(101416001)(68736007)(54906003)(97736004)(36756003)(16586007)(53416004)(6512007)(478600001)(69596002)(47776003)(5003940100001)(2950100002)(2361001)(33646002)(106356001)(6666003)(53936002)(1076002)(48376002)(189998001)(2906002)(81156014)(81166006)(8676002)(6116002)(105586002)(2351001)(86362001)(6916009)(7736002)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:DM3PR15MB1082;H:castle.thefacebook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM3PR15MB1082;23:rd+Ipl+OD8es6xlsVt3qPKfKx6zTyBpPX2dIlxb/5?= =?us-ascii?Q?LaK24n0OPaMo1tRcGyop0cDpDzjMh2gMuzIJCJhfKe0DLCvDakrc8Ep93R6T?= =?us-ascii?Q?3OAsUp4Nk+aoG5VGdwdtAXYSJTOCFzSqOf08ZHpiezO7oMv6OmpADK8J8zdb?= =?us-ascii?Q?wYIDj+kyQc7nsxTuegdlOEtt05gy/eQKGBQJ0jHW1A/Wgdzg7r/51r0ANifP?= =?us-ascii?Q?tsbli2LFPiXPtL2gir6+iKjI3vegntuiGKalo7V5xFhNMsx5Wal7f2YnKzHx?= =?us-ascii?Q?EAvi1F2aj9boR/Q/5gacUB34pRfAIMGv5W0Ku1hFnV/6gLed9W/FfIPWdxW+?= =?us-ascii?Q?pYFE5+wQAkHWfRUdcXMEmbSnenEyoFEb4gj7X1liqaZ/TwN940TV3PnxV+aA?= =?us-ascii?Q?ZQlSPXOblq4yTmNOSYtFwrRQcxsLwMvZDefP8TmQjgmw9kYROYUwgISQxyUW?= =?us-ascii?Q?ba7qp0lJZNcnZ3jcV+hxbbM6+6zNWuxvN5/FHmJSvTuc4PyfHPVToTpGkRzW?= =?us-ascii?Q?1UE8gVfO6mlWEZOwvK/C4LFsZVRaMEMoNB6bLj56UQpbtEWDH6g5RKP7z2at?= =?us-ascii?Q?cIUGJb1bfNX6Ld13HwOf3Vctw9Ic7UfHM8gt1f0q2R4N4Oz+qiTtbrvR+EaX?= =?us-ascii?Q?j2/d9W56xcA8n3FPf9WE22AudAJ6EDTdeV9wkznaVieMAm4Um7XT6c24vG/n?= =?us-ascii?Q?LCy2S1ZSO4DNdmVOjkh02nFYsh+MhWCwAKmqcjqi3k0kysfqQS0vdBSMZpyj?= =?us-ascii?Q?ysOpRhr0gqIZvmVX4fvdwv3TLJ1M5I1VuoskcP5inZkxxJ3rrFqqdjUEP+XA?= =?us-ascii?Q?FOg5iHUiXmvgOgXfoTnGjfNQBvAJFMf4JdAxfW05C71MC9XnjaG+BZVHfdb+?= =?us-ascii?Q?RLLu9sQZQSRalmx/VGPJFyA0URQbCc0YnlBHC7Dv0/nVEjsQWssYmv3AAHAW?= =?us-ascii?Q?TE6qYZoJrKaX+4cghWenWvyiUvjMNjVd5fxcssZnv5/pCgIRTQHzIIagVBms?= =?us-ascii?Q?9UGabywMH99GN33Woaq++THFMpAvGND/sgSZzr4ekSosjERiuD8fHEacI4gx?= =?us-ascii?Q?VZn2c/7PVWXFBpD1i0wNeYOaZ2dxt9CNXzuXEQiDzRXSuh6c9tJMPYNpzcwZ?= =?us-ascii?Q?0CQpK7Y4SamUy9zG6rDVEiao2ja92SBmv785xXQmW/BR+4B5t+UWA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM3PR15MB1082;6:i4JwyZClMKJ/0diNHo5v1pXC+BiyWz5dP6Q++6rt5Llg04AcZhAh0GqkLQg1j5K8msA8rMwmEmuiEllA3/GWt7KEjUhJO6KYL7DiqrLSpmSPs+WSXxKXTsBs4rUJmd9ywHkdMxwNFQRpJDCbVils0xNV0rMBLj3EN5YhzrZDS5CFnwyaTdZ7WRVWGPxZzqnhiOM3HWofgXXr/+ooRw9XoeoKNzHBbhZF7EzX9hfrk1uG9fApPow2czwiV9SHMUxF0mqf0QQVXrQynKQ4/XyJ2xkDSv75K0pmsRtY3i57/WkMfucGiJKZFnUQl+BPqMj8XCGXI+UWDYl9d5XB5nFjdVmK/TcAFb2VeJp0SGvSia0=;5:WdbGIxfE4aFqOd3x1KAPWB+2LRuv0vSrd59tFeSKqi2xQuYIr0M3lw0GPJj2Ug2ANI3G0a6LIkCP/nBl2wLodPkLOpiHnfRZnkKOOR7oK7vthDf+rzrYwlnzHela1m0J9fIibPmRLJH4LqthW29ShP+nuk9cJsK1EJMo6OrL+9g=;24:Gz1Xhi+avjmD82iqmi+T7kqHi70Msh14zMHevKrn+kxKSOv19NAGNxSICL4PY+J5+86jJ1kpACL/+Eo0HasXrbYtrpD68mo8OHDPAnM+CBE=;7:Z2zcqAw1IAmyrkfElweTkcyKopH10rLZilpeLBtriebdvDv7gOCkbx1HFTq/N/dW1NLNEMWqnpGwnHPyTiPd+mSxc9OsDJNgw4qr/wp8MJAyMdePcWNDleh8FyViqtNchwWbhRGwTlRgj2ufl8fAbglDQce4aGURu5pcS5GYK/Z3tvSxxvFkOyNEXorqaokq3j0IMsUzReb5TWxXfHaOgwjSgaW4wNM6U/1WhhXyxpjKYuRv4AyDvUxBZZH0Aaor SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM3PR15MB1082;20:ZL9sPp/rDWf7Fn0ZV85idsO9hQ5H3QZJLHXHyEU1BaMyB48PItRH841pLCUUhbs02a8I65YhIwIbFXOy7bPbwRA/dLJ/xLQUcuvQJe2u71oGlHq7lKjwLp3p2W7c73k4ZfllSfnXE6tv4BGuCVn0isMS0z3unyH6kSwwDk1aDR4= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2017 13:16:06.7662 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 27a908eb-4c1a-4199-fbd1-08d5244f603a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR15MB1082 X-OriginatorOrg: fb.com X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-11-05_03:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The purpose of this move is to use these files in bpf tests. Signed-off-by: Roman Gushchin Acked-by: Alexei Starovoitov Acked-by: Tejun Heo Cc: Daniel Borkmann --- samples/bpf/Makefile | 5 +++-- tools/testing/selftests/bpf/Makefile | 2 +- {samples => tools/testing/selftests}/bpf/cgroup_helpers.c | 0 {samples => tools/testing/selftests}/bpf/cgroup_helpers.h | 0 4 files changed, 4 insertions(+), 3 deletions(-) rename {samples => tools/testing/selftests}/bpf/cgroup_helpers.c (100%) rename {samples => tools/testing/selftests}/bpf/cgroup_helpers.h (100%) diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index 6a9321ec348a..5994075b080d 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -46,6 +46,7 @@ hostprogs-y += syscall_tp # Libbpf dependencies LIBBPF := ../../tools/lib/bpf/bpf.o +CGROUP_HELPERS := ../../tools/testing/selftests/bpf/cgroup_helpers.o test_lru_dist-objs := test_lru_dist.o $(LIBBPF) sock_example-objs := sock_example.o $(LIBBPF) @@ -69,13 +70,13 @@ map_perf_test-objs := bpf_load.o $(LIBBPF) map_perf_test_user.o test_overhead-objs := bpf_load.o $(LIBBPF) test_overhead_user.o test_cgrp2_array_pin-objs := $(LIBBPF) test_cgrp2_array_pin.o test_cgrp2_attach-objs := $(LIBBPF) test_cgrp2_attach.o -test_cgrp2_attach2-objs := $(LIBBPF) test_cgrp2_attach2.o cgroup_helpers.o +test_cgrp2_attach2-objs := $(LIBBPF) test_cgrp2_attach2.o $(CGROUP_HELPERS) test_cgrp2_sock-objs := $(LIBBPF) test_cgrp2_sock.o test_cgrp2_sock2-objs := bpf_load.o $(LIBBPF) test_cgrp2_sock2.o xdp1-objs := bpf_load.o $(LIBBPF) xdp1_user.o # reuse xdp1 source intentionally xdp2-objs := bpf_load.o $(LIBBPF) xdp1_user.o -test_current_task_under_cgroup-objs := bpf_load.o $(LIBBPF) cgroup_helpers.o \ +test_current_task_under_cgroup-objs := bpf_load.o $(LIBBPF) $(CGROUP_HELPERS) \ test_current_task_under_cgroup_user.o trace_event-objs := bpf_load.o $(LIBBPF) trace_event_user.o sampleip-objs := bpf_load.o $(LIBBPF) sampleip_user.o diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 4f0734aa6e93..9fbb02638198 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -23,7 +23,7 @@ TEST_PROGS := test_kmod.sh test_xdp_redirect.sh test_xdp_meta.sh include ../lib.mk -BPFOBJ := $(OUTPUT)/libbpf.a +BPFOBJ := $(OUTPUT)/libbpf.a $(OUTPUT)/cgroup_helpers.c $(TEST_GEN_PROGS): $(BPFOBJ) diff --git a/samples/bpf/cgroup_helpers.c b/tools/testing/selftests/bpf/cgroup_helpers.c similarity index 100% rename from samples/bpf/cgroup_helpers.c rename to tools/testing/selftests/bpf/cgroup_helpers.c diff --git a/samples/bpf/cgroup_helpers.h b/tools/testing/selftests/bpf/cgroup_helpers.h similarity index 100% rename from samples/bpf/cgroup_helpers.h rename to tools/testing/selftests/bpf/cgroup_helpers.h -- 2.13.6