From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754868AbdKAPXF (ORCPT ); Wed, 1 Nov 2017 11:23:05 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:57948 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754741AbdKAPVg (ORCPT ); Wed, 1 Nov 2017 11:21:36 -0400 From: Roman Gushchin To: CC: Tejun Heo , Alexei Starovoitov , Daniel Borkmann , , Roman Gushchin Subject: [PATCH net-next 3/4] bpf: move cgroup_helpers from samples/bpf/ to tools/testing/selftesting/bpf/ Date: Wed, 1 Nov 2017 11:20:36 -0400 Message-ID: <20171101152037.3288-4-guro@fb.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171101152037.3288-1-guro@fb.com> References: <20171101152037.3288-1-guro@fb.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [2620:10d:c091:200::3:5dcb] X-ClientProxiedBy: CO2PR04CA0099.namprd04.prod.outlook.com (2603:10b6:104:6::25) To SN2PR15MB1086.namprd15.prod.outlook.com (2603:10b6:804:22::8) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ebb44fda-e9d0-4f79-c9a7-08d5213c2952 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4602075)(2017052603199);SRVR:SN2PR15MB1086; X-Microsoft-Exchange-Diagnostics: 1;SN2PR15MB1086;3:UxFN2Umig3Xx2iHWGXoy0uBZe+H/CHs6R8+1DhPTADnDpczGZN/k11CDkozpkfvjHK0R1LtnzW06wZ6cFqi59+ww81CzgY31OvihZL5Pbs9M4heKQEOW8jOmKqLcaaqpTVza/grWGBNfxoxGa/pbrXSWNzRTZq52V1gYbWbjKuCtiUjh34wvMtiLseu7TwR3CkGYmYA+9mgRRpVlSmXjATha+A32fzixe98Jpz9YrQ64I0fcFc4qBij9dccTX6Ru;25:XPYj4bzY6elxphlCOhYsNi5nOVkJF6utEtxis0G6BZ6KKGzqG8vzQpggV1shHpTWIUuHtBkWes5nZFnNImjNLWIus0ppGTdi2eEMFf2QPI0lIjTn1cCGZC+t/1Sa/RXBR9p0UVYxw9KtsuhxS8RyHv6uGowhg0hVSn7ZQ4eVRRavD4hxLzapa2RKYjRF4EmAab7wYv7cMqhGq7BmGYCtbjFIpZ9BreX+ZYhiyKj7U0sWRHBkazDglEIkwuV0y4XOEgu/WyGYwGWRPEaXegWsICwO09vXm/8AIPdHmbe5DfCfI145+bdHW7sIA6ga8wl3/aGNsVPYkpyXpHyY6XOx3Q==;31:DgNxLyUpa5LB2Z9lliG1nVPqttvbKb+eJJWUnBJm8l6s/luNY/4HoSoO7Atrpz9vTR+x2CleNKUGg22A3E20sRYPh+CvDUDygqeOElIjhMljW6rRhLm5aDxkabGQyCcqcCZPaL7RrBFsC5fUrAFEu4p9LBt8rsIt3pqJU4iPLbOjKNt6PlFkoharWmbtbMbe3+JL/lw+ggIil9htx9BzG3LXe0DSXc67yfaLYdCo4Cw= X-MS-TrafficTypeDiagnostic: SN2PR15MB1086: X-Microsoft-Exchange-Diagnostics: 1;SN2PR15MB1086;20:zaL2Id8eB5E0SXPTwXsVnJ+KG2X7n3YHoeNKh2QS0OQlMixEiwV9arN1gJ4J1B7+qykePB7nn0IngzkjqM+Hl9LyuD6jQF82Az7rMofH7SmL/9ulG6gKoPE2R3BzzYTkeY2u/lpRfIxYDlCmgpGbfWFlEFoeXSHfLdLstNN1Jn4qXXAEykpDH9smUoziTJXrZYMos7V46E5Zh3tWtVu6GwmyCU+uEDJgoe9wfRTF9C5K+67/LARoSXBrEvhyrAwOnpv9xs2/Ro0gDWQDqksgS/6MRRf14w75htwj+t7KyC6QxWUt7zL2c5LoTvTDdVYIwcHBrduxP4TBCLqxN/TZAVxdx+8iE5Pq9ALR2RwE8mC6XX7AZHsaHv4lsFg5w7gwimSXe+gl3Go/NvXbdqA3HfvsG0gsBM++leUuEEcEGvWPb2AuyVX1/RDHQ3821SNTilrjx2VpP4ztvoNfKmtj1YtlWjNdVED6z+ZcG2DYk8sJPjoP6bE0k0cuTCHSNUps;4:l7tzz5cHPFigHxvToye0l88Wnd0CQnfvgYb3P2Oub8HrhvkuPz2fRqvzKpZ6JEUtRlEegIdGf3+NoVy5pVdVwFXmJ+KmpKCOLvYcwUSfh679YOO1cEk8D/u9ppRfk0DzReazIJu1UPZkX4YGbQghShD2FIAu8FnU9YMJH6otG9fJpLzy50qwFO/8Cw4Zig8/u2y6sQICr13WjutJnGeE+Rgaic14x7KlQM11uWSaXbDmJwtLV3z+lauCXAqsTl+nduTf13JuDXuuSyBafsUFyw5gq1182vcpU3rc4+lAJbV6xUXvQCxDBa/lhrnrS6vl 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)(3002001)(93006095)(93001095)(3231020)(10201501046)(100000703101)(100105400095)(6041248)(20161123560025)(20161123558100)(20161123555025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:SN2PR15MB1086;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:SN2PR15MB1086; X-Forefront-PRVS: 0478C23FE0 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(376002)(346002)(199003)(189002)(6116002)(189998001)(25786009)(6506006)(54906003)(36756003)(6666003)(575784001)(86362001)(8676002)(47776003)(2950100002)(68736007)(2361001)(5660300001)(1076002)(2351001)(106356001)(33646002)(105586002)(101416001)(6916009)(8936002)(50466002)(478600001)(316002)(6512007)(48376002)(5003940100001)(53936002)(81166006)(2906002)(305945005)(50986999)(97736004)(7736002)(76176999)(5890100001)(53416004)(69596002)(6486002)(81156014)(4326008)(50226002)(16586007)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:SN2PR15MB1086;H:castle.thefacebook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN2PR15MB1086;23:wMFPkpflTXnBF3b9Y6F4wC5k2VuKq9D26D31iYMwj?= =?us-ascii?Q?pgDCJxJPSFXpYGsQ2CX1DLrvHX9YextPjUJcb7gbbYxWeKwGfY5ILZaCHaWG?= =?us-ascii?Q?arwACi+LxtIbSNl4U/gIxMhBxO9vkOXuoPUOtURjjcFn9QPM3xG8L96c5n7S?= =?us-ascii?Q?FNyZ8hjSWdBwHv7UPzpm7J7cMlNPjDoIaCil7iq9nsO5J+FQqc8ULgXiOqUm?= =?us-ascii?Q?VEKr1tRcZ5pmpf+fwbenim+VodCTd8GwrgviunFPBHf5JvJ2IZaBvFVmAUQv?= =?us-ascii?Q?r8LrlYdZl5qr0npXHP+piIWpUWcSfm8xh6x0NABJlXTNfmdFbvy+wRvHGrfC?= =?us-ascii?Q?Q/lM47xbYmLLjut1dvqZzaOTIP0XBin2dZwEoKzJF05nnWK8o7Y2tZc9N6g+?= =?us-ascii?Q?db8WZR6uWmJzMRqXhudrULmKNkoYiGbEl47vO2J7l3Q6OUGLCGlz8gKI8LFc?= =?us-ascii?Q?SJlzxlID4T9wImR65Hbl1CRlXKLuUIrHvkgkAgD6NNCj/0CCReU9K3Mq7avA?= =?us-ascii?Q?L3NoJvOP5eU/mDw3LNwrbY1D9iI3VpebCBndzGTJMmlmlrz4IbK5t+MYtsWR?= =?us-ascii?Q?x4JwewOvKTsD3n3j/2UJt4NWOFMURQadhX+6fXynNy2VhyyDDb7lST10kOim?= =?us-ascii?Q?M7WKyKUthZeGNxZ1e6/tCLn1GuNcLxigoqXOD8jkru7K47yQPN5It9u0Xmld?= =?us-ascii?Q?j36kBvJv5/YnJCb43MIhaW/3qgs/Bxb3D5eOHF2katzZvZ1EQWzHhx8GYdOW?= =?us-ascii?Q?2++xFACZzywwWRZchjGmT9Om9Hx3U4Y945qWTIyGBObrp1NH/c1VQr6WOzNc?= =?us-ascii?Q?SLyYXSlGld44UnfoFAc2qyjpmiciRna2606Et+DqfxZFx5/BH9GlAvA8erxJ?= =?us-ascii?Q?Dn81PwKeqUykRNM8kavPHp6vRW0MpUGDR+Zf2DMKJ9DAz4EAlvw6Ez0vH7B0?= =?us-ascii?Q?cN0o9eChvKCn8JeES+HlZp1lyzSKhoFKWSGcvwHWqdMqB2z06+0fFsTXICAK?= =?us-ascii?Q?ejgq+iWhKtN423SIIOrO+P0PWNcFL1Qw8po1T4YtZ/Tp0uUGyT//7GyfPNgP?= =?us-ascii?Q?+19tj9/Tq1/5E4re3/i1KDJ0TmUH1lxRJoQQTKLR9uK81aHd88cVHrJvb+sF?= =?us-ascii?Q?gLKwQ2DLWidW6RgRo3e6LisIzvTYnvUdkAAIotOmw5rT3SVc4KwvQbPgp55t?= =?us-ascii?Q?QPM82hmoY6EY8xeZga/iJqr9xe+4ekdU8CV?= X-Microsoft-Exchange-Diagnostics: 1;SN2PR15MB1086;6:X14hfPEINVT9+nyamhz0IWFgRL5gAJYhZVA7djJ/LRUo5wCledhewx2YARVLl1vKv6HnQndfMsj2qCRZfyr9XTemKF7IOuWdVBJCEwrl92yGa8OvprhrM88ZDjOWkQT0bgNqWvnsU2kbwKO/C7E8v92ACVEX9RE5dLtBMh4L2MmCAFH+zVbkfpdwwSVWPPCyPhMYoXALxL2gSgKMslsS3Zzb+Xyae4Bnow7f+Rjd/axEGMzEN0t8RWR7JUX2SbdykJJJ7+wi5Lk5JAfU4zzG7qBsjK7mZ0aDwm0+VGhrJnKDSEPqcWL/fEVcm5YTIOWJ+jpJW9T57MARQpt5XPkLsmJ6IaA1ah8szktqdIaEmfc=;5:ljcIueaExiD2VKKFkVNBHDlj/4eH3ZWhhy2gOIL/Z/jI9iha9/pt/u29wf0cJym6yXzY2XZjD9yErrn7YXGJGW6WOnLeNDOhj2BmGG/ErOv6cJwtODz07DneN+xHJxorQBKx+aQ3G0DPAQfCxlVw89PDOg0U25SGze2k+of0ZXk=;24:FkCJwOxMUwYqwA8zpH4pwQAUBQiM0X0TkAN17Q3XkiR7sbRUklhtn8BVhjH1kmhG77wgjhpAmf3r8pcXy0Ly4mgprqM1LXCmrB/yot3DvG4=;7:EMkI+SD37B54zh4y83Ih9FMVybI8RKOeun8qkYqYVoAzzhJeKnU/7pRhLw70Trd99kXxOoZGelg/G8lIOWUmvD9LJMQ6yRHFQFuS3LCtuKrkKa7TzTHjFl7aPh5d4Er+WI8CWLr5WqusbOmqiUnPS5h+gElvedArKXeYnOreAXoWZSWErgD4CZL3Ou39lG7W9qRC1YCJmQHd80YeGG2ibZpwvfWHhsCj+YxDWU5ltEu2ep9D2JgR/GjzgJKKwLnH SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;SN2PR15MB1086;20:sUX6weHUDf7t/m66odp32T7pRbhAuYf5BuXo7VfSWdq+qcKNdsXwL2gERlT2b4SqDy317e4B5uArmFfY2TZH4s8I2zozCAORty+6ekkRdUlI2yOD+2x+0lEEJcXuU8dq49LI0PsHTvA5oNspwJpoJzy04REm8wphzhmpFDmMatM= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Nov 2017 15:21:00.5807 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ebb44fda-e9d0-4f79-c9a7-08d5213c2952 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR15MB1086 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-01_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 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