From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 85FF1A0A0E for ; Mon, 10 May 2021 18:14:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7FCC440140; Mon, 10 May 2021 18:14:24 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2052.outbound.protection.outlook.com [40.107.94.52]) by mails.dpdk.org (Postfix) with ESMTP id C3095410F8 for ; Mon, 10 May 2021 18:14:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gaLWY+APTyYMXVvkvH3j5Zwfy9/NQVrfU6H1TC39RPKwO6anvpK1AQMnON2FlDuy54KsdUb1rPuVt0/9h2yyzZX9S5meEv+wZqySjwafkfCkEYZ8CzRmXtgdhSWaBmF7KYg8FjXV5acdEC1uZhQ6QGEFaCDPASXlfVsbolVr9h4+fH1/W/hh2Wm/qF2m3XuRPHmSE29GRUsIzktREof2BEqEA18QAY9wtVuvfN1k5KrK2qA7jUEXcMaG6hAdlJ/nFfL2dn/RX0z5ZC5zmkOEIInUNqRBVKF8FCD7HYC5i+Jq+f3pYR53g/G9cmyC+Ec0EPTwdvCBhTZKgOYLj67Kkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tV62uvwurMXbQMiRzTP/u2H60XWCDMEbdbwIuUH7Fc0=; b=VceWC8w3iPapGwV1/rGIkXPR9FHsUcDSNbHbvLSxQHlYaGuxRdMPFAV25e07XK1Ynon1PJyhK9AhPut0EKaZ/u+knuLjhvGYy7XxMfu07OR3+e/lSnlUdxKMYKErflJUT5b3tzqLQFj05UrZ+TbdFmMSNrhLdJlTlYwZchQcVqpvGAjZLx5Qo9w19nrlMpZL40inN10VIKeGoZ4VsQFSZDkecM8kDvRdwvjv2NHpq59BNmP6lzXFkmP8Yol4/zvglc2UkglB2lMvazC7gsjK5rn5wYoHdyoDYLBoOyDSdwcLezCdXB6j+QyCX07oUI58d2xDUUKz7mIGsLfFkpSmUw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=arm.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tV62uvwurMXbQMiRzTP/u2H60XWCDMEbdbwIuUH7Fc0=; b=mpo987Eln5MUabERQgII2sWCVKj6rWxE56Z9Z2nAsL+/ii8R6S7l1onsMGpyozNkGt/yB0/ihACJRiu/jwqVPnuNkct+JnOFWoXfb4et4coIjexMmH5ZhqHE8Xjf4oSghex/78OQ5VdH3a5r2CznffirAPgWw0VyqLcEcONnNbvbMZK+E/5SFqTK37JvOnumC2ZCNN5gjMQ8wrkXGiKPmKjxo1aJ2Zx+hu0I8tzdAxCnm1bZ5qw33W4HcXwNk3P4ghNKScG3zV882rCEpkzP3aLWE+frdQiGoJMwavWyAUsrX1J4XdL1K5Er1bM4n33lQPckcgeCoXF76gH5o40aeg== Received: from CO2PR04CA0004.namprd04.prod.outlook.com (2603:10b6:102:1::14) by SJ0PR12MB5455.namprd12.prod.outlook.com (2603:10b6:a03:3ba::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.27; Mon, 10 May 2021 16:14:22 +0000 Received: from CO1NAM11FT004.eop-nam11.prod.protection.outlook.com (2603:10b6:102:1:cafe::b3) by CO2PR04CA0004.outlook.office365.com (2603:10b6:102:1::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:14:22 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT004.mail.protection.outlook.com (10.13.175.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:14:22 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:14:19 +0000 From: Xueming Li To: Feifei Wang CC: Luca Boccassi , Ruifeng Wang , Kathleen Capella , dpdk stable Date: Tue, 11 May 2021 00:01:01 +0800 Message-ID: <20210510160258.30982-112-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c48c3668-8b5b-435c-dcfd-08d913ceac1f X-MS-TrafficTypeDiagnostic: SJ0PR12MB5455: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: a7uEZh29f3GHISxyEsnawfjaOF4R5Qsoy70fxItcYoANKbJBRCNXbT4lXHEr4EUtYTwxQ4M8j0fNIyxMJHb7gS/WnFimZvFEymHGPdXBmxIqHQWDkDG7rI2icxMKFQtqHbsmik3D7hKykD3ROxzQinEhEWGVWtoyjMa1Cj14TybCyN+UKxP5ct7RMkhN9e8cys3ocvT1Kt4Ro2O4IBB70WUNGJe7TTX+Lzdpzd60sU31HR4i+bRtPTaHaOjGkFoBX/KOlCg+0epKJfaYmbR7UgKbulYcN7yWsAyA4uqNnHg1o1o5YbvjeWFcHECax+Bivi0xPwDtOgoN07xQmA+QRFsyaqYlBIVNDPghzkuxqNNvXbLhEFoq5btYLlMFuGQlBaUeHZCCBHgyBRrkSVhCK6rb3YiMW2g7ywCd04Hya3dueNZSCQrNZKuNrHLgWNUYqwNENpQudxzHOuBKNqWP0Y+4rHJkuD38BjNi/NPLmZIJyjcAhURtQqAtrWz03vK/99Eh9O/Xq3HMFLx+9KF77oD/e34wSDNxBPydYmSnWvUJjY+nf3OqorwHV8vX48MAFS9USyLo78/MH/RZ1ZPDzFydKb2G6IrKjdF3+0AIiexriIYqZRcmgD3xQCWhiRWYZS7N9auUAWVy1nekbMpLS9Ep/t/wwNSvWx5vE9O/QDhUN3ttTnrqiX2eJBfSPY6foag/cnEWiCb4gDwY2oCCvKpIR8SEfmUmfdGVcuxxjwBAyPantCn4GvYmd7sUQBiD8rMsTpUw5/RViqsjX2UERw== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(136003)(396003)(346002)(39860400002)(376002)(36840700001)(46966006)(54906003)(6916009)(4326008)(83380400001)(6666004)(53546011)(966005)(426003)(336012)(316002)(478600001)(356005)(47076005)(36906005)(82740400003)(2616005)(5660300002)(7636003)(7696005)(186003)(36860700001)(8676002)(1076003)(86362001)(82310400003)(2906002)(55016002)(70206006)(70586007)(36756003)(8936002)(6286002)(26005)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:14:22.0466 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c48c3668-8b5b-435c-dcfd-08d913ceac1f X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT004.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB5455 Subject: [dpdk-stable] patch 'net/i40e: fix parsing packet type for NEON' has been queued to stable release 20.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/12/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/7f8de7322818b057d8c0dd24ebbd2ef8ab6b9a39 Thanks. Xueming Li --- >From 7f8de7322818b057d8c0dd24ebbd2ef8ab6b9a39 Mon Sep 17 00:00:00 2001 From: Feifei Wang Date: Wed, 10 Mar 2021 10:40:29 +0800 Subject: [PATCH] net/i40e: fix parsing packet type for NEON Cc: Luca Boccassi [ upstream commit 31d7c6f7d424c533b0a4dd9b4408b814ac7852f1 ] In i40e NEON vector Rx path, the packet descs processing is incorrect. This caused wrong packet type been filled in mbuf. To fix this, when shifting the pktlen field to be 16-bit aligned, it only needs to process the high 16bit of the packet descs instead of the high 32bit. Test Results: Architecture: arm64 NIC: XL710 Driver: i40e Package: Ether()/IP()/ Without this patch: desc_to_ptype_v: ptype = 7 (error) With this patch: desc_to_ptype_v: ptype = 23 (correct) Fixes: ae0eb310f253 ("net/i40e: implement vector PMD for ARM") Signed-off-by: Feifei Wang Reviewed-by: Ruifeng Wang Tested-by: Kathleen Capella --- drivers/net/i40e/i40e_rxtx_vec_neon.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/drivers/net/i40e/i40e_rxtx_vec_neon.c b/drivers/net/i40e/i40e_rxtx_vec_neon.c index f094de69ae..edb202a51a 100644 --- a/drivers/net/i40e/i40e_rxtx_vec_neon.c +++ b/drivers/net/i40e/i40e_rxtx_vec_neon.c @@ -310,10 +310,16 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *__rte_restrict rxq, /* pkt 3,4 shift the pktlen field to be 16-bit aligned*/ uint32x4_t len3 = vshlq_u32(vreinterpretq_u32_u64(descs[3]), len_shl); - descs[3] = vreinterpretq_u64_u32(len3); + descs[3] = vreinterpretq_u64_u16(vsetq_lane_u16 + (vgetq_lane_u16(vreinterpretq_u16_u32(len3), 7), + vreinterpretq_u16_u64(descs[3]), + 7)); uint32x4_t len2 = vshlq_u32(vreinterpretq_u32_u64(descs[2]), len_shl); - descs[2] = vreinterpretq_u64_u32(len2); + descs[2] = vreinterpretq_u64_u16(vsetq_lane_u16 + (vgetq_lane_u16(vreinterpretq_u16_u32(len2), 7), + vreinterpretq_u16_u64(descs[2]), + 7)); /* D.1 pkt 3,4 convert format from desc to pktmbuf */ pkt_mb4 = vqtbl1q_u8(vreinterpretq_u8_u64(descs[3]), shuf_msk); @@ -341,10 +347,16 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *__rte_restrict rxq, /* pkt 1,2 shift the pktlen field to be 16-bit aligned*/ uint32x4_t len1 = vshlq_u32(vreinterpretq_u32_u64(descs[1]), len_shl); - descs[1] = vreinterpretq_u64_u32(len1); + descs[1] = vreinterpretq_u64_u16(vsetq_lane_u16 + (vgetq_lane_u16(vreinterpretq_u16_u32(len1), 7), + vreinterpretq_u16_u64(descs[1]), + 7)); uint32x4_t len0 = vshlq_u32(vreinterpretq_u32_u64(descs[0]), len_shl); - descs[0] = vreinterpretq_u64_u32(len0); + descs[0] = vreinterpretq_u64_u16(vsetq_lane_u16 + (vgetq_lane_u16(vreinterpretq_u16_u32(len0), 7), + vreinterpretq_u16_u64(descs[0]), + 7)); /* D.1 pkt 1,2 convert format from desc to pktmbuf */ pkt_mb2 = vqtbl1q_u8(vreinterpretq_u8_u64(descs[1]), shuf_msk); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:29.529515200 +0800 +++ 0113-net-i40e-fix-parsing-packet-type-for-NEON.patch 2021-05-10 23:59:26.510000000 +0800 @@ -1 +1 @@ -From 31d7c6f7d424c533b0a4dd9b4408b814ac7852f1 Mon Sep 17 00:00:00 2001 +From 7f8de7322818b057d8c0dd24ebbd2ef8ab6b9a39 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 31d7c6f7d424c533b0a4dd9b4408b814ac7852f1 ] @@ -26 +28,0 @@ -Cc: stable@dpdk.org @@ -36 +38 @@ -index da16dfc386..1f5539bda8 100644 +index f094de69ae..edb202a51a 100644