From:   taoyuan_eddy@hotmail.com
To:     linux-kernel@vger.kernel.org
Cc:     eddytaoyuan <taoyuan_eddy@hotmail.com>,
        Pravin B Shelar <pshelar@ovn.org>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, netdev@vger.kernel.org,
        dev@openvswitch.org
Subject: [PATCH v1 1/1] net: openvswitch: reduce cpu_used_mask memory
Date:   Wed,  1 Feb 2023 17:41:48 +0800
Message-ID: <OS3P286MB229510E55946D9D1E3EFBD5EF5D19@OS3P286MB2295.JPNP286.PROD.OUTLOOK.COM>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: OS3P286MB2295:EE_|TY3P286MB3763:EE_
X-MS-Office365-Filtering-Correlation-Id: c5fa78f5-dd67-4afe-c9d5-08db0438932c
X-MS-Exchange-SLBlob-MailProps: q3cIJLDN2c+w+CziC9pPzN+leFQPe4aiMG0x7m1hxZoUwrdy4tPAvEJugo0nog56utL3BXvXoo4qxJXfZwQW23CMdC1ZuK4A0LtMjcPXJHgmuOGbUHLfYP+ZSwg4C8aY/+nj8Vgb7bJhMhGyU4uqDpUizYMrxtD5FIJJyX4Ck5WvOAQrbN96QgcBKQ49bmN5JmuQJOxxmldgreIIBSAJ7ZqHmbIr4VEanwHdawURWMLHQPnYMZjkM4s21Z4Ax3wzNK9f37zvWwqJV0Qs3Nqh9IHS9b0iWBw21d72L7AJoGryMfilp+aGAZwe8QF2KWU26l1xnE8W/ZCZzB6iLZUqwhWn1Jp7lhiINvx7+vjcCWYi+/lcGIHKkY+OGlbwFQR/79C1mtwiwW08tR7ZYxnm4FovHGuq3J2yXOtfkB7t0/3ufLDg/NWmtXtesxptdq5rNkt1Pt5DmCmbNRwRb0Fi1Jx5//L9raZ4asly0+yVNW3EJvv+ZHuEbndrfk4gqzXsYn5CmEeXlqQMWvPMOTVq5tezV5++C+AiZHRWarvicTjmSZewDcqC8l4F9O+lhKTgOU6t8OL6ZwQgm6Z9ps9bITL3APaGkza4YZ/NeN4MERyFUfU9vX10u8d2Md6hUjpljiPf27UuSmCl6+dCTXgizBjTA2dS7kiEh1yGqaMbzGhbt7QWlXuztcpqTXdyVBjY
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: wdxe8Kd0VVA8XSkF1HJLntuHCSbdjmi5Z1Ay82+dyuA0Z8iQ7DHSTPBSKN3zhTNwUhk1Ho+CZzs6MGNIQbN0QiJnnds+e9YtTr7BlSP9rjVNHbCMmzdp+9POsmxMdY9iOffUike6A9SUEYoXuKQbpGJ87xE8iAz32sV3yr1wmRjcC2wxoX3EkVSlCrzspYZxZh9UbHjMyn94yb0esGL6p/bsYsMm94oqS1OPq/bEykuhV8bC2gbCBXIY21iPhOBiIZvJ4+k2d2Lso0VMYsHOt8CIG3ia2EX5XVcXQ4yWJeWUXLtceeYmNmaWF0huit8Hs+7T0Jnodm16pc5MonrkXBR2Q2uuJwbpBSoAuS/ZOQnVV3iXSV98oEl/6QcCGRsvgJXMgYSiaM6CHgi5jmtQ47+UxtKV/9K2gp9A0oOukvdJfTdTgRTINEcz+yBB1TuOPjOnghxzWMPGr61+dOY/D9xdhYFRznkih1DwEglwdEU1xGpW5aPlDfk96jz7O/SjZH9obc+CDXID2nEJctCiZaRbJQmUpj54JjBwGTnxFV4mdwevuYpE/+o166HHgbjh0Jpb60yyeKW6VIZga7JMXicuTi/EIoSI3MaMDAzM2hETvqGSQAP4+mj+MoPCcUYoMEKIon5iRrHjYqWIaQ8tjQ==
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?YyKLnyToVhSK1/SfftfFHbRIdCJar+T2NsWez92qfbm+pvUtZxlJ1n7P9+we?=
 =?us-ascii?Q?o3rg09Rf2zeMR3Cn/Q+v3XqWA5+BnqdMr21k27MmfqT0rH8t486e4H47hoGD?=
 =?us-ascii?Q?mv+Cm7S2muTeZhvVi5KNbGUnIA85ljLNjK5gl613ZldNJ4hYH76/xewIm9rC?=
 =?us-ascii?Q?gv6Mx1uB8ppwI+j/B89rXyW2cSUY4XsrJv5cqA1b1P/TmZ9oQb6iNw+bWliB?=
 =?us-ascii?Q?2A0/qKdd8cdKMXGFLJa9cX1qM4GfaZU6Xnp0y+LRvSHgPRtehsvfJUZ4z6S6?=
 =?us-ascii?Q?qTANhf7kyYnIwOKzCz2saK4L4kN+6VODHJWoNtAca11FPETbDmzEsJivf2Pa?=
 =?us-ascii?Q?hUJbD5HMe5SGXfY2zLAKvy1R6OxW9E89HwOHj3bUj8QUmetskhllRkChhQYZ?=
 =?us-ascii?Q?azxeAWOcHyu/awkEOiPAKL/jZB2hjV8hZuRn2y8pdV+L9RzhEHrQldQy438p?=
 =?us-ascii?Q?tJOBqYCsj6kqlMtD7GklyIgm8zlhMDivMeDeB+dvZSbFXv+n/YcOhtMn1TWA?=
 =?us-ascii?Q?ArWleEEbPs+eWEE6u4qVGQPc6Sus+q6oDqoUoMQRJeGgdglosrq3E0ogj8sK?=
 =?us-ascii?Q?3X7CLFkmBqIOyTADpone6ehKhaDTl3BvnddQM9MKZdU86WBJPeWjuiDS/Crl?=
 =?us-ascii?Q?el4mvpYNawXlEGftphScc5iEj9GGrcI0zJDo/dOsGQV95IdjDjE2XpdmxFTJ?=
 =?us-ascii?Q?nl4CHQS/66VMxLO9jAPrAeTTrRQU8KItYdMmQ2D6oLbZRycdmYMcPMw5UcNy?=
 =?us-ascii?Q?VC2ouENZaJlPNeOCg1Yuo60EYnvI+Eqea4dTKKEsLIiidZMLZp2K1qQ0zM50?=
 =?us-ascii?Q?oMTl2PfgUOqGx5sLzdrjRXkd1x0FzK07ZsWoGgmmvGpeHA9xABdGPfvdzAtn?=
 =?us-ascii?Q?BcYBWHAu86jPtdAaot/AYeyaSMCodrwSPEIHsqlS1yKfxJwjs7NLxFfyVm5q?=
 =?us-ascii?Q?GG4DPV9C+WOSNmPWJMiTTkKqtltZWNFQUgbLEY9SREgHc666FxPGGM3V0Zp6?=
 =?us-ascii?Q?sIYL3xPH8ArjsAWscs1tZk7qNjvVzoGu3XSdrY8fyZ0HbZLqV7o1bAi0fIhn?=
 =?us-ascii?Q?enqduLjnXMxOw41fb5E7SPIp1jgmQsxY3UM6UMmHBzvA2Tyd8sBrnuPhGYk7?=
 =?us-ascii?Q?nTPlsrduDjjPhE+wlIV1Jx9Nq3ha0V3tfowt9ah/a7cJzQfXlmG7yr3NmX6y?=
 =?us-ascii?Q?5QncWNSaiJtcII+nS3QEn0S/5uTDAPVJiNMx/Iwm/QITW5TtvgU4JM+u/Nuw?=
 =?us-ascii?Q?biBQUlksZcH/La9PXXUDtdve7tYU0XVhtYYyYkWgdpr2WZbZkTuPRDzIXRq4?=
 =?us-ascii?Q?jZ+1JjetTUva0QVhPMPizrJ2/DicClum6xxHRhxB1bJuVA=3D=3D?=
X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-05f45.templateTenant
X-MS-Exchange-CrossTenant-Network-Message-Id: c5fa78f5-dd67-4afe-c9d5-08db0438932c
X-MS-Exchange-CrossTenant-AuthSource: OS3P286MB2295.JPNP286.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2023 09:42:03.9734
 (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: TY3P286MB3763
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: eddytaoyuan <taoyuan_eddy@hotmail.com>

'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

Signed-off-by: eddytaoyuan <taoyuan_eddy@hotmail.com>
---
 net/openvswitch/flow.c       |  6 +++---
 net/openvswitch/flow.h       |  2 +-
 net/openvswitch/flow_table.c | 25 ++++++++++++++++++++++---
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index e20d1a973417..06345cd8c777 100644
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -107,7 +107,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;
 				}
 			}
@@ -135,7 +135,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) {
@@ -159,7 +159,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/net/openvswitch/flow.h b/net/openvswitch/flow.h
index 073ab73ffeaa..b5711aff6e76 100644
--- a/net/openvswitch/flow.h
+++ b/net/openvswitch/flow.h
@@ -229,7 +229,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/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c
index 0a0e4c283f02..c0fdff73272f 100644
--- a/net/openvswitch/flow_table.c
+++ b/net/openvswitch/flow_table.c
@@ -87,11 +87,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:
@@ -115,7 +116,7 @@ static void flow_free(struct sw_flow *flow)
 					  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)) {
+	     cpu = cpumask_next(cpu, flow->cpu_used_mask)) {
 		if (flow->stats[cpu])
 			kmem_cache_free(flow_stats_cache,
 					(struct sw_flow_stats __force *)flow->stats[cpu]);
@@ -1194,9 +1195,27 @@ 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));
 
+        /*
+         * Simply including 'struct cpumask' in 'struct sw_flow'
+         * consumes memory unnecessarily large.
+         * The reason is that compilation option CONFIG_NR_CPUS(default 8192)
+         * decides the value of NR_CPUS, which in turn decides size of
+         * 'struct cpumask', which means 1024 bytes are needed for the cpumask
+         * It affects ovs_flow_alloc performance as well as memory footprint.
+         * We should use actual CPU count instead of hardcoded value.
+         *
+         * To address this, 'cpu_used_mask' is redefined to pointer
+         * and append a cpumask_size() after 'stat' to hold the actual memory
+         * of struct cpumask
+         *
+         * cpumask APIs like cpumask_next and cpumask_set_cpu have been defined
+         * to never access bits beyond cpu count by design, thus above change is
+         * safe even though the actual memory provided is smaller than
+         * sizeof(struct cpumask)
+         */
 	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;
-- 
2.27.0