[PATCH net] net: mvpp2: prs: fix PPPoE with ipv6 packet parse

[PATCH net] net: mvpp2: prs: fix PPPoE with ipv6 packet parse

[stefanc]

From: Stefan Chulski <stefanc@marvell.com>

Current PPPoE+IPv6 entry is jumping to 'next-hdr'
field and not to 'DIP' field as done for IPv4.

Fixes: db9d7d36eecc ("net: mvpp2: Split the PPv2 driver to a dedicated directory")
Reported-by: Liron Himi <lironh@marvell.com>
Signed-off-by: Stefan Chulski <stefanc@marvell.com>
---
 drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
index b9e5b08..1a272c2 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
@@ -1655,8 +1655,9 @@ static int mvpp2_prs_pppoe_init(struct mvpp2 *priv)
 	mvpp2_prs_sram_next_lu_set(&pe, MVPP2_PRS_LU_IP6);
 	mvpp2_prs_sram_ri_update(&pe, MVPP2_PRS_RI_L3_IP6,
 				 MVPP2_PRS_RI_L3_PROTO_MASK);
-	/* Skip eth_type + 4 bytes of IPv6 header */
-	mvpp2_prs_sram_shift_set(&pe, MVPP2_ETH_TYPE_LEN + 4,
+	/* Jump to DIP of IPV6 header */
+	mvpp2_prs_sram_shift_set(&pe, MVPP2_ETH_TYPE_LEN + 8 +
+				 MVPP2_MAX_L3_ADDR_SIZE,
 				 MVPP2_PRS_SRAM_OP_SEL_SHIFT_ADD);
 	/* Set L3 offset */
 	mvpp2_prs_sram_offset_set(&pe, MVPP2_PRS_SRAM_UDF_TYPE_L3,
-- 
1.9.1

Re: [PATCH net] net: mvpp2: prs: fix PPPoE with ipv6 packet parse

[Antoine Tenart]

Hi Stefan,

Quoting stefanc@marvell.com (2020-12-17 18:23:11)
> From: Stefan Chulski <stefanc@marvell.com>
> 
> Current PPPoE+IPv6 entry is jumping to 'next-hdr'
> field and not to 'DIP' field as done for IPv4.
> 
> Fixes: db9d7d36eecc ("net: mvpp2: Split the PPv2 driver to a dedicated directory")

That's not the commit introducing the issue. You can use
`git log --follow` to go further back (or directly pointing to the old
mvpp2.c file).

Thanks!
Antoine

> Reported-by: Liron Himi <lironh@marvell.com>
> Signed-off-by: Stefan Chulski <stefanc@marvell.com>
> ---
>  drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
> index b9e5b08..1a272c2 100644
> --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
> +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
> @@ -1655,8 +1655,9 @@ static int mvpp2_prs_pppoe_init(struct mvpp2 *priv)
>         mvpp2_prs_sram_next_lu_set(&pe, MVPP2_PRS_LU_IP6);
>         mvpp2_prs_sram_ri_update(&pe, MVPP2_PRS_RI_L3_IP6,
>                                  MVPP2_PRS_RI_L3_PROTO_MASK);
> -       /* Skip eth_type + 4 bytes of IPv6 header */
> -       mvpp2_prs_sram_shift_set(&pe, MVPP2_ETH_TYPE_LEN + 4,
> +       /* Jump to DIP of IPV6 header */
> +       mvpp2_prs_sram_shift_set(&pe, MVPP2_ETH_TYPE_LEN + 8 +
> +                                MVPP2_MAX_L3_ADDR_SIZE,
>                                  MVPP2_PRS_SRAM_OP_SEL_SHIFT_ADD);
>         /* Set L3 offset */
>         mvpp2_prs_sram_offset_set(&pe, MVPP2_PRS_SRAM_UDF_TYPE_L3,
> -- 
> 1.9.1
> 

RE: [EXT] Re: [PATCH net] net: mvpp2: prs: fix PPPoE with ipv6 packet parse

[Stefan Chulski]

> External Email
> 
> ----------------------------------------------------------------------
> Hi Stefan,
> 
> Quoting stefanc@marvell.com (2020-12-17 18:23:11)
> > From: Stefan Chulski <stefanc@marvell.com>
> >
> > Current PPPoE+IPv6 entry is jumping to 'next-hdr'
> > field and not to 'DIP' field as done for IPv4.
> >
> > Fixes: db9d7d36eecc ("net: mvpp2: Split the PPv2 driver to a dedicated
> > directory")
> 
> That's not the commit introducing the issue. You can use `git log --follow` to go
> further back (or directly pointing to the old mvpp2.c file).
> 
> Thanks!
> Antoine

Ok. Probably this issue exist since mvpp2.c driver were pushed to mainline. 

Thanks,
Stefan.