From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f178.google.com (mail-pg1-f178.google.com [209.85.215.178]) (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 2CC99365A1B for ; Sun, 12 Apr 2026 11:11:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775992277; cv=none; b=DMztkFnNlM2mUf3lWOeOgagJowGiO8zyvofC6vhGMfKRXfmKLHwhNlgrTudarIRsOmV9rnznIBOUWk3hqlMy5SdIFOBryfkpRqNry4gV5USnc+HMW6xYurzKqxlLcLLg1rH9imrVQeiOwzGxp6tmSbUhk2lIk4AxJIZb2A5nLX0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775992277; c=relaxed/simple; bh=lsAEhzVS6tgX13xkojB6O97uyZ7wIxPYmdNpusmS5w8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kpEwtkI28BTdflUz4Dkf/YJs51heZVBBhloL2FpAbWcMHKnW8DjsHtrJ186gidHltTQxpL67heji3FDZG8JM49PhVI/H4vKdCq6BfCheXC9W/eVOzOMIcep4Pz0mZp0QlmOY9kwt9S5Tbi6d0hb/HZeZOqANctTXa6gcF81767Q= 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=ofNpkW8Y; arc=none smtp.client-ip=209.85.215.178 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="ofNpkW8Y" Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-c76c60c7502so1308971a12.0 for ; Sun, 12 Apr 2026 04:11:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775992275; x=1776597075; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GfVGhwZijWWeFrc0o2objX+emGxOrWrWWZpNkRkNMOc=; b=ofNpkW8Y5qiHJY85N3uY7XrWXuMiV5nEcR3c6XZUxI+q8NbS4bACDY4oXYnb2qOnoM PDFynHiHzawUM0bNAq5SLn49mq0Ua57VQWmQCEOJcqB/EVa9P/qKTMX3jwV+o/L9Qlz+ IUfxGzyF4AK1cFV/IQ9ArdXs0k2u9Vr+NRO3PQpU0FhTP0fi+Q7/zm+hyKGK5Sid+PAU gFMLFe54xrim5lam1N2mD3j4FodaDEQoih2fIOTEfohCivwTlD3f8AbQlePx2vCOdSZ2 NVS/CMRBP+2axEiggGUn4jE5z9sJbcMOfIOfoVAIWFkRloTTHVySmOWOeCDEua7o5f8x doOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775992275; x=1776597075; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=GfVGhwZijWWeFrc0o2objX+emGxOrWrWWZpNkRkNMOc=; b=Wv0j46k5Ou2T7kcWFpooYqjg/8s8p8z4KCaUW3tbWAYV3iDuPpX8Cl4wX458NdEdlb TM4cR0/S/v0QdDvGQdk+Tbj0/aBqdUwawnhUvu3wH0oQyS2BaUZ23+hyx7mCEFNJ+BBD HCJVnGVvPnLCRuwVEQw9krsNcQFJ+SI6akMR1dds7C5k47hYOm5Ck4jbjf2xM+o8mmg6 9N7PA3GpS2n1TOuweQLpWIiQgWq7NaJHpaj92YE6PqpWUnhYaV/+2YtLvZobVf61xoIX Rkr+vtPq07dvPZ4TMyA1k5M0p86fzaaDh41P8f8bxSocUQeylvITATGzNnM6rIiDQzLu xcvg== X-Forwarded-Encrypted: i=1; AJvYcCUWDN2TysetBCV5JtoKpgiQcaRoB4pciKQVp0a7sJX2veiHjNFRXHLsrFonl9A9+W2WauIipmg=@lists.linux.dev X-Gm-Message-State: AOJu0YxiO2aaRNgzHgM+weBNRpdmmGd6YmYarkco45r927Qwxg4JB40o PPfJ3Ir/KFys/x8X/VLG25xUI5onHArTwv1DfypHYV7pjooD4R6H+GJR X-Gm-Gg: AeBDievptsRsL/bumlE/QcLCMxOwP654SUT0dONcoN2bNJo11/LBphhuJ7th6ETnpDh z91AV/8YYtdNFgXe4+a4sNPLoMmsxPOJ91MDTmd1Oa6sPIkw1PTSkunmA40qlKgxbUPadJ9zrcC WHSGLTNu1ARczv990M0xImdzv7rwgLU1+ezmWd9P6qsU9kYcWeD5l1FpD+oAM3LZYFr0ldrC054 YBs0gBCBk0feUlJA6QBZwrGL6yMWsuaSZntVFuSVrrJYazg9TVDsqxK3sK8s8CA3iWQFCG/jN94 tnV/UCyL3eymf7KdFpw9y9ycWwYKGg5IcoLwCFkValMn8mNiKY0QDUoCypH1mOH37MXuQYZrt9A ScDjdYDXgLCvgmciUOcocAvwHhw8cgg14T/e7ArcjPSJMFUbCNr0HRzX6k1R3e0Un3KhzCasDpR 8C4YU2cmBruAcRR7ct60M6FleIIGyZiRdWY237DGF/ouahYhrUe2o= X-Received: by 2002:a05:6a21:99a9:b0:39f:561e:6fee with SMTP id adf61e73a8af0-39fc928c9cemr13477451637.6.1775992275505; Sun, 12 Apr 2026 04:11:15 -0700 (PDT) Received: from DESKTOP-82PPU4A.localdomain ([202.8.116.169]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c7934c9ef38sm2522981a12.12.2026.04.12.04.11.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Apr 2026 04:11:14 -0700 (PDT) From: Ujjal Roy To: "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Nikolay Aleksandrov , Ido Schimmel , David Ahern , Shuah Khan , Andy Roulin , Yong Wang , Petr Machata Cc: Ujjal Roy , bridge@lists.linux.dev, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH net-next v4 2/5] ipv6: mld: rename mldv2_mrc() and add mldv2_qqi() Date: Sun, 12 Apr 2026 11:10:44 +0000 Message-ID: <20260412111047.1326-3-royujjal@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260412111047.1326-1-royujjal@gmail.com> References: <20260412111047.1326-1-royujjal@gmail.com> Precedence: bulk X-Mailing-List: bridge@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Rename mldv2_mrc() to mldv2_mrd() as it is used to calculate the Maximum Response Delay from the Maximum Response Code. Introduce a new API mldv2_qqi() to define the existing calculation logic of QQI from QQIC. This also organizes the existing mld_update_qi() API. Signed-off-by: Ujjal Roy --- include/net/mld.h | 64 +++++++++++++++++++++++++++++++++------ net/bridge/br_multicast.c | 2 +- net/ipv6/mcast.c | 19 ++---------- 3 files changed, 59 insertions(+), 26 deletions(-) diff --git a/include/net/mld.h b/include/net/mld.h index c07359808493..6ed467e23f12 100644 --- a/include/net/mld.h +++ b/include/net/mld.h @@ -89,29 +89,75 @@ struct mld2_query { #define MLDV2_QQIC_EXP(value) (((value) >> 4) & 0x07) #define MLDV2_QQIC_MAN(value) ((value) & 0x0f) -#define MLD_EXP_MIN_LIMIT 32768UL -#define MLDV1_MRD_MAX_COMPAT (MLD_EXP_MIN_LIMIT - 1) +#define MLD_QQIC_MIN_THRESHOLD 128 +#define MLD_MRC_MIN_THRESHOLD 32768UL +#define MLDV1_MRD_MAX_COMPAT (MLD_MRC_MIN_THRESHOLD - 1) #define MLD_MAX_QUEUE 8 #define MLD_MAX_SKBS 32 -static inline unsigned long mldv2_mrc(const struct mld2_query *mlh2) +/* V2 exponential field decoding */ + +/* Calculate Maximum Response Delay from Maximum Response Code + * + * RFC3810, relevant sections: + * - 5.1.3. Maximum Response Code defines the decoding formula: + * 0 1 2 3 4 5 6 7 8 9 A B C D E F + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * |1| exp | mant | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * Maximum Response Delay = (mant | 0x1000) << (exp+3) + * - 9.3. Query Response Interval + * + * After decode, MRC represents the Maximum Response Delay (MRD) in + * units of milliseconds. + */ +static inline unsigned long mldv2_mrd(const struct mld2_query *mlh2) { - /* RFC3810, 5.1.3. Maximum Response Code */ - unsigned long ret, mc_mrc = ntohs(mlh2->mld2q_mrc); + unsigned long mc_mrc = ntohs(mlh2->mld2q_mrc); - if (mc_mrc < MLD_EXP_MIN_LIMIT) { - ret = mc_mrc; + if (mc_mrc < MLD_MRC_MIN_THRESHOLD) { + return mc_mrc; } else { unsigned long mc_man, mc_exp; mc_exp = MLDV2_MRC_EXP(mc_mrc); mc_man = MLDV2_MRC_MAN(mc_mrc); - ret = (mc_man | 0x1000) << (mc_exp + 3); + return (mc_man | 0x1000) << (mc_exp + 3); } +} - return ret; +/* Calculate Querier's Query Interval from Querier's Query Interval Code + * + * RFC3810, relevant sections: + * - 5.1.9. QQIC (Querier's Query Interval Code) defines the decoding formula: + * 0 1 2 3 4 5 6 7 + * +-+-+-+-+-+-+-+-+ + * |1| exp | mant | + * +-+-+-+-+-+-+-+-+ + * QQI = (mant | 0x10) << (exp + 3) + * - 9.2. Query Interval + * - 9.12. Older Version Querier Present Timeout + * (the [Query Interval] in the last Query received) + * + * After decode, QQIC represents the Querier's Query Interval in units + * of seconds. + */ +static inline unsigned long mldv2_qqi(const struct mld2_query *mlh2) +{ + unsigned long qqic = mlh2->mld2q_qqic; + + if (qqic < MLD_QQIC_MIN_THRESHOLD) { + return qqic; + } else { + unsigned long mc_man, mc_exp; + + mc_exp = MLDV2_QQIC_EXP(qqic); + mc_man = MLDV2_QQIC_MAN(qqic); + + return (mc_man | 0x10) << (mc_exp + 3); + } } #endif diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 9fec76e887bc..1438c023db62 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -3606,7 +3606,7 @@ static int br_ip6_multicast_query(struct net_bridge_mcast *brmctx, mld2q->mld2q_suppress) goto out; - max_delay = max(msecs_to_jiffies(mldv2_mrc(mld2q)), 1UL); + max_delay = max(msecs_to_jiffies(mldv2_mrd(mld2q)), 1UL); } is_general_query = group && ipv6_addr_any(group); diff --git a/net/ipv6/mcast.c b/net/ipv6/mcast.c index 3330adcf26db..6ddc18ac59b9 100644 --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -1315,20 +1315,7 @@ static void mld_update_qi(struct inet6_dev *idev, * - 9.12. Older Version Querier Present Timeout * (the [Query Interval] in the last Query received) */ - unsigned long mc_qqi; - - if (mlh2->mld2q_qqic < 128) { - mc_qqi = mlh2->mld2q_qqic; - } else { - unsigned long mc_man, mc_exp; - - mc_exp = MLDV2_QQIC_EXP(mlh2->mld2q_qqic); - mc_man = MLDV2_QQIC_MAN(mlh2->mld2q_qqic); - - mc_qqi = (mc_man | 0x10) << (mc_exp + 3); - } - - idev->mc_qi = mc_qqi * HZ; + idev->mc_qi = mldv2_qqi(mlh2) * HZ; } static void mld_update_qri(struct inet6_dev *idev, @@ -1338,7 +1325,7 @@ static void mld_update_qri(struct inet6_dev *idev, * - 5.1.3. Maximum Response Code * - 9.3. Query Response Interval */ - idev->mc_qri = msecs_to_jiffies(mldv2_mrc(mlh2)); + idev->mc_qri = msecs_to_jiffies(mldv2_mrd(mlh2)); } static int mld_process_v1(struct inet6_dev *idev, struct mld_msg *mld, @@ -1390,7 +1377,7 @@ static int mld_process_v1(struct inet6_dev *idev, struct mld_msg *mld, static void mld_process_v2(struct inet6_dev *idev, struct mld2_query *mld, unsigned long *max_delay) { - *max_delay = max(msecs_to_jiffies(mldv2_mrc(mld)), 1UL); + *max_delay = max(msecs_to_jiffies(mldv2_mrd(mld)), 1UL); mld_update_qrv(idev, mld); mld_update_qi(idev, mld); -- 2.43.0