From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AD8FB343D66; Mon, 20 Apr 2026 16:01:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776700913; cv=none; b=A/Ym7Z8k/82mSPO2fUd97IkmQGaZADHHq9/9jyjItwHmVHk9MLB2WDnE89NMdoM0zFPRltRCf7cO0s4xGZCsjHtG6p7ZeM4NwKf83QbNquTpnuLbS6NRj3B5x7O2fZSzA+NNE/vwvvxJ+R1om9IEpKy/EPEArbFgB6z6eYKSJAk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776700913; c=relaxed/simple; bh=N2fEwWuhm9uKCvLHmC5smQ6Z/Y+fWSdwZ6ALPr5C3qY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hbVL4DYodxVV0bZwsbeNhzWDgpxE8/V/fSH4iRPD+0viEsCywPOxugnN/2Si3DyTsT0ph6aYIslnYm4n5mPcdHtbC5+YiSleOM1ArHM/2GhsDo36XAEkMqNvnRZ2iS9Opu8+8bSukqwae2ialAT/fCecSwZzRmpUtKFK77KSphk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=sqH4IoFI; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="sqH4IoFI" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1C5E0C2BCB4; Mon, 20 Apr 2026 16:01:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1776700913; bh=N2fEwWuhm9uKCvLHmC5smQ6Z/Y+fWSdwZ6ALPr5C3qY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sqH4IoFIszHyxNMqEhmNU5BW6tdhumqOabxlW/7HsK5/c4uDL326ot+0M6VIEg6ch cpeUJk/bliSBr6QV4WGEhO5gcoDgRjl/uKgoA9o/2GFXmZlZtROuyvr6R5qR8Uv3vs yx5AER/OpKuya6F9pAHNVsqEiVUPHom+Cv4Cyk3E= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Fernando Fernandez Mancera , Eric Dumazet , Ido Schimmel , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.18 076/198] ipv4: nexthop: avoid duplicate NHA_HW_STATS_ENABLE on nexthop group dump Date: Mon, 20 Apr 2026 17:40:55 +0200 Message-ID: <20260420153938.346429385@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260420153935.605963767@linuxfoundation.org> References: <20260420153935.605963767@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Fernando Fernandez Mancera [ Upstream commit 06aaf04ca815f7a1f17762fd847b7bc14b8833fb ] Currently NHA_HW_STATS_ENABLE is included twice everytime a dump of nexthop group is performed with NHA_OP_FLAG_DUMP_STATS. As all the stats querying were moved to nla_put_nh_group_stats(), leave only that instance of the attribute querying. Fixes: 5072ae00aea4 ("net: nexthop: Expose nexthop group HW stats to user space") Signed-off-by: Fernando Fernandez Mancera Reviewed-by: Eric Dumazet Reviewed-by: Ido Schimmel Link: https://patch.msgid.link/20260402072613.25262-1-fmancera@suse.de Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/ipv4/nexthop.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/ipv4/nexthop.c b/net/ipv4/nexthop.c index 427c201175949..aa53a74ac2389 100644 --- a/net/ipv4/nexthop.c +++ b/net/ipv4/nexthop.c @@ -905,8 +905,7 @@ static int nla_put_nh_group(struct sk_buff *skb, struct nexthop *nh, goto nla_put_failure; if (op_flags & NHA_OP_FLAG_DUMP_STATS && - (nla_put_u32(skb, NHA_HW_STATS_ENABLE, nhg->hw_stats) || - nla_put_nh_group_stats(skb, nh, op_flags))) + nla_put_nh_group_stats(skb, nh, op_flags)) goto nla_put_failure; return 0; -- 2.53.0