lkml.org 
[lkml]   [2018]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.18 051/350] nfp: flower: fix pedit set actions for multiple partial masks
    Date
    4.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>

    [ Upstream commit 8913806f166e47c6b3fe8253e9cfb9caabe64341 ]

    Previously we did not correctly change headers when using multiple
    pedit actions with partial masks. We now take this into account and
    no longer just commit the last pedit action.

    Fixes: c0b1bd9a8b8a ("nfp: add set ipv4 header action flower offload")
    Signed-off-by: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
    Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/netronome/nfp/flower/action.c | 15 +++++++++------
    1 file changed, 9 insertions(+), 6 deletions(-)

    --- a/drivers/net/ethernet/netronome/nfp/flower/action.c
    +++ b/drivers/net/ethernet/netronome/nfp/flower/action.c
    @@ -314,12 +314,14 @@ nfp_fl_set_ip4(const struct tc_action *a

    switch (off) {
    case offsetof(struct iphdr, daddr):
    - set_ip_addr->ipv4_dst_mask = mask;
    - set_ip_addr->ipv4_dst = exact;
    + set_ip_addr->ipv4_dst_mask |= mask;
    + set_ip_addr->ipv4_dst &= ~mask;
    + set_ip_addr->ipv4_dst |= exact & mask;
    break;
    case offsetof(struct iphdr, saddr):
    - set_ip_addr->ipv4_src_mask = mask;
    - set_ip_addr->ipv4_src = exact;
    + set_ip_addr->ipv4_src_mask |= mask;
    + set_ip_addr->ipv4_src &= ~mask;
    + set_ip_addr->ipv4_src |= exact & mask;
    break;
    default:
    return -EOPNOTSUPP;
    @@ -336,8 +338,9 @@ static void
    nfp_fl_set_ip6_helper(int opcode_tag, int idx, __be32 exact, __be32 mask,
    struct nfp_fl_set_ipv6_addr *ip6)
    {
    - ip6->ipv6[idx % 4].mask = mask;
    - ip6->ipv6[idx % 4].exact = exact;
    + ip6->ipv6[idx % 4].mask |= mask;
    + ip6->ipv6[idx % 4].exact &= ~mask;
    + ip6->ipv6[idx % 4].exact |= exact & mask;

    ip6->reserved = cpu_to_be16(0);
    ip6->head.jump_id = opcode_tag;

    \
     
     \ /
      Last update: 2018-11-12 00:39    [W:4.039 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site