From patchwork Thu Sep 8 03:31:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhagyada Modali X-Patchwork-Id: 116069 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 7CCFCA0548; Thu, 8 Sep 2022 05:32:14 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3D0F940DDC; Thu, 8 Sep 2022 05:32:14 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2043.outbound.protection.outlook.com [40.107.237.43]) by mails.dpdk.org (Postfix) with ESMTP id 2286D400D6; Thu, 8 Sep 2022 05:32:12 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dtJpjehyRsl61PeiLXFBFFmLcqblIL6UN0XPHSyIKUF6pxP/8Yz5f3GcubPK9PljnKfFt/nxGYJJAYueHuExlde9BruRYdtUaSWjpqG/KMYxvUgdEJj1RKn4v8CWBu0c3MbmRTo7CeXVke9BQnw8lZea/nTFd+AI+cy1Fcny4+wLZzL++371u3/pGZfCYsHn5cCFRNKSSDzjhYmzqFUhtR8+mji6XbqntWI4JOuoVRWD2ExynDbY5+1xx6YtxGLcyv+a45pZtAF6/1pCupgCrO2rWQqG13YzZtUJLCkh6zcQl6k5OL3yXBWNp8/BOqwlJNFamPAbCbDPQHGlwWgrpA== 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=usoeaoj0nvA2pJdYdT+wIliV1bHjerO9aLN1FjUZEgU=; b=YtM4ogcIf82tesQcdwuISd68NdymzLa1FeQRAFoiEZFKQwEaPdcNXTbkiooMdQ6J3XGnUVyCh8Xnsxp5sKBIx2jh55jczxXlG3HcJ4L/UWjLyb8lahIh7Ud/VZDA0KNbRmHlpEw5cDtja4qNzYKbB5IkfiY7dO8b99lH9x6+l/EVxPHMX114yMIxLrY7BJe4+L1iJBJ7IsALFMF+pp/8t9JWZGxSCA0GlUbS7pK1EAXN2ZLs9OXgCid+e96x6m79ft3mEVQGVXHBonSIhh6KvVZvu+vjbT1EAemHTVQiNmbOmQBMZE6ZM+nC/6hyKHp82ahJTsUSzlwHgnp+X4rZEg== 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=usoeaoj0nvA2pJdYdT+wIliV1bHjerO9aLN1FjUZEgU=; b=fKV1sFhv//Fm5MoBeXmUt2d5lQ1XhmMV2PS+Xkb/Do0FAq4wXMt6H6G56eD3n5Gy6sa1DSmUqto8PUi7c7rStZLuNEvZXv6NbRgItF13yMrbO5KZiLAsaHAX+jugAi8TRM6zOejjSAPIYMxZ+qFk4lykbGuni1W6iEr/wuoGgBg= Received: from MW4PR04CA0085.namprd04.prod.outlook.com (2603:10b6:303:6b::30) by MW4PR12MB7118.namprd12.prod.outlook.com (2603:10b6:303:213::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.11; Thu, 8 Sep 2022 03:32:10 +0000 Received: from CO1NAM11FT011.eop-nam11.prod.protection.outlook.com (2603:10b6:303:6b:cafe::19) by MW4PR04CA0085.outlook.office365.com (2603:10b6:303:6b::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.14 via Frontend Transport; Thu, 8 Sep 2022 03:32:09 +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 CO1NAM11FT011.mail.protection.outlook.com (10.13.175.186) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5612.13 via Frontend Transport; Thu, 8 Sep 2022 03:32:08 +0000 Received: from cae-Selwin.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.2375.28; Wed, 7 Sep 2022 22:31:25 -0500 From: Bhagyada Modali To: , CC: , , Bhagyada Modali Subject: [PATCH v2 1/3] net/axgbe: reset the end of packet in scattered rx Date: Wed, 7 Sep 2022 23:31:07 -0400 Message-ID: <20220908033109.126547-1-bhagyada.modali@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220907173326.124914-1-bhagyada.modali@amd.com> References: <20220907173326.124914-1-bhagyada.modali@amd.com> MIME-Version: 1.0 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: CO1NAM11FT011:EE_|MW4PR12MB7118:EE_ X-MS-Office365-Filtering-Correlation-Id: 8974b038-c493-40fc-32c9-08da914ab5e3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JmC3UDihA7VRt96ZwzGPrp6Sb7AlsVHBsjn+7UunAMXfltO08TtpqONHe3EY7XtfMf3XbFCoVusLHd7lpfqIOSdFTe8WVnqo6S2St5xHKBkUC4o0nf/25cXqQ9GcRQixAilOMJExE4gA+SzmdKZMNM8mWbMJ1nlGy5E6sTUGpbVXjeXv9/4XMLsqGIMJt2N/py366ES1Ww8OXpo9BpupNjW3cSD+mXt28A89p8LzX5U/k47aHyeLQdq6+oS5MSHzB2XeFusKG+rmeVE0FeIfyl9oEgmtXiPAl6nflRJbVvcnmIIm/5rrwijUY+USUCb+SDu8g1nDFBLmt8K1tXu7iBJIpUnNq6zK2uhWIho+SGbleGvFu+5fZKhzIoKSrJ9+z7xPDwAN54KB5cxH5m6aLPbiv7TWDt3bSkM0X2MNgBu0dFs2Td+Iv2L+tAfVSoLwuvERkRd8dRvxlDxqoTkiHp3mkKLsz/5Mra58Jj8znmvhh3GC5YZc/MleCcETG1hK/NkKwG4NKRgw668BtTIJKgy4hqTUjnV3R/6og1Ei7LdHVdGm5VPr50xclIfBOYuoDmFVrl/VD8lyPo+pwn4+WnMgOmSYolmbWxxd6k60GPAbj+5lMOR2akGLEqKvkmHLLuJZ91w+VWW3nECKnC3jf+eLNZtYPzqex1DnpwgJ53UfSUnqpk9ViRNPndFy/ssZB2/WbGJp5uvyfMDc4yCSTIXTYz7QxWNN/8xfh2XetZCogl93vZZXuhR0fC6uLbvHGyV3BwJg6jRlt866uYvCUDPvaGYqhcx8UFDweiL9kZY8U9iWfIQGsHL3i3GhQ4NtY9j8i2hPUDVc6QLplfRiTA== 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:(13230016)(4636009)(396003)(136003)(376002)(39860400002)(346002)(40470700004)(36840700001)(46966006)(478600001)(8676002)(26005)(54906003)(6666004)(110136005)(7696005)(47076005)(2616005)(336012)(4326008)(186003)(6636002)(316002)(16526019)(83380400001)(5660300002)(70206006)(450100002)(70586007)(41300700001)(2906002)(81166007)(82740400003)(36756003)(36860700001)(8936002)(44832011)(426003)(40480700001)(82310400005)(1076003)(40460700003)(356005)(86362001)(83323001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2022 03:32:08.9801 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8974b038-c493-40fc-32c9-08da914ab5e3 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: CO1NAM11FT011.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7118 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 Reset the eop in the failure scenario and also after the last segment. Removed the packet length updation explicitly as it is done in Chaining. Fixes: 965b3127d425 ("net/axgbe: support scattered Rx") Cc: stable@dpdk.org Signed-off-by: Bhagyada Modali Acked-by: Chandubabu Namburu Signed-off-by: Bhagyada Modali --- drivers/net/axgbe/axgbe_rxtx.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index 8b43e8160b..e1488483bc 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -346,10 +346,11 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, uint32_t error_status = 0; uint16_t idx, pidx, data_len = 0, pkt_len = 0; uint64_t offloads; + bool eop = 0; idx = AXGBE_GET_DESC_IDX(rxq, rxq->cur); + while (nb_rx < nb_pkts) { - bool eop = 0; next_desc: idx = AXGBE_GET_DESC_IDX(rxq, rxq->cur); @@ -416,9 +417,12 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, mbuf->pkt_len = data_len; if (first_seg != NULL) { - if (rte_pktmbuf_chain(first_seg, mbuf) != 0) + if (rte_pktmbuf_chain(first_seg, mbuf) != 0) { rte_mempool_put(rxq->mb_pool, first_seg); + eop = 0; + break; + } } else { first_seg = mbuf; } @@ -462,8 +466,8 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, rte_pktmbuf_free(mbuf); goto next_desc; } + eop = 0; - first_seg->pkt_len = pkt_len; rxq->bytes += pkt_len; mbuf->next = NULL; From patchwork Thu Sep 8 03:31:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhagyada Modali X-Patchwork-Id: 116070 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 0722EA0548; Thu, 8 Sep 2022 05:32:20 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2D465427F9; Thu, 8 Sep 2022 05:32:15 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2051.outbound.protection.outlook.com [40.107.92.51]) by mails.dpdk.org (Postfix) with ESMTP id C1666400D6; Thu, 8 Sep 2022 05:32:12 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=T5ls4bc8LQLf5lPi/UKmDSCiB1LliLQ1rRn7vZ9gDZkf8Bmz15ohZ55Pj7V42F8U7Tc5PM89g+jfIMVgUnacHyxdmx71fpBh7FFm+SD2jcmS7AimeTDyKwdI7ocJGU4iYtFU8OfdLDkoJdeh2SjmKRqGpOhEl6mNZvC+IgGisKRYnG5o+uY0c7LOpkbCCqUmo87JcSfCImyaEXQkyN3NKSCMPpH1/EvORku4ToMn2M2X/mGWp2QfYtRRm/oSdbCZkhe4Wzi5Ok5lKQtOW3RwSYAbgr0L8I6Z3NSFq784mLHmRC2oSyvlbYozkmixA1xz7zz4TGc/3MzPdIXrZg5ZqA== 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=3RweBnZRfzHvR9GLwmMBcE7amI6TGOaaD3jc1JozoUY=; b=Nqot42rr0h2U+LfsrG4ZqSpLzDoHm+pUyIi0zpjQg17FVkqVZT95IEj83paClc49x6X8w5ASuGQBJ1vPic4awSKNpb02gCU/Qg1RQQjB7WcxntXRtOLnf9MKYFVjwTvtM8Zojyx0AqCQ3FXjSpa9PX8P4dgiEbPaRGHnt0wEIg2R4yuP5cl/s/6efFt7e5Y/8dbzJ5tHacgQ5+VlNEIysrTKYc+dzJx+/Gk5Ce1FkgCHYqgDhivqfVnC49MfdsE8ODNdLuJGfIuVfjf4mAr8aPV2vQvzmc/c2L5hzPeZ3KUfiSoQbkkhxxLbqzK8BEPPFmfmPuejWWdqwvAPGIG/3g== 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=3RweBnZRfzHvR9GLwmMBcE7amI6TGOaaD3jc1JozoUY=; b=TGnJCjNBxWLlHmh46txe9VltDFtrHtheOV5emYS9wRKLzcM/GMjksIWD/0zXSsMRfMpfrUJi0b1+ljgvoAhIFrZGxPaSL+wr6OxBcFUyx/KiHGCeHRiJmT+V4trtzlGgxUitVPjxMxOftFucQAR+qZC+d0ywMy1sRme9jML1oM8= Received: from MW4PR04CA0070.namprd04.prod.outlook.com (2603:10b6:303:6b::15) by MW4PR12MB6874.namprd12.prod.outlook.com (2603:10b6:303:20b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.18; Thu, 8 Sep 2022 03:32:10 +0000 Received: from CO1NAM11FT011.eop-nam11.prod.protection.outlook.com (2603:10b6:303:6b:cafe::e0) by MW4PR04CA0070.outlook.office365.com (2603:10b6:303:6b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.12 via Frontend Transport; Thu, 8 Sep 2022 03:32: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 CO1NAM11FT011.mail.protection.outlook.com (10.13.175.186) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5612.13 via Frontend Transport; Thu, 8 Sep 2022 03:32:10 +0000 Received: from cae-Selwin.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.2375.28; Wed, 7 Sep 2022 22:32:07 -0500 From: Bhagyada Modali To: , CC: , , Bhagyada Modali Subject: [PATCH v2 2/3] net/axgbe: clear buffers in failure scenario in scattered rx Date: Wed, 7 Sep 2022 23:31:08 -0400 Message-ID: <20220908033109.126547-2-bhagyada.modali@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220908033109.126547-1-bhagyada.modali@amd.com> References: <20220907173326.124914-1-bhagyada.modali@amd.com> <20220908033109.126547-1-bhagyada.modali@amd.com> MIME-Version: 1.0 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: CO1NAM11FT011:EE_|MW4PR12MB6874:EE_ X-MS-Office365-Filtering-Correlation-Id: 59d77527-86df-4369-e7ef-08da914ab6df X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TPP6vtQ+q7dKmDhRcs5PQVoG54IdyqOIdgNOXsEmefvSrS4pY7g5yJvT36MAeLxUjRYzKqJ/HT0ctN3QCn6lFBFvRjIOQGyWEF5C3ZuduZl4ZA8J24G8jNBseSDufBciioEmH6E0jKZ5f/C5KvKDsHchcThI7hcWboXUvI7d9YmeOQH5HuyTDa7wbt3Dia9IxS14gfVSiYIaUlxyClqBRCohNqHA8VQQGgRj0z0jjehN905tmLrGs8oB1XFHn77Gf7g1H6hiZSH+5PTKICqulX52IB9RraUKMoUaXeyHRhNZPj81xtupbsLnCRrAU8GBmC+JeIKS970wZqYaqChrXwxvmn2r2grPzJNJFjnGqS9ADnsc/yNEu0FffFOrIjr3wID/ekzREYGnZ7SkUt7g2d9+QOZj5Auajz3zx0ZGeFIn0RnWyBf6xnshUKpDfYaqn/0sQHEdWW0VqTzVPvlFkifjif/yAGZ/5mGQqtpGX6oyda/ZQ/I0aBj7RIMxYGTsjEL+0i7JuZUTbnWtiC49Kpg9Yd4u/lH/hNFWdr2pWDU83VJUVnyu9hcfgXz8uz81Qie+Aue+zChGM5qyV9C3AuZCkOc74qZOHIphACmO44IRe/f6BFd0C0/thbVf23vwDO8Pbh1ZUuadoPS+e9q6etctFYNIYQY8iN9hF1T4bEHAoObfpaODTR19VjRXVBh52qsmy0PfsZ2Q8rDLJtFWgADIHf6qoF+yd3itDPVlC+uQ9u3CC+zUz9IqRoIDXhl0cBM4OBC1Glc6Vt97cJa7mmxy1n0J0Jpwo2gIyTBxEL4/Jzk7MQJCkxqmtN0lSTcanHAnaAzr97ZaEebk7uFJfA== 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:(13230016)(4636009)(136003)(346002)(376002)(39860400002)(396003)(40470700004)(46966006)(36840700001)(356005)(2616005)(450100002)(6636002)(336012)(16526019)(1076003)(47076005)(5660300002)(82740400003)(70206006)(70586007)(8676002)(316002)(40460700003)(36756003)(41300700001)(478600001)(186003)(110136005)(54906003)(426003)(7696005)(26005)(86362001)(8936002)(4326008)(36860700001)(40480700001)(83380400001)(44832011)(82310400005)(81166007)(4744005)(2906002)(83323001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2022 03:32:10.6206 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 59d77527-86df-4369-e7ef-08da914ab6df 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: CO1NAM11FT011.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB6874 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 Clearing mbuf, first_seg when chaining mbufs fail. Increment the error count for the same. Fixes: 965b3127d425 ("net/axgbe: support scattered Rx") Cc: stable@dpdk.org Signed-off-by: Bhagyada Modali --- drivers/net/axgbe/axgbe_rxtx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index e1488483bc..c1f51ed6d6 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -418,8 +418,10 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, if (first_seg != NULL) { if (rte_pktmbuf_chain(first_seg, mbuf) != 0) { - rte_mempool_put(rxq->mb_pool, - first_seg); + rte_pktmbuf_free(first_seg); + first_seg = NULL; + rte_pktmbuf_free(mbuf); + rxq->errors++; eop = 0; break; } From patchwork Thu Sep 8 03:31:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhagyada Modali X-Patchwork-Id: 116071 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 97F46A0548; Thu, 8 Sep 2022 05:32:31 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8BD8D410FB; Thu, 8 Sep 2022 05:32:31 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2063.outbound.protection.outlook.com [40.107.93.63]) by mails.dpdk.org (Postfix) with ESMTP id 8653640697; Thu, 8 Sep 2022 05:32:29 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XWlVSqbhBtGXIHMJZNyWz7ONVe+ZCKWIaNNvLGSd9CwXZt/w/RuIQJOiq9K7u34yF8YxTGzDpYklGcJSik+yqnweQUGvbwTgTspuVokH+wiYgjsyNJmxQUQIR2rITYKs8hWfEgca2whwDEAF+yTwaaPR4+YnQSQAyJ3w2d0IGi9L/rIUx4MqLw+3zBeCGxVZ3N9Ho5XR7h497bQdHAuGwVUGoMousQ9ncUlkPkZ93kmdHEEcwHUBVPb+W14J1BT40Zf4SagudRjft9bOfr8VCtTZKq1eWQ0tHDvbtJL3tab1/Wg83/4+uVLA1Zyi4SFbCtBTwVgmXWUZvL9t1J/Bwg== 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=r/QJestHiXj/tMnaDWnavaAmJ6OSRmjnpIw/vusd6i0=; b=VkmQ3p7W8Gbx7DgV5QwgNDEl/ScNPzueid0eWmq5gK0gSMny3JO+cYUs90W1mv32bSXfzzzEbJaJyiWaCttLkInfiuxELuELbLjwMbiIghF1CCzOryv91oo3Z5EtWoxwaox2fxSmK5fkmJhFdyhbfsDnutmDprWlAVqreD0vjePHrgjdyhvQ98yOU57yozOSWGVna7b9L393wbe/bktagAnzjjEvNxLppjDpm39e+P3C5t6EcPgvpPST/fLsTLciMr0wPgy1Ld6EXiLYf/SIVpm88dhm5PXFUNB09xPCHgRcB9oi23806mkyILGSReKv2l9MJ3jZ16P3wULBbbsrfA== 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=r/QJestHiXj/tMnaDWnavaAmJ6OSRmjnpIw/vusd6i0=; b=H1hGKScmlTn5Hlpi/z/4bFJDqHF0pH7lOnVW39qz8oOKDiUb6IiUpzmoAlyAElWfPzxBYkGFEPIi12uxQCNyzXv5bMeaTh38LcMk8ZYC3uZUgVZ0w+9H8IpDe8YT8wOoDKrdrDICsijG7qIwWI/tLQRLdTsFqnmH93lJpBOvS34= Received: from MW4PR03CA0293.namprd03.prod.outlook.com (2603:10b6:303:b5::28) by MW4PR12MB7143.namprd12.prod.outlook.com (2603:10b6:303:222::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.18; Thu, 8 Sep 2022 03:32:25 +0000 Received: from CO1NAM11FT010.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b5:cafe::f8) by MW4PR03CA0293.outlook.office365.com (2603:10b6:303:b5::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.12 via Frontend Transport; Thu, 8 Sep 2022 03:32:25 +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 CO1NAM11FT010.mail.protection.outlook.com (10.13.175.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5612.13 via Frontend Transport; Thu, 8 Sep 2022 03:32:24 +0000 Received: from cae-Selwin.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.2375.28; Wed, 7 Sep 2022 22:32:11 -0500 From: Bhagyada Modali To: , CC: , , Bhagyada Modali Subject: [PATCH v2 3/3] net/axgbe: save segment data in scattered Rx Date: Wed, 7 Sep 2022 23:31:09 -0400 Message-ID: <20220908033109.126547-3-bhagyada.modali@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220908033109.126547-1-bhagyada.modali@amd.com> References: <20220907173326.124914-1-bhagyada.modali@amd.com> <20220908033109.126547-1-bhagyada.modali@amd.com> MIME-Version: 1.0 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: CO1NAM11FT010:EE_|MW4PR12MB7143:EE_ X-MS-Office365-Filtering-Correlation-Id: 2344678e-ee98-4aad-3e35-08da914abf6c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SZG2ZoSD5o5eE4Mcijnlsw/RLugsOLN4AYrwjAM5ToeUsNoXyr+mUyVSg0KxB0rWsKIplSfGA3MrKZQh29iJB4J5rSF2FmaTWya0LzZBDzRgg1dPwF2VWuXLncWly54eDXRxYxp2bx92xoqqhEtVYOmKtju6JQGAg9Ot2vIp72kX99ARC+J5qO6J72Hx8ALolEJpWqAHvrhaUBzW4RdjONdHUXCWBnI8wlGIba5PTTDBlW6+WQ7z84/lat9J6bWBUAgAG8Jv83QHZrq6skUbFXYbqWS+tvqPAp4IxiWEIn3BFhhvrjt2L/seiZWwkX0ePtzHEs7sjyaDbhMQLGntBqd0sAmX1b49G3PbE8DGX9LThcouRdKLARTZVEeFFTRDVRnHaoMCmzTuvETO0znVtfdXxMUO/0Z3q26GnZ422t6wK8Bq+cJYC/yqRbZOy6QJSn+knLW38c02gQ2NxFHr24O0WtxEfCuSRI9voSa/2j92+ipD/tA1WEcg7vAGUsEBPFFClKjgYSseO0mBJlY/dWPcw+OQ0KE3qsBMdnh7Y6YEANaYM+P7J6wPt8FESHsqod+sbeAtjFjdnBHj+0PqjBL/yeYS81KNOzrls+tt2f9aZ1cy7xQW/bcD3CH8p4flxokGpQtraIETXOmGwmbOyJdDDl6maI/eCoWJY6ETQvkXZ9/3G1abexvYRlx8stIe8HMTdXQKTQYLKl8NasWvQCMRFnqkDFJ09BLDmcNxv0AqQHLo9ZScV0Z9VpakL/WFJF8MEj5zljZBXWhAfuV5ZqPp24Tv5NlsYss9b0GUPgxqiutVpEew0A+1ef2WTDTuJ1MRmtOxUW4ATfFoWBK2kg== 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:(13230016)(4636009)(39860400002)(396003)(136003)(376002)(346002)(46966006)(40470700004)(36840700001)(54906003)(336012)(47076005)(426003)(44832011)(1076003)(26005)(186003)(40460700003)(82310400005)(7696005)(40480700001)(2616005)(5660300002)(316002)(2906002)(41300700001)(478600001)(8936002)(450100002)(110136005)(82740400003)(70586007)(6636002)(4326008)(86362001)(16526019)(36860700001)(70206006)(356005)(8676002)(81166007)(36756003)(83323001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Sep 2022 03:32:24.9621 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2344678e-ee98-4aad-3e35-08da914abf6c 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: CO1NAM11FT010.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7143 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 Saving the current segments of the packet, when the next segment data is not ready. Fixes: 965b3127d425 ("net/axgbe: support scattered Rx") Cc: stable@dpdk.org Signed-off-by: Bhagyada Modali --- drivers/net/axgbe/axgbe_rxtx.c | 11 +++++++++++ drivers/net/axgbe/axgbe_rxtx.h | 6 ++++++ 2 files changed, 17 insertions(+) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index c1f51ed6d6..65bda2a0d3 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -416,11 +416,17 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, mbuf->data_len = data_len; mbuf->pkt_len = data_len; + if (rxq->saved_mbuf) { + first_seg = rxq->saved_mbuf; + rxq->saved_mbuf = NULL; + } + if (first_seg != NULL) { if (rte_pktmbuf_chain(first_seg, mbuf) != 0) { rte_pktmbuf_free(first_seg); first_seg = NULL; rte_pktmbuf_free(mbuf); + rxq->saved_mbuf = NULL; rxq->errors++; eop = 0; break; @@ -502,6 +508,11 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, first_seg = NULL; } + /* Check if we need to save state before leaving */ + if (first_seg != NULL && eop == 0) + rxq->saved_mbuf = first_seg; + + /* Save receive context.*/ rxq->pkts += nb_rx; diff --git a/drivers/net/axgbe/axgbe_rxtx.h b/drivers/net/axgbe/axgbe_rxtx.h index 2a330339cd..2da3095547 100644 --- a/drivers/net/axgbe/axgbe_rxtx.h +++ b/drivers/net/axgbe/axgbe_rxtx.h @@ -65,6 +65,12 @@ struct axgbe_rx_queue { uint16_t crc_len; /* address of s/w rx buffers */ struct rte_mbuf **sw_ring; + + /* For segemented packets - save the current state + * of packet, if next descriptor is not ready yet + */ + struct rte_mbuf *saved_mbuf; + /* Port private data */ struct axgbe_port *pdata; /* Number of Rx descriptors in queue */