On Thu, Oct 24, 2019 at 06:35:32PM +0800, wenxu@xxxxxxxxx wrote:
> From: wenxu <wenxu@xxxxxxxxx>
>
> Move mode validate common code to nft_tunnel_mode_validate
> function.
>
> Signed-off-by: wenxu <wenxu@xxxxxxxxx>
> ---
> net/netfilter/nft_tunnel.c | 25 +++++++++++++++----------
> 1 file changed, 15 insertions(+), 10 deletions(-)
>
> diff --git a/net/netfilter/nft_tunnel.c b/net/netfilter/nft_tunnel.c
> index 3d4c2ae..78b6e8f 100644
> --- a/net/netfilter/nft_tunnel.c
> +++ b/net/netfilter/nft_tunnel.c
> @@ -18,6 +18,19 @@ struct nft_tunnel {
> enum nft_tunnel_mode mode:8;
> };
>
> +static bool nft_tunnel_mode_validate(enum nft_tunnel_mode priv_mode,
> + u8 tun_mode)
> +{
> + if (priv_mode == NFT_TUNNEL_MODE_NONE ||
> + (priv_mode == NFT_TUNNEL_MODE_RX &&
> + !(tun_mode & IP_TUNNEL_INFO_TX)) ||
> + (priv_mode == NFT_TUNNEL_MODE_TX &&
> + (tun_mode & IP_TUNNEL_INFO_TX)))
> + return true;
> +
> + return false;
> +}
> +
> static void nft_tunnel_get_eval(const struct nft_expr *expr,
> struct nft_regs *regs,
> const struct nft_pktinfo *pkt)
> @@ -34,11 +47,7 @@ static void nft_tunnel_get_eval(const struct nft_expr *expr,
> nft_reg_store8(dest, false);
> return;
> }
> - if (priv->mode == NFT_TUNNEL_MODE_NONE ||
> - (priv->mode == NFT_TUNNEL_MODE_RX &&
> - !(tun_info->mode & IP_TUNNEL_INFO_TX)) ||
> - (priv->mode == NFT_TUNNEL_MODE_TX &&
> - (tun_info->mode & IP_TUNNEL_INFO_TX)))
> + if (nft_tunnel_mode_validate(priv->mode, tun_info->mode))
> nft_reg_store8(dest, true);
> else
> nft_reg_store8(dest, false);
Probably simplify this?
nft_reg_store8(dest, nft_tunnel_mode_match(priv->mode, tun_info->mode));
The idea is that nft_tunnel_mode_match() returns u8 to store 0 / 1 on
the register.
> @@ -48,11 +57,7 @@ static void nft_tunnel_get_eval(const struct nft_expr *expr,
> regs->verdict.code = NFT_BREAK;
> return;
> }
> - if (priv->mode == NFT_TUNNEL_MODE_NONE ||
> - (priv->mode == NFT_TUNNEL_MODE_RX &&
> - !(tun_info->mode & IP_TUNNEL_INFO_TX)) ||
> - (priv->mode == NFT_TUNNEL_MODE_TX &&
> - (tun_info->mode & IP_TUNNEL_INFO_TX)))
> + if (nft_tunnel_mode_validate(priv->mode, tun_info->mode))
> *dest = ntohl(tunnel_id_to_key32(tun_info->key.tun_id));
> else
> regs->verdict.code = NFT_BREAK;
> --
> 1.8.3.1
>
