From patchwork Sat Nov 11 16:00:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesna K E X-Patchwork-Id: 134113 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 97E2D43304; Sat, 11 Nov 2023 17:00:38 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1E067400D7; Sat, 11 Nov 2023 17:00:38 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2074.outbound.protection.outlook.com [40.107.93.74]) by mails.dpdk.org (Postfix) with ESMTP id 2127C4003C for ; Sat, 11 Nov 2023 17:00:34 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mhi2ZuK0kW+eH1Qc6EvJhbeLAvV+YHC+OylKtA7Wy2+nD4vmzZ3+HANOX9P2TbvLEDh31nCfWoVuNxip8lDomdC8Dgzs3VcrgV0ya1bPSMDPKCW1gcIB+WhrrIZYxKSj66SPZKBtnPyixijXDOent+k80UDVIPcHZIRfQaqNBH801tlG5pTUNt+LpxNCyhjm8pVkUQaQ4C5lyBF6B4tu/Z7cmwVZa/5DlFUSwJztpUV276Mb++drRwvSklzS5ZbL+HGxuFVRxj5OBYcLBjJ+EKKUz5G2mBjoUXP2zcM5DyG9rm77vv0Hu8F2SH7NrEEnTW6qOzEVAz7kdC0tH/n/tw== 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=KVZoMJ70lg4YSZW23a8QMbjSpypTVW5JanA9YsFTaO4=; b=ltGifSVPjcKYkfo7pP64Hwz6gjfNll7zZmJATQa1cgtZNIQeqp9yvFhiO9ObtKis2ogb+t4pnwW6qqYD//q4SYcqsg43UcnMUjE/Vn+M/+NhFsESh1p0cxfz6luqyX4oCmHLze0/eW7XoImrqwumEO/S6YvwQh6N2zUcgdVT2QovG0ClOXE8v7OQfrsqAYYQlr4t+M0/LLPtoJv3KN4Ja5XKcZU4368PNlU9O0lYiwEBNVIOrxNBOxs8S/wXNymNUSLdTNPzd7kI7zD2gfhHOWufOmUVqysE7abeslu2tjAZ0tdRbUw1m7TLCad+SO5rD2MGjsy6wqh8b9n6n2Cdqw== 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 (0) 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=KVZoMJ70lg4YSZW23a8QMbjSpypTVW5JanA9YsFTaO4=; b=N4iJpHvluxkjIe4AEAfOGOaszhbT743mSvsgFjjozvj/2URLR/4H48KLJ+Lfy26kZutOSCsn4TUMU+QvED+XUfAoF+R5ACeHuvrroFgOG1kvXM5X+2+huNbKXPLyUE8k/FejM6zePilA4WQVCm7vlM7RV9FQCipF1nqoxttuLRw= Received: from MN2PR19CA0036.namprd19.prod.outlook.com (2603:10b6:208:178::49) by SA1PR12MB8857.namprd12.prod.outlook.com (2603:10b6:806:38d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.19; Sat, 11 Nov 2023 16:00:28 +0000 Received: from BL6PEPF0001AB71.namprd02.prod.outlook.com (2603:10b6:208:178:cafe::e) by MN2PR19CA0036.outlook.office365.com (2603:10b6:208:178::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.22 via Frontend Transport; Sat, 11 Nov 2023 16:00:28 +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 BL6PEPF0001AB71.mail.protection.outlook.com (10.167.242.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7002.13 via Frontend Transport; Sat, 11 Nov 2023 16:00:28 +0000 Received: from cae-fox.amd.com (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.2507.32; Sat, 11 Nov 2023 10:00:26 -0600 From: Jesna K E To: CC: , , Jesna K E Subject: [PATCH v1 1/3] net/axgbe: packet size doesn't exceed the configured MTU Date: Sat, 11 Nov 2023 21:30:04 +0530 Message-ID: <20231111160006.455767-1-jesna.k.e@amd.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB71:EE_|SA1PR12MB8857:EE_ X-MS-Office365-Filtering-Correlation-Id: 3597433b-9d4b-4429-7539-08dbe2cf52ee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6ed50YV41HrNKz9QiFxJmifbnf/BtPtnm4Jkhw+Ip/lbZR3ONZUS8KxifeLoySimFlv/TH4EzxOPtJaSujaGRSJ+oqHFGAFJ629uq27lvW9/Abtwmqyu5fo//OAOoDRNQyEF1gol7FkrTNqY+QBCn2GaeWy8J6gB/2BH4LMirxt/wc5Shb2fzjZG8jiM/whTcPgP2xgoyC7qFIN4QBXrJhRLdUd1B7UgjVwxP+gaQXVFOrwqrb429TTZ1qxTf4VZcFylc+RB9CA7D7dWd70b3rXZ//t5GEPGudZtBfvTeUQI98NzuExExaFVQapQzTk4W6QBV6TY9HdV7RkCpluOWBP3dVKOu1b77Bbi/FWN3qQ/W746tLxNl43EEqBRlUePvovu9/cbal7UUhDA5L5ZBkpnLqNce3Xikykur0kNPdHRheL/EWo+KXQ+qU7ieUhbyelOyBhFS/XHfMV5Z+KqphjWZ88RVqNKed4x+wEqBiGXcT3Me3LB36MlSrq+OmqkK/3IPAfsybR+ruoLW9K1aINZXEaouaV4HjaiuvBgTiwjg6IlW60VuFdi1Q6YS9CUeN9AmG/A6iiQ5qHHwVvIOib3BoHYOmG3Th21fsGvJ1Zh13U6bMgTdYu2MWkLJ2qAwT1nt/xPXy6bCCn9VLAOTX8pskL6+Ochn1TFqAT5ib9T4Jnlbm8HgkTePGPNU4nRY3m482bVdqbliqF9vf62n1uoD9ObP4spLwr3Ddl/xZqFySitecl3n9ym8OvunbK+eTpqH6m9+F4vc2DId1RDYw== 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:(13230031)(4636009)(376002)(396003)(39860400002)(136003)(346002)(230922051799003)(82310400011)(64100799003)(451199024)(1800799009)(186009)(36840700001)(46966006)(40470700004)(5660300002)(81166007)(426003)(356005)(336012)(47076005)(41300700001)(2906002)(83380400001)(40480700001)(16526019)(26005)(8676002)(4326008)(8936002)(82740400003)(54906003)(40460700003)(1076003)(2616005)(6916009)(70586007)(70206006)(316002)(7696005)(478600001)(103116003)(36756003)(86362001)(6666004)(36860700001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2023 16:00:28.0055 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3597433b-9d4b-4429-7539-08dbe2cf52ee 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: BL6PEPF0001AB71.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB8857 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 Signed-off-by: Jesna K E --- drivers/net/axgbe/axgbe_ethdev.c | 6 ------ drivers/net/axgbe/axgbe_rxtx.c | 20 ++++++++++++++++++-- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c index 3717166384..e12ee3e17a 100644 --- a/drivers/net/axgbe/axgbe_ethdev.c +++ b/drivers/net/axgbe/axgbe_ethdev.c @@ -1492,12 +1492,6 @@ static int axgb_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) struct axgbe_port *pdata = dev->data->dev_private; unsigned int val; - /* mtu setting is forbidden if port is start */ - if (dev->data->dev_started) { - PMD_DRV_LOG(ERR, "port %d must be stopped before configuration", - dev->data->port_id); - return -EBUSY; - } val = mtu > RTE_ETHER_MTU ? 1 : 0; AXGMAC_IOWRITE_BITS(pdata, MAC_RCR, JE, val); diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index a9ff291cef..68aa67a3fa 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -210,7 +210,7 @@ axgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint64_t old_dirty = rxq->dirty; struct rte_mbuf *mbuf, *tmbuf; unsigned int err, etlt; - uint32_t error_status; + uint32_t error_status, max_len; uint16_t idx, pidx, pkt_len; idx = AXGBE_GET_DESC_IDX(rxq, rxq->cur); @@ -300,6 +300,14 @@ axgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, | RTE_MBUF_F_RX_IEEE1588_TMST; pkt_len = AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, PL) - rxq->crc_len; + + /* Be sure we don't exceed the configured MTU */ + max_len = rxq->pdata->eth_dev->data->mtu + RTE_ETHER_HDR_LEN; + if (pkt_len > max_len) { + printf( "packet length exceeds configured MTU\n"); + goto err_set; + } + /* Mbuf populate */ mbuf->next = NULL; mbuf->data_off = RTE_PKTMBUF_HEADROOM; @@ -342,7 +350,7 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, struct rte_mbuf *first_seg = NULL; struct rte_mbuf *mbuf, *tmbuf; unsigned int err = 0, etlt; - uint32_t error_status = 0; + uint32_t error_status = 0, max_len = 0; uint16_t idx, pidx, data_len = 0, pkt_len = 0; bool eop = 0; @@ -409,6 +417,14 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, } } + + /* Be sure we don't exceed the configured MTU */ + max_len = rxq->pdata->eth_dev->data->mtu + RTE_ETHER_HDR_LEN; + if (pkt_len > max_len) { + printf( "packet length exceeds configured MTU\n"); + goto err_set; + } + /* Mbuf populate */ mbuf->data_off = RTE_PKTMBUF_HEADROOM; mbuf->data_len = data_len; From patchwork Sat Nov 11 16:00:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesna K E X-Patchwork-Id: 134114 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 79F5743304; Sat, 11 Nov 2023 17:00:44 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 34EBC40299; Sat, 11 Nov 2023 17:00:39 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2054.outbound.protection.outlook.com [40.107.223.54]) by mails.dpdk.org (Postfix) with ESMTP id 258D44003C for ; Sat, 11 Nov 2023 17:00:37 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XG4MT7rzLg6AwJybj6v6TIKBeHldrPZIJZ/lPqUGvG/uRw+CGNxHobTb/M4oYPmah+H8NVEkOl2LiwSyLTl69E+weXHt7D2nLvRFsnMDt26BxudMpbf/8bFFoNafEY+PMuD3LqH4Su14fwLNZ5Wl0yrHfwQ90psKoNxa8CD0+fH3BYCFDEYJmtrW3Vp5iuWWsG0QwxoxvsFb+PgZbz8aHK+fC3kmtKO+x3fbrdUJaak25n6pj+HQzWG3Msaqm5nTzIAHHMXCCog2AXESi8Jgy4gRrXSCqhkWSjaOMjrr7r3Qy9dfXkcOJPBw6R258ngABrMJEIx6VYMHxK9R5kL7OA== 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=uPjyiIOoHVDYlmFvL8kMIT0dQMA2wmY0viDQ0YL4uBU=; b=ESe5TknULWPFT5hxRrU7sEzOWWdzwrYPWFqZhRlzF6mLcDB+vSXlmKHhmnHKbXIKFa+FQE+J0c+MWyq+EaRbyP8l7GdQDraRl8zq5p5458egYSHjeWZ3Nmxm31+eo+qzgeEtUbP3qC5I7rTvnGBt/nyXSDjUGIKhPVpHYLFXLYsxckeBeepBRSbOQzqanSN+yKtXytkepjCh8E18q1JHzjZcKLuMIWO/9+TABQGFZUw3iI5AscAMN0hR9p95Srxpmuq8VFZ/69vKCfclXVEqGV4MYR8Y271YOOGm9SupxEUF5YEXP2XoZex5ZjbFj+hJJCEU5D/xFlSWOedPRW82Gw== 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 (0) 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=uPjyiIOoHVDYlmFvL8kMIT0dQMA2wmY0viDQ0YL4uBU=; b=PJgQXsRQ69eIxyQlFfNnKMs1jblz3NApv5aCeqarIracM9RpBjB+1AH8vZlqysKlIWtOK6rUjLl/bOS5W3y8qRKNLI4pkHEstNMdg5u3bnveXQ4/8MaJwzn7o0tR1v498L0oBnbdfniY4K2lq8AmRh+qupnTJFGYmzvCvHVXjAA= Received: from MN2PR19CA0033.namprd19.prod.outlook.com (2603:10b6:208:178::46) by DM4PR12MB7768.namprd12.prod.outlook.com (2603:10b6:8:102::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.26; Sat, 11 Nov 2023 16:00:32 +0000 Received: from BL6PEPF0001AB71.namprd02.prod.outlook.com (2603:10b6:208:178:cafe::ae) by MN2PR19CA0033.outlook.office365.com (2603:10b6:208:178::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.22 via Frontend Transport; Sat, 11 Nov 2023 16:00:32 +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 BL6PEPF0001AB71.mail.protection.outlook.com (10.167.242.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7002.13 via Frontend Transport; Sat, 11 Nov 2023 16:00:32 +0000 Received: from cae-fox.amd.com (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.2507.32; Sat, 11 Nov 2023 10:00:30 -0600 From: Jesna K E To: CC: , , Jesna K E Subject: [PATCH v1 2/3] net/axgbe: correct API call when offload enabled Date: Sat, 11 Nov 2023 21:30:05 +0530 Message-ID: <20231111160006.455767-2-jesna.k.e@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231111160006.455767-1-jesna.k.e@amd.com> References: <20231111160006.455767-1-jesna.k.e@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB71:EE_|DM4PR12MB7768:EE_ X-MS-Office365-Filtering-Correlation-Id: ca39f39c-f5a8-4ce9-f3ac-08dbe2cf5595 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: B8Cc3jXQ7ISrupbiwGcdecriwqMveWq9gbVQoAq84AQTq419ZcMD8Pn17aBKwP7FYlfYDdYmTihoRnRTMcn6/yj/lyKrP25gooUHFsuSaTOezf+ZIsx5yYz6Wk7H+Z54Uepa9ZlbX7ll9MbysJOT081LGLLmhZMTuh3PVLHLaYkpn50+0I6gJ4uJd1utOE5+0DZ8M7xVENtX3dTkagINzjI6VPkFhAYftpj3tXcqprySlraGeE4/txbwTBVTEPItUZh8UHYgsygwcBrOUJY9OeOaMVD4ff1K/rsMkCikFULXrva9y3jP9KJ02lQU5DYJHuhznZH+JGbAPSxnTZBjlHNdfiOaf6VhaE4OUnRhKW/4yCXy4dQO1/DHB8dZflVfIVr1TWMFbuqOUP4gxIOspVMwS+Wic1qGz+oNDDPtHpJX244L2Ukav+NDikZXulFm3XBeuxBTOBxcdP1J6AX3hx8Fazs31Ew1biIxOOK6iXeSxXd8rBPNEZCQdyVIoQpvsBmUv57AMzaF+dywuAhtbGr4QEyq4c2Hxncl1rbWKNDrNpgGygvoMUol5pHYSAHcRUmhWmy+iO4wE9N00IDaytwV96GYu0v39RLQ1ghRizxMQq6EllVeELxmVTbHUm6iW88Wot+Crcf/lruMdROnuiuPdc8VXTjdsHqdKWru5xdE/IN/kh7w3nxy7dGzoOK1B8oa3wnVSwJVePEW3iS98xgPqV2FB1a9sI0U3BiZTepghtjZegxuf4KGNavd6I8ueF8aZq0hdxjx3RX0Yggujg== 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:(13230031)(4636009)(376002)(346002)(39860400002)(136003)(396003)(230922051799003)(451199024)(186009)(1800799009)(64100799003)(82310400011)(36840700001)(40470700004)(46966006)(36860700001)(2906002)(1076003)(40460700003)(2616005)(5660300002)(86362001)(41300700001)(47076005)(103116003)(426003)(336012)(26005)(16526019)(82740400003)(54906003)(70206006)(70586007)(6916009)(316002)(83380400001)(6666004)(81166007)(478600001)(36756003)(7696005)(356005)(8676002)(4326008)(40480700001)(8936002)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2023 16:00:32.4742 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ca39f39c-f5a8-4ce9-f3ac-08dbe2cf5595 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: BL6PEPF0001AB71.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7768 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 Fixes: 9963b5131af8 ("net/axgbe: support multi-process") Signed-off-by: Jesna K E --- drivers/net/axgbe/axgbe_ethdev.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c index e12ee3e17a..e1cb60c1c3 100644 --- a/drivers/net/axgbe/axgbe_ethdev.c +++ b/drivers/net/axgbe/axgbe_ethdev.c @@ -2130,16 +2130,18 @@ void axgbe_set_tx_function(struct rte_eth_dev *dev) { struct axgbe_port *pdata = dev->data->dev_private; + struct axgbe_tx_queue *txq = dev->data->tx_queues[0]; if (pdata->multi_segs_tx) dev->tx_pkt_burst = &axgbe_xmit_pkts_seg; + else if (txq->vector_disable || + rte_vect_get_max_simd_bitwidth() < RTE_VECT_SIMD_128) + dev->tx_pkt_burst = &axgbe_xmit_pkts; + else #ifdef RTE_ARCH_X86 - struct axgbe_tx_queue *txq = dev->data->tx_queues[0]; - if (!txq->vector_disable && - rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) dev->tx_pkt_burst = &axgbe_xmit_pkts_vec; #else - dev->tx_pkt_burst = &axgbe_xmit_pkts; + dev->tx_pkt_burst = &axgbe_xmit_pkts; #endif } From patchwork Sat Nov 11 16:00:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesna K E X-Patchwork-Id: 134115 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 813BB43304; Sat, 11 Nov 2023 17:00:52 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 51342402B1; Sat, 11 Nov 2023 17:00:46 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by mails.dpdk.org (Postfix) with ESMTP id E6FCA402AE for ; Sat, 11 Nov 2023 17:00:43 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CoMMVUbFyB8cwgNS+YlFSr5RJjIEYjH2RM7Zl6oEFigBnVk/aVHDVR/IU81Ms4F1IV+vsnSLHFjyZjKh7e4FUwj47oK70DF7Z1nHzwMvYEa+BAE/Zl7uNnfK75MiihWzYlrhnqakiGwY0E1T8PtHimxwaAoriFiqbeQ+QOlj0vgZbCYCaCwDD5Dnv1/R67zIHwhrb8Qqq/xenK2tzADRpppxScug0Wl8jQW8xFuL6Pa0PvjCzZcxDmxUSSs+qvgryPz+EcwrvTsZ/6qqxBQmqLNxWDl+uw2au9w6oFoIFIBcCyeMn6IuvbOD/tQ6M7VVcFZ4j1URcL/jsoybmQXulA== 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=bdyvZCOqZ1KSswq7rPKubB6ZGsfH21ehZ13LIaya6g4=; b=aA8rC0ODibk9COLFTWRhIXrswINFFUVk1/9FL8AApwBRNx7MHyPXJQKvppwn5gNtear87oVwcYPDLNzLjAm6Ws4EmQqX+7NT1QTnQEIbOEZI5TCuBnp11ySkkl6FnWoP72oiw9ZZNVppw8WBq8unRl42VYtUOwNFyiO7Stc1Aa8oFslKBkGJnXX3NoGunn5vh6BJaEuDXeTw8+vEec5MMHqkgZtpibx77P+h9ktlM+818vhOqUlHptpwFkzdxIQMApN6dPhowhqoDCWM9OHDcgDkAENvdrcaNrFyiJoeFMLFDWDQlhoifecHA1F6EIB35uS01dXzOcbUMy38QI4gsQ== 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 (0) 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=bdyvZCOqZ1KSswq7rPKubB6ZGsfH21ehZ13LIaya6g4=; b=LOXaX0CIELuKGLqQr7vpsn3s75Y9252pzf/3icuijvnsW0+oeEQY968M5qYsYBw7+zPBzp8aAnrWMaP3C4qyH6o0RNdcA89esI9+Z/Ugml7GOVvtxf9EJi8iZgqwLOxoJ+LFJd2vCtcW+GCKowT//lA9aYQVAm0yjUDeDRuLY60= Received: from MN2PR19CA0027.namprd19.prod.outlook.com (2603:10b6:208:178::40) by SJ2PR12MB8873.namprd12.prod.outlook.com (2603:10b6:a03:53d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.26; Sat, 11 Nov 2023 16:00:37 +0000 Received: from BL6PEPF0001AB71.namprd02.prod.outlook.com (2603:10b6:208:178:cafe::1a) by MN2PR19CA0027.outlook.office365.com (2603:10b6:208:178::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.21 via Frontend Transport; Sat, 11 Nov 2023 16:00:37 +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 BL6PEPF0001AB71.mail.protection.outlook.com (10.167.242.164) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7002.13 via Frontend Transport; Sat, 11 Nov 2023 16:00:37 +0000 Received: from cae-fox.amd.com (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.2507.32; Sat, 11 Nov 2023 10:00:34 -0600 From: Jesna K E To: CC: , , Jesna K E Subject: [PATCH v1 3/3] net/axgbe: support TSO Implementation Date: Sat, 11 Nov 2023 21:30:06 +0530 Message-ID: <20231111160006.455767-3-jesna.k.e@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231111160006.455767-1-jesna.k.e@amd.com> References: <20231111160006.455767-1-jesna.k.e@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB71:EE_|SJ2PR12MB8873:EE_ X-MS-Office365-Filtering-Correlation-Id: 5b6f9913-f4ef-493b-3558-08dbe2cf5861 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vFmSlQ+tIem6nodUpMA3Mm9pXmqYOfF5gHz3LWdfULzA4Z8AowDELWsWPS7MibjZEeJrdNfnoJz31+QROoqPcPXN2xxLEWybMWL74AXf7YPsQNFaAJ5GWbPaKeOzK6ssgTxyPiqdalYTLXpLo7OBp8DVxB/X6AXX+ZgwpR4J4C8mQ54wTZtIEQbQ3T9EfEF7DS7wKqx1xlp1PqGOOTnQhSRn0srVGqGcF+tzVzZv0nhXSoXA4S2wHZGyWBwJDqdxFaafqn5Ps+CsjKacrxF5e4z4tmjLghDlO73vUVpz1Jy04GHnpskkAAQaKkwXBCTFg16FgO2r0BYfv3/0AWBTI2fkz5duwhnixSc4k+LPYUW+1tWL/at7511R4+t5SJIyBxsNvUihmCnU5IvNnC2q919NWucFen9tmHYN3/WYvfJjU2lXcmC91Umel/RexjIynwIr7XbY3fbifxQ22ehafKPpJ+FZ99AcX7nj0eTCPv8SJKb5MkygkMDW87P09KfnSSPkW8rsn5mDRlsEDaDSocDt3Gpb2EcUNBazsZ48pkfdWG9qfKmQd7qlmigjpfne+9dx1tUZQbLwhFSfGt5ocyl67lME3ZBt4RrDihybp/cAR/5bya+oQ+5MwbnssS28P4sqFMAqaChucce2MkFRTyZYrGfjCryNA5D7hIedEz24CSZfsVSNmXebtKwvFkFkfD9aT/EiuFVdkRC2xphTmYTOLpW07Pjq1HHIvgG3WUkiyJt/IH1XVMC7+vS0/Vrbu6Y+zM0CDfl5VPl8ip6czA== 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:(13230031)(4636009)(396003)(376002)(136003)(346002)(39860400002)(230922051799003)(451199024)(186009)(64100799003)(1800799009)(82310400011)(46966006)(36840700001)(40470700004)(40460700003)(16526019)(336012)(426003)(1076003)(26005)(7696005)(6666004)(2616005)(36860700001)(83380400001)(47076005)(5660300002)(4326008)(8936002)(8676002)(30864003)(2906002)(41300700001)(478600001)(316002)(6916009)(54906003)(70206006)(70586007)(36756003)(103116003)(86362001)(82740400003)(356005)(81166007)(40480700001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2023 16:00:37.1619 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5b6f9913-f4ef-493b-3558-08dbe2cf5861 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: BL6PEPF0001AB71.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8873 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 Signed-off-by: Jesna K E --- drivers/net/axgbe/axgbe_common.h | 11 + drivers/net/axgbe/axgbe_dev.c | 19 ++ drivers/net/axgbe/axgbe_ethdev.c | 1 + drivers/net/axgbe/axgbe_ethdev.h | 1 + drivers/net/axgbe/axgbe_rxtx.c | 305 +++++++++++++++---------- drivers/net/axgbe/axgbe_rxtx_vec_sse.c | 1 + 6 files changed, 223 insertions(+), 115 deletions(-) diff --git a/drivers/net/axgbe/axgbe_common.h b/drivers/net/axgbe/axgbe_common.h index a5d11c5832..1face6f361 100644 --- a/drivers/net/axgbe/axgbe_common.h +++ b/drivers/net/axgbe/axgbe_common.h @@ -162,6 +162,9 @@ #define DMA_CH_SR 0x60 /* DMA channel register entry bit positions and sizes */ +//TSO +#define DMA_CH_CR_MSS_INDEX 0 +#define DMA_CH_CR_MSS_WIDTH 14 #define DMA_CH_CR_PBLX8_INDEX 16 #define DMA_CH_CR_PBLX8_WIDTH 1 #define DMA_CH_CR_SPH_INDEX 24 @@ -1232,6 +1235,14 @@ #define TX_CONTEXT_DESC3_VT_INDEX 0 #define TX_CONTEXT_DESC3_VT_WIDTH 16 +//TSO +#define TX_NORMAL_DESC3_TPL_INDEX 0 +#define TX_NORMAL_DESC3_TPL_WIDTH 18 +#define TX_NORMAL_DESC3_THL_INDEX 19 +#define TX_NORMAL_DESC3_THL_WIDTH 4 +#define TX_CONTEXT_DESC3_OSTC_INDEX 27 +#define TX_CONTEXT_DESC3_OSTC_WIDTH 1 + #define TX_NORMAL_DESC2_HL_B1L_INDEX 0 #define TX_NORMAL_DESC2_HL_B1L_WIDTH 14 #define TX_NORMAL_DESC2_IC_INDEX 31 diff --git a/drivers/net/axgbe/axgbe_dev.c b/drivers/net/axgbe/axgbe_dev.c index 6a7fddffca..7e0d387fc3 100644 --- a/drivers/net/axgbe/axgbe_dev.c +++ b/drivers/net/axgbe/axgbe_dev.c @@ -808,6 +808,24 @@ int axgbe_write_rss_lookup_table(struct axgbe_port *pdata) return 0; } + +static void xgbe_config_tso_mode(struct axgbe_port *pdata) +{ + unsigned int i; + + struct axgbe_tx_queue *txq; + + for (i = 0; i < pdata->eth_dev->data->nb_tx_queues; i++) { + txq = pdata->eth_dev->data->tx_queues[i]; + AXGMAC_DMA_IOWRITE_BITS(txq,DMA_CH_TCR, TSE, + 1); + AXGMAC_DMA_IOWRITE_BITS(txq,DMA_CH_CR, MSS, + 800); + } + +} + + static int axgbe_enable_rss(struct axgbe_port *pdata) { int ret; @@ -1314,6 +1332,7 @@ static int axgbe_init(struct axgbe_port *pdata) axgbe_config_rx_pbl_val(pdata); axgbe_config_rx_buffer_size(pdata); axgbe_config_rss(pdata); + xgbe_config_tso_mode(pdata); wrapper_tx_desc_init(pdata); ret = wrapper_rx_desc_init(pdata); if (ret) diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c index e1cb60c1c3..5aa8743a1a 100644 --- a/drivers/net/axgbe/axgbe_ethdev.c +++ b/drivers/net/axgbe/axgbe_ethdev.c @@ -1237,6 +1237,7 @@ axgbe_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) RTE_ETH_TX_OFFLOAD_IPV4_CKSUM | RTE_ETH_TX_OFFLOAD_MULTI_SEGS | RTE_ETH_TX_OFFLOAD_UDP_CKSUM | + RTE_ETH_TX_OFFLOAD_TCP_TSO | RTE_ETH_TX_OFFLOAD_TCP_CKSUM; if (pdata->hw_feat.rss) { diff --git a/drivers/net/axgbe/axgbe_ethdev.h b/drivers/net/axgbe/axgbe_ethdev.h index 7f19321d88..31a583c2c6 100644 --- a/drivers/net/axgbe/axgbe_ethdev.h +++ b/drivers/net/axgbe/axgbe_ethdev.h @@ -583,6 +583,7 @@ struct axgbe_port { unsigned int tx_osp_mode; unsigned int tx_max_fifo_size; unsigned int multi_segs_tx; + unsigned int tso_tx; /* Rx settings */ unsigned int rx_sf_mode; diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index 68aa67a3fa..6b5ea6d622 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -643,6 +643,10 @@ int axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, RTE_ETH_TX_OFFLOAD_MULTI_SEGS)) pdata->multi_segs_tx = true; + if ((dev_data->dev_conf.txmode.offloads & + RTE_ETH_TX_OFFLOAD_TCP_TSO)) + pdata->tso_tx = true; + return 0; } @@ -843,7 +847,7 @@ static int axgbe_xmit_hw(struct axgbe_tx_queue *txq, idx = AXGBE_GET_DESC_IDX(txq, txq->cur); desc = &txq->desc[idx]; - + printf("tso::Inside axgbe_xmit_hw \n"); /* Update buffer address and length */ desc->baddr = rte_mbuf_data_iova(mbuf); AXGMAC_SET_BITS_LE(desc->desc2, TX_NORMAL_DESC2, HL_B1L, @@ -889,7 +893,6 @@ static int axgbe_xmit_hw(struct axgbe_tx_queue *txq, AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, OWN, 1); rte_wmb(); - /* Save mbuf */ txq->sw_ring[idx] = mbuf; /* Update current index*/ @@ -900,138 +903,208 @@ static int axgbe_xmit_hw(struct axgbe_tx_queue *txq, return 0; } + /* Tx Descriptor formation for segmented mbuf * Each mbuf will require multiple descriptors */ static int axgbe_xmit_hw_seg(struct axgbe_tx_queue *txq, - struct rte_mbuf *mbuf) + struct rte_mbuf *mbuf) { - volatile struct axgbe_tx_desc *desc; - uint16_t idx; - uint64_t mask; - int start_index; - uint32_t pkt_len = 0; - int nb_desc_free; - struct rte_mbuf *tx_pkt; + volatile struct axgbe_tx_desc *desc; + uint16_t idx; + uint64_t mask; + int start_index; + uint32_t pkt_len = 0; + int nb_desc_free; + struct rte_mbuf *tx_pkt; + uint64_t l2_len = 0; + uint64_t l3_len = 0; + uint64_t l4_len = 0; + uint64_t tso_segsz = 0; + uint64_t total_hdr_len; + int tso = 0; + + /*Parameters required for tso*/ + l2_len = mbuf->l2_len; + l3_len = mbuf->l3_len; + l4_len = mbuf->l4_len; + tso_segsz = mbuf->tso_segsz; + total_hdr_len = l2_len + l3_len + l4_len; + + if ((txq->pdata->tso_tx)) + tso = 1; + else + tso = 0; + + printf("tso:l2_len = %ld,l3_len=%ld,l4_len=%ld,tso_segsz=%ld,total_hdr_len%ld\n",l2_len,l3_len,l4_len, + tso_segsz,total_hdr_len); + + nb_desc_free = txq->nb_desc - (txq->cur - txq->dirty); + + printf("tso::Inside axgbe_xmit_hw_seg \n"); + if (mbuf->nb_segs > nb_desc_free) { + axgbe_xmit_cleanup_seg(txq); + nb_desc_free = txq->nb_desc - (txq->cur - txq->dirty); + if (unlikely(mbuf->nb_segs > nb_desc_free)) + return RTE_ETH_TX_DESC_UNAVAIL; + } + + idx = AXGBE_GET_DESC_IDX(txq, txq->cur); + desc = &txq->desc[idx]; + /* Saving the start index for setting the OWN bit finally */ + start_index = idx; + tx_pkt = mbuf; + /* Max_pkt len = 9018 ; need to update it according to Jumbo pkt size */ + pkt_len = tx_pkt->pkt_len; - nb_desc_free = txq->nb_desc - (txq->cur - txq->dirty); + /* Update buffer address and length */ + desc->baddr = rte_pktmbuf_iova_offset(mbuf,0); + /*For TSO first buffer contains the Header */ + if (tso) + AXGMAC_SET_BITS_LE(desc->desc2, TX_NORMAL_DESC2, HL_B1L, + total_hdr_len); + else + AXGMAC_SET_BITS_LE(desc->desc2, TX_NORMAL_DESC2, HL_B1L, + tx_pkt->data_len); - if (mbuf->nb_segs > nb_desc_free) { - axgbe_xmit_cleanup_seg(txq); - nb_desc_free = txq->nb_desc - (txq->cur - txq->dirty); - if (unlikely(mbuf->nb_segs > nb_desc_free)) - return RTE_ETH_TX_DESC_UNAVAIL; - } + rte_wmb(); + /* Timestamp enablement check */ + if (mbuf->ol_flags & RTE_MBUF_F_TX_IEEE1588_TMST) + AXGMAC_SET_BITS_LE(desc->desc2, TX_NORMAL_DESC2, TTSE, 1); + + rte_wmb(); + /* Mark it as First Descriptor */ + AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, FD, 1); + /* Mark it as a NORMAL descriptor */ + AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, CTXT, 0); + /* configure h/w Offload */ + mask = mbuf->ol_flags & RTE_MBUF_F_TX_L4_MASK; + if (mask == RTE_MBUF_F_TX_TCP_CKSUM || mask == RTE_MBUF_F_TX_UDP_CKSUM) + AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, CIC, 0x3); + else if (mbuf->ol_flags & RTE_MBUF_F_TX_IP_CKSUM) + AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, CIC, 0x1); + rte_wmb(); + + if (mbuf->ol_flags & (RTE_MBUF_F_TX_VLAN | RTE_MBUF_F_TX_QINQ)) { + /* Mark it as a CONTEXT descriptor */ + AXGMAC_SET_BITS_LE(desc->desc3, TX_CONTEXT_DESC3, + CTXT, 1); + /* Set the VLAN tag */ + AXGMAC_SET_BITS_LE(desc->desc3, TX_CONTEXT_DESC3, + VT, mbuf->vlan_tci); + /* Indicate this descriptor contains the VLAN tag */ + AXGMAC_SET_BITS_LE(desc->desc3, TX_CONTEXT_DESC3, + VLTV, 1); + AXGMAC_SET_BITS_LE(desc->desc2, TX_NORMAL_DESC2, VTIR, + TX_NORMAL_DESC2_VLAN_INSERT); + } else { + AXGMAC_SET_BITS_LE(desc->desc2, TX_NORMAL_DESC2, VTIR, 0x0); + } + rte_wmb(); + + /*Register settings for TSO*/ + if (tso) { + printf("Inside register setting-tso\n"); + /* Enable TSO */ + AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, TSE,1); + AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, TPL, + ((mbuf->pkt_len)-total_hdr_len)); + AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, THL, + l4_len); + } else { + /* Enable CRC and Pad Insertion */ + AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, CPC, 0); + /* Total msg length to transmit */ + AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, FL, + mbuf->pkt_len); + } +#if 0 + /*For TSO , needs one more descriptor to hold + * the Payload + * But while adding another descriptor packets are not + * transmitted */ + /* Save mbuf */ + txq->sw_ring[idx] = tx_pkt; + /* Update current index*/ + txq->cur++; idx = AXGBE_GET_DESC_IDX(txq, txq->cur); desc = &txq->desc[idx]; - /* Saving the start index for setting the OWN bit finally */ - start_index = idx; + desc->baddr = rte_pktmbuf_iova_offset(mbuf,total_hdr_len); + AXGMAC_SET_BITS_LE(desc->desc2, + TX_NORMAL_DESC2, HL_B1L, (mbuf->pkt_len)-total_hdr_len)); - tx_pkt = mbuf; - /* Max_pkt len = 9018 ; need to update it according to Jumbo pkt size */ - pkt_len = tx_pkt->pkt_len; + printf("(mbuf->pkt_len)-total_hdr_len=%d\n",(mbuf->pkt_len)-total_hdr_len); + printf("total_hdr_len=%d\n",total_hdr_len); - /* Update buffer address and length */ - desc->baddr = rte_mbuf_data_iova(tx_pkt); - AXGMAC_SET_BITS_LE(desc->desc2, TX_NORMAL_DESC2, HL_B1L, - tx_pkt->data_len); - /* Total msg length to transmit */ - AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, FL, - tx_pkt->pkt_len); - /* Timestamp enablement check */ - if (mbuf->ol_flags & RTE_MBUF_F_TX_IEEE1588_TMST) - AXGMAC_SET_BITS_LE(desc->desc2, TX_NORMAL_DESC2, TTSE, 1); - - rte_wmb(); - /* Mark it as First Descriptor */ - AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, FD, 1); - /* Mark it as a NORMAL descriptor */ AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, CTXT, 0); - /* configure h/w Offload */ - mask = mbuf->ol_flags & RTE_MBUF_F_TX_L4_MASK; - if (mask == RTE_MBUF_F_TX_TCP_CKSUM || mask == RTE_MBUF_F_TX_UDP_CKSUM) - AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, CIC, 0x3); - else if (mbuf->ol_flags & RTE_MBUF_F_TX_IP_CKSUM) - AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, CIC, 0x1); - rte_wmb(); - - if (mbuf->ol_flags & (RTE_MBUF_F_TX_VLAN | RTE_MBUF_F_TX_QINQ)) { - /* Mark it as a CONTEXT descriptor */ - AXGMAC_SET_BITS_LE(desc->desc3, TX_CONTEXT_DESC3, - CTXT, 1); - /* Set the VLAN tag */ - AXGMAC_SET_BITS_LE(desc->desc3, TX_CONTEXT_DESC3, - VT, mbuf->vlan_tci); - /* Indicate this descriptor contains the VLAN tag */ - AXGMAC_SET_BITS_LE(desc->desc3, TX_CONTEXT_DESC3, - VLTV, 1); - AXGMAC_SET_BITS_LE(desc->desc2, TX_NORMAL_DESC2, VTIR, - TX_NORMAL_DESC2_VLAN_INSERT); - } else { - AXGMAC_SET_BITS_LE(desc->desc2, TX_NORMAL_DESC2, VTIR, 0x0); - } + AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, OWN, 1); rte_wmb(); - - /* Save mbuf */ - txq->sw_ring[idx] = tx_pkt; - /* Update current index*/ txq->cur++; - - tx_pkt = tx_pkt->next; +#endif +#if 1 + /* Save mbuf */ + txq->sw_ring[idx] = tx_pkt; + /* Update current index*/ + txq->cur++; +#endif + tx_pkt = tx_pkt->next; while (tx_pkt != NULL) { - idx = AXGBE_GET_DESC_IDX(txq, txq->cur); - desc = &txq->desc[idx]; - - /* Update buffer address and length */ - desc->baddr = rte_mbuf_data_iova(tx_pkt); - - AXGMAC_SET_BITS_LE(desc->desc2, - TX_NORMAL_DESC2, HL_B1L, tx_pkt->data_len); - - rte_wmb(); - - /* Mark it as a NORMAL descriptor */ - AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, CTXT, 0); - /* configure h/w Offload */ - mask = mbuf->ol_flags & RTE_MBUF_F_TX_L4_MASK; - if (mask == RTE_MBUF_F_TX_TCP_CKSUM || - mask == RTE_MBUF_F_TX_UDP_CKSUM) - AXGMAC_SET_BITS_LE(desc->desc3, - TX_NORMAL_DESC3, CIC, 0x3); - else if (mbuf->ol_flags & RTE_MBUF_F_TX_IP_CKSUM) - AXGMAC_SET_BITS_LE(desc->desc3, - TX_NORMAL_DESC3, CIC, 0x1); - - rte_wmb(); - - /* Set OWN bit */ - AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, OWN, 1); - rte_wmb(); - - /* Save mbuf */ - txq->sw_ring[idx] = tx_pkt; - /* Update current index*/ - txq->cur++; - - tx_pkt = tx_pkt->next; - } - - /* Set LD bit for the last descriptor */ - AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, LD, 1); - rte_wmb(); - - /* Update stats */ - txq->bytes += pkt_len; - - /* Set OWN bit for the first descriptor */ - desc = &txq->desc[start_index]; - AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, OWN, 1); - rte_wmb(); - + idx = AXGBE_GET_DESC_IDX(txq, txq->cur); + desc = &txq->desc[idx]; + + if (tso) + desc->baddr = rte_pktmbuf_iova_offset(mbuf,total_hdr_len); + else + /* Update buffer address and length */ + desc->baddr = rte_mbuf_data_iova(tx_pkt); + + AXGMAC_SET_BITS_LE(desc->desc2, + TX_NORMAL_DESC2, HL_B1L, tx_pkt->data_len); + + rte_wmb(); + + /* Mark it as a NORMAL descriptor */ + AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, CTXT, 0); + /* configure h/w Offload */ + mask = mbuf->ol_flags & RTE_MBUF_F_TX_L4_MASK; + if (mask == RTE_MBUF_F_TX_TCP_CKSUM || + mask == RTE_MBUF_F_TX_UDP_CKSUM) + AXGMAC_SET_BITS_LE(desc->desc3, + TX_NORMAL_DESC3, CIC, 0x3); + else if (mbuf->ol_flags & RTE_MBUF_F_TX_IP_CKSUM) + AXGMAC_SET_BITS_LE(desc->desc3, + TX_NORMAL_DESC3, CIC, 0x1); + + rte_wmb(); + + /* Set OWN bit */ + AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, OWN, 1); + rte_wmb(); + + /* Save mbuf */ + txq->sw_ring[idx] = tx_pkt; + /* Update current index*/ + txq->cur++; + + tx_pkt = tx_pkt->next; + } + + /* Set LD bit for the last descriptor */ + AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, LD, 1); + rte_wmb(); + + printf("tso:: pkt_len = %d\n",pkt_len); + /* Update stats */ + txq->bytes += pkt_len; + + /* Set OWN bit for the first descriptor */ + desc = &txq->desc[start_index]; + AXGMAC_SET_BITS_LE(desc->desc3, TX_NORMAL_DESC3, OWN, 1); + rte_wmb(); return 0; } @@ -1077,6 +1150,8 @@ axgbe_xmit_pkts_seg(void *tx_queue, struct rte_mbuf **tx_pkts, idx * sizeof(struct axgbe_tx_desc)); /* Update tail reg with next immediate address to kick Tx DMA channel*/ AXGMAC_DMA_IOWRITE(txq, DMA_CH_TDTR_LO, tail_addr); + + txq->pkts += nb_pkt_sent; return nb_pkt_sent; } diff --git a/drivers/net/axgbe/axgbe_rxtx_vec_sse.c b/drivers/net/axgbe/axgbe_rxtx_vec_sse.c index d95a446bef..7034d5737a 100644 --- a/drivers/net/axgbe/axgbe_rxtx_vec_sse.c +++ b/drivers/net/axgbe/axgbe_rxtx_vec_sse.c @@ -65,6 +65,7 @@ axgbe_xmit_pkts_vec(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t idx, nb_commit, loop, i; uint32_t tail_addr; + printf("jesna::Inside axgbe_xmit_pkts_vec \n"); txq = (struct axgbe_tx_queue *)tx_queue; if (txq->nb_desc_free < txq->free_thresh) { axgbe_xmit_cleanup_vec(txq);