From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 51F6536A013 for ; Sat, 7 Mar 2026 20:51:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772916669; cv=none; b=kmpD+vx+EX5gwwSqOLEUHt4JIWMRYDVF0EAMBy9nJ38owivPG753ij3cXksnaUsNYhwaLqy1c6rjZ34AybelRI1O922Pgv365j7yo9EzywBv0mzDr2Jx2nRv875FD/iU+I9EGQI7e7B3P9d3KJWGe/w0Hap1a3NUCOPs7OCr+r8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772916669; c=relaxed/simple; bh=Bf5K9Guvd+wyKKsJCc2nAC/L9eqTu/OMzi8p66l8bNw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LbiewSy1RaL5NOg9DrtILhlgcu/bmCwWbuOgZ8TNDr/oEeHdSMlOBpQ1c5zz4vRVoHEvRq6ee+lKgsiCxwteH1jVEmu/kbYkbSaB5oBzsmJrTEoxmLbFXvJpxL3V0AYQJelFYEbHGuuGNN8rm/xEyKqznNVXBc15EhESrXf09Mg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=gJJyfyhE; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="gJJyfyhE" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-483703e4b08so101363825e9.1 for ; Sat, 07 Mar 2026 12:51:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1772916667; x=1773521467; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=G4CFOYszHIMIOTlHDrOmB+I++aqI79L6ODIfR/9Z+VQ=; b=gJJyfyhE7omqAXPsMZRHYmO+QTvJa57lsKLSCBsWFLHYZWQm1u09ZdWHEF5uJ0cxFZ CVKceoT+7+F8Gcg2J2thM8td3lmB5We0oaj+avfYKHDJ5UsZOW8Lld5Z0Y/VvnrsjzpO 56onoGm8N6iCquxbmB/par/fbcHWeknRgh9/UKUJvLoCVryjakfU6aW+5txuL0vhh0XH ptKmOTBQVXZKGXU5XV7mRlbM6oG3azUPMnp0mY5oFXDZ4mgTyZ+Q9rc5ZxQYjpVav9Wm Pk6RbH+Rwa4Sqe0WCS3HWU05uASH/u0eK5QM8HTrrzwlYgUr92mJoSiD2sM6sMOE4Mo7 fVZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772916667; x=1773521467; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=G4CFOYszHIMIOTlHDrOmB+I++aqI79L6ODIfR/9Z+VQ=; b=q6TgFT408TpIaAOkdjiADnZCVmFbE/8RqWXrvhEcV3rmYfn/loPt7jqsllhTEAzwXC 0b9ewNr2mvf2rjeEQB1Q0IQdmamOhiuNZUzr8e/wdwKoWY7uECnbqbulXeS3I2GLC1ew YmBiMxmDHZXdcMseiS4XJcQ/kaERf7SIICdV3MPDWJpY23GRAN09ChuKndo0lI/7nv3/ tjL6xnkD+fqaD+Pix7gowbCzEdwpMVB1++eGlpvSfsD4iu75B44hQfe2320IwPy3fe8T VMz9rZ9MmE91E673Ur0PhxvoLlbyii5Gf0NnZ0XyjL78dXQZxlpO7KvNYo2y8yCbVAyw vG5g== X-Forwarded-Encrypted: i=1; AJvYcCUci4I3QkRQg97jUPdotmPA6M2MBqDQZLxo/BBarkAQvixUs9qMUJuMV2iiYzieYimXQEE/w6g=@vger.kernel.org X-Gm-Message-State: AOJu0YyS+QJBCKxBLDpQMoBR/YSQCf6/pCl5D7NbmJvjSX9ML1/WBvk1 PvwidDwYRffdt3bDxJ1Q79QnDz4KMLfHKGM2nDzzUQPyPxT6TokkvYqbP9YHMw3EGHs= X-Gm-Gg: ATEYQzzM0Du1m1PdsetRrk4xgg366hoqJND7Ylu9SW9OieNPQQ08n/IOM3Dd0VcgzPy VEwyWInhhXpXRKz/hiTrXPsNGlO0zVDsMKOmUz4V1kKSt6gdXOZvmzpOxjvZhT74Ty6LdGbEN/k KHE+PpT0d8roUf7aiXXK3VCgD4oTBE12Vcqm2xH//g5vxab8nE/X7mqOYImT9eNNQYln0ee9Bg6 mX301q3tUiUg3/ctcBFCRA8YRh0EL3aI1dyN3k+Ar1ZzSS31BZZBKGUQyu7bZkeryJrIs//3Ncz /XuypzFy/ta48itVfvUzrBR/d/gMFmYI0kiXjncjXCPakpQuV+x7eJmdHke0CR8lDoUO3ilEXZK S0qOD7dD9dLOj3ThWlZxVB9/kc0uZACcruVs0uaLosXOspgIrNdwJb8W9Ha7FKzA9xvgasQn529 vIPuivVxgIGw== X-Received: by 2002:a05:600c:a30f:b0:477:a71c:d200 with SMTP id 5b1f17b1804b1-4851ee9a529mr146672705e9.11.1772916666606; Sat, 07 Mar 2026 12:51:06 -0800 (PST) Received: from localhost ([189.99.238.164]) by smtp.gmail.com with ESMTPSA id ada2fe7eead31-5ffe891ca1esm5735271137.4.2026.03.07.12.51.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Mar 2026 12:51:05 -0800 (PST) From: =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re?= Date: Sat, 07 Mar 2026 17:50:53 -0300 Subject: [PATCH net v4 1/4] ipv6: move the disable_ipv6_mod knob to core code Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260307-net-nd_tbl_fixes-v4-1-e2677e85628c@suse.com> References: <20260307-net-nd_tbl_fixes-v4-0-e2677e85628c@suse.com> In-Reply-To: <20260307-net-nd_tbl_fixes-v4-0-e2677e85628c@suse.com> To: Martin KaFai Lau , Daniel Borkmann , John Fastabend , Stanislav Fomichev , Alexei Starovoitov , Andrii Nakryiko , Eduard Zingerman , Song Liu , Yonghong Song , KP Singh , Hao Luo , Jiri Olsa , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= , David Ahern , Jay Vosburgh , Andrew Lunn , Hangbin Liu Cc: Fernando Fernandez Mancera , bpf@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Ricardo_B=2E_Marli=C3=A8re?= X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openssh-sha256; t=1772916658; l=2327; i=rbm@suse.com; h=from:subject:message-id; bh=VUwLjPvoellOz/Idggb+FMpUF6XQP2WLQN/6ZAj5ess=; b=U1NIU0lHAAAAAQAAADMAAAALc3NoLWVkMjU1MTkAAAAgguRCc5X8/UX9M40lkMnr//aFGOhce x5ezt8MFNUFlqYAAAAGcGF0YXR0AAAAAAAAAAZzaGE1MTIAAABTAAAAC3NzaC1lZDI1NTE5AAAA QOL8kA4Qc6fShFm8SSTXdDzsjABAPF8xRLLKNE8cDJPugPSoxrouOQBc5bdkio2v/bKVwILILuH hL2sS77g8Pww= X-Developer-Key: i=rbm@suse.com; a=openssh; fpr=SHA256:pzhe0fJpYLz+3cZ33FFPhIfaUElk9CXPFFXmalIH+1g From: Jakub Kicinski From: Jakub Kicinski Make sure disable_ipv6_mod itself is not part of the IPv6 module, in case core code wants to refer to it. We will remove support for IPv6=m soon, this change helps make fixes we commit before that less messy. Signed-off-by: Jakub Kicinski --- include/linux/ipv6.h | 7 ++++++- net/ipv4/af_inet.c | 6 ++++++ net/ipv6/af_inet6.c | 8 -------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 443053a76dcf..a7421382a916 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -333,7 +333,12 @@ struct tcp6_timewait_sock { }; #if IS_ENABLED(CONFIG_IPV6) -bool ipv6_mod_enabled(void); +extern int disable_ipv6_mod; + +static inline bool ipv6_mod_enabled(void) +{ + return disable_ipv6_mod == 0; +} static inline struct ipv6_pinfo *inet6_sk(const struct sock *__sk) { diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index 8036e76aa1e4..c7731e300a44 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -124,6 +124,12 @@ #include +/* Keep the definition of IPv6 disable here for now, to avoid annoying linker + * issues in case IPv6=m + */ +int disable_ipv6_mod; +EXPORT_SYMBOL(disable_ipv6_mod); + /* The inetsw table contains everything that inet_create needs to * build a new socket. */ diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index 23cc9b4cb2f1..4cbd45b68088 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -86,8 +86,6 @@ struct ipv6_params ipv6_defaults = { .autoconf = 1, }; -static int disable_ipv6_mod; - module_param_named(disable, disable_ipv6_mod, int, 0444); MODULE_PARM_DESC(disable, "Disable IPv6 module such that it is non-functional"); @@ -97,12 +95,6 @@ MODULE_PARM_DESC(disable_ipv6, "Disable IPv6 on all interfaces"); module_param_named(autoconf, ipv6_defaults.autoconf, int, 0444); MODULE_PARM_DESC(autoconf, "Enable IPv6 address autoconfiguration on all interfaces"); -bool ipv6_mod_enabled(void) -{ - return disable_ipv6_mod == 0; -} -EXPORT_SYMBOL_GPL(ipv6_mod_enabled); - static struct ipv6_pinfo *inet6_sk_generic(struct sock *sk) { const int offset = sk->sk_prot->ipv6_pinfo_offset; -- 2.53.0