From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755912AbdKBRSM (ORCPT ); Thu, 2 Nov 2017 13:18:12 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:47906 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754910AbdKBRQj (ORCPT ); Thu, 2 Nov 2017 13:16:39 -0400 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: Thu, 2 Nov 2017 13:15:29 -0400 Message-ID: <20171102171530.7627-5-guro@fb.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171102171530.7627-1-guro@fb.com> References: <20171102171530.7627-1-guro@fb.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [2620:10d:c091:200::2:53d6] X-ClientProxiedBy: CO2PR04CA0112.namprd04.prod.outlook.com (2603:10b6:104:7::14) To BL2PR15MB1073.namprd15.prod.outlook.com (2603:10b6:201:17::7) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 470b612b-5b50-4f4c-588e-08d522157082 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199);SRVR:BL2PR15MB1073; X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1073;3:friGHLWgmKlYbT+4IIFPqEUXxrx4ZOv/2LeZLJukjpq+7NEO869A+khK2V84atVF3R3RQ8vsTKcFsWezVIHA5Q5aXMSV4aan74gtW7MiAb8NYMGWkrKtYYmqjJh2Ttc0hHR2sFGt+XV51Vioy+Wo+/BUpRBMZRxb6GYLX/ifiBP2nqsSyc+3uFiduXqtrW1SYv2cuCJfogwMCIZdELjEhym3WjkIeQkmwQYZi/Yk6sYmy7JOYxA8QNEtmZR8kBLp;25:SuSl8jS0q0hUuS9RJb1F5UMfIT1fWXBte38HzhrOLFc/ew28dXG9T7sblfHbmrGU3vqSKIB3tY4gccp62/5gEJD1tOmqSEpV6eE7SLX99fVSg6Xg0B4+7NedymadK6EY0MRjjPPbHMp1qCAliY79KCfM8E6ZJiGMMjTQXGLrrx9WGLbuI3ctA+Gx/DzaWNaHqrLei+TWutL2d8Pmt3q2Et+103j9Wr2cKamKaHZsVDv3O6XKpJjF3sE8FZd6eP3QA15UB9mgDXsmcmIlI28y0oSdb+L4uP3rBSNzMYYMpuP1HiGuCsIwi39x8xocSfKfPD8VhMXb+IaIlYd4kKdGew==;31:5Q4LOls599QRbCja63ViXjiK8nlR8Yt4TBkibCr9Rp6Ai/IDyiA/Fv6WzLwnaGXxlmwsJfUDqCS5beNCEdfZ2oi1JnMH7ctNLnGbTKHY6uk3PCLeOAklRTozahwjO/owVUqmb+fBNYDbt/M7YsyjS1Ds3eMZeNQHdbNO21j2RSkCK9IvJYP+SCjb3Zit6LLkOcfdeNNCrHNRzUbIOQi5qKNtzVvQYTSycghLLlr/gOs= X-MS-TrafficTypeDiagnostic: BL2PR15MB1073: X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1073;20:+Jj+lLidSlEBQ/u9llfRGTHFuqOCCdeGkkwXhd74p2WoajVG8rsDOsemf8AaWr0ThEw2Su/yGAJu7qfMMIwBJaTs1tC71c9OELmfU0IDYNnkNxk7Gugc8TW9li2QR5vaQnIaZDNtUMhahFh0189cqzI9eW86lUtoMgijdWqeMt+8Hj8qHbBvZG1cce8/0YHZk7jR6akIDA+i6ddU6TiooMYTKGogaQ66MBWoCtKKxqsZzlkQtLb8qmsOZrKHiljP+UCu2dshuhg7V9bLFctin1XGpNz0AhzWEo5Ryd2pseyRNv8A0gB3n2W008FoJjFhsffpZ/tcXF3ov1B0YWoqAA4IquFTlrG4GGdxA2rIwTRKyBwUc5yjrkv//dlmV0lVv5WEiePQZAJD+4eT8Dl2e3awOP0NxNK2ouxOKf1WcrnBa1zVPofbvZOlxXO82A1uY68kWX/Q4cj3r8JT17MckvjViwOTyM71eGP77kAG/i/n93M3IVBEd4KPnbQ5VJcc;4:NBEeq0Usw4VfeM1uoAp0wNrm0fIFHI7L4KVqhyyq+mUEEpl/pBHVQNG1WxrBUiqjnQXZ2QOsdsY304zTVfjyV2Y/q92Ceq6q/EM3NoqHBc5uMuRsx/atvEmk11iIrv0TNz4TBKa6GyruMztETVDbNvMtHTkU2wxhOt4IFdv+7rWSx1ZXeq6PSitAG9crUDqvQuHE3PPtFx9UQGRPFQR16xdR5995u/dvkrAso2huMNIObdNNtStzPVqvCNdMv5Ruoecvb6RvWnoPi31TgID2v9ZNiGVrffFsQCYulA79ICUBdUpbbtc2baDV1sX8OTDB 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)(8121501046)(5005006)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(3231020)(3002001)(6041248)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123555025)(20161123562025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:BL2PR15MB1073;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:BL2PR15MB1073; X-Forefront-PRVS: 047999FF16 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(376002)(346002)(199003)(189002)(50986999)(76176999)(478600001)(53416004)(33646002)(54906003)(5003940100001)(2351001)(105586002)(4326008)(2361001)(2906002)(16586007)(316002)(106356001)(305945005)(5890100001)(7736002)(25786009)(101416001)(50226002)(1076002)(8676002)(189998001)(36756003)(81166006)(81156014)(47776003)(69596002)(97736004)(6116002)(6916009)(2950100002)(5660300001)(6512007)(6506006)(68736007)(53936002)(48376002)(50466002)(6486002)(8936002)(575784001)(86362001)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:BL2PR15MB1073;H:castle.thefacebook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BL2PR15MB1073;23:8700HzTb2BkBMeOM3TApEZ3RXmqiSRNx9xJxrIx+2?= =?us-ascii?Q?MQxvKvyF2t/YfX2WoizmW0HZd54CZIZitib8DkeNFxW+GDn+2kKB9Fb6ykFQ?= =?us-ascii?Q?8hjKF2QG6/g5p8tl25t0Nt5tybmO3cwd4TQW+fwcBj27A6bdISnuIdUsAQT8?= =?us-ascii?Q?UvuoJGXqU3NiPXTWdBP1mI1zus3RhfkCCEeOAVxyxCVCum6C7UGumz/7Q/0N?= =?us-ascii?Q?D9w2fFkCcgR+0GB7jPfeLp/lcX5+jTIf1dfg034w0xJlyWgaRgZCazhKTzAe?= =?us-ascii?Q?RLVO3iPNukk7oGHzJCIO0i3PkWUmB9dHsvbMMyf2gjczP0BTZalRAQ6xCwph?= =?us-ascii?Q?PrwVxh5d241OOCdORZsGthD/i3ohEp05uw4yNaGcfzdePcn2aiRz5auIGqMS?= =?us-ascii?Q?cFJNgSiI0pWLDUtcCCTabqoO58pkzJYeMVBH54jTN75mcQWWLGxz9Xi+/kjD?= =?us-ascii?Q?fC4wihOjz/t/uTxhdwf/HIG7Rp2MD4zbipCBIsPvJ4HHuZsgtcbBFOQdU1MN?= =?us-ascii?Q?sp/YTRkyLLiIr2+naZranOmlkAvO31NvcU4MEE/vcCFE99t8lcqRQA3y6ObS?= =?us-ascii?Q?utG8UzP587PjqPqb0rxCUl3fyXnW/5nH6veFL57AZFi3hulaoO4SKCherd8x?= =?us-ascii?Q?9gnm7b2+9GOEoSVOS3Wy/oZaQJfJxbaTsMLP5o5TKwGqztGlh5lD8mQjzuq0?= =?us-ascii?Q?re05TAlpIJu9OqFIZs2QM05n7cSg1X0oUDOpQsebs5iy9S7XTvyp55oO0bZs?= =?us-ascii?Q?2XK+mGwf2NkkpOOZyfdbn8LBXnxHWo/OTZwLjqHGPIZYV9UnKUf4DYsp7YY3?= =?us-ascii?Q?EYVPfAYqLouVaKvgVVAd2Nn2qYxBSJHK8Og5z1QkJKXh6PyEUcYEpUFNZf6P?= =?us-ascii?Q?g5tRi6iXYlWsAKOiOokfdktM1AGXW4U3ZlHnTPKZ+pbFJMeT9sCkYGSpp1KW?= =?us-ascii?Q?dYVfsR7xQ9fpJFhSPPRuA6pBDucQBAG3VaenU3iR0lHL2kcKqIdQ1Exr//vH?= =?us-ascii?Q?P+oUcch1w3HY32CU8HrPB3WvpqLfstcJjDh/f77qG3WsXXLl9SNimLPSSWsg?= =?us-ascii?Q?hu5bU40umwc9C1s2QK6EcKrlgWhPlS3qekwLhWh89Yd/Fh817PJzT400XpCU?= =?us-ascii?Q?EtGJ7xfkFebsFqOV1rTR0oRTTAjlTbCunGse9rDrZn2OJ4Et8CX8IXKZ2sZk?= =?us-ascii?Q?JMn9x+xYoC4xLU=3D?= X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1073;6:ceBWoQcL86EdFsVEwUMjdDzuGA9pLLtprijI1STwBeTvY8fQh2IF+9cg1WFoAR1E6wI0oilC3UZ3L66E3m1gUM/Ur96CQrzl8Jem5aqfNZg0XV/8B/Z4FM8bxe011T3b825IE2LoZQ91fhTxSl74alUmJTMUVJkVaVKVH0sj11nIcSX9yfqMTNWs4xlUMBvy5VwDgVzGs+F/NRxRdafxhjgbfmPtmcSTfCtII0JlWxue8sWPg0whkGHJhSl8H9sqbQbrF+0cv63lqzEEBT5g3PJzWWgV6wmafCtZMOQGCnAH1tvyr+yu3ORk6WsImm2xEPweWf8IaYFDDqosubB7tX7q9ZGx72u0ZxbmAPXKgNM=;5:v61OU/6kCjQPvy1plp7fWu0xOGKFQbP7F9Gl9yIl/7IkOkwNf0OPJhm1BQ3PCAUkoqWZ/P1Nugyr+iRPmAydw9oP5YG2UjsHEspP87VphFrA+DZvip7F+hEDIU7I0e5cszaoC1aAJWkVeCqvynrnOkk3Ke314HXfXrLh7xCj6SU=;24:LLjDRvgt0RIBYnJUthtpUmC9xpPoXcAc36gHcT+EdnTOuAVIeazBggASRl1q82aoaDRbjAI48dHJcoU2iWW/JomuskKRfj4AksvweMVAwaY=;7:P6Byy6Zhhq1RQAGtvMzGaR4HkrH0MaSRoYtw6ps8ZM3A8Z5BGQ5Jo/1lpfSOGGyO2XaacWPF220skiOghLFJHvztfDCjFgAvbuR0rO8H8ETFTvO8MD3aA83tJt819svuU+E4GSkUprGQu+srinpv57BsCZl8VZNMEkXZQT8SuErpkFBfg313Z4yvRfNKxTOHJHMMPXeeU+QQ4fNNMqO00Y/2sugOoD67b1GOqqcGeX2MuuqVGrgfoEnoB7fHjQiZ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1073;20:h26Ak5QINk6WYyH8Rw34ZrR75JqiPctCtuuB7D/QZ35Yqezfr1wiiDDCp3BVuKYZL0THLX4JqLhcO7rUyyIOIUQkLuhoEKj7kknDiGouv77MqzyldoUMgv3NTJVPpsFohtVcUnTALQqODApnushGN0Rj/JFFjJmKyGMah46WiCg= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2017 17:16:20.2697 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 470b612b-5b50-4f4c-588e-08d522157082 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR15MB1073 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-02_06:,, 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 ea2b9e6135f3..adb1e5dba1ea 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -45,6 +45,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) @@ -68,13 +69,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 2e7880ea0add..36c34f0218a3 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -22,7 +22,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