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;