From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) (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 00AEB3783A2 for ; Sun, 12 Apr 2026 11:11:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775992291; cv=none; b=SIW7qi8PFU4isCQ5ppM2PjCXo+VXyiELnct1a4VszRSavSUJVpXkFVFaYleiM1xknMc0z7sffi1myL1fAAHS5zsJ1tUnGsD4C7gedn8OpUOZbJkcuM8c8SqkCHyuUtTpccjRPQu5WufYd6sq2zFazJU0SUtg3exGUb+VBnwav5g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775992291; c=relaxed/simple; bh=7brjJEEot96W6bsrpWfLzJyx0E86TzSH+ZUnkfS6rLY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BYop6GLhh7BDEboBKnhEjhvuJ/wjx5THG+t9xEnfZOcXxnr+dawg07uJ0lZS+yqU+Oder9FvC5xlByOj1OFHTNTQyxzilzR8yYPFFhxvuvH/Ux1ZR1y9P1A2EFhZ8p8SWWvSJGcW+b+nGp4k00h0s6VPfCnby37GN37I3x0EdYw= 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=fYK9zJyE; arc=none smtp.client-ip=209.85.215.181 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="fYK9zJyE" Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-c76b994f7a8so1136506a12.3 for ; Sun, 12 Apr 2026 04:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775992288; x=1776597088; 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=oORmgD+tSajF1jecnR/BcGHNYT1tf2GF0qIgWz3LTVE=; b=fYK9zJyEGoDs+xLHK2p8e6+Ty1BH8a+1T2nDcWdgvRev4D/JaW+99g0LCnIB68QahD StOPovFYMwVH6pQxTWqoGbba1QXkUTPVndDNLv8FvLEt9OKi8eYqGrTcUx+O3ctGcWVs mCuwy6aSLIPy7NmJPkugj6oIs48HicxDrkyVXz9DfXNy8hgoCoqBzLzi8bzLZPi9sPJD 7gSPENmfm7kZ44OzXyJHRHk+tqVXl+m2kh4Je+n2uVTXauj7TGRMhfupq0XZiJB6Gmjm EZA09KmCYntsxnnkjawMOe9R19ivxr59Ek6Om8we48czyB69Rm0ka6L675iRJ1BzdSx7 Sy1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775992288; x=1776597088; 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=oORmgD+tSajF1jecnR/BcGHNYT1tf2GF0qIgWz3LTVE=; b=jsNA2U9wc6+MITpsdGDKhqW/i+FliddI+uotsumpKDeOPHmAUKKHCr6bReqvq/XdwF d96TYWoUxf4CQEvE2uIvqUGNiU9QU0DVgaHvVAE3gmj5TZqdcSMOWdQNT6GhSvXoBWNt U4IZbHSQeb4qSODqH+HcqHoiu57BhWi3a1YU+Y4oCkCiT84wC3PyD7nPk5rYifB3S54o fCbT+fMa+dg1NAy1usHeCBg18IFG5FaBpcbgXbMGmF5AKHs256UekynXKvZtGq/lylko /OmTlSAu/mzcO9uLuZIFh7fJsl9tDGcEQSbCFkD7SF8bEPxTWva6n0wr8+q/zXB1osif fFqQ== X-Forwarded-Encrypted: i=1; AJvYcCXDcUdof1ujsmjnv1NqA8fbE2sNs4F+b4QMJ5w5uG2h8c14TiguCdM2XEv3+DVYdis9KOvu7zY=@lists.linux.dev X-Gm-Message-State: AOJu0YysljU9ijdA343wxoArpOc2GAXKHMi54ZUtm82CyO72edduqy5x fo42JEYUo5ppVfkZvUc1voftld7Hjx6WzTJk05NbG9feAwOmNJ6LONjq X-Gm-Gg: AeBDieu0+SgAUgeWdACM9ErkOmBOyezME9M2NEYvQR/2efr+s9snTQFZK8gc+6tP499 fclsl6xbm/9pub5JgGiWg++tvHJ4927X++oL8bkSOC/JumFidH5mWB1AsrNZe8HqrCBUYr7MDN/ OvO/hU7k2Scgkve/+i7qItnV4dsvgjUCgnWAWXY7Ab3hhOMQoOw1UGL2LJp/zjChJ8Rbic1ecfK NJKupYSM4onSJHAZFtpPY7znkI6CuiyMYEFnzet/x0QIyODgjoKvUVETSqOns3a6em8818m0dyn mSlas5BnCliCzv7QoaNJvUuja8RyyhlL1xVOtAP0DR8rpmS+vW5S4sxPlxB7tY03Vv2j1v6JfdM lyKU5LBiqEiaSgO5SveSl+UGmTCZmbMv7lReZSBAiwRVZxjo2BRbJ3p/+wI7nF4/ghzYkq+852G fpjd7tR2BLiXI2/TlPf6GGkWIeWlyC1ZlyzFb8vnel X-Received: by 2002:a05:6a21:7912:20b0:39f:af98:6f92 with SMTP id adf61e73a8af0-39fe3c2d7a0mr7564178637.3.1775992288324; Sun, 12 Apr 2026 04:11:28 -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.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Apr 2026 04:11:27 -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 4/5] ipv6: mld: encode multicast exponential fields Date: Sun, 12 Apr 2026 11:10:46 +0000 Message-ID: <20260412111047.1326-5-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 In MLD, MRC and QQIC fields are not correctly encoded when generating query packets. Since the receiver of the query interprets these fields using the MLDv2 floating-point decoding logic, any value that exceeds the linear threshold is incorrectly parsed as an exponential value, leading to an incorrect interval calculation. Encode and assign the corresponding protocol fields during query generation. Introduce the logic to dynamically calculate the exponent and mantissa using bit-scan (fls). This ensures MRC (16-bit) and QQIC (8-bit) fields are properly encoded when transmitting query packets with intervals that exceed their respective linear thresholds (32768 for MRD; 128 for QQI). RFC3810: If Maximum Response Code >= 32768, the Maximum Response Code field represents a floating-point value as follows: 0 1 2 3 4 5 6 7 8 9 A B C D E F +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ |1| exp | mant | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ RFC3810: If QQIC >= 128, the QQIC field represents a floating-point value as follows: 0 1 2 3 4 5 6 7 +-+-+-+-+-+-+-+-+ |1| exp | mant | +-+-+-+-+-+-+-+-+ Reviewed-by: Ido Schimmel Signed-off-by: Ujjal Roy --- include/net/mld.h | 119 ++++++++++++++++++++++++++++++++++++++ net/bridge/br_multicast.c | 4 +- 2 files changed, 121 insertions(+), 2 deletions(-) diff --git a/include/net/mld.h b/include/net/mld.h index 6ed467e23f12..5f79ea2257d5 100644 --- a/include/net/mld.h +++ b/include/net/mld.h @@ -90,12 +90,131 @@ struct mld2_query { #define MLDV2_QQIC_MAN(value) ((value) & 0x0f) #define MLD_QQIC_MIN_THRESHOLD 128 +/* Max representable (mant = 0xF, exp = 7) -> 31744 */ +#define MLD_QQIC_MAX_THRESHOLD 31744 #define MLD_MRC_MIN_THRESHOLD 32768UL +/* Max representable (mant = 0xFFF, exp = 7) -> 8387584 */ +#define MLD_MRC_MAX_THRESHOLD 8387584 #define MLDV1_MRD_MAX_COMPAT (MLD_MRC_MIN_THRESHOLD - 1) #define MLD_MAX_QUEUE 8 #define MLD_MAX_SKBS 32 +/* V2 exponential field encoding */ + +/* + * Calculate Maximum Response Code from Maximum Response Delay + * + * MRC represents the 16-bit encoded form of Maximum Response Delay (MRD); + * once decoded, the resulting value is in milliseconds. + * + * RFC3810, 5.1.3. defines only the decoding formula: + * Maximum Response Delay = (mant | 0x1000) << (exp + 3) + * + * but does NOT define the encoding procedure. To derive exponent: + * + * For the 16-bit MRC, the "hidden bit" (0x1000) is left shifted by 12 to + * sit above the 12-bit mantissa. The RFC then shifts this entire block + * left by (exp + 3) to reconstruct the value. So, 'hidden bit' is the + * MSB which is shifted by (12 + exp + 3). + * + * Total left shift of the hidden bit = 12 + (exp + 3) = exp + 15. + * This is the MSB at the 0-based bit position: (exp + 15). + * Since fls() is 1-based, fls(value) - 1 = exp + 15. + * + * Therefore: + * exp = fls(value) - 16 + * mant = (value >> (exp + 3)) & 0x0FFF + * + * Final encoding formula: + * 0x8000 | (exp << 12) | mant + * + * Example (value = 1311744): + * 0 1 2 3 + * 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * |0 0 0 0 0 0 0 0 0 0 0 1 0 1 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 0 0| 1311744 + * | ^-^--------mant---------^ ^...(exp+3)...^| exp=5 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * + * Encoded: + * 0x8000 | (5 << 12) | 0x404 = 0xD404 + */ +static inline u16 mldv2_mrc(unsigned long mrd) +{ + u16 mc_man, mc_exp; + + /* MRC < 32768 is literal */ + if (mrd < MLD_MRC_MIN_THRESHOLD) + return mrd; + + /* Saturate at max representable (mant = 0xFFF, exp = 7) -> 8387584 */ + if (mrd >= MLD_MRC_MAX_THRESHOLD) + return 0xFFFF; + + mc_exp = fls(mrd) - 16; + mc_man = (mrd >> (mc_exp + 3)) & 0x0FFF; + + return 0x8000 | (mc_exp << 12) | mc_man; +} + +/* + * Calculate Querier's Query Interval Code from Querier's Query Interval + * + * QQIC represents the 8-bit encoded form of Querier's Query Interval (QQI); + * once decoded, the resulting value is in seconds. + * + * RFC3810, 5.1.9. defines only the decoding formula: + * QQI = (mant | 0x10) << (exp + 3) + * + * but does NOT define the encoding procedure. To derive exponent: + * + * For any value of mantissa and exponent, the decoding formula indicates + * that the "hidden bit" (0x10) is shifted 4 bits left to sit above the + * 4-bit mantissa. The RFC again shifts this entire block left by (exp + 3) + * to reconstruct the value. So, 'hidden bit' is the MSB which is shifted + * by (4 + exp + 3). + * + * Total left shift of the 'hidden bit' = 4 + (exp + 3) = exp + 7. + * This is the MSB at the 0-based bit position: (exp + 7). + * Since fls() is 1-based, fls(value) - 1 = exp + 7. + * + * Therefore: + * exp = fls(value) - 8 + * mant = (value >> (exp + 3)) & 0x0F + * + * Final encoding formula: + * 0x80 | (exp << 4) | mant + * + * Example (value = 3200): + * 0 1 + * 0 1 2 3 4 5 6 7 0 1 2 3 4 5 6 7 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * |0 0 0 0 1 1 0 0 1 0 0 0 0 0 0 0| (value = 3200) + * | ^-^-mant^ ^..(exp+3)..^| exp = 4, mant = 9 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * + * Encoded: + * 0x80 | (4 << 4) | 9 = 0xC9 + */ +static inline u8 mldv2_qqic(unsigned long value) +{ + u8 mc_man, mc_exp; + + /* QQIC < 128 is literal */ + if (value < MLD_QQIC_MIN_THRESHOLD) + return value; + + /* Saturate at max representable (mant = 0xF, exp = 7) -> 31744 */ + if (value >= MLD_QQIC_MAX_THRESHOLD) + return 0xFF; + + mc_exp = fls(value) - 8; + mc_man = (value >> (mc_exp + 3)) & 0x0F; + + return 0x80 | (mc_exp << 4) | mc_man; +} + /* V2 exponential field decoding */ /* Calculate Maximum Response Delay from Maximum Response Code diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 27010744d7ae..49ceea3ff974 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -1181,7 +1181,7 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge_mcast *brm break; case 2: mld2q = (struct mld2_query *)icmp6_hdr(skb); - mld2q->mld2q_mrc = htons((u16)jiffies_to_msecs(interval)); + mld2q->mld2q_mrc = htons(mldv2_mrc(jiffies_to_msecs(interval))); mld2q->mld2q_type = ICMPV6_MGM_QUERY; mld2q->mld2q_code = 0; mld2q->mld2q_cksum = 0; @@ -1190,7 +1190,7 @@ static struct sk_buff *br_ip6_multicast_alloc_query(struct net_bridge_mcast *brm mld2q->mld2q_suppress = sflag; mld2q->mld2q_qrv = 2; mld2q->mld2q_nsrcs = htons(llqt_srcs); - mld2q->mld2q_qqic = brmctx->multicast_query_interval / HZ; + mld2q->mld2q_qqic = mldv2_qqic(brmctx->multicast_query_interval / HZ); mld2q->mld2q_mca = *group; csum = &mld2q->mld2q_cksum; csum_start = (void *)mld2q; -- 2.43.0