From nobody Sun Jun 14 05:47:40 2026 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 3508022126D for ; Sat, 2 May 2026 13:19:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777727968; cv=none; b=R0X0pB1XQOzCU5jCyy53S5E3uLJSw0R892td1+PQKlOhexkI948VUnKK+7eYST58g4MkRDSuzIdYa7bjCQNusr4V2X2sPn3Fvf9yMiJJ1QU/gpRgoaB2DWXzjAbQmdAMoG94JlneJJNkj8LfwRdOs1IX1QaM8a9CsQuSfPfsufw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777727968; c=relaxed/simple; bh=PH9zdGszS2v4ltP/Vm27MJNnYZX6pbBgq07/H3IXfok=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EDRG67Wc7XCAmhGIa1jAi4dA2onC4FhN+DGtzHD7vAO9RsLMO1oabNRkBJDFI9r0WLpQHU8xTbZKvLUhwyFRtzjmICUTnTLaWn7Ae1GyoDYdaGpapKIwpVdMUO2cu35puOrfabSpjHCE/E0ji0ACzf2e/xWJKhuH+EouXzXroH4= 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=UfMnZV22; arc=none smtp.client-ip=209.85.210.177 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="UfMnZV22" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-835399c11e0so63814b3a.0 for ; Sat, 02 May 2026 06:19:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777727966; x=1778332766; darn=vger.kernel.org; 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=6SBkUEIvhzDL4buR9DLMar8que8lJAciCkjc6oYU6Uo=; b=UfMnZV22qNIpgn8pCuTMoDoZgglP77k9+lmvq4VdheTpJX4iVXUaHFFPyFoy2ewMJC QeDT/mpThi66RfgX2CSaycMvcHmRZX0FAeVz1V720Xpw8TM3Wp268DDgEJIeRGKAh8NU nY4SmmvIl9vqwzYqs8zjg8aifn7UE4EIzdu8Tu9z762HNNpevi9Fgwo1dTN4+2wCC3MO RDW4mvZhwTmk6HMaSw3dx2adJFc3LRPl4mxAjqlaDlKfesVhBloSpGcRX4dTuoJUq8eP fYzIGKA+P0shAeL6DIKyGSS+WNdljMclG71CrXjWt23lhl7thtyBmLu/DuXX6p+y81SB vBAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777727966; x=1778332766; 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=6SBkUEIvhzDL4buR9DLMar8que8lJAciCkjc6oYU6Uo=; b=QWENcy/9jPlYQLuY98Wsy7X/apBg/ik2YRGtoEssCBvVZlphpvGxZ0E7odBSGX3lkq KwqjR+olxfPUW3CnwX2r7Ukr3mI5vtoca4O50r2kqI7xHPhwasjDDiamDCPNIvxwUKHv y7ZvdCDjHU/8WsI2LJEcHTlA8gRrswymeycyW65T/7/0NGLmHmaSawHHEJ25Wt0nZGhp UZajOyFePb3L4ZB6osfYDmGPVESpugkOoqQyyVAllLVSZiYkb6ofREUeOjlrxAgjhkwT Ef4buUC87tRc2xPXLF+PoQ5o0jMXMPTV13ZddlZ31L5iTsiXlH2CSn1Oy/cy04FQJhZX 45jQ== X-Forwarded-Encrypted: i=1; AFNElJ/ptnjtPsne0Yj8MjNxJz8bNTvoQGANOesJxw7cfoy5zpNikc9a1Bgfho7VmeojQTFPIhU4u7Hk1rNkCoI=@vger.kernel.org X-Gm-Message-State: AOJu0YwHfEQFaeLS7CwVmN7pDUOavVbO+y81iBtBy0/w9nq3YpKbseMF 2ccpJThogtXRWQVLUHYtAZHzvST4goqAoCIKmM6TXueYUhvpRivepAvy X-Gm-Gg: AeBDieuFIowbMVBSqu/0yiME16KD9/UgtDdX3M5YgEdZnbtYzP8qSX9CedpZJdLtBkC HInBqzlbUQ7eig35oMPLLDTuWdmGQ253Ts0oK5/5NAXXycYSQOw8JjBH/VgswOAs5SbrcEcLHeL /koagCJ9kCdU1fA39nHEKMBhhV+xcwXpJtUavsx3hZW/uPeyTvYeOcWjdHE1acFShkPX12eCO3A cvrumhXe374NrafqMzWXkG8mx0qEuQzxcgsLWRG004rNoWW5L4oFx1e6LX0cJKJBnFMVztVTRGt dH4JYN2J65l8YftRV20iedStewEDXagt1i2vyKaRfm5xZz5AsFbAZ1Ry1iG1vy4fFlYiwym3FiF Q1/U5cvAY6ruNZy7CYVQgyKAKnTXX0uGPuTzJS8Hg/X8BMCfaT7hyRpEPs5Z9Y9DlXSecavnN2y j63pYOGhxJyCd47IWX4oQylXKER+HDN022M9hAf6zVc56IeKkgIGqnRjadnjIP X-Received: by 2002:a05:6a00:448b:b0:82c:d7c4:4c5c with SMTP id d2e1a72fcca58-8352d178e85mr3057979b3a.20.1777727966440; Sat, 02 May 2026 06:19:26 -0700 (PDT) Received: from DESKTOP-82PPU4A.localdomain ([202.8.116.84]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83515ad0176sm5553791b3a.39.2026.05.02.06.19.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2026 06:19:25 -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 v6 1/5] ipv4: igmp: get rid of IGMPV3_{QQIC,MRC} and simplify calculation Date: Sat, 2 May 2026 13:19:02 +0000 Message-ID: <20260502131907.987-2-royujjal@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260502131907.987-1-royujjal@gmail.com> References: <20260502131907.987-1-royujjal@gmail.com> 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" Get rid of the IGMPV3_MRC macro and use the igmpv3_mrt() API to calculate the Max Resp Time from the Maximum Response Code. Similarly, for IGMPV3_QQIC, use the igmpv3_qqi() API to calculate the Querier's Query Interval from the QQIC field. Reviewed-by: Nikolay Aleksandrov Reviewed-by: Ido Schimmel Signed-off-by: Ujjal Roy --- include/linux/igmp.h | 80 +++++++++++++++++++++++++++++++++++---- net/bridge/br_multicast.c | 2 +- net/ipv4/igmp.c | 6 +-- 3 files changed, 76 insertions(+), 12 deletions(-) diff --git a/include/linux/igmp.h b/include/linux/igmp.h index 073b30a9b850..0e095c9f234e 100644 --- a/include/linux/igmp.h +++ b/include/linux/igmp.h @@ -92,15 +92,79 @@ struct ip_mc_list { struct rcu_head rcu; }; =20 +/* RFC3376, relevant sections: + * - 4.1.1. Maximum Response Code + * - 4.1.7. QQIC (Querier's Query Interval Code) + * + * For both MRC and QQIC, values >=3D 128 use the same floating-point + * encoding as follows: + * + * 0 1 2 3 4 5 6 7 + * +-+-+-+-+-+-+-+-+ + * |1| exp | mant | + * +-+-+-+-+-+-+-+-+ + */ +#define IGMPV3_FP_EXP(value) (((value) >> 4) & 0x07) +#define IGMPV3_FP_MAN(value) ((value) & 0x0f) + +/* IGMPv3 floating-point exponential field min threshold */ +#define IGMPV3_EXP_MIN_THRESHOLD 128 + /* V3 exponential field decoding */ -#define IGMPV3_MASK(value, nb) ((nb)>=3D32 ? (value) : ((1<<(nb))-1) & (va= lue)) -#define IGMPV3_EXP(thresh, nbmant, nbexp, value) \ - ((value) < (thresh) ? (value) : \ - ((IGMPV3_MASK(value, nbmant) | (1<<(nbmant))) << \ - (IGMPV3_MASK((value) >> (nbmant), nbexp) + (nbexp)))) - -#define IGMPV3_QQIC(value) IGMPV3_EXP(0x80, 4, 3, value) -#define IGMPV3_MRC(value) IGMPV3_EXP(0x80, 4, 3, value) + +/* IGMPv3 MRC/QQIC 8-bit exponential field decode + * + * RFC3376, 4.1.1 & 4.1.7. defines the decoding formula: + * 0 1 2 3 4 5 6 7 + * +-+-+-+-+-+-+-+-+ + * |1| exp | mant | + * +-+-+-+-+-+-+-+-+ + * Max Resp Time =3D (mant | 0x10) << (exp + 3) + * QQI =3D (mant | 0x10) << (exp + 3) + */ +static inline unsigned long igmpv3_exp_field_decode(const u8 code) +{ + if (code < IGMPV3_EXP_MIN_THRESHOLD) { + return code; + } else { + unsigned long mc_man, mc_exp; + + mc_exp =3D IGMPV3_FP_EXP(code); + mc_man =3D IGMPV3_FP_MAN(code); + + return (mc_man | 0x10) << (mc_exp + 3); + } +} + +/* Calculate Max Resp Time from Maximum Response Code + * + * RFC3376, relevant sections: + * - 4.1.1. Maximum Response Code + * - 8.3. Query Response Interval + * + * After decode, MRC represents the Maximum Response Time (MRT) in + * units of 0.1 seconds (100 ms). + */ +static inline unsigned long igmpv3_mrt(const struct igmpv3_query *ih3) +{ + return igmpv3_exp_field_decode(ih3->code); +} + +/* Calculate Querier's Query Interval from Querier's Query Interval Code + * + * RFC3376, relevant sections: + * - 4.1.7. QQIC (Querier's Query Interval Code) + * - 8.2. Query Interval + * - 8.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 igmpv3_qqi(const struct igmpv3_query *ih3) +{ + return igmpv3_exp_field_decode(ih3->qqic); +} =20 static inline int ip_mc_may_pull(struct sk_buff *skb, unsigned int len) { diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 881d866d687a..9fec76e887bc 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -3518,7 +3518,7 @@ static void br_ip4_multicast_query(struct net_bridge_= mcast *brmctx, goto out; =20 max_delay =3D ih3->code ? - IGMPV3_MRC(ih3->code) * (HZ / IGMP_TIMER_SCALE) : 1; + igmpv3_mrt(ih3) * (HZ / IGMP_TIMER_SCALE) : 1; } else { goto out; } diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c index a674fb44ec25..d7eff36d98c3 100644 --- a/net/ipv4/igmp.c +++ b/net/ipv4/igmp.c @@ -991,7 +991,7 @@ static bool igmp_heard_query(struct in_device *in_dev, = struct sk_buff *skb, * different encoding. We use the v3 encoding as more likely * to be intended in a v3 query. */ - max_delay =3D IGMPV3_MRC(ih3->code)*(HZ/IGMP_TIMER_SCALE); + max_delay =3D igmpv3_mrt(ih3) * (HZ / IGMP_TIMER_SCALE); if (!max_delay) max_delay =3D 1; /* can't mod w/ 0 */ } else { /* v3 */ @@ -1006,7 +1006,7 @@ static bool igmp_heard_query(struct in_device *in_dev= , struct sk_buff *skb, ih3 =3D igmpv3_query_hdr(skb); } =20 - max_delay =3D IGMPV3_MRC(ih3->code)*(HZ/IGMP_TIMER_SCALE); + max_delay =3D igmpv3_mrt(ih3) * (HZ / IGMP_TIMER_SCALE); if (!max_delay) max_delay =3D 1; /* can't mod w/ 0 */ WRITE_ONCE(in_dev->mr_maxdelay, max_delay); @@ -1016,7 +1016,7 @@ static bool igmp_heard_query(struct in_device *in_dev= , struct sk_buff *skb, * configured value. */ in_dev->mr_qrv =3D ih3->qrv ?: READ_ONCE(net->ipv4.sysctl_igmp_qrv); - in_dev->mr_qi =3D IGMPV3_QQIC(ih3->qqic)*HZ ?: IGMP_QUERY_INTERVAL; + in_dev->mr_qi =3D igmpv3_qqi(ih3) * HZ ? : IGMP_QUERY_INTERVAL; =20 /* RFC3376, 8.3. Query Response Interval: * The number of seconds represented by the [Query Response --=20 2.43.0 From nobody Sun Jun 14 05:47:40 2026 Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) (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 BB7B5223DE5 for ; Sat, 2 May 2026 13:19:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777727975; cv=none; b=gbqaWf+W8JnSDp9L4q9nd/G3pmboOemNe2sGPsegozKyAnuUy+K1oxPEuue0n68mweEWNltISL1docsJqj/UFjs0+2A/YOOuQ0aJA9AQKcRuvDw1vaw5betqjE5bVwlZ+GLXSmrKjEUd4Lgm2bD7zsomUwHeJ+E5Sxcg+L312mg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777727975; c=relaxed/simple; bh=UCaDphay8R5jghlpOgQZQGSq8SNelf7mPTIxi7JVkS8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Hon6nA5IKq2Ngq4VpWup/whrVnuspQ4mTehOVudvZRzTZJQXAkA5cpctdU5uCFQQoCRrL1HH3rdLzo8xeyxC+Ws4ZHxk+NwljqdsFwWFTz1/B35kHPspfc63/YjqXF+R6cC6IXg58jvgbYXiu9fxxnFP0JIcc4XST/qMKP/BPyk= 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=O0gs6ZE6; arc=none smtp.client-ip=209.85.210.177 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="O0gs6ZE6" Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-82f8b60e54dso1974380b3a.2 for ; Sat, 02 May 2026 06:19:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777727973; x=1778332773; darn=vger.kernel.org; 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=CfXFwhGtvtECoZmhLyPyGGfKAV5tvDJY8uqDk21sk4s=; b=O0gs6ZE6ojtpRGIyfbEb8+3OXu2PzdgP4+HyoONlj6BWcE/JBfAkZ/uxwPP5cJR1s6 21pEGfy6J/uXHcJDfnfIDESC+/cE71r416/a4PMhxFo9n9JwBcbhPzk2+T1qsHdbJVtW D3iw9QCKg++NwMwzdx1GoJqky4vKeLGXkjttKnQBNp8Ab4W5ZsNo48G1o7R8nZLdYSoW ffvX3hI7Zw7S2v4QsTzc+bDKZfa3EoG647Dm96Tr0c/vepzsDzWMNFdRE0f0vBibNi5d B3NLF2t0PAka0LTczGNX7lxiiA4GSOLnQEOq/IU16Ok/5j39ubtrWYag+kj3QCt28ULs 5Nnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777727973; x=1778332773; 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=CfXFwhGtvtECoZmhLyPyGGfKAV5tvDJY8uqDk21sk4s=; b=K7ntFcErWMl92aCbL1xS0eT+YIqES66Vahk0ktMwyxrquR65AUWDgg2qoSBWmW08FQ jlplWaZiqfYZeO2kgWlhU2n5P1J3OttBHhjgJJD/QmlFn7zel3fjDTQTavF/kwAIsoJa PF0HloKOrHAqvbHIKFxyed3WYuNUtyuy2F9LdqHMXGt1qAWPdYxXMKuVCRfCaRbdjMly nXX/wbCmnjzL9lBKVzXSuk1RIk2tr2Yy0nvEa6/etRa+I02ZJ46HbYubKcJG8ry2n8yq YPjAu+hg8yotcsU0wM/39T+ybgBJAhBGsvzf9QaSRX1qzkzUQtmh647XhjnlkOgH7gyx X8hw== X-Forwarded-Encrypted: i=1; AFNElJ+oxd72K3fU8H/QxTng5fio+gpgynhzwSETLukyekgZ+rJzXTIGb4ivZ8rohabwH6CeJz+DIxhKwcK6B+c=@vger.kernel.org X-Gm-Message-State: AOJu0Yz1Lq2ivR7f37EW7KcE+ll8IKOKCi9JmhMLCKSUbBW4+zpD18bj Hp90uNoX0Dn9MFyAzvtsz56hqfXHUjLZgPowZfGeoS4x6oW1NFUcUwpJ X-Gm-Gg: AeBDies5sMRs/Xi5J+e9OOSr54P7ql1Uk4NXgDfFWD4OVhmyKK59RlLxwAbCLOR3Zu/ AVWgWhmkl2+QogUZhP1g97ZjRVLcfLw3VnMybwf3fNnUkBH7mGkEUgNYaJ7g41qFhkhkKbjTyUw 8onSi3xf/8ntyE3GDL9qb5kWjntj4FspYivpwT82K598BIfjJXwekFDITO47nN7ew+mDmwJYZgO LoXVU3f/r6iGNnssGJikC3FX0xXm2a5GBJvmHAkAVxyW7SiEtpdbeJOUvfpqn6iWILoVWVsNJTc vQ3jbYHjN6I4ayAOXotyGjJde0byn2SK0u7YEvGI1DvMdm28NnhzpwtugynTiDS/eP8YaabhsKa 3OpHdA51XDnXkKqK5pawItwDcdHgU8OkM1jbHzJUT+ty6dOin0O4QuXRpDyuiO465TF8pfgK0e3 Dh63NBd8lhACsrckt/wCgIzRPQvcv9mZy9A68I65eailMqAeF+Dg== X-Received: by 2002:a05:6a00:369b:b0:834:df57:9d6b with SMTP id d2e1a72fcca58-8352d28bc1fmr3081700b3a.24.1777727972918; Sat, 02 May 2026 06:19:32 -0700 (PDT) Received: from DESKTOP-82PPU4A.localdomain ([202.8.116.84]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83515ad0176sm5553791b3a.39.2026.05.02.06.19.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2026 06:19:32 -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 v6 2/5] ipv6: mld: rename mldv2_mrc() and add mldv2_qqi() Date: Sat, 2 May 2026 13:19:03 +0000 Message-ID: <20260502131907.987-3-royujjal@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260502131907.987-1-royujjal@gmail.com> References: <20260502131907.987-1-royujjal@gmail.com> 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" 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. Reviewed-by: Nikolay Aleksandrov Reviewed-by: Ido Schimmel Signed-off-by: Ujjal Roy --- include/net/mld.h | 66 +++++++++++++++++++++++++++++++++------ net/bridge/br_multicast.c | 2 +- net/ipv6/mcast.c | 19 ++--------- 3 files changed, 61 insertions(+), 26 deletions(-) diff --git a/include/net/mld.h b/include/net/mld.h index c07359808493..10e402e0fe08 100644 --- a/include/net/mld.h +++ b/include/net/mld.h @@ -89,29 +89,77 @@ struct mld2_query { #define MLDV2_QQIC_EXP(value) (((value) >> 4) & 0x07) #define MLDV2_QQIC_MAN(value) ((value) & 0x0f) =20 -#define MLD_EXP_MIN_LIMIT 32768UL -#define MLDV1_MRD_MAX_COMPAT (MLD_EXP_MIN_LIMIT - 1) +/* MLDv2 QQIC floating-point exponential field min threshold */ +#define MLD_QQIC_MIN_THRESHOLD 128 +/* MLDv2 MRC floating-point exponential field min threshold */ +#define MLD_MRC_MIN_THRESHOLD 32768UL +#define MLDV1_MRD_MAX_COMPAT (MLD_MRC_MIN_THRESHOLD - 1) =20 #define MLD_MAX_QUEUE 8 #define MLD_MAX_SKBS 32 =20 -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 =3D (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 =3D ntohs(mlh2->mld2q_mrc); + unsigned long mc_mrc =3D ntohs(mlh2->mld2q_mrc); =20 - if (mc_mrc < MLD_EXP_MIN_LIMIT) { - ret =3D mc_mrc; + if (mc_mrc < MLD_MRC_MIN_THRESHOLD) { + return mc_mrc; } else { unsigned long mc_man, mc_exp; =20 mc_exp =3D MLDV2_MRC_EXP(mc_mrc); mc_man =3D MLDV2_MRC_MAN(mc_mrc); =20 - ret =3D (mc_man | 0x1000) << (mc_exp + 3); + return (mc_man | 0x1000) << (mc_exp + 3); } +} =20 - 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 for= mula: + * 0 1 2 3 4 5 6 7 + * +-+-+-+-+-+-+-+-+ + * |1| exp | mant | + * +-+-+-+-+-+-+-+-+ + * QQI =3D (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 =3D mlh2->mld2q_qqic; + + if (qqic < MLD_QQIC_MIN_THRESHOLD) { + return qqic; + } else { + unsigned long mc_man, mc_exp; + + mc_exp =3D MLDV2_QQIC_EXP(qqic); + mc_man =3D MLDV2_QQIC_MAN(qqic); + + return (mc_man | 0x10) << (mc_exp + 3); + } } =20 #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_m= cast *brmctx, mld2q->mld2q_suppress) goto out; =20 - max_delay =3D max(msecs_to_jiffies(mldv2_mrc(mld2q)), 1UL); + max_delay =3D max(msecs_to_jiffies(mldv2_mrd(mld2q)), 1UL); } =20 is_general_query =3D 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 =3D mlh2->mld2q_qqic; - } else { - unsigned long mc_man, mc_exp; - - mc_exp =3D MLDV2_QQIC_EXP(mlh2->mld2q_qqic); - mc_man =3D MLDV2_QQIC_MAN(mlh2->mld2q_qqic); - - mc_qqi =3D (mc_man | 0x10) << (mc_exp + 3); - } - - idev->mc_qi =3D mc_qqi * HZ; + idev->mc_qi =3D mldv2_qqi(mlh2) * HZ; } =20 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 =3D msecs_to_jiffies(mldv2_mrc(mlh2)); + idev->mc_qri =3D msecs_to_jiffies(mldv2_mrd(mlh2)); } =20 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, str= uct mld_msg *mld, static void mld_process_v2(struct inet6_dev *idev, struct mld2_query *mld, unsigned long *max_delay) { - *max_delay =3D max(msecs_to_jiffies(mldv2_mrc(mld)), 1UL); + *max_delay =3D max(msecs_to_jiffies(mldv2_mrd(mld)), 1UL); =20 mld_update_qrv(idev, mld); mld_update_qi(idev, mld); --=20 2.43.0 From nobody Sun Jun 14 05:47:40 2026 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) (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 A09B72505AA for ; Sat, 2 May 2026 13:19:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777727984; cv=none; b=efYk8sdCg1vD/A3Jy1aywQ6FtV5xo/foZATcujFikS383kGEK9SZiUZ2kEbG81hHm68W67vx5dm0mEOSimqSusJZi9yXILLCaMle3U+Rt97dXTEZxkupX9oCYujQwfhgpadDL2ES6/5tRyCcLh9fF/djzu7pSdotv1IHpGMMyAg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777727984; c=relaxed/simple; bh=Gt27CTUkBy3/9y5hHiuXgkkQRu0kM5q36flW22f2Fr0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VafBO1Ue5FR6ScuWvL1tYW2pAJvY2VfqcQspv5yDW3YsmnhIzf0BXHwrsS4Z0eiMM4/555+olRDLstyR8zpQeKprcrLnZcQNRLaX4tbIkY7hNVLXmCknJSilaC4iXgihcIWhFIJE0+VG7hQWkab+VsUj4ItR7tY9TJgQP36JhC0= 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=cjNoVqab; arc=none smtp.client-ip=209.85.215.177 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="cjNoVqab" Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-c801912c903so75368a12.0 for ; Sat, 02 May 2026 06:19:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777727981; x=1778332781; darn=vger.kernel.org; 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=jmZ9G/rM0nAD31XWpPt5TscDsPxaAtvREA8xoPmeb2k=; b=cjNoVqabfn3bq+koMiK4tYNoIVuwhBq61yFZml56kjHJVDoVuX8OWAGcCw4UIPdDpe VrQbUktJhajssRcbRc95PIIzC2jbsV7jKGF5PmIk9M8auJlvGRwg50TpadRM56Lxcc7t 74gZ7Pijjxn+u0e4a/zEdy3b92TlyPJdmFaiu8JlnQ3XVgVKm2ilUbYw4aWFzp8Pfjvg p9XYupJD7aXCQnh4GjEaveGlab9ren2D/rLYg3qG6kcPSMlVMtDZl89o7NOOd1vZSJEV IwlGmA71XU4yzjv9HuiututHCpccV9fenHjUjLkR562CL0pusOjdxXBQ/OhxVQFUdAf+ IOVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777727981; x=1778332781; 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=jmZ9G/rM0nAD31XWpPt5TscDsPxaAtvREA8xoPmeb2k=; b=PbTzryekxHFGJTitOmLWkdnRTEr3UqwOQ9n0Od1Kq6pMvHS/9Pvoy9Ucqcb73Adu3y vlSQ3mol96jAIsABCTOdlIiA3PyUjTvgBEztjLjZ8U4gMl6jDI4eeii2qcAoG87du8cG MG9Y/OG99ki/mYR/58fRi9d1P2dL/TtCl9d86IcLLDrmInFNFShysqQA1Rj8UmOfXizb +Zoc8L9HDyW+atKRv7w0pj96nC46qMkTyodBq22FoeM922GzAdhGacPohO+B2+0HsF95 dOZtfHwiWSAy6/X6/gRhWe/SGv8hwt1FE5d7ujzBPgf2Wtltm0fSzY4Obcu5kD7q1gwl NGlw== X-Forwarded-Encrypted: i=1; AFNElJ/E+JVxp/YwGtAGg9LRztyA1Lnx0xF41n03T1nU+C0Em8NGcpuN+184AdJVZiBptYcwdhMv6Wn9w439EsM=@vger.kernel.org X-Gm-Message-State: AOJu0YwJc4WiNHOuhrcofT6DY+twB6bmRGfKwB9P6b25QAW7TfvaPv71 flsd0IUPrct6Irficn4+06IHpD7eiLRa2Qze3gk48bK6cj+KjRoTOmys X-Gm-Gg: AeBDieuO5g7Fy1gHCvF8xzgre4F3wEiH4Etm5IQvWpRGkPFH4Ayfc2g2mRN+LL5aqon Qai1VyBiu020s3CLpU1scVpn3/CwcJE3AVrQgBGdo+sVyXJa2d+oc/np5NZNifMzTpbhKyC+UxE d5CMKdNPei43HoQ+Cx+4JtGzRBj7SF7sLfhn7/wPtygoAvnm46Xp/dA0dS16I12HdmcCrLbYy/Q j/oy6ylw8h3JQUiq+/CtPFCMe6hWxX2is9cSv3SjWqZntf3ZPSpnFyajzJGKNZlj6o9ENF5kzsX yitquSVH5a5VcXRtpCX90mThTgyFxItDsopcb95aZvBYRvZh9P4NzMCY2LpRKWmGvBulgBHqvU2 1U5qa+1f5skrHDQePHu4jYaDxELeZ3sju42o4Oza/UpksbCd8cUfSl6zjxIVJKlUhvJxXPUGlee Nxj6RfCbwcTcTHYw7Tmd5zeTCUkTpe8x+K2q90yOXTmeYIxUuG2Q== X-Received: by 2002:a05:6a20:12ca:b0:39c:c07:1450 with SMTP id adf61e73a8af0-3a7f1c748f6mr2909119637.42.1777727980852; Sat, 02 May 2026 06:19:40 -0700 (PDT) Received: from DESKTOP-82PPU4A.localdomain ([202.8.116.84]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83515ad0176sm5553791b3a.39.2026.05.02.06.19.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2026 06:19:39 -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 v6 3/5] ipv4: igmp: encode multicast exponential fields Date: Sat, 2 May 2026 13:19:04 +0000 Message-ID: <20260502131907.987-4-royujjal@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260502131907.987-1-royujjal@gmail.com> References: <20260502131907.987-1-royujjal@gmail.com> 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" In IGMP, MRC and QQIC fields are not correctly encoded when generating query packets. Since the receiver of the query interprets these fields using the IGMPv3 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 and QQIC fields (8-bit) are properly encoded when transmitting query packets with intervals that exceed their respective linear threshold value of 128 (for MRT/QQI). RFC3376: for both MRC and QQIC, values >=3D 128 represent the same floating-point encoding as follows: 0 1 2 3 4 5 6 7 +-+-+-+-+-+-+-+-+ |1| exp | mant | +-+-+-+-+-+-+-+-+ Reviewed-by: Nikolay Aleksandrov Reviewed-by: Ido Schimmel Signed-off-by: Ujjal Roy --- include/linux/igmp.h | 87 +++++++++++++++++++++++++++++++++++++++ net/bridge/br_multicast.c | 14 +++---- 2 files changed, 93 insertions(+), 8 deletions(-) diff --git a/include/linux/igmp.h b/include/linux/igmp.h index 0e095c9f234e..3a2d35a9f307 100644 --- a/include/linux/igmp.h +++ b/include/linux/igmp.h @@ -109,6 +109,93 @@ struct ip_mc_list { =20 /* IGMPv3 floating-point exponential field min threshold */ #define IGMPV3_EXP_MIN_THRESHOLD 128 +/* IGMPv3 FP max threshold (mant =3D 0xF, exp =3D 7) -> 31744 */ +#define IGMPV3_EXP_MAX_THRESHOLD 31744 + +/* V3 exponential field encoding */ + +/* IGMPv3 MRC/QQIC 8-bit exponential field encode + * + * RFC3376, 4.1.1 & 4.1.7. defines only the decoding formula: + * MRT/QQI =3D (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' =3D 4 + (exp + 3) =3D exp + 7. + * This is the MSB at the 0-based bit position: (exp + 7). + * Since fls() is 1-based, fls(value) - 1 =3D exp + 7. + * + * Therefore: + * exp =3D fls(value) - 8 + * mant =3D (value >> (exp + 3)) & 0x0F + * + * Final encoding formula: + * 0x80 | (exp << 4) | mant + * + * Example (value =3D 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 =3D 3200) + * | ^-^-mant^ ^..(exp+3)..^| exp =3D 4, mant =3D 9 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * + * Encoded: + * 0x80 | (4 << 4) | 9 =3D 0xC9 + */ +static inline u8 igmpv3_exp_field_encode(unsigned long value) +{ + u8 mc_exp, mc_man; + + /* MRC/QQIC < 128 is literal */ + if (value < IGMPV3_EXP_MIN_THRESHOLD) + return value; + + /* Saturate at max representable (mant =3D 0xF, exp =3D 7) -> 31744 */ + if (value >=3D IGMPV3_EXP_MAX_THRESHOLD) + return 0xFF; + + mc_exp =3D fls(value) - 8; + mc_man =3D (value >> (mc_exp + 3)) & 0x0F; + + return 0x80 | (mc_exp << 4) | mc_man; +} + +/* Calculate Maximum Response Code from Max Resp Time + * + * RFC3376, relevant sections: + * - 4.1.1. Maximum Response Code + * - 8.3. Query Response Interval + * + * MRC represents the encoded form of Max Resp Time (MRT); once + * decoded, the resulting value is in units of 0.1 seconds (100 ms). + */ +static inline u8 igmpv3_mrc(unsigned long mrt) +{ + return igmpv3_exp_field_encode(mrt); +} + +/* Calculate Querier's Query Interval Code from Querier's Query Interval + * + * RFC3376, relevant sections: + * - 4.1.7. QQIC (Querier's Query Interval Code) + * - 8.2. Query Interval + * - 8.12. Older Version Querier Present Timeout + * (the [Query Interval] in the last Query received) + * + * QQIC represents the encoded form of Querier's Query Interval (QQI); + * once decoded, the resulting value is in units of seconds. + */ +static inline u8 igmpv3_qqic(unsigned long qi) +{ + return igmpv3_exp_field_encode(qi); +} =20 /* V3 exponential field decoding */ =20 diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 1438c023db62..27010744d7ae 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -934,12 +934,12 @@ static struct sk_buff *br_ip4_multicast_alloc_query(s= truct net_bridge_mcast *brm size_t pkt_size, igmp_hdr_size; unsigned long now =3D jiffies; struct igmpv3_query *ihv3; + unsigned long lmqt, mrt; void *csum_start =3D NULL; __sum16 *csum =3D NULL; struct sk_buff *skb; struct igmphdr *ih; struct ethhdr *eth; - unsigned long lmqt; struct iphdr *iph; u16 lmqt_srcs =3D 0; =20 @@ -1004,15 +1004,15 @@ static struct sk_buff *br_ip4_multicast_alloc_query= (struct net_bridge_mcast *brm skb_put(skb, 24); =20 skb_set_transport_header(skb, skb->len); + mrt =3D group ? brmctx->multicast_last_member_interval : + brmctx->multicast_query_response_interval; *igmp_type =3D IGMP_HOST_MEMBERSHIP_QUERY; =20 switch (brmctx->multicast_igmp_version) { case 2: ih =3D igmp_hdr(skb); ih->type =3D IGMP_HOST_MEMBERSHIP_QUERY; - ih->code =3D (group ? brmctx->multicast_last_member_interval : - brmctx->multicast_query_response_interval) / - (HZ / IGMP_TIMER_SCALE); + ih->code =3D mrt / (HZ / IGMP_TIMER_SCALE); ih->group =3D group; ih->csum =3D 0; csum =3D &ih->csum; @@ -1021,11 +1021,9 @@ static struct sk_buff *br_ip4_multicast_alloc_query(= struct net_bridge_mcast *brm case 3: ihv3 =3D igmpv3_query_hdr(skb); ihv3->type =3D IGMP_HOST_MEMBERSHIP_QUERY; - ihv3->code =3D (group ? brmctx->multicast_last_member_interval : - brmctx->multicast_query_response_interval) / - (HZ / IGMP_TIMER_SCALE); + ihv3->code =3D igmpv3_mrc(mrt / (HZ / IGMP_TIMER_SCALE)); ihv3->group =3D group; - ihv3->qqic =3D brmctx->multicast_query_interval / HZ; + ihv3->qqic =3D igmpv3_qqic(brmctx->multicast_query_interval / HZ); ihv3->nsrcs =3D htons(lmqt_srcs); ihv3->resv =3D 0; ihv3->suppress =3D sflag; --=20 2.43.0 From nobody Sun Jun 14 05:47:40 2026 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (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 335A1215075 for ; Sat, 2 May 2026 13:19:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777727992; cv=none; b=jxB9MM4MDXXbcW3H/KAUJ/ycyGdCoBqK7pz+glIPPaeDn9ID2x9Zfc45g6KQKRU6OAMOs2SkvpZizoezH1T+9+nIzJz9U2rKSfodBY6TDutCjaWKEfA4HNFqW+x647MhPGx9XuiGDdqRsw1MCXZbb+Axm9QOc7dITtzrNeTQOEg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777727992; c=relaxed/simple; bh=jJnc0mGZNzy4u3y501gtICX3ws5YMm+lbxgjciB6cvg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e9M8BcD3YgV3wvh9oIdyQMrFrUe9myiqmVnKaBjUZzXjxx8hzFv3pbEyyxofmoHPgKVoIbQMFrMPon3g17z2kWOOhu02Ruvsb1XnYdpeM6RRSk828ugI3RgGclRgek5x9x3JqYyUl517HK8sKAwAmG2wQ7+iZsuqNcBTfiSSbPc= 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=Pz83j5o/; arc=none smtp.client-ip=209.85.210.180 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="Pz83j5o/" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-82f8b60e54dso1974479b3a.2 for ; Sat, 02 May 2026 06:19:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777727989; x=1778332789; darn=vger.kernel.org; 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=zl++HpBCtAW5kzSiDlCg+WmmabaPSzgG75Hq/zfZ4gA=; b=Pz83j5o/Rj23bPD3Mo2VxZr6BPglH8+gBOrNUFH0S0v4H/Z4SnxMRpf9aDR3cW2ivj YVa2lzkcQkZuh7dC/G2pOrV44T60amTulNKDH4CqUkIZJD7SqayMMs18ucuz+lazFIEd w6yWJVT0CnrpqzmUwFxxc8Jhqb7zdDXyKfRirKpEvUXLrsqwmFr2WwFMhASiBt+0H4F2 ezi7XDSVxfihHeMObcml0DSUMSZS7D+GPiSD2G1xYw3hAuJzc0I4IAhIc+NJ4RBEqk5/ teSGmEirsNACAVvtc038PReswyYfCrSOj2KwTK+R/Ry/3mixR0L2bsy/7pb4PoITe6OL rKfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777727989; x=1778332789; 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=zl++HpBCtAW5kzSiDlCg+WmmabaPSzgG75Hq/zfZ4gA=; b=Xj6aO+meG8EEzGEbxwp1G8/Kxo41CWOiR/+rPFxi6jHVJCuz8uWHRtAR4i0y0stL5y MdJd7jM0AEKiVFXn0cLNbnnPAH2h7zOwtw5bNMYvNtcmj51xFML0tPs8+8zty0b/IGbU pSrUThbA9tITPG5IoMdYOgwxgznuSg6h0iZpUyvz7QKILgMyevgcEiZ6v84XovI4/OW2 UXG+YIj18KZSANJ/5rq2BPc5fZlJr6PiGcNN6wWa31WuevTSx7EUB5NCHUFdQFTERwHk uigs/UuWKsDrnloQLFNpouvKs9dTKne105NWaVE1lXfEh3wrhWFQJOISQWa7cai0zaXz i/Lw== X-Forwarded-Encrypted: i=1; AFNElJ9q3DsAHJUpXl1q5e83HPrb4UiFStyrP1zey3AItnn0Ovbl7IPJFWP6GyJLfC13wZPhEiti3cIZDU4pbyk=@vger.kernel.org X-Gm-Message-State: AOJu0Yyv2y4lbcyLcLPmD8226FZzLdlQbuEuLVIAu6pCoNsGwIGG+5Cv MyG9nfC7tb8BlxaUEP9RMkAl7JtvTmal+CSmSaq2LrUiiA3SJtJnmy8y X-Gm-Gg: AeBDievJWr14Vk7Xgwg8BIpwOUWLzqkMTHYV/GFNpyO1wZ+OAtVWkf/6VkM8gl3vSfI OkOWqxSsjWGMBeJyMxegqAx7SZBr67XWLIK8h+tIQG9Kp7Uf/yXSHhknvbskT2FRwKQ6e6RmnvL H3vW05MZQjF/DOHQHt8Qx1rSxYKsAmCIG4CRGs9+UdsYMTbwvAt+g3lietiSMxZLAHwKAvmSadE w9cHeLCnxOFNmasc+q3sMIEu2mbbi/XO6cvksYZCj3MdUUdQkzhlvdmM94AWgPTVSvupX6s4Zc/ PzCZt5LfoAf/EG3fuU5X5xKBD1EEb50TUUSP7EkUPZkV7SYKd4b8t7R5BFAndwBFVrY29yAK7jP sTn527LNvGm/gtvr0Cps0XPQ3M9x3H7h4+8c/gPPFJ8CTKqFI3GQ/h2kD/wZc63yraRwoJZbKPQ id6m5FrIS6V0jso3pcyAvfCqG7aFZZnBR6OP0U7qhnm1wno3KhIQ== X-Received: by 2002:a05:6a00:13a0:b0:82f:4628:4186 with SMTP id d2e1a72fcca58-8352d2cf7aamr3023049b3a.42.1777727989546; Sat, 02 May 2026 06:19:49 -0700 (PDT) Received: from DESKTOP-82PPU4A.localdomain ([202.8.116.84]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83515ad0176sm5553791b3a.39.2026.05.02.06.19.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2026 06:19:47 -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 v6 4/5] ipv6: mld: encode multicast exponential fields Date: Sat, 2 May 2026 13:19:05 +0000 Message-ID: <20260502131907.987-5-royujjal@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260502131907.987-1-royujjal@gmail.com> References: <20260502131907.987-1-royujjal@gmail.com> 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" 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 >=3D 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 >=3D 128, the QQIC field represents a floating-point value as follows: 0 1 2 3 4 5 6 7 +-+-+-+-+-+-+-+-+ |1| exp | mant | +-+-+-+-+-+-+-+-+ Reviewed-by: Nikolay Aleksandrov 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 10e402e0fe08..23255cc47ced 100644 --- a/include/net/mld.h +++ b/include/net/mld.h @@ -91,13 +91,132 @@ struct mld2_query { =20 /* MLDv2 QQIC floating-point exponential field min threshold */ #define MLD_QQIC_MIN_THRESHOLD 128 +/* MLDv2 QQIC FP max threshold (mant =3D 0xF, exp =3D 7) -> 31744 */ +#define MLD_QQIC_MAX_THRESHOLD 31744 /* MLDv2 MRC floating-point exponential field min threshold */ #define MLD_MRC_MIN_THRESHOLD 32768UL +/* MLDv2 MRC FP max threshold (mant =3D 0xFFF, exp =3D 7) -> 8387584 */ +#define MLD_MRC_MAX_THRESHOLD 8387584 #define MLDV1_MRD_MAX_COMPAT (MLD_MRC_MIN_THRESHOLD - 1) =20 #define MLD_MAX_QUEUE 8 #define MLD_MAX_SKBS 32 =20 +/* 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 =3D (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 =3D 12 + (exp + 3) =3D exp + 15. + * This is the MSB at the 0-based bit position: (exp + 15). + * Since fls() is 1-based, fls(value) - 1 =3D exp + 15. + * + * Therefore: + * exp =3D fls(value) - 16 + * mant =3D (value >> (exp + 3)) & 0x0FFF + * + * Final encoding formula: + * 0x8000 | (exp << 12) | mant + * + * Example (value =3D 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| 13117= 44 + * | ^-^--------mant---------^ ^...(exp+3)...^| exp= =3D5 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * + * Encoded: + * 0x8000 | (5 << 12) | 0x404 =3D 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 =3D 0xFFF, exp =3D 7) -> 8387584 */ + if (mrd >=3D MLD_MRC_MAX_THRESHOLD) + return 0xFFFF; + + mc_exp =3D fls(mrd) - 16; + mc_man =3D (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 =3D (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' =3D 4 + (exp + 3) =3D exp + 7. + * This is the MSB at the 0-based bit position: (exp + 7). + * Since fls() is 1-based, fls(value) - 1 =3D exp + 7. + * + * Therefore: + * exp =3D fls(value) - 8 + * mant =3D (value >> (exp + 3)) & 0x0F + * + * Final encoding formula: + * 0x80 | (exp << 4) | mant + * + * Example (value =3D 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 =3D 3200) + * | ^-^-mant^ ^..(exp+3)..^| exp =3D 4, mant =3D 9 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * + * Encoded: + * 0x80 | (4 << 4) | 9 =3D 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 =3D 0xF, exp =3D 7) -> 31744 */ + if (value >=3D MLD_QQIC_MAX_THRESHOLD) + return 0xFF; + + mc_exp =3D fls(value) - 8; + mc_man =3D (value >> (mc_exp + 3)) & 0x0F; + + return 0x80 | (mc_exp << 4) | mc_man; +} + /* V2 exponential field decoding */ =20 /* 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(s= truct net_bridge_mcast *brm break; case 2: mld2q =3D (struct mld2_query *)icmp6_hdr(skb); - mld2q->mld2q_mrc =3D htons((u16)jiffies_to_msecs(interval)); + mld2q->mld2q_mrc =3D htons(mldv2_mrc(jiffies_to_msecs(interval))); mld2q->mld2q_type =3D ICMPV6_MGM_QUERY; mld2q->mld2q_code =3D 0; mld2q->mld2q_cksum =3D 0; @@ -1190,7 +1190,7 @@ static struct sk_buff *br_ip6_multicast_alloc_query(s= truct net_bridge_mcast *brm mld2q->mld2q_suppress =3D sflag; mld2q->mld2q_qrv =3D 2; mld2q->mld2q_nsrcs =3D htons(llqt_srcs); - mld2q->mld2q_qqic =3D brmctx->multicast_query_interval / HZ; + mld2q->mld2q_qqic =3D mldv2_qqic(brmctx->multicast_query_interval / HZ); mld2q->mld2q_mca =3D *group; csum =3D &mld2q->mld2q_cksum; csum_start =3D (void *)mld2q; --=20 2.43.0 From nobody Sun Jun 14 05:47:40 2026 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 C2A122505AA for ; Sat, 2 May 2026 13:19:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777727998; cv=none; b=thpdvf9eH+hLbVdWgUpnM9TJr+6/MWrMjI5XwJGlgr8w8npYGiJTWuj3EHrS7TCFRVO+ws/rwvbcig23vZzisoTA9pMQF6pOZb0IHdIbPIXQbf+6q/pcv4bZbVdlbtrC6FbHevbjHuxfa02FW3Q154HlSc2iUzuTeeVMxrJP/sQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777727998; c=relaxed/simple; bh=lxcyWp12IdlZXXKd8Ugl4on7xBBXleJuqVt+0M1OoPk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RWXE/u47HEcX0saJPzAvYuNh/CvL0dW6+F7+eLN3YJbGDTFRutSoW87ZlTIG4dZER6vbOChvx53FCbXVSLWNI7oEt/o4YH3DD5NU5NMZ+c/253nO8+2poYzpXrtwq+Gu0NDC8b7+RtE+maf0M21RomfPCVAKMloPf3krI+gdh5c= 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=dPAAqsyb; arc=none smtp.client-ip=209.85.210.171 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="dPAAqsyb" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-82f8893bff3so1289653b3a.2 for ; Sat, 02 May 2026 06:19:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777727996; x=1778332796; darn=vger.kernel.org; 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=2gfGrYQ7AWXi3RXTSR0Z1BGRv06bnLTOB4wH+tsRKV8=; b=dPAAqsybsiX8QZ3ITlSHXnOzi+2xC6mnt78AYeFl2Xlm/wdBl/72cXJ/9lh3+2yAR/ i3RRjFXi0C/fnxPnn/RYSX5K2jV7BkEQe07rpqLBSF40sL1eoEaXcInIoLeHu4jTfz5w UW3yYRA2h+JwMU4xos1t2N0wNJOfbbSO637Ffe3q+iRa94bzmEEQ0yXqEJlBEFaWHVdS gTCEM5IboBAYZZHVRmCbNTPkcNtCpf6KLfWqzgSKunNrtlXg+OHvc93oUplo9HIjsJ7v V9K9POv5sI8xX8QSVpryzZk+5WaTO+kM/a2qT1z6MIVPKdLAsqY8TZOjB1UILoajNK2/ rg4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777727996; x=1778332796; 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=2gfGrYQ7AWXi3RXTSR0Z1BGRv06bnLTOB4wH+tsRKV8=; b=KIMDKKXjOrj9gElbRBJSiy2YRBwTUFUcmkQ0fLSGEb/J82DZFn9ksooTvcugqVDjKI GkL6PsC09sL4xRUcl3ehQ7C3Bz8muPDisjzZ2plcw3/K/7uOBuMWsuYYALSwr85dmarq s7lcXRlWME8NSXH2vZsz7Nj2KOW0CdfQkJ8126Stct3NUtDh2agsqlB4NpU21QWLtl9y xdQ5yDEH2zTXkBX8qZgjvz82G5mp7Nu7yADlce2nMlR+nOhRtBhpYI3nQ4gM/Pb173vJ EzfISjoVw+Ex2ak+j9mQuTqGELzjYedhbmvkpak0dMCSCs5DHpADL3GwntT95GRYEAxW mqiQ== X-Forwarded-Encrypted: i=1; AFNElJ+W+/IcZta01CiccM+b8xubPyXM0byF8vA/85LpBNe8h9vVVH7Ur0LeY52YW7ogTITuCDL5tGmVYCFAfgg=@vger.kernel.org X-Gm-Message-State: AOJu0Yx10F+zO74GjKwRqMQPHRwIQs71vjyxHHiuQiCaYZsNl7fECfaY NagVJVyln6DhKB/onIkmdVHFef92L2dUu9kxZz0kGmD2Vpn22LYfSDPx X-Gm-Gg: AeBDies21uHWi7AgZoUKMcgN2V7xxOov1PS30SRsH+iax+r4rrfNsC8239mo/bccXrS EhTt7XbPTRhAN+kU2cyHjwuTW0J2jPCCe091QoKUgdS5A25tgwn0K/8n3T9cc0oacoPweQhLILB 89AOauO3qCEPOkRZQopNnAEEexZtVpliywT94T7vAoR+Oa4jGgJjvlqqDXl/HibCI9Awfh+yo23 T7csMejVTLNvcnBa55NHq76D37rlz68bytW+YvgW1yGgPz9wvpr/dnvSx3zL0YCL2cjE9Ej3+d1 j3uq6cDP/DCl7tcviQryhHvh75WUQx87VFcjHtDa7Am5nEl61dlkpUPbW8U7wDzF2kTCyvS53x7 pTSiAjKWJkTb0uDC32Exq4l1oBFjQctiA7p9MQTCXRq4LNwvktsnsc7GDcr7IAs8iIDjUKv2YMW VWb3nXCT7Iha9tBzA5q/Q6hUBJr5/++NWdR5gCVD+dVOXzVmahIf3ndVrNTOFC X-Received: by 2002:a05:6a00:aa8c:b0:82c:6bcc:f3fa with SMTP id d2e1a72fcca58-8352d2b58c1mr2888895b3a.35.1777727996093; Sat, 02 May 2026 06:19:56 -0700 (PDT) Received: from DESKTOP-82PPU4A.localdomain ([202.8.116.84]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83515ad0176sm5553791b3a.39.2026.05.02.06.19.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 May 2026 06:19:55 -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 v6 5/5] selftests: net: bridge: add MRC and QQIC field encoding tests Date: Sat, 2 May 2026 13:19:06 +0000 Message-ID: <20260502131907.987-6-royujjal@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260502131907.987-1-royujjal@gmail.com> References: <20260502131907.987-1-royujjal@gmail.com> 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" Enhance vlmc_query_intvl_test and vlmc_query_response_intvl_test in bridge_vlan_mcast.sh to validate IGMPv3/MLDv2 protocol compliance for MRC and QQIC field encoding across both linear and exponential ranges. TEST: Vlan multicast snooping enable [ OK ] TEST: Vlan mcast_query_interval global option default value [ OK ] TEST: Number of tagged IGMPv2 general query [ OK ] TEST: IGMPv3 QQIC linear value 60(s) [ OK ] TEST: MLDv2 QQIC linear value 60(s) [ OK ] TEST: IGMPv3 QQIC non linear value 160(s) [ OK ] TEST: MLDv2 QQIC non linear value 160(s) [ OK ] TEST: Vlan mcast_query_response_interval global option default value [ OK= ] TEST: IGMPv3 MRC linear value of 60(x0.1s) [ OK ] TEST: MLDv2 MRC linear value of 24000(ms) [ OK ] TEST: IGMPv3 MRC non linear value of 240(x0.1s) [ OK ] TEST: MLDv2 MRC non linear value of 48000(ms) [ OK ] Reviewed-by: Nikolay Aleksandrov Reviewed-by: Ido Schimmel Signed-off-by: Ujjal Roy --- .../net/forwarding/bridge_vlan_mcast.sh | 140 +++++++++++++++++- 1 file changed, 132 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh b/= tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh index e8031f68200a..07a377652a59 100755 --- a/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh +++ b/tools/testing/selftests/net/forwarding/bridge_vlan_mcast.sh @@ -162,14 +162,27 @@ vlmc_query_cnt_setup() { local type=3D$1 local dev=3D$2 + local match=3D($3) =20 if [[ $type =3D=3D "igmp" ]]; then - tc filter add dev $dev egress pref 10 prot 802.1Q \ + # This matches: IP Protocol 2 (IGMP) + tc filter add dev "$dev" egress pref 10 prot 802.1Q \ flower vlan_id 10 vlan_ethtype ipv4 dst_ip 224.0.0.1 ip_proto 2 \ + action goto chain 1 + # AND Type 0x11 (Query) at offset 0 of IGMP header + # 20 bytes IPv4 header + 4 bytes Router Alert option + IGMP[offset 0] + tc filter add dev "$dev" egress pref 20 chain 1 prot 802.1Q u32 \ + match u8 0x11 0xff at 24 "${match[@]}" \ action pass else - tc filter add dev $dev egress pref 10 prot 802.1Q \ + # This matches: ICMPv6 + tc filter add dev "$dev" egress pref 10 prot 802.1Q \ flower vlan_id 10 vlan_ethtype ipv6 dst_ip ff02::1 ip_proto icmpv6 \ + action goto chain 1 + # AND Type 0x82 (Query) at offset 0 of MLD header + # 40 bytes IPv6 header + 8 bytes Hop-by-hop option + MLD[offset 0] + tc filter add dev "$dev" egress pref 20 chain 1 prot 802.1Q u32 \ + match u8 0x82 0xff at 48 "${match[@]}" \ action pass fi =20 @@ -181,7 +194,39 @@ vlmc_query_cnt_cleanup() local dev=3D$1 =20 ip link set dev br0 type bridge mcast_stats_enabled 0 - tc filter del dev $dev egress pref 10 + tc filter del dev "$dev" egress pref 20 chain 1 + tc filter del dev "$dev" egress pref 10 +} + +vlmc_query_get_intvl_match() +{ + local type=3D$1 + local version=3D$2 + local test=3D$3 + local enc_val=3D$4 + + if [ "$test" =3D "qqic" ]; then + # QQIC is 8-bit floating point encoding for IGMPv3 and MLDv2 + if [ "${type}v${version}" =3D "igmpv3" ]; then + # QQIC is at offset 9 of IGMP header + # 20 bytes IPv4 header + 4 bytes Router Alert option + IGMP[offset 9] + echo "match u8 $enc_val 0xff at 33" + elif [ "${type}v${version}" =3D "mldv2" ]; then + # QQIC is at offset 25 of MLD header + # 40 bytes IPv6 header + 8 bytes Hop-by-hop option + MLD[offset 25] + echo "match u8 $enc_val 0xff at 73" + fi + elif [ "$test" =3D "mrc" ]; then + if [ "${type}v${version}" =3D "igmpv3" ]; then + # MRC is 8-bit floating point encoding at offset 1 of IGMP header + # 20 bytes IPv4 header + 4 bytes Router Alert option + IGMP[offset 1] + echo "match u8 $enc_val 0xff at 25" + elif [ "${type}v${version}" =3D "mldv2" ]; then + # MRC is 16-bit floating point encoding at offset 4 of MLD header + # 40 bytes IPv6 header + 8 bytes Hop-by-hop option + MLD[offset 4] + echo "match u16 $enc_val 0xffff at 52" + fi + fi } =20 vlmc_check_query() @@ -191,9 +236,13 @@ vlmc_check_query() local dev=3D$3 local expect=3D$4 local time=3D$5 + local test=3D$6 + local enc_val=3D$7 + local intvl_match=3D"" local ret=3D0 =20 - vlmc_query_cnt_setup $type $dev + intvl_match=3D"$(vlmc_query_get_intvl_match "$type" "$version" "$test" "$= enc_val")" + vlmc_query_cnt_setup "$type" "$dev" "$intvl_match" =20 local pre_tx_xstats=3D$(vlmc_query_cnt_xstats $type $version $dev) bridge vlan global set vid 10 dev br0 mcast_snooping 1 mcast_querier 1 @@ -201,7 +250,7 @@ vlmc_check_query() if [[ $ret -eq 0 ]]; then sleep $time =20 - local tcstats=3D$(tc_rule_stats_get $dev 10 egress) + local tcstats=3D$(tc_rule_stats_get "$dev" 20 egress) local post_tx_xstats=3D$(vlmc_query_cnt_xstats $type $version $dev) =20 if [[ $tcstats !=3D $expect || \ @@ -448,8 +497,46 @@ vlmc_query_intvl_test() # 1 is sent immediately, then 2 more in the next 5 seconds vlmc_check_query igmp 2 $swp1 3 5 check_err $? "Wrong number of tagged IGMPv2 general queries sent" - log_test "Vlan 10 mcast_query_interval option changed to 200" + log_test "Number of tagged IGMPv2 general query" + + RET=3D0 + bridge vlan global set vid 10 dev br0 mcast_snooping 1 mcast_igmp_version= 3 + check_err $? "Could not set mcast_igmp_version in vlan 10" + bridge vlan global set vid 10 dev br0 mcast_snooping 1 mcast_mld_version 2 + check_err $? "Could not set mcast_mld_version in vlan 10" + bridge vlan global set vid 10 dev br0 mcast_snooping 1 mcast_query_interv= al 6000 + check_err $? "Could not set mcast_query_interval in vlan 10" + # 1 is sent immediately, IGMPv3 QQIC should match with linear value 60 (0= x3c) + # which is 8-bit encoded value of 60 [units of seconds] + vlmc_check_query igmp 3 $swp1 1 1 qqic 0x3c + check_err $? "Wrong QQIC in generated IGMPv3 general queries" + log_test "IGMPv3 QQIC linear value 60(s)" + + RET=3D0 + # 1 is sent immediately, MLDv2 QQIC should match with linear value 60 (0x= 3c) + # which is 8-bit encoded value of 60 [units of seconds] + vlmc_check_query mld 2 $swp1 1 1 qqic 0x3c + check_err $? "Wrong QQIC in generated MLDv2 general queries" + log_test "MLDv2 QQIC linear value 60(s)" + + RET=3D0 + bridge vlan global set vid 10 dev br0 mcast_snooping 1 mcast_query_interv= al 16000 + check_err $? "Could not set mcast_query_interval in vlan 10" + # 1 is sent immediately, IGMPv3 QQIC should match with non linear value 1= 32 (0x84) + # which is 8-bit encoded value of 160 [units of seconds] + vlmc_check_query igmp 3 $swp1 1 1 qqic 0x84 + check_err $? "Wrong QQIC in generated IGMPv3 general queries" + log_test "IGMPv3 QQIC non linear value 160(s)" =20 + RET=3D0 + # 1 is sent immediately, MLDv2 QQIC should match with non linear value 13= 2 (0x84) + # which is 8-bit encoded value of 160 [units of seconds] + vlmc_check_query mld 2 $swp1 1 1 qqic 0x84 + check_err $? "Wrong QQIC in generated MLDv2 general queries" + log_test "MLDv2 QQIC non linear value 160(s)" + + bridge vlan global set vid 10 dev br0 mcast_snooping 1 mcast_igmp_version= 2 + bridge vlan global set vid 10 dev br0 mcast_snooping 1 mcast_mld_version 1 bridge vlan global set vid 10 dev br0 mcast_snooping 1 mcast_startup_quer= y_count 2 bridge vlan global set vid 10 dev br0 mcast_snooping 1 mcast_query_interv= al 12500 } @@ -469,10 +556,47 @@ vlmc_query_response_intvl_test() log_test "Vlan mcast_query_response_interval global option default value" =20 RET=3D0 - bridge vlan global set vid 10 dev br0 mcast_snooping 1 mcast_query_respon= se_interval 200 + bridge vlan global set vid 10 dev br0 mcast_snooping 1 mcast_startup_quer= y_count 0 + bridge vlan global set vid 10 dev br0 mcast_snooping 1 mcast_igmp_version= 3 + check_err $? "Could not set mcast_igmp_version in vlan 10" + bridge vlan global set vid 10 dev br0 mcast_snooping 1 mcast_mld_version 2 + check_err $? "Could not set mcast_mld_version in vlan 10" + bridge vlan global set vid 10 dev br0 mcast_snooping 1 mcast_query_respon= se_interval 600 + check_err $? "Could not set mcast_query_response_interval in vlan 10" + # 1 is sent immediately, IGMPv3 MRC should match with linear value 60 (0x= 3c) + # which is 8-bit encoded value of 60 [units of 0.1s =3D 6 seconds] + vlmc_check_query igmp 3 $swp1 1 1 mrc 0x3c + check_err $? "Wrong MRC in generated IGMPv3 general queries" + log_test "IGMPv3 MRC linear value of 60(x0.1s)" + + RET=3D0 + bridge vlan global set vid 10 dev br0 mcast_snooping 1 mcast_query_respon= se_interval 2400 + check_err $? "Could not set mcast_query_response_interval in vlan 10" + # 1 is sent immediately, MLDv2 MRC should match with linear value 0x5dc0 = (24000) + # which is 16-bit encoded value of 24000 [units of ms / 24 seconds] + vlmc_check_query mld 2 $swp1 1 1 mrc 0x5dc0 + check_err $? "Wrong MRC in generated MLDv2 general queries" + log_test "MLDv2 MRC linear value of 24000(ms)" + + RET=3D0 + # 1 is sent immediately, IGMPv3 MRC should match with non linear value 14= 2 (0x8e) + # which is 8-bit encoded value of 240 [units of 0.1s =3D 24 seconds] + vlmc_check_query igmp 3 $swp1 1 1 mrc 0x8e + check_err $? "Wrong MRC in generated IGMPv3 general queries" + log_test "IGMPv3 MRC non linear value of 240(x0.1s)" + + RET=3D0 + bridge vlan global set vid 10 dev br0 mcast_snooping 1 mcast_query_respon= se_interval 4800 check_err $? "Could not set mcast_query_response_interval in vlan 10" - log_test "Vlan 10 mcast_query_response_interval option changed to 200" + # 1 is sent immediately, MLDv2 MRC should match with non linear value 0x8= 770 (34672) + # which is 16-bit encoded value of 48000 [units of ms / 48 seconds] + vlmc_check_query mld 2 $swp1 1 1 mrc 0x8770 + check_err $? "Wrong MRC in generated MLDv2 general queries" + log_test "MLDv2 MRC non linear value of 48000(ms)" =20 + bridge vlan global set vid 10 dev br0 mcast_snooping 1 mcast_igmp_version= 2 + bridge vlan global set vid 10 dev br0 mcast_snooping 1 mcast_mld_version 1 + bridge vlan global set vid 10 dev br0 mcast_snooping 1 mcast_startup_quer= y_count 2 bridge vlan global set vid 10 dev br0 mcast_snooping 1 mcast_query_respon= se_interval 1000 } =20 --=20 2.43.0