Commit b709857e authored by Eric Dumazet's avatar Eric Dumazet Committed by Jakub Kicinski
Browse files

ipv6: fix _DEVADD() and _DEVUPD() macros 



ip6_rcv_core() is using:

	__IP6_ADD_STATS(net, idev,
			IPSTATS_MIB_NOECTPKTS +
				(ipv6_get_dsfield(hdr) & INET_ECN_MASK),
			max_t(unsigned short, 1, skb_shinfo(skb)->gso_segs));

This is currently evaluating both expressions twice.

Fix _DEVADD() and _DEVUPD() macros to evaluate their arguments once.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20250319212516.2385451-1-edumazet@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 4a5524a2

include/net/ipv6.h

+7 −4
Original line number Diff line number Diff line
@@ -246,17 +246,20 @@ extern int sysctl_mld_qrv; 
#define _DEVADD(net, statname, mod, idev, field, val)			\

({									\

	struct inet6_dev *_idev = (idev);				\

	unsigned long _field = (field);					\

	unsigned long _val = (val);					\

	if (likely(_idev != NULL))					\

		mod##SNMP_ADD_STATS((_idev)->stats.statname, (field), (val)); \

	mod##SNMP_ADD_STATS((net)->mib.statname##_statistics, (field), (val));\

		mod##SNMP_ADD_STATS((_idev)->stats.statname, _field,  _val); \

	mod##SNMP_ADD_STATS((net)->mib.statname##_statistics, _field, _val);\

})



#define _DEVUPD(net, statname, mod, idev, field, val)			\

({									\

	struct inet6_dev *_idev = (idev);				\

	unsigned long _val = (val);					\

	if (likely(_idev != NULL))					\

		mod##SNMP_UPD_PO_STATS((_idev)->stats.statname, field, (val)); \

	mod##SNMP_UPD_PO_STATS((net)->mib.statname##_statistics, field, (val));\

		mod##SNMP_UPD_PO_STATS((_idev)->stats.statname, field, _val); \

	mod##SNMP_UPD_PO_STATS((net)->mib.statname##_statistics, field, _val);\

})



/* MIBs */