Message ID | 20180628163458.27193-12-guro@fb.com |
---|---|
State | Superseded, archived |
Headers | show
Return-Path: <netdev-owner@vger.kernel.org> X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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=netdev-owner@vger.kernel.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=fb.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=fb.com header.i=@fb.com header.b="OxCaJ8AN"; dkim=pass (1024-bit key; unprotected) header.d=fb.onmicrosoft.com header.i=@fb.onmicrosoft.com header.b="j1xIwEfz"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41Glny6Hmlz9ryk for <patchwork-incoming-netdev@ozlabs.org>; Fri, 29 Jun 2018 02:38:14 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030212AbeF1Qhu (ORCPT <rfc822;patchwork-incoming-netdev@ozlabs.org>); Thu, 28 Jun 2018 12:37:50 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:45780 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935507AbeF1QgT (ORCPT <rfc822;netdev@vger.kernel.org>); Thu, 28 Jun 2018 12:36:19 -0400 Received: from pps.filterd (m0109332.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w5SGXNWc018194; Thu, 28 Jun 2018 09:35:58 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=facebook; bh=bORC1JD0YP835z1QFQWDyQXRjeP3qHZESb5m6qq3qEU=; b=OxCaJ8ANGrex0T4ZnseCZMVMoGdnVnitCAYWStmbpk1jdEGRf2n64XzaHM1u8cK3GAxM zFw/G2sRX99Gwoi6faH/lousyAtL1AzkFNfpER2E15SuBnus6yBSjk64VN19OXzRYaK0 MqFWune6RVrgV29d2pgUo2Kj0rK45ExbyfI= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2jw36e81xj-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Thu, 28 Jun 2018 09:35:58 -0700 Received: from NAM03-BY2-obe.outbound.protection.outlook.com (192.168.54.28) by o365-in.thefacebook.com (192.168.16.11) with Microsoft SMTP Server (TLS) id 14.3.361.1; Thu, 28 Jun 2018 09:35:55 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.onmicrosoft.com; s=selector1-fb-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bORC1JD0YP835z1QFQWDyQXRjeP3qHZESb5m6qq3qEU=; b=j1xIwEfzhyuHEGNFNA3800k+EySThu2MDkcZmxeooSo0seRP6fLm2nGIUvgvXnONgpiHKuND0knbrWHEZPpugjoRY3nI9YQ5DEpy/E0udVilrFViWKjYAUOCyuLFbNKhvVhbpSYJD0bqaLi6+viBz26cIGrm3O3Zaw+db2dsmmU= Received: from castle.thefacebook.com (2620:10d:c090:200::4:4716) by DM3PR15MB1083.namprd15.prod.outlook.com (2603:10b6:0:12::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.906.24; Thu, 28 Jun 2018 16:35:36 +0000 From: Roman Gushchin <guro@fb.com> To: <netdev@vger.kernel.org> CC: <kernel-team@fb.com>, <tj@kernel.org>, Roman Gushchin <guro@fb.com>, Alexei Starovoitov <ast@kernel.org>, Daniel Borkmann <daniel@iogearbox.net> Subject: [PATCH bpf-net 11/14] bpf/test_run: support cgroup local storage Date: Thu, 28 Jun 2018 09:34:55 -0700 Message-ID: <20180628163458.27193-12-guro@fb.com> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180628163458.27193-1-guro@fb.com> References: <20180628163458.27193-1-guro@fb.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [2620:10d:c090:200::4:4716] X-ClientProxiedBy: MWHPR19CA0024.namprd19.prod.outlook.com (2603:10b6:300:d4::34) To DM3PR15MB1083.namprd15.prod.outlook.com (2603:10b6:0:12::9) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fb6fbca1-a6f8-440b-52a9-08d5dd152db6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(8989117)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600026)(711020)(2017052603328)(7153060)(7193020); SRVR:DM3PR15MB1083; X-Microsoft-Exchange-Diagnostics: 1; DM3PR15MB1083; 3:ZBbch2uuXtfBajLTo4aDx7SWgBFEMdkV1sZixY8k3iP4LasluIzgAzXeewMtyZvudQSlIi8lUGBHTauP2fE5XGHD49zilbfmZQdYxiO84IkFEPPmslHg/CNwtfETDkCXMPtMjk2pVhjJCr3DcxOvOavaGaX0LMer0zPcip5UxwUN4UIq9EhklhWQh68dui/eIldEoLkp5tQGA1E905wp1dy1uFYWl9PklB3NavT04qlvmbU85hfMO1xz9iXoZ8K+; 25:z7QVhRjlgwC6qiAJ3go+5OvmaJ+iwqYcSApzAKfA1oXndPWIjhMH0Ky630RP5YnbMWqmh7a8M2ZbxCmLLLgc3CYG9DXdbdd+LKTqfTacq4HfAVzDfHa3KQm9yAGvU8LhN7j5Pihuw/EP5goMSYaJLS4WPM+UXpauej7yerYSYAWe9EU6n9ryHQYbFD1UjF1ajMTyHh74v30Fap4cdbXY1ZoqT9cJHdHuCDBXQAdEFoTY8fNFstWN8njTYNL7kUiC+c9j+BnPtBEDQ0y/bseF2/MehfbNTWQbqDFPO2+sJMGlCJptqt2AkKFGnmATm1uJWPnZbwGzQLR/yt/LNZ3siw==; 31:sKjB38HszhQO6iWhNzUg+jzoADgCPhJVnHVdyWhP+Znxx7KFft+Yx4//Xo0N8sMCK0oGfyKu/HOSMMtuw80ZCKO4jUOMLodyLzj9IN50f71QEBLXM+nHmGynhhoBO21dBBbc/e0+iIObKc3ZbHrX4aS13DDht0tGRbezZk1uCoFkyAwljpoi9h8Tk2TT8ITPXwEBo24zWaedwOln1LYsi15mptlXsPnwYk1Kp+o4M7I= X-MS-TrafficTypeDiagnostic: DM3PR15MB1083: X-Microsoft-Exchange-Diagnostics: 1; DM3PR15MB1083; 20:os6gwj3HKM4rTfbC+nb0AkOlnklxcviXqMpYqiY78lKh6r9LE0jilmUz4dWFO2W8kSyMWorjhVz54Zt1bfNbBv+XK/JM22aj0l3cP/k6Ly/d1POGFfL9nAaeBmZUXty+r9s0e9hm/zqCgIqrh8Q57acMqFc4V6EgOrHiD0cPo3dTrvE7A7wIk9vElLdZyq4Xs2THKcbzTF3mo3PL9Yru7GE/Eya5S5lFj2T/Fyml2uLOWDDsQTrYwxofPOJ3hsPrJiVewrYpumN2aql5VKAyW7Y65xhXx/Y5xHO6E13foC6zhvPIQSxt70C1NaRawoa0B7y4gEO2DflYp8SFPwWs6HE0jaLISBtdt1AIHtx3EO0hkEBcjk81SPXOBCSwNm/2QNSo/WFXNjbC+dCz4XEIMVXy/wtM8ErnjQ0WI0z7mXqi3Q6F53Gsfa0A5Ra2schxyjrgddsisr90DIVpsYBXyDZ4pD5rgZLKREG9zs2ZOSEBHIitm0I4MYwsQcWPZj2L; 4:+7uEwchFTOg02YpH6w+vVyEm7mIN1e+prY7d8wqhNY7UlTXU3kFLu3yckdZZ4pBjeqTS++qtNolH7266PVvTvE4ppgZBsVY3/CdtBINmdtgd7FiPbmHSHR8F6i0umBL0ofH7pc3zpvOsqvF3pFYE38h1stKdFUXpgY90LzZSxt498R8UF7+vCAw2UWbm8yURxjv1lgcnQHxIH0q4sgpCP3okC8F/IcecfmPLXHpcDMc6WFLHx4StuGnOcwRJnFrfwnfRYOCFcanQkF26RBnsNdtR5f1zlEhOx4D4G4Itk1CbaDlbybvJNtG2W2NtHQVy X-Microsoft-Antispam-PRVS: <DM3PR15MB1083C7F49EE68185FCFE4035BE4F0@DM3PR15MB1083.namprd15.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:(67672495146484); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3231254)(11241501184)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123558120)(20161123564045)(6072148)(201708071742011)(7699016); SRVR:DM3PR15MB1083; BCL:0; PCL:0; RULEID:; SRVR:DM3PR15MB1083; X-Forefront-PRVS: 0717E25089 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(376002)(346002)(366004)(396003)(136003)(39860400002)(189003)(199004)(25786009)(36756003)(86362001)(486006)(53936002)(11346002)(2616005)(446003)(106356001)(2351001)(16526019)(186003)(7736002)(305945005)(46003)(8676002)(81156014)(81166006)(6116002)(2361001)(68736007)(6916009)(6666003)(1076002)(8936002)(16586007)(4326008)(2906002)(76176011)(54906003)(6506007)(386003)(53416004)(316002)(6512007)(97736004)(5660300001)(52116002)(47776003)(51416003)(69596002)(52396003)(50466002)(476003)(50226002)(478600001)(5024004)(105586002)(6486002)(14444005)(48376002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:DM3PR15MB1083; H:castle.thefacebook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: fb.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; DM3PR15MB1083; 23:mwc2DtXCxyPDlq8BHk8NVygk3jzXEta+JKzW9f5EH9D9H28PHZv4K8SAhuoQ15+jy1sZirwYFJElWq4PHXmNLDvpyRDwBpxRr6DYHi1siuhJp6ahBj8+2awnJhyHpsFHEbYEW5r8S6TJtwkxgOUbmwMsQQw1aXT2gG9FhSYLpYIpUaEOo1hGLIuV1P6G9ECTdAHhaeblYQgkMcZhH+0+UOYYC7cNradsgG8QJuS1J5Bqvxg35qv82ZXun6l1809AriJ4HSEfrCQlr8Q95pIkFgsqGMKqRd/SwJOnuTnDbO7Ni5+GhDzZd1ruGINgtHjBh+vtIOMwGyQWBu9aNM5wDmVVtKHrjEyI+q+ZspSyfiIt7cxaI40E0lF6PBm81Ft03BFuusFZI+1gJAHcVRSwAIuqf18EYECfKTSXjaul8WDbBk6hwG2qJF3oHSEH068B7vtutWRsQ9GBNgAEDvY1R2HZssQRgWingv16RBZk5SSCHmAro6yIguBeouyhfGwq8K5QnfkB9UUkpQytw6huM61qg+ueqXM2AeMOvXncguZNLHsJ/BvB/tzX5no1T/eOQVlW5AR+01Ge6H2cTqfnIneXdJa6ZFJIPTcR/sYOnWRnPXRq19u3e5C+aI2/6bBg8PlycET1KYf+4e5QXBanazmOh1LUlH1/hGHoFQXExPm2cS9oGk2Wt7EWYjeKkh6KKh2Rur0dmRLAcYkicj9BahoZvWXuEV/eMkDSqS60lLGNiQoKw9mogyFefWqilWsggMXQGtLGeCKdQGhzhuesxwglhM3668NmDKqONmZtgKDST51ai+famFxl32MWWUvjfQsVLe87SIz6zdQBz/ffokGgR13oWcwfbPv7K78fC0U+xnwI92dRVYQ7HLFVMfyK2l8MqRLdyOMYD6Kn8kgcH9Fnyc3dMndfIHjYC9yRb822yOfXJHHQuN6abQ/Cjf8bSvAYa4RSRqeXUJM78zVrWY9KQYMY10G4TpR/UKM9S7tx6zpT/86KWhSZOfjgzWO4n3iURqmxtGPoiIAsH8aVJLjIW+Qy/KsfeIO4Ct1jzFSJSXdspu/i8oqWphBxgu5in2uSabYbCugG/DlH1rZ1uDwsifzKMaCV05jgvX6OINniW2foTht/T/veOzoufFv7EATuU5y7vBogVf1xHJ1/kgmUOTf1wjCSp7qjewSPFOdvzE+Zq0lL4kpq8HF6A/gWfk44/3gLJNa7c/7V2uWseCW3wZizRZ+5Z9Qv1mQ32JVGoslmGrs75HZuY2kJiqlQL/L5f85z7Njj1bLL6IGb9L9o5AOijfaeMy1uAqXOVQA= X-Microsoft-Antispam-Message-Info: lsRreC2Q/QPEgr2d1+aKvlEh/6QfHliZ1KyD2T8FW6xFthfzIjK47ZHQ6kOfsEfORy+nQWIYiK5MnsjMmbmWbtOP6Sm1MUW2NjcY9zefZiC9zRcuQFwaYRGRuFBJ/cZkrrv7gGVLfLSqyKVMaWOS5afG7wFh5eG1qFVLtTG8JLFe3zo8uEyRcU7zwDAOSruqvV85yRWTWKT1WkMk2uw9plWH++GvUv+sNEQWMlPe4ke8TNzITs87veLoST/Bqzi5F9nSYEngfC/mtgp2X3Dv1SjqVJ19OVW+xbzQP5Z1N61kJFjfeJTEJYHy44ypwg1i3mdNWFgrHykA5wZLAtlGHSSqTH8NWpXq/TCoNPCoBn4= X-Microsoft-Exchange-Diagnostics: 1; DM3PR15MB1083; 6:K/xgI+QDpI7A/IyBy1Pxaa60I7JnD8kiGZ8/wc/2RTTjG5Z4dKgQgJLkdeSgObavoHtssldk2xmdKE3Mt0eR0JYjChURrTdqz215BHUWwJ3hfoe5GuOwadI3hIUpHdZynzfBQpD9n2m+dIS6Q0NnuMK9bz4zRkojp5bF8vUtYojaG+1zuzO/S6baI8xWTjsSWxxiD5oTG6K5O4B6KxsVELXaJnaHmrj4ywn12gRG2C0TNQHOwXUWiJx92tS7tEv7qUFKYa4SofLFlM8R/+nRgRI3yi6r3K+q2zfjm0naGXvpBSjhlX1iwS95IibEhmumL9jE4XUoDeI+cOyu6QwyRnoAcgV8XNTtMh8AdNX+8ogCENSiBpIBA9v1EYG6gWXT65lRxVyGJW368TLZ8+r0THDLZnD+/so4oMzRNQVr0J17EIomDTB/n+LxEhddYJWvOumbJFvxf9xLQa2waoG/ww==; 5:o4LnBZk0QVYdSxCLJdwZ+cv1kIGMhNV1zV1c0+EStQr7/VP1AEjqNkVayLaVHlXF5S7Upa7/iEfAdybv0wfLwnueeJUD8jmLTadPi6+AHNGLZYJtUNgE7+2gs0xgs6XUjlgHaFg4m1/tH0y8mVsWFwTBOHj38SZKrtZMrvRu+oU=; 24:meaC1W/HLdc3J2Ut1scGND44lBut0SBS9iJ2w/IRk9xhvbSKy31EBgerLbFMKjQP+539wTv4W4Cis8JhAAiLgYyxO0rkmr+Ehyub7EFOA14= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM3PR15MB1083; 7:4TZM+ljsJ2nw/NjH2qHCuwX8PEuGHx0tJDb9c3ahYlub5i2XobwYlL6jozr4VQP+vcNkuBRBha44i4g1iPt5ghnJQHB2YEjZxrb98yTU5dre5ejsMfzwVkYvNNO6gezlxw+pEUyYowCdYFg2FXAfFHTN3S7eFixSIeODDTMJkKCLBUCm9Oi2v8mYQtIgc2/Nsh3FUKF1yodR3zqydpKNILiCRt3Hh2ef+r8xBsJyqV1JCD/ObcO74Y6EItwGpvmd; 20:QlvnU3pQpy9uqFzRBKotevLAb4ynC1pYlNPGMU5dMtqNPs+MQTbjOyFsvZgtRM+aS90GyzA4BdnKl0xSOQtNRX3DAV8eYRY64ARZGOXhCWe712Bhzo+mCe3gLmKUI1qjih8Yh56AMMj7b61S1b+aiMe7Se5jRf/Rkx+8XO9zDiY= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2018 16:35:36.5952 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fb6fbca1-a6f8-440b-52a9-08d5dd152db6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR15MB1083 X-OriginatorOrg: fb.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-06-28_08:, , signatures=0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
Series |
bpf: cgroup local storage
|
expand
|
diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c index 68c3578343b4..74971a9b7cfb 100644 --- a/net/bpf/test_run.c +++ b/net/bpf/test_run.c @@ -11,12 +11,14 @@ #include <linux/filter.h> #include <linux/sched/signal.h> -static __always_inline u32 bpf_test_run_one(struct bpf_prog *prog, void *ctx) +static __always_inline u32 bpf_test_run_one(struct bpf_prog *prog, void *ctx, + struct bpf_cgroup_storage *storage) { u32 ret; preempt_disable(); rcu_read_lock(); + bpf_cgroup_storage_set(storage); ret = BPF_PROG_RUN(prog, ctx); rcu_read_unlock(); preempt_enable(); @@ -26,14 +28,19 @@ static __always_inline u32 bpf_test_run_one(struct bpf_prog *prog, void *ctx) static u32 bpf_test_run(struct bpf_prog *prog, void *ctx, u32 repeat, u32 *time) { + struct bpf_cgroup_storage *storage = NULL; u64 time_start, time_spent = 0; u32 ret = 0, i; + storage = bpf_cgroup_storage_alloc(prog); + if (IS_ERR(storage)) + return PTR_ERR(storage); + if (!repeat) repeat = 1; time_start = ktime_get_ns(); for (i = 0; i < repeat; i++) { - ret = bpf_test_run_one(prog, ctx); + ret = bpf_test_run_one(prog, ctx, storage); if (need_resched()) { if (signal_pending(current)) break; @@ -46,6 +53,8 @@ static u32 bpf_test_run(struct bpf_prog *prog, void *ctx, u32 repeat, u32 *time) do_div(time_spent, repeat); *time = time_spent > U32_MAX ? U32_MAX : (u32)time_spent; + bpf_cgroup_storage_free(storage); + return ret; }