From patchwork Mon May 22 08:04:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 127140 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 70A8242B6F; Mon, 22 May 2023 10:05:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7285B4282D; Mon, 22 May 2023 10:05:29 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2114.outbound.protection.outlook.com [40.107.95.114]) by mails.dpdk.org (Postfix) with ESMTP id 05EF7410D1 for ; Mon, 22 May 2023 10:05:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R6g7vauqzOfWx00S4o4Ki3BggQRw6Ieo1xddbfR3B7/O3myerxDgqE3dTtLEB4AgcV6cKW968/s4d9O9L7f4eqvS9DdUGKQMPj0MdB+bQA1Ib+HaKzC71snhy/pYFfuLiVzAUUJY/RFgA2LIPcmpElXhR0QWJDa+/hkKU9+qsEgDarrJMA53kibGsGfxV2nlYRoQTTz9eZPvVSgYlqIPYXu8uFC2YbjhC5ljdpRETxtUGHp5KAkRBk7jzXsxR9hnIxd1meLmVtj0vyLgaF7wLJYdSfrqgBy9Motq2GWnOsrrJpbCz9ECbRcLuwbQwO/QjXyAITQzyh/ua0LMcvbEzg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QGC2NmcvHts7O7gsCwYSvoyn1js7V1HUhEKTyZA3kC4=; b=anmbjLSWOJZiB65M/wohj73AZhBi63Ik2B2DfXnytLC5U4qIPvkPjRRZ//e/9LRYpuX7fhlx732kjV90lDYCOyTMo3rnlevAK0JJ3ItvtlpsQFZ9auDYgz+80loGlIaYj0BcnR69nxnbUmvf+v4irWdD2dlnp1jTMUWvysVomaw7pZpW97dmDtiaxCfIhyU9PF+Bo3YODhUnJPX70rlW7qNg+FQGZSMXJbS2FICglRO6IskfqokhQ5ps8EFeOh+jP0Hna9dar4OJmt/rVfhBJBraDa9PZCjTOkB2BVhfPEypUIANdmffiNMrwXGEfpQYZdOIPlVID2gyB8YZgblRQg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QGC2NmcvHts7O7gsCwYSvoyn1js7V1HUhEKTyZA3kC4=; b=hE65pRURjpa/GUdhR2weSNOYEdC2iCYYp+mK8wSqXoujn1PvjTkzt9R+oz2k7pWhm0xUY+6BtdWlig14tg2WCLcM8bbQPgfVQepA0ygCT7pt0ciAI67EvdIgCAA9cjIPAGErNlUbmgZlHMCw378Ou1xLtZ9ZszezndiTrgU3Rhs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SA3PR13MB6395.namprd13.prod.outlook.com (2603:10b6:806:3a0::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.13; Mon, 22 May 2023 08:05:26 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994%3]) with mapi id 15.20.6411.027; Mon, 22 May 2023 08:05:26 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Qin Ke , Chaoyong He Subject: [PATCH 1/5] mailmap: update contributor entry Date: Mon, 22 May 2023 16:04:56 +0800 Message-Id: <20230522080500.2014001-2-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230522080500.2014001-1-chaoyong.he@corigine.com> References: <20230522080500.2014001-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR03CA0109.apcprd03.prod.outlook.com (2603:1096:4:91::13) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA3PR13MB6395:EE_ X-MS-Office365-Filtering-Correlation-Id: 38072333-cd7a-4ff0-2c5d-08db5a9b4d10 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p+ojGDdNYkqH0vxT3NXJm+/SBTaiv/WIhtarrvlVGPPWgQMIlPsD/VEuxmCN9H6lWByPAe1adbkCw7BOba+RqaMErXJh/2qSGE3UF5izj1k8xkbToObsUvJWH39t+QAl5CxQYzr7XJIbtWE7XhJutLTyjm64Rbb1Ja2ZHR7D3siKWCVyoN03j3cooiw4ZtFSYBKBzJ55GVnKvPw0Uo6CQdNkT/2zEnWGmicmBMFOwC3IQ0Y6lwSuHruA8O0nJoQtlKtsumfebumVaEfHKT9Eq5bAbTx7zR2GDrIn8BfoyzZ+ciHiEvh25P1zKcmnXH9IWZhzVVUxdTNqEpvsdx2bstVrcuRFggjWWnZuMtZC0PXiGegz5F3J3bxu6jxyJd65lnAeR9EaV5dOjR3gH3mmEougs3eb0idtk852vYV99RKiswjxoTuA1LGZOARezBCnmK7K9owaNsDEgJUJL3NwWjX7fR8AdaKqrAEkRcDwECSxO/7ylsoQBGcxg1UGKmgVTqOCz3yZ+7aHxV297FmDRPVD+bWKwZdhno5o5UwMfLou7d6sNAKG3YOxxPJZSlgD1L6RYqU7Wh1lrR+gTovj+RJr0heSr9jb0R+PWPuW8chbYquEktDUCdWBeDo3AqGV X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(346002)(376002)(366004)(39830400003)(136003)(451199021)(38100700002)(38350700002)(8676002)(8936002)(5660300002)(6512007)(6506007)(1076003)(26005)(186003)(2906002)(4744005)(2616005)(36756003)(44832011)(107886003)(86362001)(54906003)(316002)(6666004)(478600001)(4326008)(66556008)(66476007)(6916009)(66946007)(52116002)(41300700001)(6486002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XgYJBXN8bUh5pYVINgp9T8WanenoZjMKIkF2wTNmaExKAwQmOZkciX/hydp7bqCW94gtgc3LWZ51J+2EdQ/+Mj3n58V1ELYsqfb97r5c0qRVd1XDLDg1dIHGyNZDW5lgE6d/kQ7khx1SGtT2b1yDdCDeRFC/8vTEQwtOygu0IekiZWykOEdSvSUH+OGM0LsDF1udPdU7aHT4+Ihez2/JwsgC+jJw9O7bPVNYvhppG86PmyVTdkWkpm05/WIY8raDWnLwpo8dD24FvmwKLsmDP2eNPXKxi/8P9RFrGLac4TDrfljDSPjOZjtG7jk2sZE2gW7D9yvGtzEyhtCjKjj6iw0Cleyq5FSpop/+INkVN7KhmK8/rKEtOMbE1kQDHjZMBhXc+oEHJuy9V8zKssOtg3Bf1TDGZm2fY9EDBdH1TTwkb9q5eS9MzfWXPLhY3dICbfGJnsLn9kbXpFTogDMKRQVXbDKMVmN8vIS4rpbkhZWe9eOJ35UZRmURNAXG7l1vkZviXtArwWDiwhAfEQeG0RcyIJQKQbfSjczysYSxv7R4nJIcE9QYBSA0WZHhFGcIfalmeNmzbJyAwUTT7KDnqa++84gbwQGVg0WQEodN/swdbCMsBmBN9jKtJaPdt85ateIHgArv7yqHGKsKjf7bADb4t5jcyJsZKwcCmxyfTgy9jgnS5f21nWSZMX7i0fiQTg889yidxVrwNfMHJ8+j8E5MizjmnExHnNOVIc+j+m/E+ToK9GvVD/Js7zKlpOxEX9AK7u1tEAbNTVcsS96eCmVCtGscCKi8Eg34uac8ebWQYuyw6PuLU2Wge+3lQVgLxkkslKt0I70SSdom17dJZWxN4tT4tKineeprbtYcUmzDhjcqf0iqkQPQwT0No0wd/QX0ARIrNrsXZBtd1wau96YCB8bFF9x9bCIrAqsb+cEMIfy5knx9iFKTnrHJGBa5/8t15ZbgArZk+6dcJR/YvHrUJ/rahF+c004JD3ETiW9WZuzi+6QcRz0k8lF9b4XJirlbfpwbd32cKTbRc26ibUjp/NiB02jjcqEz6avwq4RTfYPz8l+Gnf2GcZsjmXec1a3NwOHT5Cz8GBDr5MzajfAbH/kJBt5X5lXLZUNPNhR7LhEx+XxesHrILRq1fxZpyWNx5f5gC/IDMlPvg4MbQ6aoMgGTqK2sQEUcVuYPEFL8mo3GiHJ6y7qOVc82UE/YMAsgAiDt8Qy6tas0ZuQTocs3JKhYEmNc5O0M1aQTR/9h6dffpDrrno5y9Pi3hNqNYmBDSxWGpHOn06fJqQFJ95FQZXMIhB4nsycNEy0OIOPZ3MZERPTffHGsQgX11bwEFWybFe5h9ZmFulEiFbNNudgdIZ3FbPV8Pv15wBofnn9OUVtiVHpbs7Wapp/DotNyCaFRna2cKFbYr81F/PQJs8DBkgHgJ6QXH2BoBHPwpXS6uiXzlx8/obzGadwNfTEKZDPa4vuk8NimVKRS6433sk3zimHZ7725Iu/UAHelZaoTkiDtMtrEVqgRXiunRgWz2IvLVGbJ7it8wrZxyL9x6axFMQCJJ4Z3DZ2zUYssxAW7KrITUX+AnV+5rdHkGJXmEJ64j0fwvfvYta66G0n6Qw== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38072333-cd7a-4ff0-2c5d-08db5a9b4d10 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2023 08:05:26.5681 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: lxAu+080X8/4ZNWrIjkwgzA2W0IOiZ0+K2UTPJszNNGF+edfJMNlZDMR6gyaSOgDUInp6X/0znY7sbZSN1QfJHQWEaF0OdgUUIK6FU3UGkM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR13MB6395 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Qin Ke Add a new contributor. Signed-off-by: Qin Ke Reviewed-by: Chaoyong He --- .mailmap | 1 + 1 file changed, 1 insertion(+) diff --git a/.mailmap b/.mailmap index 4f4d8eb749..cdf2cc8a65 100644 --- a/.mailmap +++ b/.mailmap @@ -1090,6 +1090,7 @@ Qiming Chen Qiming Yang Qinglai Xiao Qingmin Liu +Qin Ke Qin Sun Qi Zhang Quentin Armitage From patchwork Mon May 22 08:04:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 127141 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7586D42B6F; Mon, 22 May 2023 10:05:41 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A111D427EE; Mon, 22 May 2023 10:05:31 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2135.outbound.protection.outlook.com [40.107.95.135]) by mails.dpdk.org (Postfix) with ESMTP id 88F7242D36 for ; Mon, 22 May 2023 10:05:30 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OEDskCkL9PM7XwoN7QThAwO4n04KrlADv2oqZIdKmrzEsUJxZkfI+axd4+24E4IfAxaX17j7j63HsL0C/wbpQ5tHeHZ144SRWMQSPC4HNfDrsc08GZb17c+Sh7wLkKdZ5zmObyOPEGGyK+LLgkDGFOUpwUy9A7e8moyBJxL9s/tc4AMzEPpD3H/3NBEU/j4qlDORfcFXm9fCFWcA5RX7PhKcoOZa4SEu4AHusiuv7te8ZQZIh22jnPkMfErXkDc0pHCdBSw3X/Ng6n1t9xlQgr7T1/i7+GRS1dA/CryH5JcdoJRXV7pyhB1ELGJADvKFLEP9h6YMdStaGeN9fjZMcA== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=5UJAWVeqEd+xF1OgmxzqMJzRu25X26RgLFwSddE5VEU=; b=oYmmUdG+FRKhjtXBWb/0FD44sbuxEZ0USXhN0DjMEP/WSgkbWkorJ5u64JocXZZcAi2sKHbuMwHIr34BZGYhM+8gWgZVO9TMYOOvZ5GAGG7A7Q8oA8SwFSYzZUGb4EunsrtprA0YgTk2rS0I4o+vRLI+J3knYOmS1Bnu6VgHc2QEZjoUR5rtPigmKnqXbXGloxrjzEV2+SZ6B5Z+Bi17CDxDArqhefsjZwuCFRtP3tDmxxclRxrkRSV2wwuXuhTU5OW+XdFYEFfR4afG2F59ciCXmPrNiB+OvEM4Z0GdRvSZlKUOy65FRrJU5kQqiiBEkyWv++j+o6EaShXrQ5NblA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5UJAWVeqEd+xF1OgmxzqMJzRu25X26RgLFwSddE5VEU=; b=AV8tz3/UMDz1FaopbouQNWIggnmBUsjKjAvpyEwwaOX9l8Q0Ourxw9MNaldr71/3UHTH4wG02aqBMK/dAWkE1ja3bKxOFJydoZM8j1rxmmo3zzmoeWqJcrLIOmb7dU59Tn2IueKmJVh0x6+PYm5OOHinC0LjxypNPZJ7uTKch0M= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SA3PR13MB6395.namprd13.prod.outlook.com (2603:10b6:806:3a0::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.13; Mon, 22 May 2023 08:05:28 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994%3]) with mapi id 15.20.6411.027; Mon, 22 May 2023 08:05:28 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Qin Ke , Chaoyong He Subject: [PATCH 2/5] net/nfp: rename field and add comment for Rx descriptor Date: Mon, 22 May 2023 16:04:57 +0800 Message-Id: <20230522080500.2014001-3-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230522080500.2014001-1-chaoyong.he@corigine.com> References: <20230522080500.2014001-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR03CA0109.apcprd03.prod.outlook.com (2603:1096:4:91::13) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA3PR13MB6395:EE_ X-MS-Office365-Filtering-Correlation-Id: 3940e799-f144-4193-4419-08db5a9b4e7f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qMiKQvtameRQCkBZSPCosHXHZwKYUm3FNFOid0R1I3lrqjQgU4WGhq1nYqDQBr0OrKUu2z0zTyDZ9oGOLqH4hQeOmBjXN3wrrF5bz2xWAjUs6efq0eEm7LM+aCsk9AjW6J9S2ll6CEspgTC9vTxQYStNTNADKyJJHWTgFvh+Yvmg4zqifKEGNUFsZfZEq64NlEq5+qnenhJXVCbTq96r89udxRcL90APBwjhYsDkZVnL0BURdpMEXVacnrSO6z/stTRNaF/IefUTOlFG5d6goZ2HJTHvJ18f6XbehXZOLFSx/Z89kulTxFjeaiP5rPGX5aTnaFKwgke5ttpIJNHm4NxeIg6cJ/Tu3Ek3Ty1VCCC6/HFVZhMeN5UpJpP5oF6AUbwn4b0GkUFRei2+V+UmiKl5ZQVzFJHFrHLbWcrC6xNUKi5cZRxwjihZxJboDL7PG7jBb0dFak3e6vxQq5kSk3AdipbCB/BTBKgylCDUHEb1NX0wsUD6LIS+cP9MzD3NDuWZV2AFCm4dmufD2P5IpT1YxmtbqC16mWFrNZay8hM1JWrOf2pt1oyoq8pWcWOCcNnkxvcjv23kI/1Jt94Ubok3ktZCP9ckSWzb6tXWANi3uDkGNvsfWsuMsE9wgeSo X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(346002)(376002)(366004)(39830400003)(136003)(451199021)(38100700002)(38350700002)(8676002)(8936002)(5660300002)(6512007)(6506007)(1076003)(26005)(186003)(2906002)(2616005)(36756003)(83380400001)(44832011)(107886003)(86362001)(54906003)(316002)(6666004)(478600001)(4326008)(66556008)(66476007)(6916009)(66946007)(52116002)(41300700001)(6486002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Cd52B1B9r0xldjyYmrw6lAUrHowd?= =?utf-8?q?GzB0iLBHk/DpG1riBRCZaEZHbfA1kFHV1Ty930AnDRmVqFJw2ZvZH8Ow+FV2aLGRZ?= =?utf-8?q?ATDy1ySGVVIC1lkFmVhLm5dNDR1Fk6YmlVjzCVckY63XPoH/rL22S0mlsJ7358Szh?= =?utf-8?q?AGDqAPaNJwBGdl2Lq/gsCrwS1IzTCtVitnkibG8d8qys3QB/g127UQ0OErXc9hfTt?= =?utf-8?q?3nDrCM1Tmi6UTNu9yloCuS8mg1UdBLrja3OvNuT+n6Brlt6JRBzv9zfKavPh2Rict?= =?utf-8?q?JtDm7fcEGpVDCQao+DyVFPzbzjW9spjvYdxH77DIW6FDfiYjjh8DqmDuRnekoQ3m0?= =?utf-8?q?6k7tbAT6cTVL3DWn/ofZxB/BH9I/AaBl90kDMydomRp0DcIH9ETLWyioqWnbxs9kK?= =?utf-8?q?Lf0M4JSVaIpIdH5zAVvD86vSaUJWSQvyakAbxyGpBjK8jKYWgM9MtraQhuqc16R9a?= =?utf-8?q?cyW54lIN++Ikko/R5LwD56wC3B96PUgrqxDoMMDeUcCYcB7QZkGziHZpz7WsNyrkk?= =?utf-8?q?ffnvxB1BtoXoQ5AC2RoURSUACMeQs7j5UQQDJQVN9dQ4Ecziqb5Xdwp4eLPNaQT4X?= =?utf-8?q?4+8EIe8NfbVzF2scHA/DNSkogVwFcDy/tzBPJgDMcCgQAQ3lB3qdKzh3vkKgElaN+?= =?utf-8?q?gmB3GvkXRDraSzPbEZNxCJM3EZomReZkERGChytEJJiKvxWeO+/KfUkniol+8UDvu?= =?utf-8?q?4poJuedO9ikD1LX7iMUoX9VMvBl+WjVWnUfBd+ASkufrqZOmiFOORo5Yij/aew7HV?= =?utf-8?q?uBtDka6L5QEXGi5qlaqlPOFLv9Bq1ipu5e37D7ypHXmNV5HaU5Q6ZZ44Wii5n7qqz?= =?utf-8?q?M5Kxb5i5ErwFrdvR5VaM5s2Kam+32PvY4/KdDzspw9Z219cLU7jZI0Ta5Zy6jZ/NH?= =?utf-8?q?bR63sVAlS32ximJ1G6UPjwqeMS4zhj1Ink9MT54Ih2kLxiGpiTRJv+hmvsETlHO5A?= =?utf-8?q?aVIrrWDY9uR6P5GCdFvSX5XsaIJ9FJX586/kjsgtyo8eaB55CRi298zuISFcPTNu6?= =?utf-8?q?TNiokUnjx+y5LNbpuAZWFqMgJVPwu4LjeqBTdg6oD639SIZChFVL3LUC8XjAWt6sL?= =?utf-8?q?090eoiX3aB7D3ZaCgXLii1ltSxAFl9DSp5pzZP0+mrqImYdKc7kNFxnpYtrK17aeP?= =?utf-8?q?atsOixDO8EoqklvNNGHjKdJW1YX/82eiRW8Qaw+8bGFzRtz5teQxRUufEoeTFGwTU?= =?utf-8?q?Cn8/2la7f6wuV5QnePYi70AgxdxAavQoLyWkcKRG7K8oMilGX1nj/KF35Ze1s/rZp?= =?utf-8?q?i06HpxWFM3xoEsShiy4in4IZRfOTnzhtN5mpnTsGbrxtnQeBPVSTnVAtOTUjJKlYg?= =?utf-8?q?BmUyIQDKcz/DSqBdDgKsu1aUTq8saWBg/Ktn+pqn+TmSksvBoSVoGDNVe6b6+GJlW?= =?utf-8?q?3/SmegxCApby6cCdq5SrLinlnwiYWuunxQOHqzNpzOIr+zEwSBv8FYpiKF2HDyxwX?= =?utf-8?q?nxY8nqNuSbu0blQNcFhWIUkjDDLbppdz5M5+sko3jBk5VXejwoqAOT0c/K0ppdHPN?= =?utf-8?q?u9Sc8pUH8Vyp1jurDdOUNTxN26AgcJBiBQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3940e799-f144-4193-4419-08db5a9b4e7f X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2023 08:05:28.8164 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 6HZeI9OVOyIPFX5alFYImf4x15fIUjBfgzEXJ15HM2lpcw6qZvrU/SKTT1Jlt8dNNGg/qvLFjFhGyh84uxq04gtRrjw7AvJglS10qrbd3BI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR13MB6395 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Qin Ke As rxd.vlan in Rx descriptor has been out of use and can be used for packet type offload and other offloading information based on comprehensive evaluation, it is renamed to rxd.offload_info. Also adds the comment for Rx descriptor structure. Signed-off-by: Qin Ke Reviewed-by: Niklas Söderlund Reviewed-by: Chaoyong He --- drivers/net/nfp/flower/nfp_flower.c | 2 +- drivers/net/nfp/nfp_rxtx.c | 2 +- drivers/net/nfp/nfp_rxtx.h | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/net/nfp/flower/nfp_flower.c b/drivers/net/nfp/flower/nfp_flower.c index 72933e55d0..294e7431b1 100644 --- a/drivers/net/nfp/flower/nfp_flower.c +++ b/drivers/net/nfp/flower/nfp_flower.c @@ -428,7 +428,7 @@ nfp_flower_pf_recv_pkts(void *rx_queue, if ((rxds->rxd.flags & PCIE_DESC_RX_VLAN) && (hw->ctrl & NFP_NET_CFG_CTRL_RXVLAN)) { - mb->vlan_tci = rte_cpu_to_le_32(rxds->rxd.vlan); + mb->vlan_tci = rte_cpu_to_le_32(rxds->rxd.offload_info); mb->ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED; } diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index 3c78557221..2f7369315d 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -245,7 +245,7 @@ nfp_net_parse_meta_vlan(const struct nfp_meta_parsed *meta, } } else if ((hw->ctrl & NFP_NET_CFG_CTRL_RXVLAN) != 0) { if ((rxd->rxd.flags & PCIE_DESC_RX_VLAN) != 0) { - mb->vlan_tci = rte_cpu_to_le_32(rxd->rxd.vlan); + mb->vlan_tci = rte_cpu_to_le_32(rxd->rxd.offload_info); mb->ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED; } } diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h index f72c54fb25..73ef0a7c9f 100644 --- a/drivers/net/nfp/nfp_rxtx.h +++ b/drivers/net/nfp/nfp_rxtx.h @@ -172,25 +172,25 @@ struct nfp_net_txq { struct nfp_net_rx_desc { union { - /* Freelist descriptor */ + /** Freelist descriptor. */ struct { - uint16_t dma_addr_hi; - uint8_t spare; - uint8_t dd; - - uint32_t dma_addr_lo; + uint16_t dma_addr_hi; /**< High bits of buffer address. */ + uint8_t spare; /**< Reserved, must be zero. */ + uint8_t dd; /**< Whether descriptor available. */ + uint32_t dma_addr_lo; /**< Low bits of buffer address. */ } __rte_packed fld; - /* RX descriptor */ + /** RX descriptor. */ struct { - uint16_t data_len; - uint8_t reserved; - uint8_t meta_len_dd; + uint16_t data_len; /**< Length of frame + metadata. */ + uint8_t reserved; /**< Reserved, must be zero. */ + uint8_t meta_len_dd; /**< Length of metadata + done flag. */ - uint16_t flags; - uint16_t vlan; + uint16_t flags; /**< RX flags. */ + uint16_t offload_info; /**< Offloading info. */ } __rte_packed rxd; + /** Reserved. */ uint32_t vals[2]; }; }; From patchwork Mon May 22 08:04:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 127142 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B522B42B6F; Mon, 22 May 2023 10:05:47 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BECC642D3A; Mon, 22 May 2023 10:05:33 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2121.outbound.protection.outlook.com [40.107.95.121]) by mails.dpdk.org (Postfix) with ESMTP id 616A642D38 for ; Mon, 22 May 2023 10:05:32 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f1Zp3RDwS4SLz79hkZyaWGApZ+dpzxMLOPO6m8XhP2H82z5TCekddUHRLLbKpAEhZvP/e+v4xp9SlU2Bxlu7klGJVsCFDHdE65FhJwMtIYR7DNV85C2Y8XPFsEgV6sssLMnwYpG5GagiICM/2049Kcx+7ZlqXcUkwjEaATZSGcYvOsIxUH2CzXwRJBkTz/LH/CniqLbCwoVDxht/RX5jjQBT3jBTlDNWlh2TyFad07meOfj5UyGBa/JE3+Z6kSqLlipQsKfQ0UcqeyW4Io3pv19oRFi+6hUB1UeuZ1Gf5RBtDwF84PK6Y7a/lsU6ZgVuNrbTeBC85ztMwcM8sI4NBg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=HzrNLWcD2qGemt+F9aZGlHTiiqrl0N3F6XLTTr0gIW8=; b=B4uC/kTBXp+dHHW/q8XHblnn26xuMkVSv5GYkG4QP4vhbvgHEh2LFYDuncc+4VW3g6xMVL6q1BPZygSc6kWtFrCR3EcMfoF1rXnTeRdfWxulgglLz6lTozhUFo7Yb3Ao83M6EyeRu+B8+KAraqOfbBE4l82OTLcF0hMYVCYcXRVU+TbI0ECVUHmd8SyqrqtO/+9v4Hr9FbZEUgrIV3yvFXH4LE+akcyLRm+8+Uw0CsNivUo1lr54XWCDHc8oDR7Fxr8WlQOINN3QhJ+j4Rue54Cs2LGlAzmwWHkWCXINc0khvnYZhjeX3hQfgZMgDHlCqZ/DXDph8eqYCjGSDZir3g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HzrNLWcD2qGemt+F9aZGlHTiiqrl0N3F6XLTTr0gIW8=; b=MQTiJ8pPegEPNLTVPSu02QzYDBNvqeAGwE4wJnv9IEeJkgkIQnJoxdRPMl5ilgY5y4zrVfsIkDfMOuAE58aJM8CWJ/MN6qOFj/nbIoDDXSC/DSpSmPQeLvWBFOL4w6pGyTYsCRDeplB3qVDR9M2d2ccGOoQmhE/E4Z5v68yqKX8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SA3PR13MB6395.namprd13.prod.outlook.com (2603:10b6:806:3a0::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.13; Mon, 22 May 2023 08:05:31 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994%3]) with mapi id 15.20.6411.027; Mon, 22 May 2023 08:05:31 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Qin Ke , Chaoyong He Subject: [PATCH 3/5] net/nfp: standardize the logic for nfp reconfig function Date: Mon, 22 May 2023 16:04:58 +0800 Message-Id: <20230522080500.2014001-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230522080500.2014001-1-chaoyong.he@corigine.com> References: <20230522080500.2014001-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR03CA0109.apcprd03.prod.outlook.com (2603:1096:4:91::13) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA3PR13MB6395:EE_ X-MS-Office365-Filtering-Correlation-Id: 119a25b0-1e27-41af-235b-08db5a9b4fd4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HIy34aSyRcRMnOlfcCLqVDJw9vBf7w1y1FJtGgyDM8iEm/Gx3592yZ83z9npoBdXeEvHLNMJMgg577Ltnp6HFNUIVAfx4utN9s9MZYP/YYTwZ6yzpGglMyVEkU0V84QMscgqyMRnhIks2+1+EuDYslhd6iYt9h+Pn84S2IrdL0J1wA39dvtq8sRASLX2foZwY5AR8c6aXn9uIL5oNudo6xp6SoC+2WYwSZC6aA99qwMG+jPynDNAoKQHvxMxi8ULL/uBxQiZeAkBPfpNz7FJI/p3P0lJLAzKY4U4LXs6XVijtQ3dCvuYoTk3GXkmxOTaDWdnLcWSRgKqHFu2h9iDo8PNWUK4QFxB+M0s0CPHEvEKgncrOukqH6RVCa0FhjY9Y6Wx6qQsvqwi76Ap2j9nQ1lJYp85GPNdSHPJcQdsT2723DeB2438mi4a5/3vxaeQbhlyyFZioK9N23NEaAJl9f9uRbwNnuvWOD/Gpcoxss0QFI6obxI6qHYXxYvbNCcywGapmFqX9gPnTAeLTOEOuu4BfUlDYN08YDevajJNCiT3zLQZjF6b8xMuerHA7p+TGhSf45zmPIUXLm5kCoc9zPbFyG2c/xpKw+B/m9a0GiGViJF0tHY0kjvRWz2oi/wc X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(396003)(346002)(376002)(366004)(39830400003)(136003)(451199021)(38100700002)(38350700002)(8676002)(8936002)(5660300002)(66574015)(6512007)(6506007)(1076003)(26005)(186003)(2906002)(2616005)(36756003)(83380400001)(44832011)(107886003)(86362001)(54906003)(316002)(6666004)(478600001)(4326008)(66556008)(66476007)(6916009)(66946007)(52116002)(41300700001)(6486002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?elrUUKw4emGfPmO2FdXUo3zNQi52?= =?utf-8?q?aL2pHIcQoKNBDeMLFK9FAGsshsj1+lQLh86Fo9gmnrQrndJNeumvM8xP9s/CB3+iK?= =?utf-8?q?/dNJIrbogqWvngA3S2l5ZziOsA10mr6gqEWjNI59WG5OGBgUGvj44ZD+FTOwuzl89?= =?utf-8?q?rugsjLrF/1hEuJOiMOksSCW2J7IY0lV0hqCLPDJyqQqC5rCAzEuLWGPRb14o8lTCu?= =?utf-8?q?Kcvz23/xHEvwKWFkxL3HPfHlVcg2HVvqt+zVee8SMLHZoZFLigb7zQoWd9Xgdzt7T?= =?utf-8?q?bpP7tgZu+1Ziwwpf1I/NKamhLN/uTtNsq3+7Ei2rks7qbTFAOZX78c2idX2Y3NQUb?= =?utf-8?q?JcJ59D3+148Be8ElTfWA9Ca5ICilvY3MslYuoUdrMqqGiJY+YrNv2XELjanvU3E1V?= =?utf-8?q?eDNvtTLZKG5Q6arwBQCr2/hyLf3rj1CoSlVOASoCQ5tLqGYusEEq6sogthr28p+8t?= =?utf-8?q?/BMJiO+VGYY0+3CPOcVfRAQU9HlqwpwOM66AaXYQikH4fctb4P5RPvY9k/aJyS4Q/?= =?utf-8?q?FF4INb5yGdkEKfFW5WTwDDcOw6MvXTnMywsDCTPnuORZm9RB41LBzC74HPuO7fgK/?= =?utf-8?q?NpkFMfkMcus2JdLJ/VIiO68Oti5VNZA7UhPQsoTd4+Vq4MXSlpalJxibhycCa3ZNI?= =?utf-8?q?+dAQxRn3TtbfqvgoAxpKLzOreEIb9+2yTQjdcNTyjNiABsD2EVKco7leKNaRexKqW?= =?utf-8?q?q81PmQaI6C5gtIosgWqGJehEnrlGONQxChKA5SIPdVJR+s3sxhng58DyRxmRGWAZU?= =?utf-8?q?oZwI1YERxFO5Rs/0nA8r1ldpqjiyzAab2Dd4DnQXxT5j7fxsD2lCNmqI7Lh0B/NPM?= =?utf-8?q?pCLykVnDlOcwYry14rkTss+ccJCAYHguO107LNAqJihmp0jceSE5r3xFKBgRrUpSo?= =?utf-8?q?Zdg+mfuAvGtGaa5BJQIjxApDztWX2tkpQlpoLdNzXjG0Y0WWvbzSnWCaXPLR/C/SV?= =?utf-8?q?ADMiXOUc3rf8n6Av84TbwESh3Pwly6XNJ2jcu/3A93aXtizU2hoKUAtbwV6wMWGop?= =?utf-8?q?pb99b7HusuYnCoyRIox+sGtBjxfCRS8BweadtVpibyKEJF9FBR5Fr54Px5lvAm1aI?= =?utf-8?q?3Qghl3RCtsmJSPbhsksZen7kIwhj/JQKQqXIw/fB4nXmkdl+e/hlqj+DZ3/7DCEPe?= =?utf-8?q?v7pTXH1lo9ZJeB3N4w9tOII+sD4/rfxcjgP2awklX5GZR7lAGgQqANuRLQxvNwSBM?= =?utf-8?q?LqwMyPmU8SYr6KzGD3r+gySjYjiADMUl3UHg07hdQ0MqiHHSMJRgXTR7kS8xut6WA?= =?utf-8?q?XEhjBEFeeXTxfRXyRlcQO6IBdnhnCjvElIrQbaL16hUHaYDALXHUZRiRSVWZSHdNp?= =?utf-8?q?DkeQH5Nz1dHQimZ81NbDkRQPQsvsmqHuu2PrJxnhxx07OrEKPL0KiRUEtjjIyiSHp?= =?utf-8?q?PD82bX/TpKyJlum9GktTUhW8zxkX0AMXuThaIQLBetO1BE67DJTz3qBb8J/Y7tRZr?= =?utf-8?q?4pjhtdIawfFbw8vgxeGaL8BdyVKkALP+ZHnHFg3wLXDRzhix5Y0BMHEZjWUHBAHmU?= =?utf-8?q?kj6xFsKzH4nYv1fl9kXjr6lz5w04TwttbQ=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 119a25b0-1e27-41af-235b-08db5a9b4fd4 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2023 08:05:31.0775 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2+5JrKoi+9jDxFtCYRTA5DeevNr2760wpS8Ems+M1/o0tcD2g0NdrGYNO+VpRgD+QlZqUpvedFvKV+dkTICNLnJLvQXOr1bwyt1GC/HI0vM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR13MB6395 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Qin Ke There are some issues about return value and code style related with nfp_net_reconfig(), standardizes them. The line of code nn_cfg_writel(hw, NFP_NET_CFG_CTRL, ctrl) only needs to be executed once, deletes the redundant line in nfp_net_start() which has called nfp_net_reconfig() including the line. Signed-off-by: Qin Ke Reviewed-by: Niklas Söderlund Reviewed-by: Chaoyong He --- drivers/net/nfp/nfp_common.c | 32 ++++++++++++++++++-------------- drivers/net/nfp/nfp_ethdev.c | 1 - 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index c9fea765a4..0644f6f1a8 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -256,22 +256,27 @@ __nfp_net_reconfig(struct nfp_net_hw *hw, uint32_t update) return 0; } -/* - * Reconfigure the NIC - * @nn: device to reconfigure - * @ctrl: The value for the ctrl field in the BAR config - * @update: The value for the update field in the BAR config +/** + * Reconfigure the NIC. * * Write the update word to the BAR and ping the reconfig queue. Then poll * until the firmware has acknowledged the update by zeroing the update word. + * + * @param hw + * Device to reconfigure. + * @param ctrl + * The value for the ctrl field in the BAR config. + * @param update + * The value for the update field in the BAR config. + * + * @return + * - (0) if OK to reconfigure the device. + * - (EIO) if I/O err and fail to reconfigure the device. */ int nfp_net_reconfig(struct nfp_net_hw *hw, uint32_t ctrl, uint32_t update) { - uint32_t err; - - PMD_DRV_LOG(DEBUG, "nfp_net_reconfig: ctrl=%08x update=%08x", - ctrl, update); + int ret; if (hw->pf_dev != NULL && hw->pf_dev->app_fw_id == NFP_APP_FW_CORE_NIC) nfp_net_notify_port_speed(hw->eth_dev); @@ -283,18 +288,17 @@ nfp_net_reconfig(struct nfp_net_hw *hw, uint32_t ctrl, uint32_t update) rte_wmb(); - err = __nfp_net_reconfig(hw, update); + ret = __nfp_net_reconfig(hw, update); rte_spinlock_unlock(&hw->reconfig_lock); - if (err != 0) { - PMD_INIT_LOG(ERR, "Error nfp_net reconfig for ctrl: %x update: %x", - ctrl, update); + if (ret != 0) { + PMD_DRV_LOG(ERR, "Error nfp net reconfig: ctrl=%#08x update=%#08x", + ctrl, update); return -EIO; } return 0; - } /* diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 722ec17dce..1ddb7a92ee 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -144,7 +144,6 @@ nfp_net_start(struct rte_eth_dev *dev) if (hw->cap & NFP_NET_CFG_CTRL_RINGCFG) new_ctrl |= NFP_NET_CFG_CTRL_RINGCFG; - nn_cfg_writel(hw, NFP_NET_CFG_CTRL, new_ctrl); if (nfp_net_reconfig(hw, new_ctrl, update) < 0) return -EIO; From patchwork Mon May 22 08:04:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 127143 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 348F942B6F; Mon, 22 May 2023 10:05:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 267A742D42; Mon, 22 May 2023 10:05:37 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2096.outbound.protection.outlook.com [40.107.100.96]) by mails.dpdk.org (Postfix) with ESMTP id 647A042D48 for ; Mon, 22 May 2023 10:05:35 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oBNZ8HP91oRarB7Ahf/gAf4nMll02dbWxmmgafK9rqkdd3cWI/AcNmqgO6jfc2KExHlWTAnfDIADzNrMq55dlIrz4D2z3R2dNokQ9CCRPhCb8lnlaechJHwOBu15/C4G2Z21JoYOYs9AZwydfgydmI6jDU1t/MpEf1PO0SO06I/aFWFGI5FGVLMYkP0Ptzv/UBLeBhHEB46NIjc6VLAA0svSknUPnNZxaBca0Sk8bgiivdzarK2SthifddVIyySzyp6fDkT6tAYExBpulFlj1BE80Nyn8Woe0LwUcoIC7IpCrsAch0OiboRTYrbycGZGC41qWRkMG0JeQiCrqxrngg== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=sHbrdda/Eyq00Apsxq5vUbxpMN772dEHwNBoLl8NBvo=; b=k6jgXweKdq0fWX1tGHRVos0aPkTcLB6q9Av1N8ID7t5UhuXlWTqnaX1bYeSbGUH2I9XMeJopY7nacImuRZOd1fctFP7M695QAvNYmiTm8ECoeJG6bzUK2atTuwmEO6/ZJx00txZwPqnNrbwtN4FcVrnwDVWzpLZo45czhg0PcQ6XDGgTQsRQoIxGikYdIn66LADiTGAd6zDpk4OKIwVmElaxn4u5kcnxhn8GIHxriYSIWif+EblF4WoKnIOl6sVG/nBNM9UlDag2GYry0N7VXs03W2BqQ5veZFklRf3/nzdU9yxIXo2v0ySgWPCCeFTiFd7LIf1yKdnU7EWrmhmGmw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sHbrdda/Eyq00Apsxq5vUbxpMN772dEHwNBoLl8NBvo=; b=N2pCEKWBWz8fG4d9gwmtj0JOOYEKhQz7l9RD34a/C0zjsA3c9dvTDmADq/2wYBZVTPVVm4w+daDkDew28VXOnGavlzUz1w/AL+S943GWNTjULWMchnYVADU14wk8c+1j4eVHVPkdjOa8sUeS7En4hv0P0I1UOex+6+/Ma2hCeTQ= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SA1PR13MB6543.namprd13.prod.outlook.com (2603:10b6:806:3a3::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.13; Mon, 22 May 2023 08:05:33 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994%3]) with mapi id 15.20.6411.027; Mon, 22 May 2023 08:05:33 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Qin Ke , Chaoyong He Subject: [PATCH 4/5] net/nfp: remove logic of reporting packet type by hash type Date: Mon, 22 May 2023 16:04:59 +0800 Message-Id: <20230522080500.2014001-5-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230522080500.2014001-1-chaoyong.he@corigine.com> References: <20230522080500.2014001-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR03CA0109.apcprd03.prod.outlook.com (2603:1096:4:91::13) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB6543:EE_ X-MS-Office365-Filtering-Correlation-Id: c8a84131-c871-4781-c705-08db5a9b512d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MG6+DzQ9QG/1egnJ3vtzJ2Hy2aH5E6GKsyiAcLefvx+ntdnlZuOWeZUwXtx0wFy1pKibMJNJvTIBhM7FduPyxsZ7FiqYr7XXo2LffDA2o9QhPAMUxlKrLo4lEGrrwAYlhzrLXSsBnEY2NwbT7ALzlunf1TkYcA7uR+Vj3n0489bN+U4kKL/gZe6Hp8g+lF/rGoB/byDsWIJnppsqEBYISaZHPbAk/7ed49TbrrCq6evEgrNpemzvaVYPcy8DzzUcg0OvbFjNwyFv7h8i4KGlB3NvFUx0GZEZV8zJ9mbn9fi7je0YuO6JyI0O3GwONBO0QLYkFPvNIzx8+GkONbioDSPQRBlBHAm10kBZSgNX109s6650cAKCzTjooHTMLIpNLHc2DHmNYFF1dKhTMY1cS73Af6qRxdiWu6uu8M8JJI56xvuq2XA0CBoUKLW8SMyzi4RJqpLj+To+Ji29TpJ9Uao9b0igYyoMI7PSPFFQ+VAr4yDDkbe2gw7AidQgIcPvSAUK6bPbiPb31SSpgJknuJ8HohKKcWQq1MvuPlaYpMCoX4L/JIKhpUhA+zv8wBX34CiY/zTZT+ynSHoTP3PfnO+hY8/KmWTPkB44Zmt0w4MvR80T2kLbCNrdo1ZFxiYD X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(366004)(396003)(136003)(346002)(39830400003)(376002)(451199021)(8676002)(8936002)(5660300002)(44832011)(83380400001)(186003)(26005)(1076003)(6512007)(6506007)(2616005)(86362001)(107886003)(38100700002)(38350700002)(41300700001)(6666004)(6486002)(52116002)(66476007)(66556008)(66946007)(316002)(6916009)(4326008)(36756003)(478600001)(54906003)(2906002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?V3da9sfyd9BBDUPJQaax75RSvA7u?= =?utf-8?q?mu6RqRX2pTZ/6eQ+eEzNRHdculzdCTZ/pTrDMHhOepphxTtAcqpNuHp5fT+53lU6+?= =?utf-8?q?L0gDIerUuK4sAFCoAnqVgnVA0Yo1iP/au7h4y39od4EKcvItN5mkS5Z5pqdJbSqur?= =?utf-8?q?qjnYaAChrAEYQMYPJpU94KV5SAA2wXQIzkwxxEkTKpXz3PeC6TDZPDj8eNq70efhD?= =?utf-8?q?L35+D2/8N4fsT5PRdaVy3K0AcA5LOecN+AdUp4poWyFO4cvWjVbTuZHuLgjQrX1ew?= =?utf-8?q?f4QhB98b7zWtD8lAZDck6sLtiFaz21k8jWWQFgqt3qXbstFejMAUVdxPeAikNvFH+?= =?utf-8?q?LlylmcUWBeNASnK118bChSNp9JVsYLnnU0WdptK1dvLjId7vFaP1T4QBJNge4W++N?= =?utf-8?q?l785xdhn4wYkAbii9Pj+5ZGSVuEqNpHC88y+Ort0cbQxOn62HlXQJsTyGD3uVLyhE?= =?utf-8?q?Gm2T6za82xioJAlM+wMiZ7LkaCeEfWbk2kuh6zyejrJPVbSdudKwaeu4zGHL+oV/I?= =?utf-8?q?gK8YmQ6EarfFTg5k50MWKUmnh7bEv4I9Z+KCYMR3o3xkocGOtf6Fbeu4elMnPE8D8?= =?utf-8?q?5bHW3yflhqCAxAoMGFE60otRV3PqiVneRlDLPprz+aUPA8jcu6LxE3jl6NkdC7VJ+?= =?utf-8?q?hMSvD/I5ave/oa7gEnRm4Is8gpioIxpNguAxhU2jQjlC05h8Ey1RFA3nGeR0OISAU?= =?utf-8?q?/rym/5e6d0M1vCtfUAqy2omy10leQZez1Yxrynu0SPOEOp1NmkUHqh8f6bloYi1oy?= =?utf-8?q?UcxwH2rRIWWz8OczvjX1eOm4NSwrXsBSTc2euW3JNj5dwScmJ8h+oCAMUhdvu0wyk?= =?utf-8?q?/+wf59I0FGc5A7/mAZoIqPw5hlhiqle8rJV55CwsqYwX6JHToaEcbB2NZMWS9HO2K?= =?utf-8?q?otlD/mtW/Ax6m6h58KsZcjjfZ/Bq3rlDn8ET6Zgl9Z9gptsoMVX034Nuo+INf+xRz?= =?utf-8?q?G+NT4ghcmPxjjLoVF0tBJCZdlBIY6jIodi5cCOg65lH4AwbwdE8jm6qDq9BLEEF8m?= =?utf-8?q?vf0aAFI7oTpwkECIJTVI7mbDl36YUQ8vc6BI+QunhJ67xl0lOMzRDB34MsRIZxiaV?= =?utf-8?q?BzLNnx6D8QWYfk4u11kjYpT5JLk5zKLt9Cdf6CTRo+NyW5nwPuNnmtifWPJRKA3th?= =?utf-8?q?3EIaT2KBaW0+SizNfJQCgcYk9WHZy/TpP9pJVLYBXLacHyVaehQIGbiDHs45+m1TV?= =?utf-8?q?NbsulBRPF8LOmTqqw+RRjh0KrnCZ4I5SwwXoy01/OTDYZCGKtyyaNoQodc92W4hIh?= =?utf-8?q?4DpMm7ygr5f8VWGnl3np9H+/KqWaw9yViV/bitaHzQfEF26kKk2dZ3Y6iTjsPO29R?= =?utf-8?q?ecjimzb39G46l8/NO1FAinGGYKk8mZbR3XmwfraSEJnLbN7168dgrmnMRHIbSZMWf?= =?utf-8?q?2AxIYK53x6kty7xpdemLHsLSasFPcNxRvatYIhmTFsDNKseCWEYIa3vxUc2HXswjD?= =?utf-8?q?ZiPjgj1FxiDPK59ycAvMpwtDv8MT6O6OVssoPmd5IK35riaTIL5xNjrX0EkOAlIXS?= =?utf-8?q?RNvADVJGZZdYm3U9xV5Ac/M4r8WJ6LafSA=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: c8a84131-c871-4781-c705-08db5a9b512d X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2023 08:05:33.3238 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4JAldeiiSwY8RGKZoL2/e7Cr/z/bAUIDfdDaGOx5unQmujF4iHXGHXVcENAcqboipFqnNID9+AMNfeWqcrrlABke9sqKIPxFM8UIz57zhnI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB6543 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Qin Ke Firstly, the hash type is originally used as the keyword to calculate rss hash value, not packet type itself. Secondly, there are some issues in the existing logic and it is conflict with packet type offload which to do next. Removes the logic of reporting packet type by hash type. Signed-off-by: Qin Ke Reviewed-by: Niklas Söderlund Reviewed-by: Chaoyong He --- drivers/net/nfp/nfp_rxtx.c | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index 2f7369315d..26bf1543ac 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -167,32 +167,6 @@ nfp_net_parse_meta_hash(const struct nfp_meta_parsed *meta, mbuf->hash.rss = meta->hash; mbuf->ol_flags |= RTE_MBUF_F_RX_RSS_HASH; - - switch (meta->hash_type) { - case NFP_NET_RSS_IPV4: - mbuf->packet_type |= RTE_PTYPE_INNER_L3_IPV4; - break; - case NFP_NET_RSS_IPV6: - mbuf->packet_type |= RTE_PTYPE_INNER_L3_IPV6; - break; - case NFP_NET_RSS_IPV6_EX: - mbuf->packet_type |= RTE_PTYPE_INNER_L3_IPV6_EXT; - break; - case NFP_NET_RSS_IPV4_TCP: - mbuf->packet_type |= RTE_PTYPE_INNER_L3_IPV6_EXT; - break; - case NFP_NET_RSS_IPV6_TCP: - mbuf->packet_type |= RTE_PTYPE_INNER_L3_IPV6_EXT; - break; - case NFP_NET_RSS_IPV4_UDP: - mbuf->packet_type |= RTE_PTYPE_INNER_L3_IPV6_EXT; - break; - case NFP_NET_RSS_IPV6_UDP: - mbuf->packet_type |= RTE_PTYPE_INNER_L3_IPV6_EXT; - break; - default: - mbuf->packet_type |= RTE_PTYPE_INNER_L4_MASK; - } } /* From patchwork Mon May 22 08:05:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 127144 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2279342B6F; Mon, 22 May 2023 10:06:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 23C4B42D4A; Mon, 22 May 2023 10:05:39 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2095.outbound.protection.outlook.com [40.107.100.95]) by mails.dpdk.org (Postfix) with ESMTP id 4E6E442D49 for ; Mon, 22 May 2023 10:05:37 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Yj4l005ZjY3d3hK74hEAwONow1/N7FzefYIPWKk4GUbE8PMwr85+PqQ+y9Bjon/+HseNbM/7urBLIvVirKurRqVflF48fDDs9KGDKsBpxsmxE1e8XD/+lbh1fnkauhqGZO6JgGX9hpse12XAexScqQpqg4T6iqfMT6RV6QPj91OyMVLoy4k0GeTxk/NYjFdZl9faGNOXbS8jinxyepHNOFgYTjTXDq2sEqkYYKE55wsxvxFO2O4cqLbLRmZ55uug7J/NRjrSF2Vazyiapdw/HZqW/2bHbgKSu9wNB+yeUUSoOLi2jEhgl8tTyUAVRKHSWOuyzniCP113KO/XF7QmeQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ByYL4RcMbS3mub/Nz/6eM0vUVjiDhel/2sD07UC4Clw=; b=ChJBYYpmikYFiXEGu6dIGEnTZej29ku3dZ7EOGeevSbh4IekAVjFeGtExbHi26PNQUsXNnKJsHvEcHNZNLPP84OdNMHZaP/OSRQm+8hpNG3uCBRtbazaTvmcnLx8aBz7tf0tLAfo/vbsbnxDTi0iro00YDYr9eoyungvXTqodda3bcgmlGE3bpddaBYd9CGd95/DxEoo7LnmPenDXQA50JP24or1IesC7Z+n9x9CxTWLVTrPEbH53MasSPLZ/TuT7BrbxIsPklq8hkBTvxsInDDQkoxPi+2Dc6WMVGwI0nT4fc4j7FGpC5Q8z27lFRUjdyfOxv69flbj+GErL1Qg1Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ByYL4RcMbS3mub/Nz/6eM0vUVjiDhel/2sD07UC4Clw=; b=u3dn9PiRdN/l25LcktmFw7ykcCbspEs9uN7mOxb1Gdzw0VyClerh/kxPRF0DhxCDjpf1xYxygkGniTQGIoHMJaA4ExqaGuRiaAKP8aGF6AFXaYuVILL/ZKGxXfnAORDeGBcpEP3LjggIOMNzRmbxO+6G599CZ+BZn6LSeFaPFcY= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by SA1PR13MB6543.namprd13.prod.outlook.com (2603:10b6:806:3a3::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6433.13; Mon, 22 May 2023 08:05:35 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ac2e:52b6:82ec:4994%3]) with mapi id 15.20.6411.027; Mon, 22 May 2023 08:05:35 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, niklas.soderlund@corigine.com, Qin Ke , Chaoyong He Subject: [PATCH 5/5] net/nfp: report packet type by Rx descriptor Date: Mon, 22 May 2023 16:05:00 +0800 Message-Id: <20230522080500.2014001-6-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230522080500.2014001-1-chaoyong.he@corigine.com> References: <20230522080500.2014001-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SG2PR03CA0109.apcprd03.prod.outlook.com (2603:1096:4:91::13) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|SA1PR13MB6543:EE_ X-MS-Office365-Filtering-Correlation-Id: 4f8bddc2-58c6-4a4b-ccc4-08db5a9b5289 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g5lsKyhtyoJF/5Xq1oca3iYH8GuQThAggErH9pgLTAbWWvQZSW8JOzIX97XrwOEhOhrwhrfSIYAPoHVd1Fym+L+anPHrtOL6COP8j60nNJjhMELIt6g4LDwzfvYzSOVkpKv56JPq0ZffF5i6kHIR1aw9yEyJ6nAFjyg6YJEkCbeThyKEylwQuh+ZgNBa6RrxM+Rgb6XevXwx/cQNZaUwx5Lh2l2JnqSWjU3rxn7seo2/hWIPrgUuqAP50IFsOhdUK/O3mSxnK1FS142ZcexqlYzdBm70lXt9SZ4yGb9VHpAH9tGyFwEwsng4vRZOvz45OqiHtJoVXMLMhJT7kf9iw45FbXjkx49VgaN2d53J2yc1ISwlRGBxFmuGJU3Yg6uR4I1shljdN5wSPTVnuE2raK/mHYTaflK11LQgEvqk1ZAGGwdn/JAw5HNdBKjBljYktKCcGTaBnNNVJj7Wo2F7qL8gP/7Id1/pXLiHSOeIbK3Rl6uryp5xOgA4/4sm2pIR8zMeCQbI4Q+uRSbCTabfE2jpIs6dbtzUGGpqVvfF+K3Gpt4jhlBUhmTzbyiQ8TSFWBvGDNul+RX5VGfK4n9tUi3wY7q2fzsgs6PSNd9wWWMEApnXCBOxoHcmLY3GnRiK X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230028)(4636009)(366004)(396003)(136003)(346002)(39830400003)(376002)(451199021)(8676002)(8936002)(5660300002)(44832011)(66574015)(83380400001)(186003)(26005)(1076003)(6512007)(6506007)(2616005)(86362001)(107886003)(38100700002)(38350700002)(41300700001)(6666004)(6486002)(52116002)(66476007)(66556008)(66946007)(316002)(6916009)(4326008)(36756003)(478600001)(54906003)(2906002)(30864003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?EgSM23m62SYFTLYYzAM/+x8PzDic?= =?utf-8?q?bLgI4z3MeX7l3Gwq1HAegmgKsCV1cYwslR2z19BClvubeHnIruiKLDfZ+14iqCAs/?= =?utf-8?q?mBKsdajfiKpaq3ZjbCzV1M+WNCAX2ececGwBkRUYmXpbmF15qesYEun/bZgV7hQzA?= =?utf-8?q?7aFiNUhjFqdYL8KdyUGL82Cy3sdY+kTUvkEk+einUUc/ZQUQWrj8iZWz5UTS1DeKw?= =?utf-8?q?qpVTWklcvWUm3bnTHmSmyBjcLQv7glKlTYXRkh169kH62/bK6jYegemZLt9C1dt2l?= =?utf-8?q?/77rErj3BO8yYtoxO2uFgLtAp5L/AhMLPNKcj1fNmQ+AG5jW+BaJxF00As3q5z2Q9?= =?utf-8?q?wKmOZ0pVr4LjZPuDbiEOnIemSUkt+nnSGsiW1C83qA1ZGLnZS+u9DeoKPxDgoAjIo?= =?utf-8?q?G/yuvVacvwHrvrbm6ROLk+mthiBvt6gVqTYoImOjI7XezPc6PbSm4FrH6+FK2Njhv?= =?utf-8?q?Y/C3sN9I2Sza+4VqwMZ3Pk4CEZj7Wh07iKRePIKWvFu8bHFR847XTBFHvPFBLnqnR?= =?utf-8?q?Jl7dvpam6kjF+hzOZX/9mZJDOR42LscLkTcYHSwVo/Js/+6HT4XzqnFs33X/Ka5JJ?= =?utf-8?q?zZ4lr0Oqt6SA2/Ap/Pkywx4D+xEjHBx3bI2qekqu4OUEz+fGzhMCFaf8jQEM3mdvu?= =?utf-8?q?vw4OzfzE5R90tMw9Ogl54sWEcrLmofr5sZaZNrjT7md96lWYumM4RG66ydPhcB/qz?= =?utf-8?q?qbZDFdx0R6nHRSK3c+2ZXlqK0tkWetsBH6JmGznOwYQp+8xLA0s4i5qL80OLp0qaz?= =?utf-8?q?acr0N6tUhK8gTXlLyijzoRBevC3iCoiHZrWU/mz8O4VWDSnvqVH8I4tRmdR3kX3uj?= =?utf-8?q?1ee6TTZq/x2ZqzgV62yADPc82Q68gXG+mWThaJcCZHUkK9K3mjOoON55tm/XvFHdK?= =?utf-8?q?hEB87Zj+K6+KSTxMOh68qvO8Vw/43lEO1l7kq5TRMEbFPGLKABW/6k4zW1WEhrT21?= =?utf-8?q?JmdzdfBYH9g9VcLBIN0KMMPk7MqhiCEYlIbXol1Z9tIq0HIY0Y3qMi/yOiXzr84h1?= =?utf-8?q?Em7APvhFMYh+XkKJZkOp32psu6mgfaBOjRY9iVp6ZN2UuAoX4c94L8JnlR4mnmmOo?= =?utf-8?q?z1rTVpFBoc/j26bV9u0jNApXFTRbMoh127Unv4C8fQYKm0TyCzh++hcInmY5QU+fk?= =?utf-8?q?71jb2nAKPUoWREfB2Oz/DOv7RcmHPiSb9gJzt4V0HAljLaZ15aNWNLk9SNZkJA3ix?= =?utf-8?q?m7N7/f8OtAx5pr8fNWDsxFzM8DoJp5paDueGjvQ3R2CJjxE/rOcL4rbdparLxr/WH?= =?utf-8?q?P2+tSxn7bZcmpNBIEphi/il0j7v0GBFDUgNJxPr3i4Cwc3EPgHLdpUHqlDInhRCjV?= =?utf-8?q?lgW9qZOMZKm5X9kzNq13YvNkJTNAHy00oNrneO3pj/tUEuV3j8V/NLd8n7s/zH6Vy?= =?utf-8?q?8S+jfLxRR+zx6MCBaVGnQ/fJasgkSafLPP6Jnk3SOXjjos1UErjNW2MDH90Ci4hI4?= =?utf-8?q?rwbwqlRcZPMhVPc8ZX+Q74KNuNoAaby0b1hWcz8PBgPT6ZSaYsZCzVBZtRYhvhn9y?= =?utf-8?q?MUuOHxC3XoJAhQEIYgRYC69FRZtxS9V2Hw=3D=3D?= X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f8bddc2-58c6-4a4b-ccc4-08db5a9b5289 X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2023 08:05:35.6120 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: YJr12UrqoCXc2hnekfIdgvP9kxq6NreDxRTlcW5R2zE+A5ZD83CoxiTU78CR945xiOmyj9E0K4OLCIzevcj7BX/JJRjGOGN+mUmmRDL6et0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR13MB6543 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org From: Qin Ke There are some issues about reporting packet type by hash type of metadata. And it may cause more performance loss and space wasting. Parses packet type from Rx descriptor and set it to mbuf. And opens the feature by default in nfp_net_start(). Signed-off-by: Qin Ke Reviewed-by: Niklas Söderlund Reviewed-by: Chaoyong He --- drivers/net/nfp/nfp_common.c | 42 +++++++++++ drivers/net/nfp/nfp_common.h | 1 + drivers/net/nfp/nfp_ctrl.h | 16 +++-- drivers/net/nfp/nfp_ethdev.c | 11 +++ drivers/net/nfp/nfp_rxtx.c | 134 +++++++++++++++++++++++++++++++++++ drivers/net/nfp/nfp_rxtx.h | 83 ++++++++++++++++++++++ 6 files changed, 283 insertions(+), 4 deletions(-) diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c index 0644f6f1a8..0bd95d050e 100644 --- a/drivers/net/nfp/nfp_common.c +++ b/drivers/net/nfp/nfp_common.c @@ -301,6 +301,48 @@ nfp_net_reconfig(struct nfp_net_hw *hw, uint32_t ctrl, uint32_t update) return 0; } +/** + * Reconfigure the NIC for the extend ctrl BAR. + * + * Write the update word to the BAR and ping the reconfig queue. Then poll + * until the firmware has acknowledged the update by zeroing the update word. + * + * @param hw + * Device to reconfigure. + * @param ctrl_ext + * The value for the first word of extend ctrl field in the BAR config. + * @param update + * The value for the update field in the BAR config. + * + * @return + * - (0) if OK to reconfigure the device. + * - (EIO) if I/O err and fail to reconfigure the device. + */ +int +nfp_net_ext_reconfig(struct nfp_net_hw *hw, uint32_t ctrl_ext, uint32_t update) +{ + int ret; + + rte_spinlock_lock(&hw->reconfig_lock); + + nn_cfg_writel(hw, NFP_NET_CFG_CTRL_WORD1, ctrl_ext); + nn_cfg_writel(hw, NFP_NET_CFG_UPDATE, update); + + rte_wmb(); + + ret = __nfp_net_reconfig(hw, update); + + rte_spinlock_unlock(&hw->reconfig_lock); + + if (ret != 0) { + PMD_DRV_LOG(ERR, "Error nft net ext reconfig: ctrl_ext=%#08x update=%#08x", + ctrl_ext, update); + return -EIO; + } + + return 0; +} + /* * Configure an Ethernet device. This function must be invoked first * before any other function in the Ethernet API. This function can diff --git a/drivers/net/nfp/nfp_common.h b/drivers/net/nfp/nfp_common.h index 47df0510c5..baa6752a44 100644 --- a/drivers/net/nfp/nfp_common.h +++ b/drivers/net/nfp/nfp_common.h @@ -423,6 +423,7 @@ nfp_pci_queue(struct rte_pci_device *pdev, uint16_t queue) /* Prototypes for common NFP functions */ int nfp_net_reconfig(struct nfp_net_hw *hw, uint32_t ctrl, uint32_t update); +int nfp_net_ext_reconfig(struct nfp_net_hw *hw, uint32_t ctrl_ext, uint32_t update); int nfp_net_configure(struct rte_eth_dev *dev); void nfp_net_log_device_information(const struct nfp_net_hw *hw); void nfp_net_enable_queues(struct rte_eth_dev *dev); diff --git a/drivers/net/nfp/nfp_ctrl.h b/drivers/net/nfp/nfp_ctrl.h index bca31ac311..ce31dea609 100644 --- a/drivers/net/nfp/nfp_ctrl.h +++ b/drivers/net/nfp/nfp_ctrl.h @@ -214,11 +214,19 @@ /* Offload definitions */ #define NFP_NET_N_VXLAN_PORTS (NFP_NET_CFG_VXLAN_SZ / sizeof(uint16_t)) -/** - * 64B reserved for future use (0x0080 - 0x00c0) +/* + * 3 words reserved for extended ctrl words (0x0098 - 0x00a4) + * 3 words reserved for extended cap words (0x00a4 - 0x00b0) + * Currently only one word is used, can be extended in future. */ -#define NFP_NET_CFG_RESERVED 0x0080 -#define NFP_NET_CFG_RESERVED_SZ 0x0040 +#define NFP_NET_CFG_CTRL_WORD1 0x0098 +#define NFP_NET_CFG_CTRL_PKT_TYPE (0x1 << 0) + +#define NFP_NET_CFG_CAP_WORD1 0x00a4 + +/* 16B reserved for future use (0x00b0 - 0x00c0). */ +#define NFP_NET_CFG_RESERVED 0x00b0 +#define NFP_NET_CFG_RESERVED_SZ 0x0010 /* * RSS configuration (0x0100 - 0x01ac): diff --git a/drivers/net/nfp/nfp_ethdev.c b/drivers/net/nfp/nfp_ethdev.c index 1ddb7a92ee..bd55a54d58 100644 --- a/drivers/net/nfp/nfp_ethdev.c +++ b/drivers/net/nfp/nfp_ethdev.c @@ -57,6 +57,8 @@ nfp_net_start(struct rte_eth_dev *dev) struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); struct rte_intr_handle *intr_handle = pci_dev->intr_handle; uint32_t new_ctrl, update = 0; + uint32_t cap_extend; + uint32_t ctrl_extend = 0; struct nfp_net_hw *hw; struct nfp_pf_dev *pf_dev; struct nfp_app_fw_nic *app_fw_nic; @@ -147,6 +149,15 @@ nfp_net_start(struct rte_eth_dev *dev) if (nfp_net_reconfig(hw, new_ctrl, update) < 0) return -EIO; + /* Enable packet type offload by extend ctrl word1. */ + cap_extend = nn_cfg_readl(hw, NFP_NET_CFG_CAP_WORD1); + if ((cap_extend & NFP_NET_CFG_CTRL_PKT_TYPE) != 0) + ctrl_extend = NFP_NET_CFG_CTRL_PKT_TYPE; + + update = NFP_NET_CFG_UPDATE_GEN; + if (nfp_net_ext_reconfig(hw, ctrl_extend, update) < 0) + return -EIO; + /* * Allocating rte mbufs for configured rx queues. * This requires queues being enabled before diff --git a/drivers/net/nfp/nfp_rxtx.c b/drivers/net/nfp/nfp_rxtx.c index 26bf1543ac..1bf32c4853 100644 --- a/drivers/net/nfp/nfp_rxtx.c +++ b/drivers/net/nfp/nfp_rxtx.c @@ -304,6 +304,138 @@ nfp_net_parse_meta(struct nfp_net_rx_desc *rxds, } } +/** + * Set packet type to mbuf based on parsed structure. + * + * @param nfp_ptype + * Packet type structure parsing from Rx descriptor. + * @param mb + * Mbuf to set the packet type. + */ +static void +nfp_net_set_ptype(const struct nfp_ptype_parsed *nfp_ptype, struct rte_mbuf *mb) +{ + uint32_t mbuf_ptype = RTE_PTYPE_L2_ETHER; + uint8_t nfp_tunnel_ptype = nfp_ptype->tunnel_ptype; + + if (nfp_tunnel_ptype != NFP_NET_PTYPE_TUNNEL_NONE) + mbuf_ptype |= RTE_PTYPE_INNER_L2_ETHER; + + switch (nfp_tunnel_ptype) { + case NFP_NET_PTYPE_TUNNEL_NONE: + break; + case NFP_NET_PTYPE_TUNNEL_VXLAN: + mbuf_ptype |= RTE_PTYPE_TUNNEL_VXLAN; + break; + case NFP_NET_PTYPE_TUNNEL_NVGRE: + mbuf_ptype |= RTE_PTYPE_TUNNEL_NVGRE; + break; + case NFP_NET_PTYPE_TUNNEL_GENEVE: + mbuf_ptype |= RTE_PTYPE_TUNNEL_GENEVE; + break; + default: + PMD_RX_LOG(DEBUG, "Unrecognized nfp tunnel packet type: %u", + nfp_tunnel_ptype); + break; + } + + switch (nfp_ptype->l4_ptype) { + case NFP_NET_PTYPE_L4_NONE: + break; + case NFP_NET_PTYPE_L4_TCP: + mbuf_ptype |= NFP_PTYPE2RTE(nfp_tunnel_ptype, L4_TCP); + break; + case NFP_NET_PTYPE_L4_UDP: + mbuf_ptype |= NFP_PTYPE2RTE(nfp_tunnel_ptype, L4_UDP); + break; + case NFP_NET_PTYPE_L4_FRAG: + mbuf_ptype |= NFP_PTYPE2RTE(nfp_tunnel_ptype, L4_FRAG); + break; + case NFP_NET_PTYPE_L4_NONFRAG: + mbuf_ptype |= NFP_PTYPE2RTE(nfp_tunnel_ptype, L4_NONFRAG); + break; + case NFP_NET_PTYPE_L4_ICMP: + mbuf_ptype |= NFP_PTYPE2RTE(nfp_tunnel_ptype, L4_ICMP); + break; + case NFP_NET_PTYPE_L4_SCTP: + mbuf_ptype |= NFP_PTYPE2RTE(nfp_tunnel_ptype, L4_SCTP); + break; + default: + PMD_RX_LOG(DEBUG, "Unrecognized nfp layer 4 packet type: %u", + nfp_ptype->l4_ptype); + break; + } + + switch (nfp_ptype->l3_ptype) { + case NFP_NET_PTYPE_L3_NONE: + break; + case NFP_NET_PTYPE_L3_IPV4: + mbuf_ptype |= NFP_PTYPE2RTE(nfp_tunnel_ptype, L3_IPV4); + break; + case NFP_NET_PTYPE_L3_IPV6: + mbuf_ptype |= NFP_PTYPE2RTE(nfp_tunnel_ptype, L3_IPV6); + break; + case NFP_NET_PTYPE_L3_IPV4_EXT: + mbuf_ptype |= NFP_PTYPE2RTE(nfp_tunnel_ptype, L3_IPV4_EXT); + break; + case NFP_NET_PTYPE_L3_IPV6_EXT: + mbuf_ptype |= NFP_PTYPE2RTE(nfp_tunnel_ptype, L3_IPV6_EXT); + break; + case NFP_NET_PTYPE_L3_IPV4_EXT_UNKNOWN: + mbuf_ptype |= NFP_PTYPE2RTE(nfp_tunnel_ptype, L3_IPV4_EXT_UNKNOWN); + break; + case NFP_NET_PTYPE_L3_IPV6_EXT_UNKNOWN: + mbuf_ptype |= NFP_PTYPE2RTE(nfp_tunnel_ptype, L3_IPV6_EXT_UNKNOWN); + break; + default: + PMD_RX_LOG(DEBUG, "Unrecognized nfp layer 3 packet type: %u", + nfp_ptype->l3_ptype); + break; + } + + mb->packet_type = mbuf_ptype; +} + +/** + * Parse the packet type from Rx descriptor and set to mbuf. + * + * @param rxds + * Rx descriptor including the offloading info of packet type. + * @param hw + * Device. + * @param mb + * Mbuf to set the packet type. + */ +static void +nfp_net_parse_ptype(struct nfp_net_rx_desc *rxds, + struct nfp_net_hw *hw, + struct rte_mbuf *mb) +{ + uint32_t cap_extend; + uint32_t ctrl_extend; + struct nfp_ptype_parsed nfp_ptype; + uint16_t rxd_ptype = rxds->rxd.offload_info; + + if (rxd_ptype == 0 || (rxds->rxd.flags & PCIE_DESC_RX_VLAN) != 0) + return; + + cap_extend = nn_cfg_readl(hw, NFP_NET_CFG_CAP_WORD1); + ctrl_extend = nn_cfg_readl(hw, NFP_NET_CFG_CTRL_WORD1); + + if ((cap_extend & NFP_NET_CFG_CTRL_PKT_TYPE) == 0 || + (ctrl_extend & NFP_NET_CFG_CTRL_PKT_TYPE) == 0) + return; + + nfp_ptype.l4_ptype = (rxd_ptype & NFP_NET_PTYPE_L4_MASK) >> + NFP_NET_PTYPE_L4_OFFSET; + nfp_ptype.l3_ptype = (rxd_ptype & NFP_NET_PTYPE_L3_MASK) >> + NFP_NET_PTYPE_L3_OFFSET; + nfp_ptype.tunnel_ptype = (rxd_ptype & NFP_NET_PTYPE_TUNNEL_MASK) >> + NFP_NET_PTYPE_TUNNEL_OFFSET; + + nfp_net_set_ptype(&nfp_ptype, mb); +} + /* * RX path design: * @@ -438,6 +570,8 @@ nfp_net_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) nfp_net_parse_meta(rxds, rxq, hw, mb); + nfp_net_parse_ptype(rxds, hw, mb); + /* Checking the checksum flag */ nfp_net_rx_cksum(rxq, rxds, mb); diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h index 73ef0a7c9f..eebe9b3ee2 100644 --- a/drivers/net/nfp/nfp_rxtx.h +++ b/drivers/net/nfp/nfp_rxtx.h @@ -170,6 +170,89 @@ struct nfp_net_txq { #define PCIE_DESC_RX_L4_CSUM_OK (PCIE_DESC_RX_TCP_CSUM_OK | \ PCIE_DESC_RX_UDP_CSUM_OK) +/* + * The bit format and map of nfp packet type for rxd.offload_info in Rx descriptor. + * + * Bit format about nfp packet type refers to the following: + * --------------------------------- + * 1 0 + * 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * | |tunnel | l3 | l4 | + * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + * + * Bit map about nfp packet type refers to the following: + * + * L4: bit 0~2, used for layer 4 or inner layer 4. + * 000: NFP_NET_PTYPE_L4_NONE + * 001: NFP_NET_PTYPE_L4_TCP + * 010: NFP_NET_PTYPE_L4_UDP + * 011: NFP_NET_PTYPE_L4_FRAG + * 100: NFP_NET_PTYPE_L4_NONFRAG + * 101: NFP_NET_PTYPE_L4_ICMP + * 110: NFP_NET_PTYPE_L4_SCTP + * 111: reserved + * + * L3: bit 3~5, used for layer 3 or inner layer 3. + * 000: NFP_NET_PTYPE_L3_NONE + * 001: NFP_NET_PTYPE_L3_IPV6 + * 010: NFP_NET_PTYPE_L3_IPV4 + * 011: NFP_NET_PTYPE_L3_IPV4_EXT + * 100: NFP_NET_PTYPE_L3_IPV6_EXT + * 101: NFP_NET_PTYPE_L3_IPV4_EXT_UNKNOWN + * 110: NFP_NET_PTYPE_L3_IPV6_EXT_UNKNOWN + * 111: reserved + * + * Tunnel: bit 6~9, used for tunnel. + * 0000: NFP_NET_PTYPE_TUNNEL_NONE + * 0001: NFP_NET_PTYPE_TUNNEL_VXLAN + * 0100: NFP_NET_PTYPE_TUNNEL_NVGRE + * 0101: NFP_NET_PTYPE_TUNNEL_GENEVE + * 0010, 0011, 0110~1111: reserved + * + * Reserved: bit 10~15, used for extension. + */ + +/* Mask and offset about nfp packet type based on the bit map above. */ +#define NFP_NET_PTYPE_L4_MASK 0x0007 +#define NFP_NET_PTYPE_L3_MASK 0x0038 +#define NFP_NET_PTYPE_TUNNEL_MASK 0x03c0 + +#define NFP_NET_PTYPE_L4_OFFSET 0 +#define NFP_NET_PTYPE_L3_OFFSET 3 +#define NFP_NET_PTYPE_TUNNEL_OFFSET 6 + +/* Case about nfp packet type based on the bit map above. */ +#define NFP_NET_PTYPE_L4_NONE 0 +#define NFP_NET_PTYPE_L4_TCP 1 +#define NFP_NET_PTYPE_L4_UDP 2 +#define NFP_NET_PTYPE_L4_FRAG 3 +#define NFP_NET_PTYPE_L4_NONFRAG 4 +#define NFP_NET_PTYPE_L4_ICMP 5 +#define NFP_NET_PTYPE_L4_SCTP 6 + +#define NFP_NET_PTYPE_L3_NONE 0 +#define NFP_NET_PTYPE_L3_IPV6 1 +#define NFP_NET_PTYPE_L3_IPV4 2 +#define NFP_NET_PTYPE_L3_IPV4_EXT 3 +#define NFP_NET_PTYPE_L3_IPV6_EXT 4 +#define NFP_NET_PTYPE_L3_IPV4_EXT_UNKNOWN 5 +#define NFP_NET_PTYPE_L3_IPV6_EXT_UNKNOWN 6 + +#define NFP_NET_PTYPE_TUNNEL_NONE 0 +#define NFP_NET_PTYPE_TUNNEL_VXLAN 1 +#define NFP_NET_PTYPE_TUNNEL_NVGRE 4 +#define NFP_NET_PTYPE_TUNNEL_GENEVE 5 + +#define NFP_PTYPE2RTE(tunnel, type) ((tunnel) ? RTE_PTYPE_INNER_##type : RTE_PTYPE_##type) + +/* Record NFP packet type parsed from rxd.offload_info. */ +struct nfp_ptype_parsed { + uint8_t l4_ptype; /**< Packet type of layer 4, or inner layer 4. */ + uint8_t l3_ptype; /**< Packet type of layer 3, or inner layer 3. */ + uint8_t tunnel_ptype; /**< Packet type of tunnel. */ +}; + struct nfp_net_rx_desc { union { /** Freelist descriptor. */