| Message ID | 1452261737-7475-17-git-send-email-pablo@netfilter.org |
|---|---|
| State | Accepted |
| Delegated to: | Pablo Neira |
| Headers | show |
From: Pablo Neira Ayuso > Sent: 08 January 2016 14:02 > From: Florian Westphal <fw@strlen.de> > > Needed to convert the (64bit) conntrack counters to BE ordering. > ... > 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; That is horrid. On a little-endian system you are byteswapping the data 3 times. Image the code on a cpu that doesn't support misaligned transfers and doesn't have a byteswap instruction. David -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/netfilter/nft_byteorder.c b/net/netfilter/nft_byteorder.c index fde5145..383c171 100644 --- a/net/netfilter/nft_byteorder.c +++ b/net/netfilter/nft_byteorder.c @@ -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;