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 C04B1A0544; Tue, 11 Oct 2022 02:53:44 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C280942BFA; Tue, 11 Oct 2022 02:52:18 +0200 (CEST) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2079.outbound.protection.outlook.com [40.107.95.79]) by mails.dpdk.org (Postfix) with ESMTP id 978C242C02 for ; Tue, 11 Oct 2022 02:52:12 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KZMfS047sJ4TrabJEIKW4hcSuO5wDmzVDmpm875bUQc5M50EQ8GT2DIrBowHrcGJzpMPDdcb+JlzxWztTHmDZDHcm1BtNGDSSBu7wnLC56XVJ1LoNg2aKUhV1TrZ7//o5hG4a9wO2NGk/BFVkXPNX5t/6gfUFikjy6xKPCwTR7mP/u0/QfqouvfJDfkW/0dITPLzgFOEsGY6gdxDW1c0PZyTBaF4oAEn5nkY1gp1oDDXqepUlo8c/vThagrgwU2dj2kzxXvKaG+IHW1/JDeUGaxFLFj+drfUEZowvAO2pbiKCcVqNiSbrphXgzkL/bLDz4EvjikJcTh0aamsrOZrYA== 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=DEMP+YC3l5Yu16Fd8LraaULY4ysRJg08S4fb10zD8zU=; b=PX/I52OFC1ppCXB5Aulym14XcRNqSdy4WqJBA1H+YN+P6lYoPNhgY/GZDGrQshKQPcDmhxDm1hrKRPk00ZAntlLAoIkE+Rs2KnpwGKX+TIJCL1hEGDWTnVmEsM5sTBCshRIjz0WKExoklMs0+t7WIOFhA47nP8PIq9SPDZcTap6Jok3gVpLe5oJnsb+oKaZzmPbIX9/llTagUoKwSIxvNVFO1Bnat+TxXy4vIuYvUwNSn5rfon/fi/zM8XcxB4dno9Or7OprzAw4kNpqFLwsVwNCSApJ3Fpee2QGa5WkAzY0Ajhvo2l3H87q8+FCVSamEug4PCg4DvJh9bDyLE3uDA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DEMP+YC3l5Yu16Fd8LraaULY4ysRJg08S4fb10zD8zU=; b=VR3dr3cFiZk93hnIcXOZmUMPoVUK0qBssC9+SowJuZi0Ouh9aHQ/AxsH/evEjdArwZFK238Gc5J2sVeT72SUrQTov3w6DRVz7WtIkoqIgRdI/y/mahz5lwLjgnBNaFgudpqGGyazj81alggHc3mnKMOIgxvOVVqStd86lizIWvM= Received: from BN8PR04CA0024.namprd04.prod.outlook.com (2603:10b6:408:70::37) by CO6PR12MB5458.namprd12.prod.outlook.com (2603:10b6:5:35b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.19; Tue, 11 Oct 2022 00:52:10 +0000 Received: from BN8NAM11FT012.eop-nam11.prod.protection.outlook.com (2603:10b6:408:70:cafe::37) by BN8PR04CA0024.outlook.office365.com (2603:10b6:408:70::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15 via Frontend Transport; Tue, 11 Oct 2022 00:52:10 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT012.mail.protection.outlook.com (10.13.177.55) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5709.10 via Frontend Transport; Tue, 11 Oct 2022 00:52:10 +0000 Received: from driver-dev1.pensando.io (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.28; Mon, 10 Oct 2022 19:52:09 -0500 From: Andrew Boyer To: CC: Andrew Boyer Subject: [PATCH v1 23/35] net/ionic: add a lookup table for packet type Date: Mon, 10 Oct 2022 17:50:20 -0700 Message-ID: <20221011005032.47584-24-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221007174336.54354-1-andrew.boyer@amd.com> References: <20221007174336.54354-1-andrew.boyer@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT012:EE_|CO6PR12MB5458:EE_ X-MS-Office365-Filtering-Correlation-Id: 3cf1d41a-e50f-4619-a661-08daab22d443 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sOilZVcrOfOGJ/ziSPYupiFYqJUZLemJFSzywSNbD1ECxiZhkhJX6i8x7LQsDZUK8HIw3iU4jgX2syZ1T8YFw7MzDFHoCKh9IrXSpUNZ0kOcx+MJELlhcYWsphmnm9SP5JuptF1UHF+ZG7nD96uo+Yf29Dv11k3UoBZP4K8TITyinpzQeKWSdyK6jcXzmOdB36lsyMwKyQRS6bWODhS+mOiyrH4AMmgoIimQ3k7iAaohu9+RtrQGlLfjbQzN9r4CbGCB8T/JBOf2YjtGcAV9KqyMy7jUn4oqqTinKIcPXIp7OElFOUQuni1c9wcexfUdeUgfJUDRw8FiKEzl2hs8vpua3TwZggANaqbnzj9u2rWn3Dmw17I8Z4DVlY6IYWlL+J01/LVn/5rnGj8VwgZUJMi9Ys9l83RIVc2S6fl0J2njO5/pYnK/6cxDHt67x9WWaOCxe9pHcR0i/StjErmMvLwUIjpv4+WszYF/1nyOwCRrfR4n6Sqqo8Vk+jrUESIgDZg2auB+1rj6sWGyGVy1wZpA8//6dd44269V+tn+4w6pzouh1rRlEVtSCTBt/WZmSRhidHcL6SVdJ1Gf69Q9zbpEE6x6OmO1X2vXPW7lrHHFU/d2kLwpTJGnDHgNgL5Yig5pFPLJnatbwAHWRROKuctrHDa8HL9w04ueNa+WdoQj37YjxfSyXpbMZkpBUsVxNDrIkb0pq039sGChKsWO/PgO2M6vCUJyMQwMyos2kouac+XK9wLEV5mOplRU2P7NK5W2kh2LmjZZrDGK3QOwZKbq5hmvmHBSqc8ULTU/9l/Xt+6Xe0w/y6aozLrttMcA X-Forefront-Antispam-Report: CIP:165.204.84.17; CTRY:US; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:SATLEXMB04.amd.com; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(13230022)(4636009)(136003)(376002)(396003)(39860400002)(346002)(451199015)(36840700001)(40470700004)(46966006)(36756003)(86362001)(36860700001)(44832011)(5660300002)(82740400003)(336012)(16526019)(1076003)(186003)(2616005)(47076005)(81166007)(356005)(83380400001)(426003)(82310400005)(26005)(6666004)(478600001)(8676002)(6916009)(316002)(70586007)(70206006)(8936002)(2906002)(41300700001)(4326008)(40460700003)(40480700001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2022 00:52:10.4318 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3cf1d41a-e50f-4619-a661-08daab22d443 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d; Ip=[165.204.84.17]; Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT012.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR12MB5458 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 This improves performance by reducing branching. Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_rxtx.c | 63 ++++++++++++++++------------------ 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c index 5ee6573a50..bb09c4eb1f 100644 --- a/drivers/net/ionic/ionic_rxtx.c +++ b/drivers/net/ionic/ionic_rxtx.c @@ -804,6 +804,22 @@ ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev, return 0; } +/* RTE_PTYPE_UNKNOWN is 0x0 */ +static const uint32_t ionic_ptype_table[IONIC_RXQ_COMP_PKT_TYPE_MASK] + __rte_cache_aligned = { + [IONIC_PKT_TYPE_NON_IP] = RTE_PTYPE_UNKNOWN, + [IONIC_PKT_TYPE_IPV4] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4, + [IONIC_PKT_TYPE_IPV4_TCP] = + RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4 | RTE_PTYPE_L4_TCP, + [IONIC_PKT_TYPE_IPV4_UDP] = + RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4 | RTE_PTYPE_L4_UDP, + [IONIC_PKT_TYPE_IPV6] = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6, + [IONIC_PKT_TYPE_IPV6_TCP] = + RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6 | RTE_PTYPE_L4_TCP, + [IONIC_PKT_TYPE_IPV6_UDP] = + RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6 | RTE_PTYPE_L4_UDP, +}; + /* * Cleans one descriptor. Connects the filled mbufs into a chain. * Does not advance the tail index. @@ -820,6 +836,7 @@ ionic_rx_clean_one(struct ionic_rx_qcq *rxq, uint32_t pkt_type; uint32_t left, i; uint16_t cq_desc_len; + uint8_t ptype; void **info; cq_desc_len = rte_le_to_cpu_16(cq_desc->len); @@ -895,41 +912,19 @@ ionic_rx_clean_one(struct ionic_rx_qcq *rxq, rxm->ol_flags = pkt_flags; /* Packet Type */ - switch (cq_desc->pkt_type_color & IONIC_RXQ_COMP_PKT_TYPE_MASK) { - case IONIC_PKT_TYPE_IPV4: - pkt_type = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4; - break; - case IONIC_PKT_TYPE_IPV6: - pkt_type = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6; - break; - case IONIC_PKT_TYPE_IPV4_TCP: - pkt_type = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4 | - RTE_PTYPE_L4_TCP; - break; - case IONIC_PKT_TYPE_IPV6_TCP: - pkt_type = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6 | - RTE_PTYPE_L4_TCP; - break; - case IONIC_PKT_TYPE_IPV4_UDP: - pkt_type = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4 | - RTE_PTYPE_L4_UDP; - break; - case IONIC_PKT_TYPE_IPV6_UDP: - pkt_type = RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6 | - RTE_PTYPE_L4_UDP; - break; - default: - { - struct rte_ether_hdr *eth_h = rte_pktmbuf_mtod(rxm, + ptype = cq_desc->pkt_type_color & IONIC_RXQ_COMP_PKT_TYPE_MASK; + pkt_type = ionic_ptype_table[ptype]; + if (pkt_type == RTE_PTYPE_UNKNOWN) { + struct rte_ether_hdr *eth_h = rte_pktmbuf_mtod(rxm, struct rte_ether_hdr *); - uint16_t ether_type = eth_h->ether_type; - if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_ARP)) - pkt_type = RTE_PTYPE_L2_ETHER_ARP; - else - pkt_type = RTE_PTYPE_UNKNOWN; - stats->mtods++; - break; - } + uint16_t ether_type = eth_h->ether_type; + if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_ARP)) + pkt_type = RTE_PTYPE_L2_ETHER_ARP; + else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_LLDP)) + pkt_type = RTE_PTYPE_L2_ETHER_LLDP; + else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_1588)) + pkt_type = RTE_PTYPE_L2_ETHER_TIMESYNC; + stats->mtods++; } rxm->packet_type = pkt_type; -- 2.17.1