From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (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 601AD1FD4 for ; Fri, 1 May 2026 17:31:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777656718; cv=none; b=So4SpsLWReDE9z6trytbjqz3o2zOyfqF4NCTqmQPBOHcdiE2DUyxir3YpbBuyOGyd/DTgw9mN/M6EviTySqAhHogXbO4+ZAHDdvjlQaQHXiPdhl25G9VrmEJ75WKrgahpjMC/1hM+oE7owWUKy0NPv2ux9EWFk1XqUDBQHp7PAk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777656718; c=relaxed/simple; bh=PDn8j0lrnxkTWFi/Ss5XFw7DFZtI8b/CvWn3vrzRAiw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eWaw3dGLD3ghC3DLzztlXl/jO1/t/U4DVoQswBd4YNXpaBgtzt7uzNiQdWx4SyEaI6CptfwJ05hF3cHC8N6iUKxW8Iun/3kkbZ0PGlIkYe+EmL3BqJmT980CiOifIZSok6pERDFVciKv7hqJlseYxFCIXbIoB2mUSzMVUWrsPek= 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=lSs2Ssgi; arc=none smtp.client-ip=209.85.216.44 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="lSs2Ssgi" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-35d90833cacso1834793a91.2 for ; Fri, 01 May 2026 10:31:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777656717; x=1778261517; 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=LslMTLSTH+cOBfpp7e2vjMYbfCy9riwOyI9tt0Uj2os=; b=lSs2SsgiY6CRUk4lGbfl4fvv4ydmkW8XFXq+pkbh0NZVYuU6TblA4n1gZbtZmSdXHt TnPJbiLm9vn3TugoMk60MXccE9GbYX3exAxfIQBVnaMazWUSkxkj6GETfjHM95n6PhWA 9sroLoqcvBeFkutTCbE4QfCpKCUCOg/2Y1565NcKnL1Ev05PiOb3MPCK6w+t73QJrsvc uhJw9Akxgsw9etCXCBG5tdSNLKITnHG/asNQudqCNCnri1CMgkAiza7nIyZo7E2Nw0T/ UaJNuSADswhxeZq7fw0UGXxtqmLOTxjILoupzGLVvSZkr2hO0VpX26YPrmbAmWfd2cUX +zZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777656717; x=1778261517; 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=LslMTLSTH+cOBfpp7e2vjMYbfCy9riwOyI9tt0Uj2os=; b=gu7vVW/EqOS6M/qAD+s6/VIxdDkp6CAVz0vJVBGjEt8Ik1LnIonRtPRkxh309nnrvX d7bzOlXGdI1KHX7Fo8Nu9kDkcEqJFOdYb3SJo75XmI4Beu7OLVG2tgmZLUuk/PCfvyzj fFITbSP2fU8nmGQy+hhvpyuCDwsbtCdqLTuMwt0v3cCiQIaw8KOeUzcqfvUKS9ijt6fY pKHYigWgeMM043ShicwwktTHvZfMUzwTGjWB34AE3lXlGm0M59MiMf5w+swnjaXUas3N VZJEbaECCJ1bn1Rc2E2P+uaLJ2fwW+FENTV+46rERU3Yeiz1SDSFC+TEAPz5dxXMO83c y56A== X-Forwarded-Encrypted: i=1; AFNElJ9PXNDSGNBfayF6T2m/RVNV0pGMZ1ZqE1qglENQFNOhr7hPEoxEDA5bjfgfZQUYe3Q9di86+gGGBaM+iFo=@vger.kernel.org X-Gm-Message-State: AOJu0Ywbky+Bqm3rpMc3RBxWlJN305DNWIMsLYHSjVDOszUn9uCxxC+3 h/n9YT7NruYWjy0WJuuu15F5dJttakirRJvwExjSteMHSfhVQDTjd7Qq X-Gm-Gg: AeBDievIDSVURLHqsGGRkEPL4/oACiedXS44O+qcHJABWErHXyQ11bYRKOvvJdvVOxR 0F7xkakPupCuASd3+CnJF0qevdf1LKQTq85lJrt1vW2mX15pXXdzpHncUIiiqZ2QC6ssClrCf+X ZBolvLn90pAvuBVudMbLfFCIWrVHTv+MuOMYrKZjgEWmYOf//shJ0UuU+E4LudlJCWJSG0sxNDT t31fCg/v8ZNwQAqvDng7UqteqyDvOv1ha/4RZTdl2c0/oUxB161+SpWXol/qs0p3R1VMdFDmdHi Qx1d11YWx8djFaSx+VlIdljMfhBGMnoJKnnD16gzJAmZWAtrkcp/K2mEe4uy5JHN8M4/jmM3aHp DluXOfSi06QZ5oGDh4PUOclke4MphbycQRnD6yxMj+bFljPQycHJEjYjBflNAccH5P7/H1itKd5 9G0fuKbtddROeKJ7R3LPxFJ5JPb9n55BOfYPKEnuKlTNTKZ3ze5A== X-Received: by 2002:a17:90b:5707:b0:364:a173:2d61 with SMTP id 98e67ed59e1d1-3650cd70c41mr143017a91.11.1777656716795; Fri, 01 May 2026 10:31:56 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 May 2026 10:31:56 -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 2/5] ipv6: mld: rename mldv2_mrc() and add mldv2_qqi() Date: Fri, 1 May 2026 17:31:26 +0000 Message-ID: <20260501173130.3486-3-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 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: 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) -#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) #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