From patchwork Wed Feb 1 05:59:44 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: 1735347 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::133; helo=smtp2.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=GpbYm9Yn; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (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 4P6BCJ0mgzz23hd for ; Wed, 1 Feb 2023 17:02:20 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 4CEC9405CE; Wed, 1 Feb 2023 06:02:18 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 4CEC9405CE Authentication-Results: smtp2.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=GpbYm9Yn X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mEfl0q-Vu2Y3; Wed, 1 Feb 2023 06:02:17 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp2.osuosl.org (Postfix) with ESMTPS id 4428640586; Wed, 1 Feb 2023 06:02:16 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 4428640586 Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 2059AC0033; Wed, 1 Feb 2023 06:02:16 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 90588C002B for ; Wed, 1 Feb 2023 06:02:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 6A61881A92 for ; Wed, 1 Feb 2023 06:02:15 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 6A61881A92 Authentication-Results: smtp1.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=GpbYm9Yn X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id payyTHu3k2pa for ; Wed, 1 Feb 2023 06:02:14 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 98F41819F8 Received: from APC01-PSA-obe.outbound.protection.outlook.com (mail-psaapc01olkn2056.outbound.protection.outlook.com [40.92.52.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id 98F41819F8 for ; Wed, 1 Feb 2023 06:02:14 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OVsBH2+sWHQBTVnzYxuZRusI0vHWfghUpLFJm1c18J5sKKK+EnfotqP5XbkrzUunb3rZ0HS49mKjAxpfYZR9GIMu/xoLIR5Lx5ZLfCg8txPdJbO4OS6yFJVg9Z23SL0pOxlT+HUZ75BZk8yrAqYDYhED2eQQftvQP7odXBUZHAWcQKaA0jbtrXpG0qQksRxPRZ0WYw1X7vz5vePp84uPBDVqpeS/cqOu7I5iUop+lA5C5CcZ29a57HTw5bfbfr5pGRqIXtAMWnrssLbhJE+O+9E9UEnuK9Zec2vqGrlYydwPfj7SnRsqn30qGMqSXFElGaNeOgqLlEOxYWMJuWSrFQ== 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=PnWkXfGIGZ7Z2ooR39UOqX4A94L2/lPzDNfYSrueXiA=; b=iPL5wBfEZrVWFeho/OrnOTNSSbgHleOlrtqDlWls2PNPWKa3OGj/lJkaxul+cIfXGbfYn3f4g+Vrje4X7oZxaTSaixbZ3QgA51lct5He+MAkqFVQEvKOqjjaw8AkKrDHoMx10Bm/Vgqh5G/x5NKznglXdVLDiAAQ706PRJMnHfblktRoi7I7IsXEeXAo0hY1K/jM3pOiubszVJbns6wEgxQbS8uYkRQV1EanE+TLFJln0X2OEEobbBviIZ7m5f9abVRcM4zA45LMv89iZ/8jAqaYW2IpWHXNzV3BfBW74Kz4zPZ58mGbgm3rm3yQj5drFy+iFzoT+GOhHjGP0dlW6A== 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=PnWkXfGIGZ7Z2ooR39UOqX4A94L2/lPzDNfYSrueXiA=; b=GpbYm9YnwWhrmw4a5XPEvZet6PK2XGphH2SfuT+Tf7eVHX217xSHMZMV34GSm8tPA+WgzzudWg21bv+/JBrzL7qMELTKoOKXAfcO/Y40TOM0bMFhlJ371DVEa/sIu9B/TO6k6+0/KFI3PdlXaTdR/eM2EacahYAhLBxXU492wLZX8dypJbdUSFkFFD0olmekGA7vnLPb2b/JRcBkVGxzy2oB99O3vuLAw4SJBKNga8AVTDjyryDSsL36aenUTmszXc89LOGDiGQQuMCyzyPhR78UrDKXiyjudbYRBVZhZzVXRy+3jWjlokn4lCG8pew8D7QsViIXXj+MaeTha6jCjA== Received: from OS3P286MB2295.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:19b::11) by OS7P286MB3771.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:238::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.22; Wed, 1 Feb 2023 06:02:10 +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:02:10 +0000 From: taoyuan_eddy@hotmail.com To: dev@openvswitch.org Date: Wed, 1 Feb 2023 13:59:44 +0800 Message-ID: X-Mailer: git-send-email 2.27.0 X-TMN: [Z1fiawXCmBvSp3858SLy8qrQmZ89yX0MRNEzOdBWQcJEZvZCsJfsKsZvUvEOvN6t] X-ClientProxiedBy: SI2P153CA0006.APCP153.PROD.OUTLOOK.COM (2603:1096:4:140::22) To OS3P286MB2295.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:19b::11) X-Microsoft-Original-Message-ID: <20230201055944.549018-1-taoyuan_eddy@hotmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: OS3P286MB2295:EE_|OS7P286MB3771:EE_ X-MS-Office365-Filtering-Correlation-Id: f4fc7ee4-3e18-4891-2d14-08db0419db47 X-MS-Exchange-SLBlob-MailProps: CLk2x5OX5Vace6zxPrgsmEha7cCEWthBKW/vG7drijUf9PIgti1Pm/MsSM2+YKhX/vmsv1ReS/NJDkGod+mz3gkddTuv+ztn0X1Ids6TQxmr713ZfHOsjooRv6KsGVV34btrDig1pCgIUnzHi3+aeqPizg8M7235UWVZwbXdWW7hAP8J0bDHZvMcukTMwd4q4cn5GPbXJgp3kRmnieE13jzPsEDjatvuq92N15rgqsNEkwPTd4OLbMFthgsKyrCa1y/cbCR2eCsGc79wnXD30uZhPkfpFBDRjU7iJsTISVtqGH8/BWYUW//UKanarXmWVSgZUTaWIfNY6irlaUWMqad6EeLuMY/Z6uFuJ7iP1Wktau4w2ndReCt4XvOWu8ur4wFJzzQ/ljVJdZMGgv9JMlk9FkYa2SsrcEAP0xEvWMgUsAO2JgudENjS3IOOcTGmj3GvJGvimhSVjl4NR8evNuAbUc3muerhaR/Fb0Bq7qeTcmI89/AjRo/kKFgrDV4YH7d2lO4LyDDVNJFlCyZOKRci5bl0DYYFKZalOTrdRLYxb/lKH95IebYCFxsSoX9wqSsRyVhYeQ/ce72XnBLLj2jM2WgieonTpOwyP0rTsqbGBp3x2QxdLiMOQsBbrau3TRa/RuUfvf2dtSOdKgQJudHX+U8gwmYFZt5UDzNe+1w42T2VUuK+ynlZpzDLXJ8PNlYPbFLjQTBbwMii9HF2DQ== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5KlHdKBQiE4A3VOGudtqCEPQ9XdNur5AvsGHyOqJef7ajvauEtQaKuj7biz/yYc3bKit5N1BK+OjKO1Mx4SHuWDDJlj5dddFBZq3hajvQL/6kBYF4mGl7L08v4+6I2otv/Kg5g+GQxFjDHrUTwTGRw2cZqlwF4z1jVneHpdvgYKjv2dgO2Dg1vcEvdwBblsEc594jCR89hyYIqLKVlVESiiCGjxIpIsVTHQSvJCLYVMSFXmiq5EtTTW6HMf/1fIwaDza7VCsBdPOpHEvvjzWTv1IzUGcyszIbkZrFrTCa3cLaqL/9myy1su2Rl+7702vzeQ0TBaVWMPSTq1ScBQVakgnXY5QlfYtSqeSOFZzfZf6McWU866oYJl18k+0V6pbr1KmViL7NyMdXZiKkVWFCCmjz7dzYsyv4H3whbiqvP+/oRV6wN/meZXN/0LgNk08dxaYuXDzhmfu8fGkVIVmdA+7J4Zclk6Ouh/68ZcMo9TII3hO3w/RUk3elo9fxUHus7Lcwcn9RGkZD0h067w/o5glbT6AJzF3hBIshdJepTTCUzZlAsPVUuYW9fsS7J87jA4d5UTwgvrgQqlUd0kfSkpzGK1jN8PypSxKu0U4C5W/xsBasKUqj2GKM5jRhCHcSCBG8flkSFoH1uhVugy/wQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UJWBMGsZxcoYu9ZpWW0yv1Anog0EmfBwxuzlAiUZ3FsnQ2bJVeTzKLbWc+sJIwoW0C4viG7qmxxfaKlu0aqulPZZxL82lDkhNzCEzBIHN2MmaJmJeAWoJI8PJmkFWjRZQwjB3/0lDHiVw8oKzxN9mRPDMWLJ5VAJRtQsxD0hZ4z3pkT59FqOSTHTaOCRj/TVAfKOWMQYcpB9rg/cJthQx54joieV03VPy9I2HDnNqB+bt7EzJiz7WS6zxUEwf897GABFHQNk4dRRsxtNAwHO+o1jhKo4WHr/qmpi3tahuezB3mmIBcA7HkAfsjr9B2kvLHiWgLSShLdPzsV0TR1yTiAzDF2fg1dfWpp5FICakHd8vz8qWQ/ujmZk1hVvd6FfG5dDF6faFnZkKMTaKP+GoYIuViVY2kPx4sbqH+Lp/JPxzPHjYNfvRgAqgdWyryuyrN2GNtMsn3WkuCasYIIemLvZuXAPyN5ij/KyKqvTy/7FpStMo01vMlazkyFxDMoR9DiA+1D9ul7luca/g34xmdIIoKYA5g+AD5Y+VcrVjRmHK5+US+yFt/UEhmFHbzTMqrft0XCFYKGGtHQ+Kt3k5yhbbKsxLfx+VImx3pT49aQgq7w64W3PS0pfOGOIv6OGfetnaO5YAjXisHVxNcJtrOtD66E9E3/KGhheCKbD17gLyiP+DZaohZadlgCeGnsxtCLchUwLkDi4ESX3Tr608EPj4lCIscg6SXtO4AeZh21KGLNtfgq6/q5yYjfEC3eokSy5HeN67NlcPF/rGKTVZ2pMhchYzPcJ1rPV9EO2vPUWeYf5VqS3iqiexZW7H4YqTehG5R2zkPjJ7MeWXjkt7JmPp7MnWG69Kk0wewvtp6QMyn6NVR1zTXwEQj7o7ndtU862ODUUuEprGcnkR+IIwC96cR8BzJOJW7PTPQCT/OdoyRTjDVt53BHRDbiUc7nawgKfv9CkuSkLlWwyTz45BK4AyU80kp0YTOWacqPPQGDg9z7WJWT09hjNoYYnnhd5L8qlNxa0umTdG2c3Gka7X3XZQyR2grUSQaybgrefRivEz6Li7d0gYqFyu9pBTSYT28513o760MQB3Esy5vGf2FxFIumbfFCqyyht8h1Ph+aYhLi/T2dnjYDWWPumySQNKBQMZn/Qk9KhWc8A8KcsfT2BsZQoMyee5/s4gQ9UV42sImFHml1N8K+Pa1YiIiMmMCmzLGNbhrBxgntLVpjqH/tnqJqjp1MVSWI2LAeqg2x2rFhVXSNAXG+UQZvxbiPuVna7KfC+lHHo1lUibeM1AO+BKGll5dbstxuUEDDw7RXB6m3xx1bGcKmKfLd8gf5wCSVjlJ1zLV68rRyvNT/H9g== X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-05f45.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: f4fc7ee4-3e18-4891-2d14-08db0419db47 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:02:10.6074 (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: OS7P286MB3771 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 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;