[{"id":1774723,"web_url":"http://patchwork.ozlabs.org/comment/1774723/","msgid":"<20170925131045.GG19364@kwain>","list_archive_url":null,"date":"2017-09-25T13:10:45","subject":"Re: [PATCH net v2 1/3] net: mvpp2: fix parsing fragmentation\n\tdetection","submitter":{"id":61603,"url":"http://patchwork.ozlabs.org/api/people/61603/","name":"Antoine Tenart","email":"antoine.tenart@free-electrons.com"},"content":"On Mon, Sep 25, 2017 at 02:59:46PM +0200, Antoine Tenart wrote:\n> From: Stefan Chulski \n> \n> Parsing fragmentation detection failed due to wrong configured\n> parser TCAM entry's. Some traffic was marked as fragmented in RX\n> descriptor, even it wasn't IP fragmented. The hardware also failed to\n> calculate checksums which lead to use software checksum and caused\n> performance degradation.\n> \n> Fixes: 3f518509dedc (\"ethernet: Add new driver for Marvell Armada 375 network unit\")\n\nWith,\n\nSigned-off-by: Stefan Chulski \n\nI don't know why this SoB was removed but it should be added back.\n\nAntoine\n\n> Signed-off-by: Antoine Tenart \n> ---\n> drivers/net/ethernet/marvell/mvpp2.c | 20 ++++++++++++++------\n> 1 file changed, 14 insertions(+), 6 deletions(-)\n> \n> diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c\n> index dd0ee2691c86..da04939a2748 100644\n> --- a/drivers/net/ethernet/marvell/mvpp2.c\n> +++ b/drivers/net/ethernet/marvell/mvpp2.c\n> @@ -676,6 +676,7 @@ enum mvpp2_tag_type {\n> #define MVPP2_PRS_RI_L3_MCAST\t\t\tBIT(15)\n> #define MVPP2_PRS_RI_L3_BCAST\t\t\t(BIT(15) | BIT(16))\n> #define MVPP2_PRS_RI_IP_FRAG_MASK\t\t0x20000\n> +#define MVPP2_PRS_RI_IP_FRAG_TRUE\t\tBIT(17)\n> #define MVPP2_PRS_RI_UDF3_MASK\t\t\t0x300000\n> #define MVPP2_PRS_RI_UDF3_RX_SPECIAL\t\tBIT(21)\n> #define MVPP2_PRS_RI_L4_PROTO_MASK\t\t0x1c00000\n> @@ -2315,7 +2316,7 @@ static int mvpp2_prs_ip4_proto(struct mvpp2 *priv, unsigned short proto,\n> \t (proto != IPPROTO_IGMP))\n> \t\treturn -EINVAL;\n> \n> -\t/* Fragmented packet */\n> +\t/* Not fragmented packet */\n> \ttid = mvpp2_prs_tcam_first_free(priv, MVPP2_PE_FIRST_FREE_TID,\n> \t\t\t\t\tMVPP2_PE_LAST_FREE_TID);\n> \tif (tid < 0)\n> @@ -2334,8 +2335,12 @@ static int mvpp2_prs_ip4_proto(struct mvpp2 *priv, unsigned short proto,\n> \t\t\t\t MVPP2_PRS_SRAM_OP_SEL_UDF_ADD);\n> \tmvpp2_prs_sram_ai_update(&pe, MVPP2_PRS_IPV4_DIP_AI_BIT,\n> \t\t\t\t MVPP2_PRS_IPV4_DIP_AI_BIT);\n> -\tmvpp2_prs_sram_ri_update(&pe, ri | MVPP2_PRS_RI_IP_FRAG_MASK,\n> -\t\t\t\t ri_mask | MVPP2_PRS_RI_IP_FRAG_MASK);\n> +\tmvpp2_prs_sram_ri_update(&pe, ri, ri_mask | MVPP2_PRS_RI_IP_FRAG_MASK);\n> +\n> +\tmvpp2_prs_tcam_data_byte_set(&pe, 2, 0x00,\n> +\t\t\t\t MVPP2_PRS_TCAM_PROTO_MASK_L);\n> +\tmvpp2_prs_tcam_data_byte_set(&pe, 3, 0x00,\n> +\t\t\t\t MVPP2_PRS_TCAM_PROTO_MASK);\n> \n> \tmvpp2_prs_tcam_data_byte_set(&pe, 5, proto, MVPP2_PRS_TCAM_PROTO_MASK);\n> \tmvpp2_prs_tcam_ai_update(&pe, 0, MVPP2_PRS_IPV4_DIP_AI_BIT);\n> @@ -2346,7 +2351,7 @@ static int mvpp2_prs_ip4_proto(struct mvpp2 *priv, unsigned short proto,\n> \tmvpp2_prs_shadow_set(priv, pe.index, MVPP2_PRS_LU_IP4);\n> \tmvpp2_prs_hw_write(priv, &pe);\n> \n> -\t/* Not fragmented packet */\n> +\t/* Fragmented packet */\n> \ttid = mvpp2_prs_tcam_first_free(priv, MVPP2_PE_FIRST_FREE_TID,\n> \t\t\t\t\tMVPP2_PE_LAST_FREE_TID);\n> \tif (tid < 0)\n> @@ -2358,8 +2363,11 @@ static int mvpp2_prs_ip4_proto(struct mvpp2 *priv, unsigned short proto,\n> \tpe.sram.word[MVPP2_PRS_SRAM_RI_CTRL_WORD] = 0x0;\n> \tmvpp2_prs_sram_ri_update(&pe, ri, ri_mask);\n> \n> -\tmvpp2_prs_tcam_data_byte_set(&pe, 2, 0x00, MVPP2_PRS_TCAM_PROTO_MASK_L);\n> -\tmvpp2_prs_tcam_data_byte_set(&pe, 3, 0x00, MVPP2_PRS_TCAM_PROTO_MASK);\n> +\tmvpp2_prs_sram_ri_update(&pe, ri | MVPP2_PRS_RI_IP_FRAG_TRUE,\n> +\t\t\t\t ri_mask | MVPP2_PRS_RI_IP_FRAG_MASK);\n> +\n> +\tmvpp2_prs_tcam_data_byte_set(&pe, 2, 0x00, 0x0);\n> +\tmvpp2_prs_tcam_data_byte_set(&pe, 3, 0x00, 0x0);\n> \n> \t/* Update shadow table and hw entry */\n> \tmvpp2_prs_shadow_set(priv, pe.index, MVPP2_PRS_LU_IP4);\n> -- \n> 2.13.5\n>","headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3y14GF1Jdpz9tXD\n\tfor ;\n\tMon, 25 Sep 2017 23:11:01 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S964884AbdIYNKt (ORCPT );\n\tMon, 25 Sep 2017 09:10:49 -0400","from mail.free-electrons.com ([62.4.15.54]:43615 \"EHLO\n\tmail.free-electrons.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S964811AbdIYNKr (ORCPT\n\t); Mon, 25 Sep 2017 09:10:47 -0400","by mail.free-electrons.com (Postfix, from userid 110)\n\tid 23D872098E; Mon, 25 Sep 2017 15:10:45 +0200 (CEST)","from localhost (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr\n\t[90.63.216.87])\n\tby mail.free-electrons.com (Postfix) with ESMTPSA id E52CA2095A;\n\tMon, 25 Sep 2017 15:10:44 +0200 (CEST)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on\n\tmail.free-electrons.com","X-Spam-Level":"","X-Spam-Status":"No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT,\n\tURIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0","Date":"Mon, 25 Sep 2017 15:10:45 +0200","From":"Antoine Tenart ","To":"davem@davemloft.net","Cc":"Stefan Chulski , andrew@lunn.ch,\n\tgregory.clement@free-electrons.com, thomas.petazzoni@free-electrons.com,\n\tmiquel.raynal@free-electrons.com, nadavh@marvell.com,\n\tlinux@armlinux.org.uk, linux-kernel@vger.kernel.org,\n\tmw@semihalf.com, netdev@vger.kernel.org,\n\tAntoine Tenart ","Subject":"Re: [PATCH net v2 1/3] net: mvpp2: fix parsing fragmentation\n\tdetection","Message-ID":"<20170925131045.GG19364@kwain>","References":"<20170925125948.13507-1-antoine.tenart@free-electrons.com>\n\t<20170925125948.13507-2-antoine.tenart@free-electrons.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=iso-8859-1","Content-Disposition":"inline","Content-Transfer-Encoding":"8bit","In-Reply-To":"<20170925125948.13507-2-antoine.tenart@free-electrons.com>","User-Agent":"Mutt/1.9.0 (2017-09-02)","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"}}]