From patchwork Wed Feb 1 06:33:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?57yYIOmZtg==?= X-Patchwork-Id: 1735366 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=hotmail.com header.i=@hotmail.com header.a=rsa-sha256 header.s=selector1 header.b=AfezzMVz; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P6Bwm5nW7z23hd for ; Wed, 1 Feb 2023 17:34:48 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 54E85418EA; Wed, 1 Feb 2023 06:34:46 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 54E85418EA Authentication-Results: smtp4.osuosl.org; dkim=fail reason="signature verification failed" (2048-bit key, unprotected) header.d=hotmail.com header.i=@hotmail.com header.a=rsa-sha256 header.s=selector1 header.b=AfezzMVz X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id q4LRG7Z4vH68; Wed, 1 Feb 2023 06:34:45 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp4.osuosl.org (Postfix) with ESMTPS id EB365418C7; Wed, 1 Feb 2023 06:34:43 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org EB365418C7 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id BCD41C0033; Wed, 1 Feb 2023 06:34:43 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id C1AE8C002B for ; Wed, 1 Feb 2023 06:34:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 8322460E43 for ; Wed, 1 Feb 2023 06:34:41 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 8322460E43 Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=hotmail.com header.i=@hotmail.com header.a=rsa-sha256 header.s=selector1 header.b=AfezzMVz X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RMrubOF0y4Nn for ; Wed, 1 Feb 2023 06:34:41 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org AC9E560E53 Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01olkn20826.outbound.protection.outlook.com [IPv6:2a01:111:f400:feae::826]) by smtp3.osuosl.org (Postfix) with ESMTPS id AC9E560E53 for ; Wed, 1 Feb 2023 06:34:40 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pw7OLT19o0sfMKCgNgAIY/Ee2Op/z5uV0Qy0PwroS6fdq4Fc/XU9ERnPkv2T4RFXczJxw8i/qKeTyXW2Jk7u1xtIZfLFty3qIQqCUOzGS4NYyGjMVtzEZio+okfFd6xJIgIKaddwse7t8Ethz8EzSSXsTpyo2T6zs5lbLmf020m3ZOgzmNFYO0UcVY+PcF5496MYoVSL3QaEcPL5MzyJ5cg0568CwL5fR6VT0RDmgTHh8tEkkZjgHFdz6BmpWQXL5xEAcI69gE4sPfVy58lVoTGo97Rwx3moe7g+Oh9r16e5EuuNQ2+05+jkCMe/5sOL/8DM013BGaNeg8bcMa0vsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Q/ZbjijOi9ro09csSBR8wI2FppARhbPj48D+YzmYbt8=; b=jVkPeyyxUaZFqWGRKVFS6wDW5hqaIxqg75Bx/LDaG2CFPqnbqFSrga4oiypB6Bnl+dd7eh0qcmmsLuzhD0INgXtaUcSpx5mZhjN6wMiYt+IdruJcxCWJqokkqNSdKYH6SC51b2tEID3Eh/S1oIwgo1cbYAEt2Xc6zoA+Vj998MykCseljqhy2gPX7HDdoXSA29yuNJGconuwN/G82Y48Q5OnowK6Qj2eM9GGpsmxoHJin/pX3tzgC5pBpsKeSK+zGTWGQXb+H5mUCbRC4l9Cqn+QeAaQjj/WobPLE25SnhK1+vlXaWffCvS1foM5zoOAJAgU+9VxN5UaLmbI5Ic7vw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Q/ZbjijOi9ro09csSBR8wI2FppARhbPj48D+YzmYbt8=; b=AfezzMVzZeYnbeuIuKoUivTVVUxOG79IU6xdFWxNrlEwzXoSNE+HD0X+HpTLgmJTINLtP8u2yfZOx+/01rxStLDZywjeKa0/201EX3IQAKxUSohbNC9xRHParLxr/DaHngFVYaW1I+RkhljZbEmTOjBDWBjSUHVwaevU7++GeVOUyrqXWR+kk5YPB5NAtIcmksbxW8HabaTK/yIi9+86Am/Ao3ntoucQC1qBaasv3I0QZaDnotIiZ/xnJPuNxW7H5dZv0NvIsYjMxQxkcfHbvOBkkghaIHmkd6jAMXoneeqLIk1ty21Th6V8oTz+BIpyAnUI4BTQPWiPTHVt4B55zQ== Received: from OS3P286MB2295.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:19b::11) by OS3P286MB3402.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:20a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36; Wed, 1 Feb 2023 06:34:38 +0000 Received: from OS3P286MB2295.JPNP286.PROD.OUTLOOK.COM ([fe80::9a1d:12f5:126c:9068]) by OS3P286MB2295.JPNP286.PROD.OUTLOOK.COM ([fe80::9a1d:12f5:126c:9068%8]) with mapi id 15.20.6064.022; Wed, 1 Feb 2023 06:34:37 +0000 From: taoyuan_eddy@hotmail.com To: dev@openvswitch.org Date: Wed, 1 Feb 2023 14:33:41 +0800 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [VXQPaxGLVE++zz8oK2AeOMFjZ9cWHHp4voFYHuHZvS65ffNDVv9mFz6vHvwQRpJi] X-ClientProxiedBy: SI2P153CA0030.APCP153.PROD.OUTLOOK.COM (2603:1096:4:190::15) To OS3P286MB2295.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:19b::11) X-Microsoft-Original-Message-ID: <20230201063341.561814-1-taoyuan_eddy@hotmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3P286MB2295:EE_|OS3P286MB3402:EE_ X-MS-Office365-Filtering-Correlation-Id: 166dc2d7-e21f-4cdf-1817-08db041e63fc X-MS-Exchange-SLBlob-MailProps: CLk2x5OX5Vace6zxPrgsmEha7cCEWthBLHmIdLLwwCnMIu18vHCW/htuirRt+ndtjKXQuqOAnN0WME7Fre36XVy3utBlID2BiQs91OL4RciXb0F0cgjeB8zr3g+eMRa8H2EOvlmPwoNS7ai6El1BFd2WIQRSAnYI546qBegdAash+wbOerC6GYrIX77yzpJeeuyrjIxT6sVmLUbbMEU/SSFGyphMFYBgVpMb/Axu48IQojbADt9OTLdTv88KQM1HyK986ok75jeY192iPUX0Cz+SUpT0WHINP+8LVHpCL07HBm/VmT+E0ysl89YOS92FJkN6xouviqbBq82rCHka/q/7OQj3ca92Hs80q3nnjbINSOtx5bKSWBjxzwN7Bl5gagrC/plxQaBjj9iiqCEdRu8iCpbrxNuqQSwOuwWXtPCpRnwRFXKA1M1Ln7xCWYpFExqVA6yU0m+9EjhTt36hS8IyY8Fo117ZuB2jhz1XJh6UGJv+P0rDwf38vvX5kWl2EQUltbPtBUfkyk0CyOxO8GeqOQKkvZQXxNuMBuoYy2mNPzYJhfBJlr/MZ72p7Lx5/UUGMuDz5VL69RAJQqiXKp1Dz2IFFJD04etplACmduhpKX7u8Yn31aElmyUVzBU5GrDko+Bt0msBIom/e+hhLq/9e66ukFi06NBHV74wXvNQV3ofpdvZM0iKQtRGt0fCm+em4qy7yw3YB0zhuAK94g== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eYPhZxKFRXqnfieJKZahqY/+V6B/Omv2uxzIa0kg5eqCUjOUuqQDIDXJG52foIo/S39xfT1Mb8BeUGUtSGZMRcnGV9kP61oB+FP6hg4PfQS3nkiQJWVXlspPNZJ+xRQ/fCnxrtsCG18zJJKCQs8qvqWEFPWRsEM12QA1t+OUcDhAWyc+QOCRvQ3uot1Sr4phuBWoF14d8uXcGCu2B2yw2IZcxsG1qqLCX8cLxKcF3+ZrIVCAFeIJZodv3NsZIX1r1s4rOTGdRncYe5HeIVe1vx0NasvDeYVNuzc4wV7bfmskwkhXGcF+v+AbL/tzqUn6ZW9klRdwhjlHFSxpzyeVCkQ17KAfyiVmLmyBMStFqpYWJFIvUzD0XTI2sEeWAVtcriDUL74V7if0C46a+YbespFiN+xIKmz6lwhkZ8N1mJbgooGCCLDJTiiXX+Ew960jtHV53vJz1Zz3MTJXpBT/1wIk13Ff66dy8GRl5jG4Lk7jANMM9XMCzq1yZXgjwlqMTFelkL0jqZkxqrToEQOp56Pa28IdbxyZBly1dSCAo+NVB2Nqb94ivxK68XjShi5xyIPr6rKr1Hdg/I7m7lOrqP9uEfTg0WinMwV9LeTrwnGt82sScP1HOUKjHggSZyIsTKvjm7bEAhdKq6xzQdYHWA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6DuTCNOcj6+1rbFY8wmS7wf9QwxW2BV7XMwM7reV8Ylim5f9B3UVVf7DYJ66c4guk7cAh6Z+hAWkOqc5A6LCgZ1tNdCHpSqNN2Fi/aIdPZb59kRc9HPHmpwMuTKsSs4IAFPjgEY+tyHBp5VSkiZyjp/H2/M0ukU4x69gqaYfLQ6GhHmSIicgLrwykg5g1oXNVrzNHvG5TrOaX+pd/8XinfxxbNsk++qhw8lVf4I1I1qAjzw839bVRlAicG2SULalu4S/DzZP741sozOBsHIImObQhqMht/oWrFXE36qr1Ih4Ch9D4PzLqdNoScsVruMqTXAlhPR0R64j/Zv9fMi0xz7R7GmWnElshp3BqoOzo981Ao+fj1+kBO/0oSzuBL+zo9UpTY92FM5UpBmbjt+yCMcX61YLdPlGD3ddltIwz2aknhqtu6zUJyKe9jEz3FJikaGUjkgQbKEe0A4P1ht6yYaGB6IKHAStRAAtQ9FK6VNkoHrITarqdFgwfE+E2xq4bRfEBslly62vmnlK9ijrnb5GRPtPzCBnH1rdRxiw5T6W/1kVQHa8c9WPyFskfz+Baj52+lrto4v4PSTPSfwoQyrRbZ7KKiSN5VejcSphTfBBP3sPYhjhi8hU1dTcclkJrSPnqcSU8+dTTT8nH8w7uUbihgeuBAfAPFJhsADPjoi0/AnP+LEwxPVyZ+CSbIfeLdWT022CQPVfiLg4eSUpu2A94W5vxqNlMdyr2dQAIGt2fgkjWjwTuwxHO5v/9gKukTKdPd6+NBh7roXl4cTULh0asTmxlSbQ2OO/4+wqtTw5JsOd+/ogNmnVrG9XHzQKvFgYQoMKfDxkjDXHnE9tZn8qd4f7acjOnB/uwXbtU1BSRpezjTW4QNE7KMpytuA14vZ2QpD4ug4Lthw0uW0o2ZFlNqmVsJFQ38jtZHaFCme4cyEajJROLfZYKQEa3ETw+mBnQwPGNav1ogzhyqlEBETwxxDyNBYjloh5/dYstIyBJQWxqfcyB3QNiW1BoODXHs9I8cLWpMC07XVmYuyPhU100Cr0OV/9DBExgvby7jYwOYrCZDUNRGOZoWGmoC96i5I707JCe7To6XPv+EiKi8LdIeqwAh5uCoqnEblY3AftHWdm9zwz+g/8D40/i8uHslqGnfOQ1GNcuBreZ4C4AHky1t6bkNyZg1WwDIt0v/ZU2hnIikoFWCubyYc/s8yfnMIOtRdvL2QCQkCQK8qas+sy6f79WOIFBX5D0SIJR9t4WTD5w4hkkF8waGfUDhezemyJUSICQ4z3dVWVIxAU2DCsleVtSzeo9yywiK7pzDrGuemRgHDAcQH4a73ts8RLMNJUsK1lScdusdh0POATyA== X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-05f45.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 166dc2d7-e21f-4cdf-1817-08db041e63fc X-MS-Exchange-CrossTenant-AuthSource: OS3P286MB2295.JPNP286.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2023 06:34:37.9177 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: OS3P286MB3402 Subject: [ovs-dev] [PATCH v1 1/1] net: openvswitch: reduce cpu_used_mask memory X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: eddytaoyuan 'struct cpumask cpu_used_mask' is embedded in struct sw_flow. However, its size is hardcoded to CONFIG_NR_CPUS bits, which can be 8192 by default, it costs memory and slows down ovs_flow_alloc. This fix uses actual CPU number instead This submission is for 2.17 LTS only. Since datapath has been moved to linux kernel since 3.0, I will file seperate review to kernel community in another thread Signed-off-by: eddytaoyuan --- datapath/flow.c | 6 +++--- datapath/flow.h | 2 +- datapath/flow_table.c | 28 +++++++++++++++++++++++++--- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/datapath/flow.c b/datapath/flow.c index 5a00c238c..ef2bd30c8 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -118,7 +118,7 @@ void ovs_flow_stats_update(struct sw_flow *flow, __be16 tcp_flags, rcu_assign_pointer(flow->stats[cpu], new_stats); - cpumask_set_cpu(cpu, &flow->cpu_used_mask); + cpumask_set_cpu(cpu, flow->cpu_used_mask); goto unlock; } } @@ -146,7 +146,7 @@ void ovs_flow_stats_get(const struct sw_flow *flow, memset(ovs_stats, 0, sizeof(*ovs_stats)); /* We open code this to make sure cpu 0 is always considered */ - for (cpu = 0; cpu < nr_cpu_ids; cpu = cpumask_next(cpu, &flow->cpu_used_mask)) { + for (cpu = 0; cpu < nr_cpu_ids; cpu = cpumask_next(cpu, flow->cpu_used_mask)) { struct sw_flow_stats *stats = rcu_dereference_ovsl(flow->stats[cpu]); if (stats) { @@ -170,7 +170,7 @@ void ovs_flow_stats_clear(struct sw_flow *flow) int cpu; /* We open code this to make sure cpu 0 is always considered */ - for (cpu = 0; cpu < nr_cpu_ids; cpu = cpumask_next(cpu, &flow->cpu_used_mask)) { + for (cpu = 0; cpu < nr_cpu_ids; cpu = cpumask_next(cpu, flow->cpu_used_mask)) { struct sw_flow_stats *stats = ovsl_dereference(flow->stats[cpu]); if (stats) { diff --git a/datapath/flow.h b/datapath/flow.h index 584d9f565..2383155cc 100644 --- a/datapath/flow.h +++ b/datapath/flow.h @@ -227,7 +227,7 @@ struct sw_flow { */ struct sw_flow_key key; struct sw_flow_id id; - struct cpumask cpu_used_mask; + struct cpumask *cpu_used_mask; struct sw_flow_mask *mask; struct sw_flow_actions __rcu *sf_acts; struct sw_flow_stats __rcu *stats[]; /* One for each CPU. First one diff --git a/datapath/flow_table.c b/datapath/flow_table.c index 650338fb0..0b2a8e905 100644 --- a/datapath/flow_table.c +++ b/datapath/flow_table.c @@ -100,11 +100,12 @@ struct sw_flow *ovs_flow_alloc(void) if (!stats) goto err; + flow->cpu_used_mask = (struct cpumask *)&(flow->stats[nr_cpu_ids]); spin_lock_init(&stats->lock); RCU_INIT_POINTER(flow->stats[0], stats); - cpumask_set_cpu(0, &flow->cpu_used_mask); + cpumask_set_cpu(0, flow->cpu_used_mask); return flow; err: @@ -126,7 +127,7 @@ static void flow_free(struct sw_flow *flow) if (flow->sf_acts) ovs_nla_free_flow_actions((struct sw_flow_actions __force *)flow->sf_acts); /* We open code this to make sure cpu 0 is always considered */ - for (cpu = 0; cpu < nr_cpu_ids; cpu = cpumask_next(cpu, &flow->cpu_used_mask)) + for (cpu = 0; cpu < nr_cpu_ids; cpu = cpumask_next(cpu, flow->cpu_used_mask)) if (flow->stats[cpu]) kmem_cache_free(flow_stats_cache, rcu_dereference_raw(flow->stats[cpu])); @@ -961,9 +962,30 @@ int ovs_flow_init(void) BUILD_BUG_ON(__alignof__(struct sw_flow_key) % __alignof__(long)); BUILD_BUG_ON(sizeof(struct sw_flow_key) % sizeof(long)); + /* Directly defining 'struct cpumask' in 'struct sw_flow' has + * drawbacks: + * *It takes memory unnecessarily (by default 1000 bytes or so) + * The reason is that compilation option CONFIG_NR_CPUS decides + * the value of NR_CPUS, which in turn decides size of + * 'struct cpumask', while in practice we should use + * using local machine's CPU count instead. + * *Flow creation needs cycles to initialize them + * *Flow deletion/get/clear needs cycles to iterate through them + * + * To address this, cpu_used_mask used the size for local + * machine's real CPU count instead of NR_CPUS. + * + * 'struct sw_flow' already has one FAM(Flexible Array Memember) + * 'stats' on the tail, C structure does not allow for one more + * FAM in sw_flow. + * + * Final solution is extending memory in stats to make room + * for cpu_used_mask at the end. + * This is how we have 'cpumask_size()' below + */ flow_cache = kmem_cache_create("sw_flow", sizeof(struct sw_flow) + (nr_cpu_ids - * sizeof(struct sw_flow_stats *)), + * sizeof(struct sw_flow_stats *)) + cpumask_size(), 0, 0, NULL); if (flow_cache == NULL) return -ENOMEM;