From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0050.outbound.protection.outlook.com [104.47.33.50]) by dpdk.org (Postfix) with ESMTP id 2E067D1F7 for ; Fri, 24 Mar 2017 14:36:33 +0100 (CET) Received: from BN3PR0301CA0054.namprd03.prod.outlook.com (10.160.152.150) by CO2PR03MB2263.namprd03.prod.outlook.com (10.166.92.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.12; Fri, 24 Mar 2017 13:36:29 +0000 Received: from BN1AFFO11FD041.protection.gbl (2a01:111:f400:7c10::100) by BN3PR0301CA0054.outlook.office365.com (2a01:111:e400:401e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.991.14 via Frontend Transport; Fri, 24 Mar 2017 13:36:29 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; caviumnetworks.com; dkim=none (message not signed) header.d=none; caviumnetworks.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD041.mail.protection.outlook.com (10.58.52.252) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.977.7 via Frontend Transport; Fri, 24 Mar 2017 13:36:29 +0000 Received: from bf-netperf1.idc ([10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v2ODZhg1005481; Fri, 24 Mar 2017 06:36:26 -0700 From: Hemant Agrawal To: CC: , , , , , Date: Fri, 24 Mar 2017 19:05:30 +0530 Message-ID: <1490362538-20854-15-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1490362538-20854-1-git-send-email-hemant.agrawal@nxp.com> References: <1489756124-10805-1-git-send-email-hemant.agrawal@nxp.com> <1490362538-20854-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131348361898541966; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39850400002)(39400400002)(39380400002)(39840400002)(39450400003)(39410400002)(39860400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(9170700003)(189998001)(33646002)(575784001)(81166006)(8676002)(86362001)(8936002)(110136004)(2906002)(105606002)(85426001)(104016004)(54906002)(47776003)(8656002)(2351001)(48376002)(4326008)(2950100002)(50466002)(106466001)(77096006)(36756003)(50226002)(6666003)(5003940100001)(38730400002)(305945005)(53936002)(5660300001)(6916009)(50986999)(76176999)(356003); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR03MB2263; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD041; 1:rHPB/8gNf5qf0v1V9FdnH8iFF8ffMx/i8ifC/HJ5vyhNRCXjENdvHGt/L9bKzvmNKIClqgaPMJYTqn5H5JsvrfqZ0W/8Jt0orEloEA1oDNBfAR6nuLx9WRkQ4nkaU9LzOTUBbN2mKT57OcLUmQm6hUD4A7sa0816EdEdCZZM+wuTDXh79XP1Y88MPQqG3NKQXuMSl2IcW7tsCznTq2yLdvv7RDaIxmholUuaWP4EHi0wRtYaYVl07slHUkdeNjjiTawwn8z5i2LwwTtOawwb6/JqtuYrxT0V9jcs6UZATKB//vOaaGXzTSxtVQuvnQd/CVfekh9cubkowL/aF2wxqyVYjLhN3CyNQRdjry301Jy0zv4GuFnY29KytlQu32kT3iZB7WUrFQQeF+TQWIhgno7b9OuJTTtQixJi0t5scctf8HKqI4rpNdcOVyfTfla5RI25iIIFIj8UtIjFE7oDJBDW0njkjYqDxgeR2IGveJ5QBevsmZk0SwISnzeGD2sx9jmi9a0T4HjTYSpdbwAy5BQyjOXu4swqBl2R9Glf7hJ12mtZi0rYrNr0IZd/qfmnazY7vp3UgX45gPU5amV/VXD7y9QeHThe/JpK+phIMko+Lz8xXIx9newlLkaM+3NP154H+86Mb+htUCtz90LBfQ== MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: e8ed1dc2-9ee8-4c66-622e-08d472bac73f X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:CO2PR03MB2263; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2263; 3:a2GDZyFPuL71qQxptRcdnTeGCvJkWkD++ZgFxW7swb5VJcEsamZNv/9auDeXb/J87/+GaQMxTf04RMgPEgDfy4L1gV0cahD45hReODfiWamAf2aL3jkobneParx4GUUoQHQZO6NAXH0/rIvcpnkHoihiMJAMQdjE6WCVqgJ96zIsTXelxSxeUZ5Q+uDRpTpGUEvaVdR+vpf2qX54f3I5D8xQyqttPnw03CXuPtp4RbhAixaMC7+5xSnIxesabhlWY8Zsvx8qkWRlLHiYHKMx5DTN7D/JFQ5NoCoWHzqeuJ7Pa8jqiy5zlfxKOOvSXZ7NPZfHgIoi6fTStL0n5XQPlKW4u6BmRoAecojggPa+FXZCyzVb0q05u25PtRJhOUuU; 25:kjbc4PlTXrNBIK6evlYdII7iHul7hRXq7UipvVAG6Bq/yw6X9O/3Luu6Q9L7o8mG6vHPAeoD3n9txtgSCHueTUpvtZaQaq0QiW1SMZvhdChysrZzDP1jb2Ssy9FLz7LLcIGJOi/k8F+8hLFwrKhHsYzKIxxledVLFV4F3kIZ99RDgMGOMDgrypfIDC25wOenLpu/MvVepxumZkGyaqDze5AnA96iwWVrsLsqx5xc15Jx9YZi+5JFLrRwTqWHhACXtr0mXVmN8HjoU5qr7zK48OCxLkAq01rz4ok0sW9OCQ+lfM6kRSwYEZoR+hAyP7UDrqQ/By9zZ0ZuXq5oMhCvkk/vOXzy+hyiagzeuhdZwGDyXzhaZCs85mE1B+IG7ihbWeIS10vlNM0i0hjdWodeNrc6gFHH/Xg/b01bgWJ9vZdWjcJ+GHms4GDTLca+xxYkPOxaE0vj9ekp++BLYFxAOw== X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2263; 31:1LrfucpRQzscdf8kJcR2VxiPDsn55DlM5yo/kQ9LexnavqRmyCpMXo1VrmKjQ2Cdvos0orjJn++UkvRusl+6U7lPIrIJDd+UgkUV3G2OMaMqAp7j9NvZEY33sB2BSb2ej7kRZMn4I/DnE5+mnxr5fiqfRKWnsZqc2mQCl0mutCFTz44A/pWq8pwC80pqlgIlGAt/ekkNV5Fs0KsENEfo+6WaCxMGf/pWlv8onbtbv3jJvE/JsGqzXA0LbzRuuk1uG1zsekU8SoecjkDGJ1JyKcwWEKBfgsUvLbzj8c5re30= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13017025)(13024025)(13023025)(13018025)(5005006)(8121501046)(13015025)(10201501046)(3002001)(6055026)(6096035)(20161123556025)(20161123565025)(20161123559025)(20161123563025)(20161123561025); SRVR:CO2PR03MB2263; BCL:0; PCL:0; RULEID:(400006); SRVR:CO2PR03MB2263; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2263; 4:H58XAcH9k5h/EIB8dhQ99+pF+9OBb68i8jqZBR4ILyty7zo9o3Au08kYINN1H6AtHBW05WStajrqODftPfGdPvPlZEogS/oWs9q56roRAU4R0JIzstj0ZyfbKRwEex9RjH0sEg87BVjMPoNe3/0QJxfR1vB26o/4XNRl8ME5hd6SW120yInUAeVyBHBRS7cZKU+XpvG1saNqGyPAXkdrH/bXjBWWUQbReogY/mQbAr8xbiWLAd+y7SfWabiMkvYeFE1+Nx0rKD6x//3b1gP0O3bp7leGtyC90tS1JGYncYWtzUJDWgvEfnL/tjuty+EcfKMZVZWeabbOEbGbU3pEe1advCRL0Q4YJOTwPUzVPYHTcHLrkUxFYA1w35Rh9xREDCBmw0suL7lfzClEqir28Eopvut0/hBAybZYF9Wv5aBJHflQGDgbSAnVW+bLVqkPZFZAGJ2BHHOmHeSgwL2MQMXgT1iNQMxIZuDErC7SrVWtphBK/MOQjROecYQNnJAZJlV65djg436P3gzBGgC9LtP6OrbNgUCAm7kbIbJkmkrpcwUk5pO1lNujTWF+unrM0kLZWihoZ7q/86TfHtZGsDQ5YsQyC9hI5zBgVmL0q6kEGgjZyZ3Bd5f2zDpSOhSfOtDTinkkEEdFed0hrvQ0VeOiXMnRshXPDBsM+Ku09clg/RVkAjhmMCmgvBF6RADFNuFXntTVKS4sMBoEDqOYvJWH7lLClTpGxT3xpg1GSOO2PdS4wsYva84WsCIROxIA X-Forefront-PRVS: 0256C18696 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR03MB2263; 23:wVb/SDIIq6iizEUs/eH8dvkIaZxGnixi8S3OC8lWQ?= =?us-ascii?Q?9YLjU4g+WGIxzijW7MD6rur7AvKoHDvkJyPwhWOiraaSrGGF8+HrJjRRKrCo?= =?us-ascii?Q?oIDklPTzfTEmn+6itFNm6es471/AvAmXH4Pf+jxqA5BmQO+rQ6GVOkidm/00?= =?us-ascii?Q?/wrj39liSp7qyqrbUTaQyNfDBvcqSn39FnIUCzoX4qdrq35gZ8M63Os6+R0p?= =?us-ascii?Q?OsJX++9nS+plFqfU6rLQZqekfKrNJAyox/PUxwmiRB2/U43Uaa5YfB+R9dSG?= =?us-ascii?Q?67qxyEAcYYoDHtKFdp026uQa6LwYiBsdvAALdrhBelnqQ5MBO3UfjUbpydp8?= =?us-ascii?Q?vSRyamHw9PRhWd3bcG4Z+w0OnQw3+DvplVgWscFUa4kaXy7TaURJhLjR8TaZ?= =?us-ascii?Q?ES1nDw4ykCIZAWRDY0I67TQI6VqnMoozuvlS/56J1t5Iz2VEX3+gNeN4kjSN?= =?us-ascii?Q?LFuYLSEycrKY30KBHHp3ssfJ3tsrw9NKXKBlM9qddcnsh0kT1E6kMn2o+I65?= =?us-ascii?Q?i1khz0VTcv248R7iCXK4XlH2rafkt6dxl5m014ZOeEuav+mmHzjWF7gtuf7I?= =?us-ascii?Q?0Vh7i3E/Fdcd1d4UG0JAYeM2EDiqqmY0gCkJnuOSvLDqpanE6yAI/b61IGaE?= =?us-ascii?Q?WR1zlD16vELQ8pjcMGiBIxV1TTxitggMh9WTOxJ/G0zVzicAnrYkYIX0gBXF?= =?us-ascii?Q?bmlzg/9hui7Ge9FNuDQ69cOBC+o/EEITJmTzvP8VQPcqd1bphxdK2KfinauC?= =?us-ascii?Q?gLWUVYVHsrmNKJDh9/fMjQMb9GROQ+sX7wgVLvniMHC+mfm8ofryci0y2Rm2?= =?us-ascii?Q?1r8t3pNNwpQ9rwouVRrv5KlijkL8Ngwi1YI1HcCJoSMYahV9zpv2AuppUKdw?= =?us-ascii?Q?L6eMv7vcHVQDlprHoMSrpnYbUGOLlJq7u6Com92D37ZFAr/N1wHSxzdQ9mnj?= =?us-ascii?Q?q0QaVQSI+ILCnaw+nc0Zrb/vrOzF39apHByVM65jHblc1KY7cRLG2/1oFcou?= =?us-ascii?Q?T/Dly6CBg/XJ6BJqYQoVsel3fhxzVmHtJVeeLors8D7k9WXgPX711vJi9K3a?= =?us-ascii?Q?5R/PHepUXwspsRQbSCri6/CMP8N/09TH2lJY1WT5NGSIU6oZj4sKj3ohLcm1?= =?us-ascii?Q?cPm27pMvzeGRymnO4NsVL283tfThOJqs528afVaNAdHDJtPnY6xznUw3x4hS?= =?us-ascii?Q?WEmaxAUruIXC8dGWC9I8lYxbqOp0n0ymWcon3VxS4hz/Rydli1u6JLWhjiDb?= =?us-ascii?Q?R2DrvyfxioXisqihas=3D?= X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2263; 6:oJlFbDCkRWFSJodMZ0jafa7B+Yktfj5OZ/eLROrwmv//WlC/G59E33K6F0y8FiY+dn+guT6yEMJgnD2qshyH3HS5n3vBPqMNMEoJ8Hv+b1ArS8dcAQeHWFkXH9M297xD6SZ3vCuiy+pvlaOWdXIkdQPBV5IDbYeMDJOxSKgOoRlq0nvp4m5beQtBSIcujVteBykJ86iagAm/rAjzADHnJZu2fAcYhGUHBgtR7qXg2HrM/i7B9+Upbt0NXWbShRh+0/EuvEq79f3c855pJ7VVrzLrdiBbEa208z97O7F6NO79roSaN2gjCLtYk34/t7zsMEpY3MYCuMPwFa+CRtOgKL3//exxQyvk0a90MIowrfUQGLWto4Idt87krY4bGRfcsT/m2CQIA/csFDBphw859g7ym3dSnwiDtMB3k2CONlM=; 5:Uq8HavVzpjHP+xB6hyv68oWurQm5E0oH8MJUuCy5tm6/zJ/XDxoKMlSCIppXRXgmx+MMpnNl2G5WWe6RIrxXAVayYnNQEJgMR7jDqy/B4ya6BMj2FGR6EUmYfjDo/bDlkFvmcTXBG+/a4jeEwRR6XdAirtphd0DEaegWOh0JwHOSyL/bXwRe+SB60xbWqA1E; 24:TP3O8NCsr9dcDLeseCLPiqwF6t18nFhJtC6pE9iduE20YZ4kMTtVyJ0CkUdmWLeMNQydWWFAEynBSHmKH3dUna0+eG3EePuCeGN3mVulkzc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2263; 7:5H9jYyxKjinodNbLUhdKsbeLuY8KfYDictKzdMGDZf45l21WEzgQwynpnU/IeGFvCQgYSb/9gnHE57NfPVEkCdPxJuLhvmEb2d2JVBUgl/C29AeGOTj8p8LEa9lZgYR/Yuh2odE/HF1UCtYcQfultY8uRkYkw06mjliSXmy76FUcGzMcPHqRVxkhGVJuwd7CfScdpUIlKp/Ip4bbArI3Eq44LboJWyMEe5dUuXgDShTVs9Rxv72Em8G37PEPALOHdsrl+Cyw2Lus+oXJCToQpvWdUOOR1SziE489Vf6RjlPrNWxlUUBcwWJXFeC/oT7LmuRTlZSYeSbtKD2bohtVfA== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2017 13:36:29.6669 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR03MB2263 Subject: [dpdk-dev] [PATCH v10 14/22] net/dpaa2: support for Rx packet parsing and packet type X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Mar 2017 13:36:34 -0000 Signed-off-by: Hemant Agrawal --- doc/guides/nics/features/dpaa2.ini | 1 + drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h | 257 +++++++++++++++++++++++++++ drivers/net/dpaa2/dpaa2_ethdev.c | 23 +++ drivers/net/dpaa2/dpaa2_rxtx.c | 91 +++++++++- 4 files changed, 371 insertions(+), 1 deletion(-) create mode 100644 drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h diff --git a/doc/guides/nics/features/dpaa2.ini b/doc/guides/nics/features/dpaa2.ini index a6b7964..0746d4b 100644 --- a/doc/guides/nics/features/dpaa2.ini +++ b/doc/guides/nics/features/dpaa2.ini @@ -10,6 +10,7 @@ Promiscuous mode = Y RSS hash = Y L3 checksum offload = Y L4 checksum offload = Y +Packet type parsing = Y Linux VFIO = Y ARMv8 = Y Usage doc = Y diff --git a/drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h b/drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h new file mode 100644 index 0000000..9324c6a --- /dev/null +++ b/drivers/net/dpaa2/base/dpaa2_hw_dpni_annot.h @@ -0,0 +1,257 @@ +/*- + * BSD LICENSE + * + * Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. + * Copyright (c) 2016 NXP. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * * Neither the name of Freescale Semiconductor, Inc nor the names of its + * contributors may be used to endorse or promote products derived + * from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @file + * + * DPNI packet parse results - implementation internal + */ + +#ifndef _DPAA2_HW_DPNI_ANNOT_H_ +#define _DPAA2_HW_DPNI_ANNOT_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/* Annotation valid bits in FD FRC */ +#define DPAA2_FD_FRC_FASV 0x8000 +#define DPAA2_FD_FRC_FAEADV 0x4000 +#define DPAA2_FD_FRC_FAPRV 0x2000 +#define DPAA2_FD_FRC_FAIADV 0x1000 +#define DPAA2_FD_FRC_FASWOV 0x0800 +#define DPAA2_FD_FRC_FAICFDV 0x0400 + +/* Annotation bits in FD CTRL */ +#define DPAA2_FD_CTRL_ASAL 0x00020000 /* ASAL = 128 */ +#define DPAA2_FD_CTRL_PTA 0x00800000 +#define DPAA2_FD_CTRL_PTV1 0x00400000 + +/* Frame annotation status */ +struct dpaa2_fas { + uint8_t reserved; + uint8_t ppid; + __le16 ifpid; + __le32 status; +} __packed; + +/** + * HW Packet Annotation Register structures + */ +struct dpaa2_annot_hdr { + /**< word1: Frame Annotation Status (8 bytes)*/ + uint64_t word1; + + /**< word2: Time Stamp (8 bytes)*/ + uint64_t word2; + + /**< word3: Next Hdr + FAF Extension + FAF (2 + 2 + 4 bytes)*/ + uint64_t word3; + + /**< word4: Frame Annotation Flags-FAF (8 bytes) */ + uint64_t word4; + + /**< word5: + * ShimOffset_1 + ShimOffset_2 + IPPIDOffset + EthOffset + + * LLC+SNAPOffset + VLANTCIOffset_1 + VLANTCIOffset_n + + * LastETypeOffset (1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 bytes) + */ + uint64_t word5; + + /**< word6: + * PPPoEOffset + MPLSOffset_1 + MPLSOffset_n + ARPorIPOffset_1 + * + IPOffset_norMInEncapO + GREOffset + L4Offset + + * GTPorESPorIPSecOffset(1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 bytes) + */ + uint64_t word6; + + /**< word7: + * RoutingHdrOfset1 + RoutingHdrOfset2 + NxtHdrOffset + * + IPv6FragOffset + GrossRunningSum + * + RunningSum(1 + 1 + 1 + 1 + 2 + 2 bytes) + */ + uint64_t word7; + + /**< word8: + * ParseErrorcode + Soft Parsing Context (1 + 7 bytes) + */ + uint64_t word8; +}; + +/** + * Internal Macros to get/set Packet annotation header + */ + +/** General Macro to define a particular bit position*/ +#define BIT_POS(x) ((uint64_t)1 << ((x))) +/** Set a bit in the variable */ +#define BIT_SET_AT_POS(var, pos) ((var) |= (pos)) +/** Reset the bit in the variable */ +#define BIT_RESET_AT_POS(var, pos) ((var) &= ~(pos)) +/** Check the bit is set in the variable */ +#define BIT_ISSET_AT_POS(var, pos) (((var) & (pos)) ? 1 : 0) +/** + * Macrso to define bit position in word3 + */ +#define NEXT_HDR(var) ((uint64_t)(var) & 0xFFFF000000000000) +#define FAF_EXTN_IPV6_ROUTE_HDR_PRESENT(var) BIT_POS(16) +#define FAF_EXTN_RESERVED(var) ((uint64_t)(var) & 0x00007FFF00000000) +#define FAF_USER_DEFINED_RESERVED(var) ((uint64_t)(var) & 0x00000000FF000000) +#define SHIM_SHELL_SOFT_PARSING_ERRROR BIT_POS(23) +#define PARSING_ERROR BIT_POS(22) +#define L2_ETH_MAC_PRESENT BIT_POS(21) +#define L2_ETH_MAC_UNICAST BIT_POS(20) +#define L2_ETH_MAC_MULTICAST BIT_POS(19) +#define L2_ETH_MAC_BROADCAST BIT_POS(18) +#define L2_ETH_FRAME_IS_BPDU BIT_POS(17) +#define L2_ETH_FCOE_PRESENT BIT_POS(16) +#define L2_ETH_FIP_PRESENT BIT_POS(15) +#define L2_ETH_PARSING_ERROR BIT_POS(14) +#define L2_LLC_SNAP_PRESENT BIT_POS(13) +#define L2_UNKNOWN_LLC_OUI BIT_POS(12) +#define L2_LLC_SNAP_ERROR BIT_POS(11) +#define L2_VLAN_1_PRESENT BIT_POS(10) +#define L2_VLAN_N_PRESENT BIT_POS(9) +#define L2_VLAN_CFI_BIT_PRESENT BIT_POS(8) +#define L2_VLAN_PARSING_ERROR BIT_POS(7) +#define L2_PPPOE_PPP_PRESENT BIT_POS(6) +#define L2_PPPOE_PPP_PARSING_ERROR BIT_POS(5) +#define L2_MPLS_1_PRESENT BIT_POS(4) +#define L2_MPLS_N_PRESENT BIT_POS(3) +#define L2_MPLS_PARSING_ERROR BIT_POS(2) +#define L2_ARP_PRESENT BIT_POS(1) +#define L2_ARP_PARSING_ERROR BIT_POS(0) +/** + * Macrso to define bit position in word4 + */ +#define L2_UNKNOWN_PROTOCOL BIT_POS(63) +#define L2_SOFT_PARSING_ERROR BIT_POS(62) +#define L3_IPV4_1_PRESENT BIT_POS(61) +#define L3_IPV4_1_UNICAST BIT_POS(60) +#define L3_IPV4_1_MULTICAST BIT_POS(59) +#define L3_IPV4_1_BROADCAST BIT_POS(58) +#define L3_IPV4_N_PRESENT BIT_POS(57) +#define L3_IPV4_N_UNICAST BIT_POS(56) +#define L3_IPV4_N_MULTICAST BIT_POS(55) +#define L3_IPV4_N_BROADCAST BIT_POS(54) +#define L3_IPV6_1_PRESENT BIT_POS(53) +#define L3_IPV6_1_UNICAST BIT_POS(52) +#define L3_IPV6_1_MULTICAST BIT_POS(51) +#define L3_IPV6_N_PRESENT BIT_POS(50) +#define L3_IPV6_N_UNICAST BIT_POS(49) +#define L3_IPV6_N_MULTICAST BIT_POS(48) +#define L3_IP_1_OPT_PRESENT BIT_POS(47) +#define L3_IP_1_UNKNOWN_PROTOCOL BIT_POS(46) +#define L3_IP_1_MORE_FRAGMENT BIT_POS(45) +#define L3_IP_1_FIRST_FRAGMENT BIT_POS(44) +#define L3_IP_1_PARSING_ERROR BIT_POS(43) +#define L3_IP_N_OPT_PRESENT BIT_POS(42) +#define L3_IP_N_UNKNOWN_PROTOCOL BIT_POS(41) +#define L3_IP_N_MORE_FRAGMENT BIT_POS(40) +#define L3_IP_N_FIRST_FRAGMENT BIT_POS(39) +#define L3_PROTO_ICMP_PRESENT BIT_POS(38) +#define L3_PROTO_IGMP_PRESENT BIT_POS(37) +#define L3_PROTO_ICMPV6_PRESENT BIT_POS(36) +#define L3_PROTO_UDP_LIGHT_PRESENT BIT_POS(35) +#define L3_IP_N_PARSING_ERROR BIT_POS(34) +#define L3_MIN_ENCAP_PRESENT BIT_POS(33) +#define L3_MIN_ENCAP_SBIT_PRESENT BIT_POS(32) +#define L3_MIN_ENCAP_PARSING_ERROR BIT_POS(31) +#define L3_PROTO_GRE_PRESENT BIT_POS(30) +#define L3_PROTO_GRE_RBIT_PRESENT BIT_POS(29) +#define L3_PROTO_GRE_PARSING_ERROR BIT_POS(28) +#define L3_IP_UNKNOWN_PROTOCOL BIT_POS(27) +#define L3_SOFT_PARSING_ERROR BIT_POS(26) +#define L3_PROTO_UDP_PRESENT BIT_POS(25) +#define L3_PROTO_UDP_PARSING_ERROR BIT_POS(24) +#define L3_PROTO_TCP_PRESENT BIT_POS(23) +#define L3_PROTO_TCP_OPT_PRESENT BIT_POS(22) +#define L3_PROTO_TCP_CTRL_BIT_6_TO_11_PRESENT BIT_POS(21) +#define L3_PROTO_TCP_CTRL_BIT_3_TO_5_PRESENT BIT_POS(20) +#define L3_PROTO_TCP_PARSING_ERROR BIT_POS(19) +#define L3_PROTO_IPSEC_PRESENT BIT_POS(18) +#define L3_PROTO_IPSEC_ESP_PRESENT BIT_POS(17) +#define L3_PROTO_IPSEC_AH_PRESENT BIT_POS(16) +#define L3_PROTO_IPSEC_PARSING_ERROR BIT_POS(15) +#define L3_PROTO_SCTP_PRESENT BIT_POS(14) +#define L3_PROTO_SCTP_PARSING_ERROR BIT_POS(13) +#define L3_PROTO_DCCP_PRESENT BIT_POS(12) +#define L3_PROTO_DCCP_PARSING_ERROR BIT_POS(11) +#define L4_UNKNOWN_PROTOCOL BIT_POS(10) +#define L4_SOFT_PARSING_ERROR BIT_POS(9) +#define L3_PROTO_GTP_PRESENT BIT_POS(8) +#define L3_PROTO_GTP_PARSING_ERROR BIT_POS(7) +#define L3_PROTO_ESP_PRESENT BIT_POS(6) +#define L3_PROTO_ESP_PARSING_ERROR BIT_POS(5) +#define L3_PROTO_ISCSI_PRESENT BIT_POS(4) +#define L3_PROTO_CAPWAN__CTRL_PRESENT BIT_POS(3) +#define L3_PROTO_CAPWAN__DATA_PRESENT BIT_POS(2) +#define L5_SOFT_PARSING_ERROR BIT_POS(1) +#define L3_IPV6_ROUTE_HDR_PRESENT BIT_POS(0) + +/* Debug frame, otherwise supposed to be discarded */ +#define DPAA2_ETH_FAS_DISC 0x80000000 +/* MACSEC frame */ +#define DPAA2_ETH_FAS_MS 0x40000000 +#define DPAA2_ETH_FAS_PTP 0x08000000 +/* Ethernet multicast frame */ +#define DPAA2_ETH_FAS_MC 0x04000000 +/* Ethernet broadcast frame */ +#define DPAA2_ETH_FAS_BC 0x02000000 +#define DPAA2_ETH_FAS_KSE 0x00040000 +#define DPAA2_ETH_FAS_EOFHE 0x00020000 +#define DPAA2_ETH_FAS_MNLE 0x00010000 +#define DPAA2_ETH_FAS_TIDE 0x00008000 +#define DPAA2_ETH_FAS_PIEE 0x00004000 +/* Frame length error */ +#define DPAA2_ETH_FAS_FLE 0x00002000 +/* Frame physical error; our favourite pastime */ +#define DPAA2_ETH_FAS_FPE 0x00001000 +#define DPAA2_ETH_FAS_PTE 0x00000080 +#define DPAA2_ETH_FAS_ISP 0x00000040 +#define DPAA2_ETH_FAS_PHE 0x00000020 +#define DPAA2_ETH_FAS_BLE 0x00000010 +/* L3 csum validation performed */ +#define DPAA2_ETH_FAS_L3CV 0x00000008 +/* L3 csum error */ +#define DPAA2_ETH_FAS_L3CE 0x00000004 +/* L4 csum validation performed */ +#define DPAA2_ETH_FAS_L4CV 0x00000002 +/* L4 csum error */ +#define DPAA2_ETH_FAS_L4CE 0x00000001 + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index ae2549b..9c0efcb 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -310,6 +310,28 @@ PMD_INIT_FUNC_TRACE(); } +static const uint32_t * +dpaa2_supported_ptypes_get(struct rte_eth_dev *dev) +{ + static const uint32_t ptypes[] = { + /*todo -= add more types */ + RTE_PTYPE_L2_ETHER, + RTE_PTYPE_L3_IPV4, + RTE_PTYPE_L3_IPV4_EXT, + RTE_PTYPE_L3_IPV6, + RTE_PTYPE_L3_IPV6_EXT, + RTE_PTYPE_L4_TCP, + RTE_PTYPE_L4_UDP, + RTE_PTYPE_L4_SCTP, + RTE_PTYPE_L4_ICMP, + RTE_PTYPE_UNKNOWN + }; + + if (dev->rx_pkt_burst == dpaa2_dev_rx) + return ptypes; + return NULL; +} + static int dpaa2_dev_start(struct rte_eth_dev *dev) { @@ -517,6 +539,7 @@ .promiscuous_enable = dpaa2_dev_promiscuous_enable, .promiscuous_disable = dpaa2_dev_promiscuous_disable, .dev_infos_get = dpaa2_dev_info_get, + .dev_supported_ptypes_get = dpaa2_supported_ptypes_get, .mtu_set = dpaa2_dev_mtu_set, .rx_queue_setup = dpaa2_dev_rx_queue_setup, .rx_queue_release = dpaa2_dev_rx_queue_release, diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index 25574c0..c1ea33a 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -49,6 +49,88 @@ #include #include "dpaa2_ethdev.h" +#include "base/dpaa2_hw_dpni_annot.h" + +static inline uint32_t __attribute__((hot)) +dpaa2_dev_rx_parse(uint64_t hw_annot_addr) +{ + uint32_t pkt_type = RTE_PTYPE_UNKNOWN; + struct dpaa2_annot_hdr *annotation = + (struct dpaa2_annot_hdr *)hw_annot_addr; + + PMD_RX_LOG(DEBUG, "annotation = 0x%lx ", annotation->word4); + + if (BIT_ISSET_AT_POS(annotation->word3, L2_ARP_PRESENT)) { + pkt_type = RTE_PTYPE_L2_ETHER_ARP; + goto parse_done; + } else if (BIT_ISSET_AT_POS(annotation->word3, L2_ETH_MAC_PRESENT)) { + pkt_type = RTE_PTYPE_L2_ETHER; + } else { + goto parse_done; + } + + if (BIT_ISSET_AT_POS(annotation->word4, L3_IPV4_1_PRESENT | + L3_IPV4_N_PRESENT)) { + pkt_type |= RTE_PTYPE_L3_IPV4; + if (BIT_ISSET_AT_POS(annotation->word4, L3_IP_1_OPT_PRESENT | + L3_IP_N_OPT_PRESENT)) + pkt_type |= RTE_PTYPE_L3_IPV4_EXT; + + } else if (BIT_ISSET_AT_POS(annotation->word4, L3_IPV6_1_PRESENT | + L3_IPV6_N_PRESENT)) { + pkt_type |= RTE_PTYPE_L3_IPV6; + if (BIT_ISSET_AT_POS(annotation->word4, L3_IP_1_OPT_PRESENT | + L3_IP_N_OPT_PRESENT)) + pkt_type |= RTE_PTYPE_L3_IPV6_EXT; + } else { + goto parse_done; + } + + if (BIT_ISSET_AT_POS(annotation->word4, L3_IP_1_FIRST_FRAGMENT | + L3_IP_1_MORE_FRAGMENT | + L3_IP_N_FIRST_FRAGMENT | + L3_IP_N_MORE_FRAGMENT)) { + pkt_type |= RTE_PTYPE_L4_FRAG; + goto parse_done; + } else { + pkt_type |= RTE_PTYPE_L4_NONFRAG; + } + + if (BIT_ISSET_AT_POS(annotation->word4, L3_PROTO_UDP_PRESENT)) + pkt_type |= RTE_PTYPE_L4_UDP; + + else if (BIT_ISSET_AT_POS(annotation->word4, L3_PROTO_TCP_PRESENT)) + pkt_type |= RTE_PTYPE_L4_TCP; + + else if (BIT_ISSET_AT_POS(annotation->word4, L3_PROTO_SCTP_PRESENT)) + pkt_type |= RTE_PTYPE_L4_SCTP; + + else if (BIT_ISSET_AT_POS(annotation->word4, L3_PROTO_ICMP_PRESENT)) + pkt_type |= RTE_PTYPE_L4_ICMP; + + else if (BIT_ISSET_AT_POS(annotation->word4, L3_IP_UNKNOWN_PROTOCOL)) + pkt_type |= RTE_PTYPE_UNKNOWN; + +parse_done: + return pkt_type; +} + +static inline void __attribute__((hot)) +dpaa2_dev_rx_offload(uint64_t hw_annot_addr, struct rte_mbuf *mbuf) +{ + struct dpaa2_annot_hdr *annotation = + (struct dpaa2_annot_hdr *)hw_annot_addr; + + if (BIT_ISSET_AT_POS(annotation->word3, + L2_VLAN_1_PRESENT | L2_VLAN_N_PRESENT)) + mbuf->ol_flags |= PKT_RX_VLAN_PKT; + + if (BIT_ISSET_AT_POS(annotation->word8, DPAA2_ETH_FAS_L3CE)) + mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD; + + if (BIT_ISSET_AT_POS(annotation->word8, DPAA2_ETH_FAS_L4CE)) + mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD; +} static inline struct rte_mbuf *__attribute__((hot)) eth_fd_to_mbuf(const struct qbman_fd *fd) @@ -66,7 +148,14 @@ static inline struct rte_mbuf *__attribute__((hot)) mbuf->data_len = DPAA2_GET_FD_LEN(fd); mbuf->pkt_len = mbuf->data_len; - mbuf->packet_type = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4; + /* Parse the packet */ + /* parse results are after the private - sw annotation area */ + mbuf->packet_type = dpaa2_dev_rx_parse( + (uint64_t)(DPAA2_GET_FD_ADDR(fd)) + + DPAA2_FD_PTA_SIZE); + + dpaa2_dev_rx_offload((uint64_t)(DPAA2_GET_FD_ADDR(fd)) + + DPAA2_FD_PTA_SIZE, mbuf); mbuf->next = NULL; rte_mbuf_refcnt_set(mbuf, 1); -- 1.9.1