From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933760AbdKBOzw (ORCPT ); Thu, 2 Nov 2017 10:55:52 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:34384 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933449AbdKBOzp (ORCPT ); Thu, 2 Nov 2017 10:55:45 -0400 From: Roman Gushchin To: CC: Tejun Heo , Alexei Starovoitov , Daniel Borkmann , , , Roman Gushchin Subject: [PATCH v2 net-next 4/5] bpf: move cgroup_helpers from samples/bpf/ to tools/testing/selftesting/bpf/ Date: Thu, 2 Nov 2017 10:54:39 -0400 Message-ID: <20171102145440.12986-5-guro@fb.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171102145440.12986-1-guro@fb.com> References: <20171102145440.12986-1-guro@fb.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [2620:10d:c091:200::a050] X-ClientProxiedBy: BN6PR20CA0057.namprd20.prod.outlook.com (2603:10b6:404:151::19) To CO1PR15MB1077.namprd15.prod.outlook.com (2a01:111:e400:7b66::7) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: af51ef6e-811c-417a-4e4f-08d52201c016 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199);SRVR:CO1PR15MB1077; X-Microsoft-Exchange-Diagnostics: 1;CO1PR15MB1077;3:MG0vQNNZh0B2icsu7vCriOx+0/G+qRMxqJOgCLDVVG2kr3SvvU401lAGAliSoOe3n/yqBMBkN8627zeldAgnWnhHsSaWGvbxhaCEznFeKsFkUVNpXwqVRxy90U/viuq/eDXiG3LyJ0OYqkqwWra7K3rg5wGOcUwLnRdT+OC8+AdgwFLi3lMnAU4btCJCKzb3OuTZUoCYafPVypu9+Zb6WS2ca/h/eBk4ZOfAUs8xnopxwE8ooSYwPFjS4oZNlx9g;25:nohnzs64uqSyN1HGZS60yPOTDjO6CkfLfNA1nQVDNdW1jQOhvS0nzK6XwX84o+0p1VFy7N+9GRcD/0BcVAnywB1aZVENEyeseZpLNCw45ocFNnJpc3mAsPWlXZR7HAG6Dp7jg/MQYWrx3gjWHqV+gQIpi2gu3HP/+069mAiAfLWlDA5NWm9ePCDzUnotRHaI2ILyBCSHukKJSB0acny2o6pCus8voc9Ai/8BUzsuw8OVV9wnzEgkCGd8nOe71JwXMMFtosLf4VFxXkN5dlvIYpI3q6b7OFyo9UeP/o66X+eR7zEtgBArizyO9wGy90cA9oxAXjs7e8fv6TGFewbKww==;31:ZKcyDszzipJbbckyomSHEnY7xW6YuMALIxUzV6LwEU5s6r50g1Vzh7S9cfC4dR1jMbvZLX1qMg7w79ABLl7AHAdi2bcwy5gsgREcDIpGsjJjjeP8MRiRnhqyCEMxXO8sxztyciFH0yQPRIT6jmxUbiVY7Jd0v8iBLuPM2RxdGXT6S7FXZY2hoUL+gpCOU6Bz6L1yqTjOgLtdejVnpxLq7Oc9VEXhcOEfPpk+jLGb3nM= X-MS-TrafficTypeDiagnostic: CO1PR15MB1077: X-Microsoft-Exchange-Diagnostics: 1;CO1PR15MB1077;20:bUjLEIkcGfQ+oglDhJ0DXY7q3uQiNRjDL6b1Mhu5OAaBJViP6U/NasAM9ldSVrRW2dU7JD8NGhR2WnG/ZAZrh3ph3ZK9WDm0R815WFGDFJLKcBrNCo+iJK0/6WPmvGwEcrAvqm7zOOi5mUiKwhR7c2qQvyZ6h2VG56l5UminC0pRLpuusSvVzpfuAb8jqsFKJRb+fxTXWsd9qu7OXdd4kopY+H7pSFFul9lwUgcLG2Zu/CT5gt3Wk8Ud78LOKVnW/RMVGG/bgT3iEXd7HMiF4cRBaT+LvucoN7CLPRM4BRvfxk/aYtqshTxO0aZax0XwIt4hjGMKtT+s+yrOBH4vfEaQqkiTuZioJ7vtGmoZZjXosHYrviqDOuOy7c4o+mklbFNM24Jp5gfu/8EyGk9SnfM9lA/olbA96d+wlvSIhEJ43Nry1rrBExNzwgdxjLIts/hXfoNeijQ8urE/MhH8qHqViW2VagxwosoDzoBpxa3jYsFFEzY2uZpiXzp5d47d;4:GvUFShETnvMMXx3JQCte2xUEvOdJpIrDl0IC1Hl1i4i626wgIFM8XorCTJcNW0uB5tArmf9qn5bbNPEzX4vZBVILTsj0cdhc7jU9ZfduMyfCr75QmHpeD1esbNw1bmpICpz6fII/y668FD2u1KO0p+D/4sHsTkRzAktrB+VMlXkvoRhjbPn0uG14HopLWru7c04IBPRMIEhaJ4LftouwGrQATNWDkn9XAxir0s8qQ5BGzwG8RrQmF5Ch7Cj69JAe5ByOjroBDJRl5c5++/GavhSwM1lZb3hIWEXyfBMZEsMRBmCnjR0NA5UxXvFHYJ5B 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)(3231020)(93006095)(93001095)(3002001)(10201501046)(100000703101)(100105400095)(6041248)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123558100)(20161123555025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:CO1PR15MB1077;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:CO1PR15MB1077; X-Forefront-PRVS: 047999FF16 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(346002)(376002)(199003)(189002)(81156014)(50466002)(189998001)(48376002)(76176999)(50986999)(25786009)(4326008)(2361001)(36756003)(7736002)(5660300001)(2351001)(1076002)(8676002)(101416001)(68736007)(97736004)(33646002)(2906002)(81166006)(6666003)(6116002)(105586002)(106356001)(316002)(5003940100001)(8936002)(478600001)(54906003)(53936002)(305945005)(16586007)(2950100002)(6916009)(5890100001)(6486002)(47776003)(53416004)(69596002)(575784001)(86362001)(6506006)(50226002)(6512007)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:CO1PR15MB1077;H:castle.thefacebook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CO1PR15MB1077;23:pQdPlPHi9t6D4wRx2BH22nP1JhjaGIRGHf1Q9ISSR?= =?us-ascii?Q?svdtwe1DOV6VFzmSnETDzW2lrgFfMS/hk5ExGl+KwKXBaBv3swJ5ntXkrIzJ?= =?us-ascii?Q?vSwZO53IU7fCxmvsH+i0JgxIp6QQoXAn0I8XVlDsnC4IYqIP1g4Bv54QHt+u?= =?us-ascii?Q?XJM/TiD02V8uoVDshmSNAIgPgb6osH6aJrJXm/xEV3K4vSZ+f+LlO1DEYdUw?= =?us-ascii?Q?56GkntR3DFnRsLOoN91zwTZ9KAq1bH9C705UY1HMZxiv1Bq3l7pxHb+XDHq6?= =?us-ascii?Q?dF5W2HZAzpR0al6OGkYpRePivdjGIubhF9SOUeqIB1KyYiKvc4Y73BMgd1Za?= =?us-ascii?Q?3NKMhjX0g9dRydZLFy7Nlym+atIbefTf8jLjJU8g29uo0tZ5Teo/HmtZuszZ?= =?us-ascii?Q?zpf4HW+uWG+jDCJW3ChlRbYaQgrA5x7vWt0dRW9OC3FzWgbdDMx3+4Z0ol8z?= =?us-ascii?Q?4yJ9L6/WLzeHT6iLLehFT0iAyN4Tr/TJL0ry6MVzzYwTD3BO8l66q55ORicK?= =?us-ascii?Q?irUHxDX6WF0zOHlHFq7MLJe/kyCkTg7TpNRgH9G/yfrLocKtx9VTYpUnU2H7?= =?us-ascii?Q?r9jtJasc7MX3TieyrME9hvKCoqAThZwe8W0v69WozJgZmim3bdFmRWdJkES/?= =?us-ascii?Q?zICpv/fYDHhJG1YZZAFoC7Lntzc2Z7UnzJqOIqVodtTuIIkc1vyVAPly7UY6?= =?us-ascii?Q?JKRfPtWLvS9g9dZ8L+g6pmyackOwR2aauYDLrQFfzYeZrkBfpgs8Hmspm1Qs?= =?us-ascii?Q?rtpzwxJ2LeweiGo2Xx4GuP1YEIalcmckz98KN0sTQFI7WYpMCPG8B8waoBQ4?= =?us-ascii?Q?nhC79siRRmux3pEeb4Ear1Rd1PQMsCsUmDYv1rZfpmlNuHxIcbjNu8kT4HQF?= =?us-ascii?Q?kcGZ7jWyXztGatq/MBlR9WX1A8bTdoc9jDgQ3LodOzmO7qqotH0wD8INu3VF?= =?us-ascii?Q?OJBlFqMh53u0DpB/sgRnJTJ26gmLO/B1ioGWc4YJr/srq6vx6ZQjTiOnq1kX?= =?us-ascii?Q?BztfscCiEvjTE11Qq9PvPpc551lc5yVjAE3lPTFUdgqOGpu/jQ7sge69Vm2c?= =?us-ascii?Q?RSAYLmxtsIv8xL21fHC8m3xnowDevGP2bNK3EB+e2aLD8M8OsFKr27LOHAFq?= =?us-ascii?Q?RBPeQm14/xmvFwGg/IVfTXPsSmmzR3oH01pzE0zpIyv5xHoMDegACFxdJXwc?= =?us-ascii?Q?0V4jFUhm+7xYclDM8WIQM8M2MkNuhix127a?= X-Microsoft-Exchange-Diagnostics: 1;CO1PR15MB1077;6:0k1LBwM9yYLInaAAE/fMNyZunEXqj+y7q13biL82ZiXe23wP3K2jxMha+SRw6PoaIJuBy3PA5CoqDzE/kK/RpHsP+3bEHxC79/SVJAjBcPc6GOKqKvxnEjFt8H/1eHoH1ZGilgra/BtwEz0cREzA7NXV7KlJjNwk/RENZXTvktnGTE63DETjbYFVqMRdThNWKfOkXK/jUIfFt69fOoYTKQH3FayYMvyGCvi+xLFMrgMqR8PxpT0++PB1NpUWhNTjFkLO0qksTzFuJR9o0B4rk1GWLaDA8ogu4cRt+bhi05G3RS/ga7FEe/12vIbZkqv3zREjKPpbpXePveT5V5m5/BcOudA9j2oUYGY1X5QprTg=;5:rULDBOqZCcwmvRdvG6aJ9qdw5TVaRFeJZ5zKzupZmsYVSse922K4phX74VBXofTeFbDkSpAipB1nzqL7RORV743R1OtK/gNcCG/iQUkb52lMlvcuWnKCbBQeADyP8IGZd1htEAJklCfduGPYYjf1NZjE7eHezRioM3Sw9FdjIuo=;24:9DvtSXS6geVmOlip7AxA6Mv5RMv1mxFKBjkPIP+WzNH28pUfxJGKCo64rGN5GTIbbsnWDVTpHbtN86LFoBQSHInhFYFnfGZyNvyL8S4vTO0=;7:PzI5CcWDzfBnc5cW8v+fakETz/7ICqc0ZdmHZTyj5swlpIvVXJwsp4xYZxpUkDqtaHtWBPGK3g/wt9YjMhmiGwQB+iF+yZryNOnOsEcL8r63DbP+7Juno38AFmRwX59PvIemcolLLrcpUEIIe97H+ZuRKF7pQR+DdoExnYgxi9oxBFLe8613cBPnsjdGXc/6aLQVmkx3B1N0P7yJUxdY7hTFHiehH6+vpbvqsEPxNv3Pr58kT3nORTIY/PO4+Ck1 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CO1PR15MB1077;20:8OUG0p/iBeupYQBRONRmUGSSQSZI3GOynbH0xrE9e2WjsDr0GWfggQi6zyn6DQD31CR+p0XsdNvHyLSDjIa66UnlRhjqV2VZMlQsZvK/RQe2gCLxni0fB57MHZZxHX6VgWV3Q88TSQezwvJlU7nhcB9zMH08SM5wtZOEJTm6aAI= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2017 14:55:24.0947 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: af51ef6e-811c-417a-4e4f-08d52201c016 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR15MB1077 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_05:,, 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