nftables: byteorder: provide 64bit le/be conversion
Subsystems (2)
Florian Westphal
maintainerPATCH 1/1 nftables: byteorder: provide 64bit le/be conversion
Needed to convert the (64bit) conntrack counters to BE ordering.
Signed-off-by Florian Westphal <[email protected]>
---
Also needs a small nft change, will submit it soon as part of ct counter support series.
net/netfilter/nft_byteorder.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
net/netfilter/nft_byteorder.c +23 -0
@@ -8,6 +8,7 @@* Development of this code funded by Astaro AG (http://www.astaro.com/) */ +#include <asm/unaligned.h> #include <linux/kernel.h> #include <linux/init.h> #include <linux/module.h>
@@ -39,6 +40,27 @@ static void nft_byteorder_eval(const struct nft_expr *expr, d = (void *)dst;switch (priv->size) { +case 8 : { +u64 src64; + +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); +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]); + } +break ; + } +break ; + }case 4 :switch (priv->op) {case NFT_BYTEORDER_NTOH :
@@ -101,6 +123,7 @@ static int nft_byteorder_init(const struct nft_ctx *ctx,switch (priv->size) {case 2 :case 4 : +case 8 :break ;default :return -EINVAL ;
Signature · 1 line
2.4.10
Quoted 1 line · Florian Westphal
Needed to convert the (64bit) conntrack counters to BE ordering.
Applied, thanks Florian.