nftables: byteorder: avoid uneeded le/be conversion steps
Subsystems (2)
Florian Westphal
maintainerPATCH 1/1 nftables: byteorder: avoid uneeded le/be conversion steps
David points out that we to three le/be conversions instead of just one. Doesn't matter on x86_64 w. gcc, but other architectures might be less lucky.
Since it also simplifies code just follow his advice.
Fixes c0f3275f5cb ("nftables: byteorder: provide le/be 64 bit conversion helper")
Suggested-by David Laight <[email protected]>
Signed-off-by Florian Westphal <[email protected]>
---
NB: This still has the 'potential' cast issue David mentioned but since other users in the tree do the same thing I think its okay (if not, someone else needs to fix get/put unaligned api, I'm not familiar with requirements).
net/netfilter/nft_byteorder.c +2 -4
@@ -46,16 +46,14 @@ static void nft_byteorder_eval(const struct nft_expr *expr,switch (priv->op) {case NFT_BYTEORDER_NTOH :for (i =0 ; i < priv->len /8 ; i++) { - src64 =get_unaligned_be64 (&src[i]); - src64 =be64_to_cpu ((__force __be64 )src64); + src64 =get_unaligned ((u64 *)&src[i]);put_unaligned_be64 (src64, &dst[i]); }break ;case NFT_BYTEORDER_HTON :for (i =0 ; i < priv->len /8 ; i++) { src64 =get_unaligned_be64 (&src[i]); - src64 = (__force u64 )cpu_to_be64 (src64); -put_unaligned_be64 (src64, &dst[i]); +put_unaligned (src64, (u64 *)&dst[i]); }break ; }
Signature · 1 line
2.4.10
Quoted 5 lines · Florian Westphal
David points out that we to three le/be conversions instead of just one. Doesn't matter on
x86_64w. gcc, but other architectures might be less lucky.Since it also simplifies code just follow his advice.
Applied, thanks Florian.