From patchwork Wed Sep 7 17:33:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhagyada Modali X-Patchwork-Id: 116054 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 E18E4A054A; Wed, 7 Sep 2022 19:33:51 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 84D5F40143; Wed, 7 Sep 2022 19:33:51 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2073.outbound.protection.outlook.com [40.107.93.73]) by mails.dpdk.org (Postfix) with ESMTP id 52A70400D6; Wed, 7 Sep 2022 19:33:49 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CjYRqqmUg4kH4Ose6ehYo1XD8driLGeMjyL7F23im5ixTkylcE7vZGzD/ZGgOqjsRnQB4FSvMZHtYG4wLBeejdcJ/PoUhZoxmoRgaST/6wux+ePbLU0ipZo9INUB1bAAba/mSVG9Hq6s8acHRCvv8B6O0wGs6LMDfFVF4FTntKE5gktyIWvpP8WQuPoGM3hfZr/sMw1ESaXIZDEnFrQcPmd6sVwvuHH1YIMjiAPj+UkdLmn8xVPoi+gqT8oAlccMO2R9BODvLev03TNoo4Rt1JpjGPHlSBIfexKbcYex8wbqk/nTsyFNiBEIsguucGwknGAUC+TG3PdMYcZp5VGmXw== 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=LNShfvopSsPgc/Jbs0+jAL2dhP49MzZMoV17Fcp9ds0rNLiGFMC0RsG5c2/+JUcb8mi4e/LACsCWZaV7JovrGWrTfbPw899LC7jm0DaCt+rvLDws2gXGhGKms2uyE6p2pmiET57dNrKS66Z0FLI+LQVFtUm+pifEUIz295HRA4bTDgqXd5r3bo/PjWFO/cqpTvp5joWSv/+SDPbkEGW0W4vQk0TqWU6/iCUT0msny4HwwG7u8exyLitiHfQBlCAGgFU3oIa3AlxEP1AXI9iEGb7pZDvoU2WMcDcPutmWjEwG0BgoNfTRxqg/mFRBslrTl40+fJuHXlVOEKCYBmABWQ== 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=G4ZaleX/18xj2ZahtDnba6YG/FIf1QlAS8GJ32ZCLZ8vC6iCvBI4Y6GFi0w3caBQWqcedijgFWGBaucR2Tav+J50jYTv5wrCYv1vOMKrUII082N6AlwsLYA518YISrpGOtK04koP09ej8pGAPT+IQX/hHufNeqvm+lNL9v0lgg8= Received: from BN1PR14CA0003.namprd14.prod.outlook.com (2603:10b6:408:e3::8) by BL3PR12MB6379.namprd12.prod.outlook.com (2603:10b6:208:3b2::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.18; Wed, 7 Sep 2022 17:33:47 +0000 Received: from BN8NAM11FT065.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e3:cafe::d6) by BN1PR14CA0003.outlook.office365.com (2603:10b6:408:e3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.12 via Frontend Transport; Wed, 7 Sep 2022 17:33:47 +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 BN8NAM11FT065.mail.protection.outlook.com (10.13.177.63) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5612.13 via Frontend Transport; Wed, 7 Sep 2022 17:33:47 +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 12:33:44 -0500 From: Bhagyada Modali To: , CC: , , Bhagyada Modali Subject: [PATCH 1/3] net/axgbe: reset the end of packet in scattered rx Date: Wed, 7 Sep 2022 13:33:24 -0400 Message-ID: <20220907173326.124914-1-bhagyada.modali@amd.com> X-Mailer: git-send-email 2.25.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: BN8NAM11FT065:EE_|BL3PR12MB6379:EE_ X-MS-Office365-Filtering-Correlation-Id: 85521345-1adf-494c-8d99-08da90f71e9f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WPEmPDVFtLPi8UOtZpGVoE1DaMzjjYShF/UZlaZ53/FCPoQ3UeOdKriaAH8mudJGG5ngk1RDBlv/x73nWjOYE/HH/hr3mQPcvNQ23Zh9uu6h56taev8lK3zRe9hqOrWhQmzBXkBxRPz8UrRqC0tSO6sllyU/3UCcrYNDyXIKJFqPn5Edj7i9yM1JXVAYQecyfb4husb+KsxbitoYLTe7oqkB3UsucEMGbqJlvdLCHEDQ1NrbdYi79pfFR6qtnHPd64CJDaVCZBclxryT82L2e3Qj78c1ZhRqX3tImHtyNzEt1LA+sAvxERB2LvqOcG3/Duvp0rTkrS2/FvHCuoCXAHyg8qh95cC8tWRhVjMnEU8/mwn2TdyWI0+/5DrMxTPLMhkSTHefsIwWpJRAa11MZMyCpHtO0XG6DIxamRRPFduTHvBHr1a3MhlnZrOxKaD+FQoJA/6eX/5NwWiDjaiCG28wHlV8/koEFJ5AoVAyGmk8KXce4dRixQEJZV7HEClrs3j6U73F+gIHZQVdgETnDdmjucD7HQcPYNohYTEnOFPxu56QxKPpCT8MlScmClty+01PDONiUWkWpQ8TDdiWjHeYOoDvBB/AU+G5+QuT0n1c0MXgLHx+MmbaZLQsgtR7oHSXBlcSVn4RlUqjgER0tRYT2CDb+NDLrX39JhY2J47dycrIJZWHWMbefbLXvWwfyK87pSB8spFIypBg7p06suQe6A02sO6tGutERpRXfVAYpje0bYysHZf9tEEc8WV9Q4Oaf2Khpt6iS7IA2YfCVmFZYkBLdBwYgTe4g9sZKLCF/rwyMpOhSEY7TnB4ZJDjFI+gGDFysgDaPEAzZyvnuA== 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)(346002)(396003)(39860400002)(136003)(376002)(40470700004)(46966006)(36840700001)(54906003)(6636002)(1076003)(16526019)(47076005)(186003)(82310400005)(336012)(356005)(426003)(110136005)(36860700001)(82740400003)(40480700001)(2616005)(83380400001)(316002)(8936002)(26005)(2906002)(40460700003)(41300700001)(36756003)(4326008)(7696005)(8676002)(5660300002)(81166007)(44832011)(478600001)(70206006)(70586007)(86362001)(450100002)(6666004)(83323001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2022 17:33:47.0816 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 85521345-1adf-494c-8d99-08da90f71e9f 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: BN8NAM11FT065.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL3PR12MB6379 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 --- 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 Wed Sep 7 17:33:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhagyada Modali X-Patchwork-Id: 116055 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 2A5F6A054A; Wed, 7 Sep 2022 19:33:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ABCAD427F7; Wed, 7 Sep 2022 19:33:55 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2081.outbound.protection.outlook.com [40.107.223.81]) by mails.dpdk.org (Postfix) with ESMTP id 9D9F0427EB; Wed, 7 Sep 2022 19:33:53 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bj+Qw6VIREEmqcAQmfLj/lhaWpzfYihurHmGqNSVvut1qap8dNHVNAZSNkLDkWeGP1+pwgTxTZTTQmiTsX0WqaHvBnjizkytY3Y228+uyIMQmG4LTPQFej6tS7tvTfUVN/WvTlpmWccz/ejTk63meyjen7WUKL4OBIzJ+Rqhx1mQUiz+aQjYcOmGm++j5s61QgSXbq6Gw4r8s/rell4/J7OkRj7WGGH3AmENOSVeekClMzBmydN4w+bjZX3RgNFohbibAia4mbLBDaSlWwjYypHeX95g+jxEJX2s35JoLUhYcfXW46JUGnenFRZPeeTe35f8NWaC2PXs30r9N/Q2EQ== 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=Svek0rlqmVTLsNtFFvMCw1F6JDOwkbNmmVEFMFqwNpCOAJvgx+Jx5XBiqxQ/OUilBxtIb0Cpbx48BfCQkTmBzKdcq+SfyTX9qJVMF1HPVMI/BQ4WF44KQwWajelt6wrCGMFbvdKf5+KdeMH5cNdS6x8gqkif7HZ7zL4zS4lclxAevn/xIWVqKoe9v+qL7CySLAjhcnJQKugjYE7M3paG4MOaZvXlHTYzFqr/QWGSAkEGkPkz903KhAThefioMuTGAiGBP0HO+HTDuFsh5ZHRCQmc+vIosV1EVtLLXsQuaC2kGsAkIE9gDJLl2NPt26jiZI/4ewbcHhdqdHkjRubtVA== 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=ACieTi68g0a70H21He+ztPb6T+wjb2C/pjVzOJ1qrrO6COm8aZIEk/QPI79C69y3MjEzhFaHdEj2KJEeR+6aHOQqjKm3uGYh759e1/6jhR+QK+H0Bee0Ghqpjrxe5MY3KzoBBHXZ4GLTLGFuXoBlbsm66poDldPbyy1PxAoYHac= Received: from BN9PR03CA0500.namprd03.prod.outlook.com (2603:10b6:408:130::25) by MN2PR12MB4127.namprd12.prod.outlook.com (2603:10b6:208:1d1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.10; Wed, 7 Sep 2022 17:33:51 +0000 Received: from BN8NAM11FT063.eop-nam11.prod.protection.outlook.com (2603:10b6:408:130:cafe::e8) by BN9PR03CA0500.outlook.office365.com (2603:10b6:408:130::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.12 via Frontend Transport; Wed, 7 Sep 2022 17:33:51 +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 BN8NAM11FT063.mail.protection.outlook.com (10.13.177.110) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5612.13 via Frontend Transport; Wed, 7 Sep 2022 17:33:51 +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 12:33:49 -0500 From: Bhagyada Modali To: , CC: , , Bhagyada Modali Subject: [PATCH 2/3] net/axgbe: clear buffers in failure scenario in scattered rx Date: Wed, 7 Sep 2022 13:33:25 -0400 Message-ID: <20220907173326.124914-2-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: 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: BN8NAM11FT063:EE_|MN2PR12MB4127:EE_ X-MS-Office365-Filtering-Correlation-Id: c15e0ca2-8f0a-453b-1d37-08da90f7213c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TMQq/DeFqgee9FW8gYOAcAIUoWfFmMqXyzMTuMhKp0VpEOEWAiednYT48EO/DKpGFb0Q0FSOZ4xGXre/cTwuAz6U6nj0BJwfrVTIDHNqfQf55gxnnw2t17Z6u4O6YeMNdncfrxvWqpf9pYwMqw7JUsAyKeqFh/inpmed45G/toOz5y/ie5i1p0u/l4b09HVQ9FSqxNKK5O/FeEzEzYm5L5Gv2V+j6ZYJs955z1LlIGIGvxfSXWdPZlGx4KO1g68no61DDtugC6jFW3Io/iOIW/GM/MxAIjv1235vLVVsulgE6xZl6NDZ5xBfQCozkXyOFG4R2BUoxJFreMxFCaCepm0dHGdbZlG7WHXQ15mrvSfHS1tp7VO74MLzyE4QQ4GmeYioXCDo8IpYd/G1QqGxgfPmFfn7mq5sgx5+wa6O0AdBLq2sH2QWHJumV0e6ZzwkIeMpxbV70zoYkTBVu+Lz5b10n/BZKnDzxQqa9pcWUBomi2HTeqXgBsNsOMApoCMYZQBRMaYE2kMLOC3JkK9Wey5f3iSPM9l2IZapPNKfd+R/c5+uiqgpNx6s7tnbXoHhk9HqykUL/gr8MCIiY91pakrEtT7zfOEnoh2hDEAz8IUPpHyOC2FhOSSTyw6SMIx1CnvzRuNOG7xqpAPctlkRNDGpRW4TandanLKsPpctyPMG+3tL80fOajLeQzGrNoonEY3XPGkqWrUK1Dh4+U+dn2p2a7Mtd0aD5FQAxXTcmDAMXj0WDHY1aiGMg5Z+wkuONZNyGumyP+5KpBlLmXLFHDgnTUI4TMizGqOtJvXwPjf/oqFuM9091hkZPEtxmvSwzHH4ugs5D4aVo2KJtYqJpQ== 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)(346002)(396003)(39860400002)(136003)(376002)(40470700004)(46966006)(36840700001)(54906003)(6636002)(1076003)(16526019)(47076005)(186003)(82310400005)(336012)(356005)(426003)(110136005)(36860700001)(82740400003)(40480700001)(2616005)(83380400001)(316002)(8936002)(26005)(2906002)(40460700003)(41300700001)(36756003)(4326008)(7696005)(8676002)(5660300002)(4744005)(81166007)(44832011)(478600001)(70206006)(70586007)(86362001)(450100002)(6666004)(83323001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2022 17:33:51.4631 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c15e0ca2-8f0a-453b-1d37-08da90f7213c 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: BN8NAM11FT063.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4127 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 Wed Sep 7 17:33:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhagyada Modali X-Patchwork-Id: 116056 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 5032DA054A; Wed, 7 Sep 2022 19:34:04 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D048E4281B; Wed, 7 Sep 2022 19:34:00 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by mails.dpdk.org (Postfix) with ESMTP id 67178427EC; Wed, 7 Sep 2022 19:33:59 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VX3f8ukQuflgRbrlhlK8MNV3SgV1lY4n6rfgDY+XpNHBOPoRwb9z06Cs6xmvAp95fTAGyC4qNiro65FyAEE0zXyvAjiWlgWphNXdLiHgXBtOeuVhel9UMPsHIzKF0j2gLpVayofd01qLQa6psfmr3PC41cPxjq45cRLVm9P2Gafa+s5pady4KFRETa2wE8RLb3mCS504XKQLzCinutNoPoERltoIz1U+TYIvnYr+1djQTR+evUAKOsUMSAu5HOhyXFQ7awpej/QlC9VVzJGydGruaMLVtKOfXv1NB9Yn3qJFo5fw40vf7tjn3vXbNKM8jk6rJ2WSWS4OTqnNVNYeFQ== 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=7moRDmcPCgvev1Dz6nSR8K1Jt7pDBb1hgmVgXV0hkVg=; b=SmclTZ7Su0+9hvqgRpLsH1Hlljl3TLLfetsLi8afCAPVgQ2a3E40h0xjdXaDEhqjRr8tYpVkJPJZ0Nxb5aFoIF4Tq/vyr05SUuy5DrwItbVuuXrORO7J6qNeygk1e86iY2LXTtKNjAcjSNaB5J5pZaETOWhjnYa6DnkzUG6Xj4C7lF9A/WehRKPLaTqIqibYnYo/jFwYVjs0sJkU8LyZh/0gUCssnWpEixXeTmvYtmh5KG1PmtrALuHqQIAXDximxcvWCcQFl4+6zTDnd0MG32bYYoGwgMZ1T2yl1CGidFRG7ZOo2zqJafOKb5nNpV76mHwv0FNt2VHLuyaKFMan7Q== 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=7moRDmcPCgvev1Dz6nSR8K1Jt7pDBb1hgmVgXV0hkVg=; b=J/5qX8CCWY6EoZyHcrCXOc/X8x9tSCEL98C72YxFQc2X1KKzvESog4A2UQK+ngIab/KQk3lJnMUAPw4gPdOO7ZvVuH1NmulTVHpI8YsJ77DG2YL38HAgBHjh8mtIZgZN05PjRz6z9yLazcccr2Uy7tvWYe2V4yMEh5w9qED8yxI= Received: from BN7PR06CA0051.namprd06.prod.outlook.com (2603:10b6:408:34::28) by SJ1PR12MB6292.namprd12.prod.outlook.com (2603:10b6:a03:455::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.12; Wed, 7 Sep 2022 17:33:57 +0000 Received: from BN8NAM11FT059.eop-nam11.prod.protection.outlook.com (2603:10b6:408:34:cafe::c) by BN7PR06CA0051.outlook.office365.com (2603:10b6:408:34::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.14 via Frontend Transport; Wed, 7 Sep 2022 17:33:56 +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 BN8NAM11FT059.mail.protection.outlook.com (10.13.177.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5612.13 via Frontend Transport; Wed, 7 Sep 2022 17:33:56 +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 12:33:53 -0500 From: Bhagyada Modali To: , CC: , , Bhagyada Modali Subject: [PATCH 3/3] net/axgbe: save segment data in scattered Rx Date: Wed, 7 Sep 2022 13:33:26 -0400 Message-ID: <20220907173326.124914-3-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: 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: BN8NAM11FT059:EE_|SJ1PR12MB6292:EE_ X-MS-Office365-Filtering-Correlation-Id: 9e097963-667e-44f8-50ec-08da90f72467 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NQKeIZtVSWvExCIp0gEaI1h7jeTuxltKp6nekuDkfEuMbhabK0ojgVfhL2gPMdV9Nu+u5l5Ys+aZpR64CNYrlP8W7FSiDYuVJkibJODbf3HsiJOnNWaijwKbDwecdBl7/P0gWj4b9TfA6kfpeaqr73q5nGbiARKxyqufGQeEE7vPx0PGT8hjazuryvvAadLuDxtmmrObV7kvOcPE5XLMoR8OoEonXB55haiOGyJ2KzkL/NTspMTpenwItQCvlGtx+P6RKzcky9LE+U/03RQo27+JnoPW7VkzXnb0PkhMmCifJB3Zx7ZRvpECnHZCC3eyVvJLIAbbACjxKtfWnmzWawXrttDFuBH2i9iscMh116yX4wbNuoUZ8e39TPHEnN/leGFfY0zk2KmgxMcVDwJYyICEuol3r1paG2jHb3lexTBIlKOkF6CZeOdjZnqDqvgB8jLR4QMY7EfFtygFeP/Szkia6Rac5Qctz4JRTT1JprckmQjS0l28oTE3jc5D0NHZlrsDq80f9ZkyWDbLA24K/hX/vZQ613UycD7Fw5fN/bP2W1H3As0AdDKTDyIUtJok6jO+Lzrp4KKk6BD5xVKSYbe749fRiOVeqovk9Iypi5ljRituT9jRF0ToW0VRG3gAP+gOtXsIOB9PO1X7+crb/bSQ4Q6Dm3E3xtc3HpaKlN/tFuvXUsXoOa7GmyhTI+zqUeWh34iY7EMx4jZCDnOKMGfNGp+OVhXhmvW+0awAiHViKwc5NFu1azH4X0H75XwN51l82PwDpC3O4Bbyn8D5Y1JbCW7nvInqrcN6hqM40Ky5qa8pzpfUXWP4/+GCUlGp/v9ycb1at0/XwOdU8w5kyQ== 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)(376002)(396003)(39860400002)(346002)(40470700004)(46966006)(36840700001)(450100002)(54906003)(6636002)(316002)(110136005)(8676002)(5660300002)(36860700001)(44832011)(2906002)(4326008)(8936002)(70206006)(70586007)(36756003)(16526019)(478600001)(40480700001)(41300700001)(336012)(426003)(2616005)(186003)(82310400005)(1076003)(86362001)(81166007)(356005)(40460700003)(82740400003)(7696005)(6666004)(47076005)(26005)(83323001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2022 17:33:56.7481 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9e097963-667e-44f8-50ec-08da90f72467 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: BN8NAM11FT059.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6292 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 Save the segments of the packet, when the next descriptor 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 */