* [PATCH 3/3] net: mvpp2: parser fix PPPoE
@ 2023-03-11 7:10 Sven Auhagen
2023-03-15 7:00 ` Jakub Kicinski
2023-03-15 11:53 ` Michal Swiatkowski
0 siblings, 2 replies; 4+ messages in thread
From: Sven Auhagen @ 2023-03-11 7:10 UTC (permalink / raw)
To: netdev; +Cc: mw, linux, kuba, davem, maxime.chevallier
In PPPoE add all IPv4 header option length to the parser
and adjust the L3 and L4 offset accordingly.
Currently the L4 match does not work with PPPoE and
all packets are matched as L3 IP4 OPT.
Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de>
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
index ed8be396428b..9af22f497a40 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
@@ -1607,59 +1607,45 @@ static int mvpp2_prs_vlan_init(struct platform_device *pdev, struct mvpp2 *priv)
static int mvpp2_prs_pppoe_init(struct mvpp2 *priv)
{
struct mvpp2_prs_entry pe;
- int tid;
-
- /* IPv4 over PPPoE with options */
- tid = mvpp2_prs_tcam_first_free(priv, MVPP2_PE_FIRST_FREE_TID,
- MVPP2_PE_LAST_FREE_TID);
- if (tid < 0)
- return tid;
-
- memset(&pe, 0, sizeof(pe));
- mvpp2_prs_tcam_lu_set(&pe, MVPP2_PRS_LU_PPPOE);
- pe.index = tid;
-
- mvpp2_prs_match_etype(&pe, 0, PPP_IP);
-
- mvpp2_prs_sram_next_lu_set(&pe, MVPP2_PRS_LU_IP4);
- mvpp2_prs_sram_ri_update(&pe, MVPP2_PRS_RI_L3_IP4_OPT,
- MVPP2_PRS_RI_L3_PROTO_MASK);
- /* goto ipv4 dest-address (skip eth_type + IP-header-size - 4) */
- mvpp2_prs_sram_shift_set(&pe, MVPP2_ETH_TYPE_LEN +
- sizeof(struct iphdr) - 4,
- MVPP2_PRS_SRAM_OP_SEL_SHIFT_ADD);
- /* Set L3 offset */
- mvpp2_prs_sram_offset_set(&pe, MVPP2_PRS_SRAM_UDF_TYPE_L3,
- MVPP2_ETH_TYPE_LEN,
- MVPP2_PRS_SRAM_OP_SEL_UDF_ADD);
-
- /* Update shadow table and hw entry */
- mvpp2_prs_shadow_set(priv, pe.index, MVPP2_PRS_LU_PPPOE);
- mvpp2_prs_hw_write(priv, &pe);
+ int tid, ihl;
- /* IPv4 over PPPoE without options */
- tid = mvpp2_prs_tcam_first_free(priv, MVPP2_PE_FIRST_FREE_TID,
- MVPP2_PE_LAST_FREE_TID);
- if (tid < 0)
- return tid;
+ /* IPv4 over PPPoE with header length >= 5 */
+ for (ihl = MVPP2_PRS_IPV4_IHL_MIN; ihl <= MVPP2_PRS_IPV4_IHL_MAX; ihl++) {
+ tid = mvpp2_prs_tcam_first_free(priv, MVPP2_PE_FIRST_FREE_TID,
+ MVPP2_PE_LAST_FREE_TID);
+ if (tid < 0)
+ return tid;
- pe.index = tid;
+ memset(&pe, 0, sizeof(pe));
+ mvpp2_prs_tcam_lu_set(&pe, MVPP2_PRS_LU_PPPOE);
+ pe.index = tid;
- mvpp2_prs_tcam_data_byte_set(&pe, MVPP2_ETH_TYPE_LEN,
- MVPP2_PRS_IPV4_HEAD |
- MVPP2_PRS_IPV4_IHL_MIN,
- MVPP2_PRS_IPV4_HEAD_MASK |
- MVPP2_PRS_IPV4_IHL_MASK);
+ mvpp2_prs_match_etype(&pe, 0, PPP_IP);
+ mvpp2_prs_tcam_data_byte_set(&pe, MVPP2_ETH_TYPE_LEN,
+ MVPP2_PRS_IPV4_HEAD | ihl,
+ MVPP2_PRS_IPV4_HEAD_MASK |
+ MVPP2_PRS_IPV4_IHL_MASK);
- /* Clear ri before updating */
- pe.sram[MVPP2_PRS_SRAM_RI_WORD] = 0x0;
- pe.sram[MVPP2_PRS_SRAM_RI_CTRL_WORD] = 0x0;
- mvpp2_prs_sram_ri_update(&pe, MVPP2_PRS_RI_L3_IP4,
- MVPP2_PRS_RI_L3_PROTO_MASK);
+ mvpp2_prs_sram_next_lu_set(&pe, MVPP2_PRS_LU_IP4);
+ mvpp2_prs_sram_ri_update(&pe, MVPP2_PRS_RI_L3_IP4,
+ MVPP2_PRS_RI_L3_PROTO_MASK);
+ /* goto ipv4 dst-address (skip eth_type + IP-header-size - 4) */
+ mvpp2_prs_sram_shift_set(&pe, MVPP2_ETH_TYPE_LEN +
+ sizeof(struct iphdr) - 4,
+ MVPP2_PRS_SRAM_OP_SEL_SHIFT_ADD);
+ /* Set L3 offset */
+ mvpp2_prs_sram_offset_set(&pe, MVPP2_PRS_SRAM_UDF_TYPE_L3,
+ MVPP2_ETH_TYPE_LEN,
+ MVPP2_PRS_SRAM_OP_SEL_UDF_ADD);
+ /* Set L4 offset */
+ mvpp2_prs_sram_offset_set(&pe, MVPP2_PRS_SRAM_UDF_TYPE_L4,
+ MVPP2_ETH_TYPE_LEN + (ihl * 4),
+ MVPP2_PRS_SRAM_OP_SEL_UDF_ADD);
- /* Update shadow table and hw entry */
- mvpp2_prs_shadow_set(priv, pe.index, MVPP2_PRS_LU_PPPOE);
- mvpp2_prs_hw_write(priv, &pe);
+ /* Update shadow table and hw entry */
+ mvpp2_prs_shadow_set(priv, pe.index, MVPP2_PRS_LU_PPPOE);
+ mvpp2_prs_hw_write(priv, &pe);
+ }
/* IPv6 over PPPoE */
tid = mvpp2_prs_tcam_first_free(priv, MVPP2_PE_FIRST_FREE_TID,
--
2.33.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 3/3] net: mvpp2: parser fix PPPoE
2023-03-11 7:10 [PATCH 3/3] net: mvpp2: parser fix PPPoE Sven Auhagen
@ 2023-03-15 7:00 ` Jakub Kicinski
2023-03-15 7:54 ` Sven Auhagen
2023-03-15 11:53 ` Michal Swiatkowski
1 sibling, 1 reply; 4+ messages in thread
From: Jakub Kicinski @ 2023-03-15 7:00 UTC (permalink / raw)
To: Sven Auhagen; +Cc: netdev, mw, linux, davem, maxime.chevallier
On Sat, 11 Mar 2023 08:10:24 +0100 Sven Auhagen wrote:
> In PPPoE add all IPv4 header option length to the parser
> and adjust the L3 and L4 offset accordingly.
> Currently the L4 match does not work with PPPoE and
> all packets are matched as L3 IP4 OPT.
Also needs a Fixes tag
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 3/3] net: mvpp2: parser fix PPPoE
2023-03-15 7:00 ` Jakub Kicinski
@ 2023-03-15 7:54 ` Sven Auhagen
0 siblings, 0 replies; 4+ messages in thread
From: Sven Auhagen @ 2023-03-15 7:54 UTC (permalink / raw)
To: Jakub Kicinski; +Cc: netdev, mw, linux, davem, maxime.chevallier
On Wed, Mar 15, 2023 at 12:00:43AM -0700, Jakub Kicinski wrote:
> On Sat, 11 Mar 2023 08:10:24 +0100 Sven Auhagen wrote:
> > In PPPoE add all IPv4 header option length to the parser
> > and adjust the L3 and L4 offset accordingly.
> > Currently the L4 match does not work with PPPoE and
> > all packets are matched as L3 IP4 OPT.
>
> Also needs a Fixes tag
Yes, I will add it in v2.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 3/3] net: mvpp2: parser fix PPPoE
2023-03-11 7:10 [PATCH 3/3] net: mvpp2: parser fix PPPoE Sven Auhagen
2023-03-15 7:00 ` Jakub Kicinski
@ 2023-03-15 11:53 ` Michal Swiatkowski
1 sibling, 0 replies; 4+ messages in thread
From: Michal Swiatkowski @ 2023-03-15 11:53 UTC (permalink / raw)
To: Sven Auhagen; +Cc: netdev, mw, linux, kuba, davem, maxime.chevallier
On Sat, Mar 11, 2023 at 08:10:24AM +0100, Sven Auhagen wrote:
> In PPPoE add all IPv4 header option length to the parser
> and adjust the L3 and L4 offset accordingly.
> Currently the L4 match does not work with PPPoE and
> all packets are matched as L3 IP4 OPT.
>
> Signed-off-by: Sven Auhagen <sven.auhagen@voleatech.de>
>
> diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
> index ed8be396428b..9af22f497a40 100644
> --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
> +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c
> @@ -1607,59 +1607,45 @@ static int mvpp2_prs_vlan_init(struct platform_device *pdev, struct mvpp2 *priv)
> static int mvpp2_prs_pppoe_init(struct mvpp2 *priv)
> {
> struct mvpp2_prs_entry pe;
> - int tid;
> -
> - /* IPv4 over PPPoE with options */
> - tid = mvpp2_prs_tcam_first_free(priv, MVPP2_PE_FIRST_FREE_TID,
> - MVPP2_PE_LAST_FREE_TID);
> - if (tid < 0)
> - return tid;
> -
> - memset(&pe, 0, sizeof(pe));
> - mvpp2_prs_tcam_lu_set(&pe, MVPP2_PRS_LU_PPPOE);
> - pe.index = tid;
> -
> - mvpp2_prs_match_etype(&pe, 0, PPP_IP);
> -
> - mvpp2_prs_sram_next_lu_set(&pe, MVPP2_PRS_LU_IP4);
> - mvpp2_prs_sram_ri_update(&pe, MVPP2_PRS_RI_L3_IP4_OPT,
> - MVPP2_PRS_RI_L3_PROTO_MASK);
> - /* goto ipv4 dest-address (skip eth_type + IP-header-size - 4) */
> - mvpp2_prs_sram_shift_set(&pe, MVPP2_ETH_TYPE_LEN +
> - sizeof(struct iphdr) - 4,
> - MVPP2_PRS_SRAM_OP_SEL_SHIFT_ADD);
> - /* Set L3 offset */
> - mvpp2_prs_sram_offset_set(&pe, MVPP2_PRS_SRAM_UDF_TYPE_L3,
> - MVPP2_ETH_TYPE_LEN,
> - MVPP2_PRS_SRAM_OP_SEL_UDF_ADD);
> -
> - /* Update shadow table and hw entry */
> - mvpp2_prs_shadow_set(priv, pe.index, MVPP2_PRS_LU_PPPOE);
> - mvpp2_prs_hw_write(priv, &pe);
> + int tid, ihl;
>
> - /* IPv4 over PPPoE without options */
> - tid = mvpp2_prs_tcam_first_free(priv, MVPP2_PE_FIRST_FREE_TID,
> - MVPP2_PE_LAST_FREE_TID);
> - if (tid < 0)
> - return tid;
> + /* IPv4 over PPPoE with header length >= 5 */
> + for (ihl = MVPP2_PRS_IPV4_IHL_MIN; ihl <= MVPP2_PRS_IPV4_IHL_MAX; ihl++) {
> + tid = mvpp2_prs_tcam_first_free(priv, MVPP2_PE_FIRST_FREE_TID,
> + MVPP2_PE_LAST_FREE_TID);
pe can be defined here:
struct mvpp2_prs_entry pe = {};
and now memset can be ommited.
> + if (tid < 0)
> + return tid;
>
> - pe.index = tid;
> + memset(&pe, 0, sizeof(pe));
> + mvpp2_prs_tcam_lu_set(&pe, MVPP2_PRS_LU_PPPOE);
> + pe.index = tid;
[...]
>
> --
> 2.33.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-03-15 11:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-11 7:10 [PATCH 3/3] net: mvpp2: parser fix PPPoE Sven Auhagen
2023-03-15 7:00 ` Jakub Kicinski
2023-03-15 7:54 ` Sven Auhagen
2023-03-15 11:53 ` Michal Swiatkowski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.