From nobody Mon May 25 04:34:01 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 313732FB97B for ; Tue, 19 May 2026 01:55:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779155727; cv=none; b=LwC6c+pBX37oS0FRli/9xEd/W1K97lKRr+FOlYyus+sXWSiaUmDA65JXgS+KvOoyow47wd5U1+0r+aS3sEcDrqPUvIjhOp1Igjzh+0m9pJaXkQv+fF0BLkQbsSjf14qvLZxGpHMLVuu9M8mFIWgCIRoZ6YoSq0i8gM7+in799Fg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779155727; c=relaxed/simple; bh=VLgfShC+GnqWUvnm2T1qwLmUj4i+nQ5Lf0c0ffK125E=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=NswQc+qRTd+lFroFcVaMaTWOWe1KMpSu6VkBv/lj6FxUciY/y5ZVETL0V8s3CLlioAOhg2tqSAEFalt0q5zG2TGljlp9FBW2oOBxz0bk2C1175id6Y/B1ILUFa+66ZLYWnZtE5+1tUf10tw8UZ1vQKv8vWQzCxa40QoPXOqftvg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=cm1O+m+Q; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cm1O+m+Q" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-2baca4df358so16230095ad.2 for ; Mon, 18 May 2026 18:55:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779155724; x=1779760524; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=CrLsXHJrmnZC07Rq0XCc6PS/mOpD2keMwqnjxffoI7k=; b=cm1O+m+QrGjkF/sIHe6KGD2ZTAlf/HGzAhsqpBxhlls91i/eg9CALUeBWwCFtfZJ63 s2WLotJq77USlrd+eAORSLOgMITKfXev8WFZsjf5KdnNZENhKzIugHGqJzD1g0yC8pfu ObzMLXUU3yKt+mW+4BWqKLKWlcHyevCNx1e6ngp9WTgCKuW2awR2R4WFC0uVMFvESvF1 dJOA1Mz01EqRv2MckBMSdGWpfH9bykCUNNNSP60+NzaPDb8Tfh5wu6N4Lx07sNsBABG7 tIbZ5kaDGVHI755exmoIlmzEmE4vz5trNmdqSPbci9kfPxt7BYB836snljDq+KcRWSvb Soeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779155724; x=1779760524; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=CrLsXHJrmnZC07Rq0XCc6PS/mOpD2keMwqnjxffoI7k=; b=f0cQgqmk5k7C7HCp1JgQVV9ux/RKIV8ZW4WIN1VLXxMLzN2W/xTRW6kok9Vw82wRsl wkd4hkK0jaJjCg4KSbcnEVtDW4kPG1VErQrk5foP/pyuQT6xFT5eTy900t5SdShLuRbp 7hj4yu9Buj1x69F9C6fYIxnmK4CS+Bb2j/OX7iou8dwXNtK5NiFNsKhzT8rsCdp2Am7m 80kPHO3DCwHgfJYZPZxanaAYWv0GQ7XoL2k6CWrXnddAnqxzc6ausf1qrGlTHlg3CsFk o9rCaBvNwnObQvOp83iECpe4oUImpXdHPxQlwMSF7uDaZ5w/thIYxC81LRK2X7meYFur F3yQ== X-Forwarded-Encrypted: i=1; AFNElJ8euVdNsOUyTK1h1WVnT75IlVigc/i1W+Zq/ddpx/jpCClE71i4upvxz/gcGVg+s3Vm3EM4AmjGrdALspQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwOEhb5Rdmlf/2AqL+X9K04UMXVJdsORwzAfTeuwco5ktSPkAUf dFDGscO/J/mo5e+bo17xtUse6ZWGP/B7oQT9As9TQxtf3p2h3QutSys8 X-Gm-Gg: Acq92OF16hPibhGDXOmDE0T8kBugQtceXqBQgsC3QRcScPO+Chzt/Y2GubLp6+DLfe5 fDqkhcYTVP3qO8R8rb/Kv4vyuGb/JQZAvIjLt8Xro3tXmOhxwk0nVVDcGrFZsWqIqgHEUJ2Jsl8 ig1FARDAEtb/6ltadJ4rLKyhhSLNHj0CPbuFbQdGjRJUCPfhJggso4cU0bpzXl6aLDba2kC24Tl me0lrx5Odd+KE1i5ie2y3T5vNagIKVZaM3ms41Ia5VG4iSNtgfk2ucaclwK8GVmFQEVtjVmzWnn XXjLZ1bj9ALGuf1DWENdWVaCmLmmbpIU9vFbAfjPSjBtWMSeybTSebyVjcy3HIOYfp9B65lFpGD lAObPjwAukizYcVWdaAas0eoyzxUYuudf7qinzxrOTw8Shty8sdDkKMjPvExTpxdI4rK3Fi5LIE crKOqlTjwLVj3OjvVwRm8TJ2iX9pSy6Ok3lLdbh4gp+ko/ZrFDbDSL0FxY7lWSOikvkZ1gPJlmX 3ksvmYOTZjeOYT8KP9BdPXEryfq3h6zWn8= X-Received: by 2002:a17:903:37ce:b0:2bd:a403:1d82 with SMTP id d9443c01a7336-2bda4031ef2mr126868885ad.21.1779155724515; Mon, 18 May 2026 18:55:24 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2bd5d235e04sm169927115ad.80.2026.05.18.18.55.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 May 2026 18:55:23 -0700 (PDT) From: Rosen Penev To: netfilter-devel@vger.kernel.org Cc: Simon Horman , Julian Anastasov , Pablo Neira Ayuso , Florian Westphal , Phil Sutter , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org (open list:IPVS), lvs-devel@vger.kernel.org (open list:IPVS), coreteam@netfilter.org (open list:NETFILTER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] ipvs: Use flexible array for MH lookup table Date: Mon, 18 May 2026 18:55:06 -0700 Message-ID: <20260519015506.634185-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Store the Maglev hash lookup table in the scheduler state allocation instead of allocating it separately. This keeps the lookup table tied to the RCU-freed state lifetime and simplifies the allocation and cleanup paths. Assisted-by: Codex:GPT-5.5 Signed-off-by: Rosen Penev --- net/netfilter/ipvs/ip_vs_mh.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/net/netfilter/ipvs/ip_vs_mh.c b/net/netfilter/ipvs/ip_vs_mh.c index 020863047562..d31d3c6d4216 100644 --- a/net/netfilter/ipvs/ip_vs_mh.c +++ b/net/netfilter/ipvs/ip_vs_mh.c @@ -59,11 +59,11 @@ static int primes[] =3D {251, 509, 1021, 2039, 4093, =20 struct ip_vs_mh_state { struct rcu_head rcu_head; - struct ip_vs_mh_lookup *lookup; struct ip_vs_mh_dest_setup *dest_setup; hsiphash_key_t hash1, hash2; int gcd; int rshift; + struct ip_vs_mh_lookup lookup[]; }; =20 static inline void generate_hash_secret(hsiphash_key_t *hash1, @@ -372,7 +372,6 @@ static void ip_vs_mh_state_free(struct rcu_head *head) struct ip_vs_mh_state *s; =20 s =3D container_of(head, struct ip_vs_mh_state, rcu_head); - kfree(s->lookup); kfree(s); } =20 @@ -382,16 +381,10 @@ static int ip_vs_mh_init_svc(struct ip_vs_service *sv= c) struct ip_vs_mh_state *s; =20 /* Allocate the MH table for this service */ - s =3D kzalloc_obj(*s); + s =3D kzalloc_flex(*s, lookup, IP_VS_MH_TAB_SIZE); if (!s) return -ENOMEM; =20 - s->lookup =3D kzalloc_objs(struct ip_vs_mh_lookup, IP_VS_MH_TAB_SIZE); - if (!s->lookup) { - kfree(s); - return -ENOMEM; - } - generate_hash_secret(&s->hash1, &s->hash2); s->gcd =3D ip_vs_mh_gcd_weight(svc); s->rshift =3D ip_vs_mh_shift_weight(svc, s->gcd); --=20 2.54.0