lkml.org 
[lkml]   [2021]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 137/221] nfp: flower: add ipv6 bit to pre_tunnel control message
    Date
    From: Louis Peens <louis.peens@corigine.com>

    [ Upstream commit 5c4f5e19d6a8e159127b9d653bb67e0dc7a28047 ]

    Differentiate between ipv4 and ipv6 flows when configuring the pre_tunnel
    table to prevent them trampling each other in the table.

    Fixes: 783461604f7e ("nfp: flower: update flow merge code to support IPv6 tunnels")
    Signed-off-by: Louis Peens <louis.peens@corigine.com>
    Signed-off-by: Simon Horman <simon.horman@netronome.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../ethernet/netronome/nfp/flower/tunnel_conf.c | 15 +++++++++++++--
    1 file changed, 13 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
    index 7248d248f604..d19c02e99114 100644
    --- a/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
    +++ b/drivers/net/ethernet/netronome/nfp/flower/tunnel_conf.c
    @@ -16,8 +16,9 @@
    #define NFP_FL_MAX_ROUTES 32

    #define NFP_TUN_PRE_TUN_RULE_LIMIT 32
    -#define NFP_TUN_PRE_TUN_RULE_DEL 0x1
    -#define NFP_TUN_PRE_TUN_IDX_BIT 0x8
    +#define NFP_TUN_PRE_TUN_RULE_DEL BIT(0)
    +#define NFP_TUN_PRE_TUN_IDX_BIT BIT(3)
    +#define NFP_TUN_PRE_TUN_IPV6_BIT BIT(7)

    /**
    * struct nfp_tun_pre_run_rule - rule matched before decap
    @@ -1268,6 +1269,7 @@ int nfp_flower_xmit_pre_tun_flow(struct nfp_app *app,
    {
    struct nfp_flower_priv *app_priv = app->priv;
    struct nfp_tun_offloaded_mac *mac_entry;
    + struct nfp_flower_meta_tci *key_meta;
    struct nfp_tun_pre_tun_rule payload;
    struct net_device *internal_dev;
    int err;
    @@ -1290,6 +1292,15 @@ int nfp_flower_xmit_pre_tun_flow(struct nfp_app *app,
    if (!mac_entry)
    return -ENOENT;

    + /* Set/clear IPV6 bit. cpu_to_be16() swap will lead to MSB being
    + * set/clear for port_idx.
    + */
    + key_meta = (struct nfp_flower_meta_tci *)flow->unmasked_data;
    + if (key_meta->nfp_flow_key_layer & NFP_FLOWER_LAYER_IPV6)
    + mac_entry->index |= NFP_TUN_PRE_TUN_IPV6_BIT;
    + else
    + mac_entry->index &= ~NFP_TUN_PRE_TUN_IPV6_BIT;
    +
    payload.port_idx = cpu_to_be16(mac_entry->index);

    /* Copy mac id and vlan to flow - dev may not exist at delete time. */
    --
    2.30.1


    \
     
     \ /
      Last update: 2021-03-29 10:38    [W:4.863 / U:0.372 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site