From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 3462B309EEB for ; Fri, 1 May 2026 17:31:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777656711; cv=none; b=tCRvHEESOkyu6FsEDAHBoI/v5hUUUQqocxhiJh6l+OYC+V7mhd0OGlPbaQArM+a8SGrN+RODkdZCKLAS2FcOFysIEiZkxW+QEsjM0cYMqNlTn9krmPf+nmM7kikSNCfrn7iAVBEV5K5ac0z+D0AQ0jKgruNbjjvR6XdM6KknLdk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777656711; c=relaxed/simple; bh=OIVGLHkE0+zv8tPvOlRxlxnAchQfUFIaCtRMGLN9J8Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r3NZMr7izAoU1YJFdomq1tfL2IwDHCtXaH/sA+0F1tDHoNXzMh4SMwRenshfYpvn4U2MdF/Tc0ApvfOTH8m6XLn4MJgZBKKQUJ4hJsKRUPniDqBB7omBFKN47RW+Xhf4yadVvX2h0WwiKqMZM0RFmJ5hNQ4F9fzvVVmiCZ/5rgc= 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=h43qFyYc; arc=none smtp.client-ip=209.85.216.54 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="h43qFyYc" Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-35e576110adso1570352a91.0 for ; Fri, 01 May 2026 10:31:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777656709; x=1778261509; 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=YWCZJ9utsVn2aH4mDSbQniFeJPJsfUBS8uLBgw2m2To=; b=h43qFyYcKZwo1MSgMOkH/3ISiYG2BTyPOYOgSmNLinPpNpZOOV+Fzc0UMd1bMyA/RW jO53Vd7sQADeyi+JI9runBIN38BhU315ljAFiNtrUkW9DBydqFIoapW5ehLahLttJo/7 cqAr8WioNnP4Nc06CuDzilel7Vpi4ZQVHNV/rXtt7s+d09Bn9JopNwxv+DKECN8KTeZC sxw9cSoozlTNQRqCQTAjNllQnFS+tKxMxcaxs3t80Yq1WdBE+pDzJ9Y9k3Cz5TXQiYVx xpW+v47dEF8a4XS+cXDcEw7SzUb3qnfejkadFNqT1XzL/7ooyiS5v16nwxUs1usdORdE Amag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777656709; x=1778261509; 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=YWCZJ9utsVn2aH4mDSbQniFeJPJsfUBS8uLBgw2m2To=; b=PqCjrJ38yONuGUEa5fPSzsmSPeS6STOCaqiAcKUoZV0o1Fr4MG0gm4GXkNDj5hMzgj kEuF1bb3c40G4jMQweGsoSc37NT2okzP0G8NF8J4ZIcA9gVo6/M10XCItfe/v3aXdyg0 3idwLFo8u0o40KB/FjdLz8ViUIy63GMRhwCvA6DCwBhliXovLwQfQiVko7ytUTnfrXCZ z8jVS3yZW/KwgHh61P9b2WJOMJiR1Gvys/OZkDFqY3V87UPTKCKBv2sWRBt/VZUiKROX EL4ANWfwtVkG7gRSVdZpogYQVl6KTyUqWrbeJoXszPAxseZLwL3kltzGzxYEfAhn9fdc 4+XQ== X-Forwarded-Encrypted: i=1; AFNElJ/ZXBP0oHBbHT90erLAHfuNAUP6tLfkESKaOctrliGX3k4TkpFdz/KpjGMIwgSG2l1n2eCvmWFWmnsrFqQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxlR/453/1FVXt5UF9Y56job5ZD5fsWCxRJDEsBedWMiDKIGXPK 5BbDYrWPi6GzjcX53d/F5i8uG7LmxDePKyfWUxcQ/MWHdkZJfX/vymz0 X-Gm-Gg: AeBDiet0z++1yT/1G3aEyCVAj2Tll3xtj+gnsTml65qe1ZQNj7xWv8Nu8GAr87wIIe0 ckNtXqWzcbYULOCr2AAcHAoOVHiRhw0gm+PpnQ+vLKe8xxau6prUk+DEgT1363DuLeAwRpnn422 0xXZftsh8bb1q+yxzP7r9VSj+WObbrbTvaTW4zknnO68B3XmOyKLkSGoHvP1AgkTHIxWzTDStJl 8vnlXxri8Qvzrs0VKD5YpKJmSqyzpEsqBbdXB+E+T5YaUTiQBC2E0m/8isH/tRLvYnHiQqhyD/M vgTMHyZPu0ZaIZETIVYuy0mnCI9lWXMA4mR/p8lBW3ueNHYcAL3l4zUS59tKaT8L0jm6bxKZxZY NIFMhI73aaMuaQWdIKNUU7qrV2zrTNbxTMcrAE3FjFNhv4RMXwIGXD6GVKIWosa8ZMRm87um4Jm j9Ga4WuAZIRRlYmnKJvmHKb+qcX1OHPccj5q/9xs/uDIOyEHsEgw== X-Received: by 2002:a17:90b:498c:b0:35f:b9f1:fded with SMTP id 98e67ed59e1d1-3650c4f44f4mr293791a91.12.1777656709241; Fri, 01 May 2026 10:31:49 -0700 (PDT) Received: from DESKTOP-82PPU4A.localdomain ([202.8.116.84]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-364ebec73aasm2908906a91.2.2026.05.01.10.31.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 May 2026 10:31:48 -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 v5 1/5] ipv4: igmp: get rid of IGMPV3_{QQIC,MRC} and simplify calculation Date: Fri, 1 May 2026 17:31:25 +0000 Message-ID: <20260501173130.3486-2-royujjal@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260501173130.3486-1-royujjal@gmail.com> References: <20260501173130.3486-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: 8bit 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: 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; }; +/* RFC3376, relevant sections: + * - 4.1.1. Maximum Response Code + * - 4.1.7. QQIC (Querier's Query Interval Code) + * + * For both MRC and QQIC, values >= 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)>=32 ? (value) : ((1<<(nb))-1) & (value)) -#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 = (mant | 0x10) << (exp + 3) + * QQI = (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 = IGMPV3_FP_EXP(code); + mc_man = 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); +} 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; max_delay = 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 = IGMPV3_MRC(ih3->code)*(HZ/IGMP_TIMER_SCALE); + max_delay = igmpv3_mrt(ih3) * (HZ / IGMP_TIMER_SCALE); if (!max_delay) max_delay = 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 = igmpv3_query_hdr(skb); } - max_delay = IGMPV3_MRC(ih3->code)*(HZ/IGMP_TIMER_SCALE); + max_delay = igmpv3_mrt(ih3) * (HZ / IGMP_TIMER_SCALE); if (!max_delay) max_delay = 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 = ih3->qrv ?: READ_ONCE(net->ipv4.sysctl_igmp_qrv); - in_dev->mr_qi = IGMPV3_QQIC(ih3->qqic)*HZ ?: IGMP_QUERY_INTERVAL; + in_dev->mr_qi = igmpv3_qqi(ih3) * HZ ? : IGMP_QUERY_INTERVAL; /* RFC3376, 8.3. Query Response Interval: * The number of seconds represented by the [Query Response -- 2.43.0