From patchwork Fri Sep 2 08:47:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhagyada Modali X-Patchwork-Id: 115783 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 0244AA0544; Fri, 2 Sep 2022 10:48:19 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E023940693; Fri, 2 Sep 2022 10:48:18 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2046.outbound.protection.outlook.com [40.107.94.46]) by mails.dpdk.org (Postfix) with ESMTP id 3363E40684; Fri, 2 Sep 2022 10:48:18 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=f/sJO5N0BueMgMuUO8bRjQazPwiQ2pH/XJXfmzDIRPDSsdyic88Zj1YVfffoGQV1F3oYTkh4z0FREmq1RCbk98ze95UeVCy0xGN/M6DnldSGSSFGmYo8O/14WwZ+UtnhnvnKLNd2w+9l27fASv8n/KwEilyrDYjXeuwm+x+HvDOQ3pvQkQX/hgMQQL++dxcF8rGayqKkZldZnmpERSS/MRD558u+q1iGkOG8y5kl/vJaHmpIrk/qIAgyTP2Uls8MkoX+sRqZpUAJZrEywD56ys1aw7DyT/l/IztIIvzjDXVoT0bwDdl5F5IR1HSqyJZ3FkbEjl/8hND7c6Q6449BOQ== 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=vdqth9mq0BpTl36BYGJIUTqjUW0Ze1VnepKUqGwrIyw=; b=lqwrz9w+rNG94srYPfrVaDwDfGyD/Cqcw8c9PdyOq8KJmT2Rur780zlAHwRli5S+nWjYPtS4IW3on7dcBy/1vYCZwXKp+WagsnfcSmQb9WrJQoSKALKYD9I64reCgFhGVDddRF1axXBoYC237aB7ZJfjU2b1V0us7iecmi6Cwx8ugJz7JYcPF6h7U/GUJdGmcNS0+jA/JPNmG/Ip4NWVGrnwQJQf1ee6y/pCB0JhHGGf1vPJPZQxKXiIMwzQixcirz675jtl167zf8dYPLyjQ2ciIVqzteOhnMDCSBTizHhiJQaeUKhG5jGvYufBDzRj8pn5+LtExGrqN0hjVprLfg== 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=vdqth9mq0BpTl36BYGJIUTqjUW0Ze1VnepKUqGwrIyw=; b=4punHJlN0scupkFmwnz4zAPWQFoU8qsZzrMxdDmfC57VjpY4lesToFync6yMMSFk14wL3qpNpnTCNO7q5KmfhBmv8NR82NHEqsxObmyVarKGQLR98LUSPD+khficgX5ubNTQMjmZQ518DwPldKQlQg7VQu7OTm8/MELez9H10X0= Received: from CY5PR19CA0043.namprd19.prod.outlook.com (2603:10b6:930:1a::33) by DS0PR12MB6557.namprd12.prod.outlook.com (2603:10b6:8:d3::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.14; Fri, 2 Sep 2022 08:48:16 +0000 Received: from CY4PEPF0000B8EB.namprd05.prod.outlook.com (2603:10b6:930:1a:cafe::c5) by CY5PR19CA0043.outlook.office365.com (2603:10b6:930:1a::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.15 via Frontend Transport; Fri, 2 Sep 2022 08:48:16 +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 CY4PEPF0000B8EB.mail.protection.outlook.com (10.167.241.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5588.7 via Frontend Transport; Fri, 2 Sep 2022 08:48:15 +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; Fri, 2 Sep 2022 03:48:13 -0500 From: Bhagyada Modali To: , CC: , , Bhagyada Modali Subject: [PATCH v3 1/4] net/axgbe: fix scattered Rx Date: Fri, 2 Sep 2022 04:47:51 -0400 Message-ID: <20220902084754.99884-1-bhagyada.modali@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220901124948.97063-1-bhagyada.modali@amd.com> References: <20220901124948.97063-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-Office365-Filtering-Correlation-Id: 8245c1e3-a3b0-415d-2f59-08da8cbfe07d X-MS-TrafficTypeDiagnostic: DS0PR12MB6557:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /W79XRhpV4358R7jGN5akq7x3cBmha8njJ+82AYrZgaxoHVRQFd4c3R/EqUuJQdzv+t+1nKAmtEv6QlA4Kjra8wOmPIq95iTAB2TJS83+UrfMqhdzw3av2TcqGRfbuLMkv2clGNnOulDERenciBjZgUf5cc+1YGFxMXogDoc86wxyi1C3QhDoo3zuoBLc/RZ03Zf3Epegjqs2TO14AB1tkT1xWBts5n/yFqaGUOgQP8qN5Tp3l2RVglyvHtJNaoxcAlokVzrqZdErvPk1PJ8CTiXgmSC84jmjhjiFM4lNSTnW+43RptD6xZCk25dEuRYv8PM+kxRgUA/UY+zEV0P7h09Sp9in26Vsh+L8vBqaii5oeUy1OWo+L5R/M4tzds1JGI8rv7qjEBbYN+XFIRnSZIz80PLCR3OB2aMR21goNpWZzJL3rlLJ9StxCHyDSPLxI7oLj+lBs9tbZzRd7JtNnYQ8hK46Mr2G35oyNsOopPSdrMGZzghEARzXYAt5MbjpLPlBA1fEHemhg3n68CCwUa9oYC+Ndk3ouyzkqOOpa5Gj8F4fyAXfPEJaY6gl+EhOSirSlO+x8Oae1dRhfscUgUx9RkhscrrVXMvOqsALU9G/cR3K3WJjW5DMgrVm0+vACnhoRGIcssivdaSTFCpbgJdLAVOGmfIOoXq5PydsKxFr7b5tKhwm2qGsccuq+sz5xo0Nn5UmaGTwtW1kDtYZstPuDBZ4dSkwiEcnngigYAJcUBve8lnW+U0Rz/VZVwAaqzPIo+mNIuCe8sgqlBWYO+H00+oU2dzXVdWLJamTDSmMwN5aE9c+GbIaNF90KB8kMgZ7MhC8sCi0WerhPME8A== 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)(39860400002)(346002)(396003)(40470700004)(36840700001)(46966006)(83380400001)(81166007)(356005)(82740400003)(40460700003)(36860700001)(40480700001)(70206006)(70586007)(450100002)(8676002)(4326008)(316002)(6636002)(54906003)(110136005)(82310400005)(2906002)(8936002)(5660300002)(44832011)(7696005)(6666004)(47076005)(16526019)(2616005)(1076003)(426003)(336012)(186003)(26005)(478600001)(41300700001)(36756003)(86362001)(83323001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2022 08:48:15.7726 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8245c1e3-a3b0-415d-2f59-08da8cbfe07d 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: CY4PEPF0000B8EB.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB6557 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 Error check needs to be done only for last segment of Jumbo packet. Freed first_seg and reset eop to 0 in error case 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 --- v2: * removed the extra paranthesis * initialised the variables * updated the commit logs --- drivers/net/axgbe/axgbe_rxtx.c | 35 +++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index f38bb64fab..89ed6fd74a 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -343,8 +343,8 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, uint64_t old_dirty = rxq->dirty; struct rte_mbuf *first_seg = NULL; struct rte_mbuf *mbuf, *tmbuf; - unsigned int err, etlt; - uint32_t error_status; + unsigned int err = 0, etlt; + uint32_t error_status = 0; uint16_t idx, pidx, data_len = 0, pkt_len = 0; uint64_t offloads; @@ -381,19 +381,6 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, } mbuf = rxq->sw_ring[idx]; - /* Check for any errors and free mbuf*/ - err = AXGMAC_GET_BITS_LE(desc->write.desc3, - RX_NORMAL_DESC3, ES); - error_status = 0; - if (unlikely(err)) { - error_status = desc->write.desc3 & AXGBE_ERR_STATUS; - if ((error_status != AXGBE_L3_CSUM_ERR) - && (error_status != AXGBE_L4_CSUM_ERR)) { - rxq->errors++; - rte_pktmbuf_free(mbuf); - goto err_set; - } - } rte_prefetch1(rte_pktmbuf_mtod(mbuf, void *)); if (!AXGMAC_GET_BITS_LE(desc->write.desc3, @@ -406,6 +393,24 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, pkt_len = AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, PL); data_len = pkt_len - rxq->crc_len; + /* Check for any errors and free mbuf*/ + err = AXGMAC_GET_BITS_LE(desc->write.desc3, + RX_NORMAL_DESC3, ES); + error_status = 0; + if (unlikely(err)) { + error_status = desc->write.desc3 & + AXGBE_ERR_STATUS; + if (error_status != AXGBE_L3_CSUM_ERR && + error_status != AXGBE_L4_CSUM_ERR) { + rxq->errors++; + rte_pktmbuf_free(mbuf); + rte_pktmbuf_free(first_seg); + first_seg = NULL; + eop = 0; + goto err_set; + } + } + } if (first_seg != NULL) { From patchwork Fri Sep 2 08:47:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhagyada Modali X-Patchwork-Id: 115784 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 2317FA0544; Fri, 2 Sep 2022 10:48:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 13D58427F6; Fri, 2 Sep 2022 10:48:26 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2082.outbound.protection.outlook.com [40.107.237.82]) by mails.dpdk.org (Postfix) with ESMTP id E59F140684; Fri, 2 Sep 2022 10:48:24 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fDVZ2n7e/5KRwfpK3vqdJhUVHFDZd/wzWEoXhJhTGLkSui9nvB8rSE7G0VvCwQt6MMGWoZwE9CtnFn4cP+6mj9hqAiAtbimP6OM2KIe7o/c8On74hW9UUZmXqROI6FUax+nlwQ/PJVr/n1/Ey+Ux2flSOW0uCq/pvc0rCF5F5g//4JUCp6GrYk5+yjM5teNI0c7AGlKrNB1HjT+9Ufdn81+UD/6O1h5vO+O9ZvPXwvTE7gSqofMqOw2e2DaVoZxAfSxKMH/0/m9/GxDt+/x0RzVqcfNDDLlefxn5DoUdyAEElwfTJtIfwuOdyq6aFL2XC10CNZiwbCtGxcYRqjszcw== 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=j9f3ira0StvLzqF7mEy1rmO2vPLhSz/0l7yYy2u9iUE=; b=cWS8Ixl7q7XdJJQVzxDKDTOyrJiCndcCG1HAtlD3vG32pC7HmkC+X6QVv0Z4cYN/WIixcAvh7+s8SdLOG0bnMEa+587ur6hwJN1FW9TYt5askdVJbOVfu8yhSIQsswo4OBwZepKsx9Okk7tRjs/4ZjT3DE9taM9VABGA4AHN6v/0IjSvrsoaizYLy71CzPB8Ih4qk7nkk/jNMamNpOzrK1UArvxBue+Vi10MimUOcsNmyn3AhkbnWHuyiDdloiMmdChf2JtrhRACe/bKcydNd9VBKwITBsGHkcGaRx/PpUR00th+xEJiSxZ89okGOLKZW6/BtcePm8UatQ+3RJoTEA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=temperror (sender ip is 165.204.84.17) smtp.rcpttodomain=dpdk.org smtp.mailfrom=amd.com; dmarc=temperror 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=j9f3ira0StvLzqF7mEy1rmO2vPLhSz/0l7yYy2u9iUE=; b=L6oblG2uAZxnhkJXEpwz7WuifY8MtYdG8Bl+/vrCXxqdD8wUPLn/oFKk2mRpnSdW1QPXmqsrVE9sJHdEGkMTUI97pCROokk6NZSqXd30rXPHAHwQmWqN6C+8+CL5zc5XxfDcJ7wA6vl5jv8LTButxrZxoKKqPlq6Y9gDkXWAqAk= Received: from DM6PR07CA0124.namprd07.prod.outlook.com (2603:10b6:5:330::34) by DM6PR12MB4960.namprd12.prod.outlook.com (2603:10b6:5:1bc::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.10; Fri, 2 Sep 2022 08:48:22 +0000 Received: from CY4PEPF0000B8EC.namprd05.prod.outlook.com (2603:10b6:5:330:cafe::d3) by DM6PR07CA0124.outlook.office365.com (2603:10b6:5:330::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.10 via Frontend Transport; Fri, 2 Sep 2022 08:48:22 +0000 X-MS-Exchange-Authentication-Results: spf=temperror (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=temperror action=none header.from=amd.com; Received-SPF: TempError (protection.outlook.com: error in processing during lookup of amd.com: DNS Timeout) Received: from SATLEXMB04.amd.com (165.204.84.17) by CY4PEPF0000B8EC.mail.protection.outlook.com (10.167.241.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5588.10 via Frontend Transport; Fri, 2 Sep 2022 08:48:21 +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; Fri, 2 Sep 2022 03:48:18 -0500 From: Bhagyada Modali To: , CC: , , Bhagyada Modali Subject: [PATCH v3 2/4] net/axgbe: fix mbuf lengths in scattered Rx Date: Fri, 2 Sep 2022 04:47:52 -0400 Message-ID: <20220902084754.99884-2-bhagyada.modali@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220902084754.99884-1-bhagyada.modali@amd.com> References: <20220901124948.97063-1-bhagyada.modali@amd.com> <20220902084754.99884-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-Office365-Filtering-Correlation-Id: 72d39bdb-fb89-4ca5-7c2f-08da8cbfe3b8 X-MS-TrafficTypeDiagnostic: DM6PR12MB4960:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GoshddOUxfDln5zFtNB38Bj+rrYWvnH2afZ2Ehsh/tCGcIipKRNxxOunXDQzbSek/QPZe1G902WaCtrXMu014F1Iu2+ouPFALdEiz3/lLQS4weMpFHq/ystyxj8rR20u1ohHdqA/gwcLGp60X+sFEYinDzIGLIHxHyjC4yOZrHu3jf85M7zRiiofrmvZaH4rV5qdVqJnleOQilt8lxNOdCUmtgrIypGFs9yiMsGhFQKWMKLgOyZU61zNv5YdNvDcuinazxBIsPRooIsWPjGO6TvagKOzGeB9hAh+79RY7nR18qsnkjkyC3TXQrJSsjhVL1PtHCFaZR7s9mpl0bdjtpszknxLOPcQ6zMp474npYNNF51eI0viuf6cUbYGfQtmdAjj6hZgWqJHuxfd6+egaumveLNUJVUzd5OnSznCRr96X7czc3orI/24/WbwbIH9lHIq8YemWkq5v41paBPauztmGgKQedOjDyV/SERzIOwRdSvQ+/3Ih2iCOoXQFeRiFcLqukoSN7SfcDBxqg20YkKW3PPbYSCZA9ofxcbqd7oSjK33tC2ju9knD4k4nYXwXJQ7vUh9JvQdaI/WNseJUltbqz9YjXQTRonQ79ZPrA/f7FDJb4jz9b4NqPBHc8gKUipRI5V94eS/hNMMsCQZujknWahMkZ1TcDCnygPEMVbZNNaK6Hy2xLPB0oGinhbwwlv7IUuJj2JawIbuUFJc5VAroNbu5UClmc8gXyPo6Q+kU2+88gJNIMJBzRvb+5QqbxNTIxqnHH/k8SFWFdhjE3/sRZUe2bjgblphy+KfYtj+sWldT8f4dE7d3yTBbPJ5M72MFvUNUWxGt2nl87eVXQ== 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)(346002)(136003)(376002)(396003)(36840700001)(40470700004)(46966006)(7696005)(16526019)(26005)(426003)(47076005)(336012)(2616005)(186003)(1076003)(4744005)(44832011)(8936002)(5660300002)(6666004)(41300700001)(86362001)(36756003)(478600001)(36860700001)(81166007)(40460700003)(356005)(63350400001)(63370400001)(83380400001)(54906003)(6636002)(110136005)(82310400005)(2906002)(40480700001)(316002)(82740400003)(4326008)(8676002)(70206006)(70586007)(450100002)(83323001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2022 08:48:21.1944 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 72d39bdb-fb89-4ca5-7c2f-08da8cbfe3b8 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: CY4PEPF0000B8EC.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4960 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 Updated pkt_len and data_len in the last segment of the packet. Fixes: 965b3127d425 ("net/axgbe: support scattered Rx") Cc: stable@dpdk.org Signed-off-by: Bhagyada Modali --- drivers/net/axgbe/axgbe_rxtx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index 89ed6fd74a..2c2554e900 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -391,8 +391,8 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, } else { eop = 1; pkt_len = AXGMAC_GET_BITS_LE(desc->write.desc3, - RX_NORMAL_DESC3, PL); - data_len = pkt_len - rxq->crc_len; + RX_NORMAL_DESC3, PL) - rxq->crc_len; + data_len = pkt_len % rxq->buf_size; /* Check for any errors and free mbuf*/ err = AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, ES); From patchwork Fri Sep 2 08:47:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhagyada Modali X-Patchwork-Id: 115785 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 71897A0544; Fri, 2 Sep 2022 10:48:31 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2C1C74280B; Fri, 2 Sep 2022 10:48:31 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2056.outbound.protection.outlook.com [40.107.243.56]) by mails.dpdk.org (Postfix) with ESMTP id E86EA427ED; Fri, 2 Sep 2022 10:48:29 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MBZpOjzhdFU7yiiUjoFNwycUY/cMkOQ9xMauAZNI8hOkruQMV7MH3FnxaM+z4k4hn8uC+TTWpLo/X7l8h4+BwTxbSdlAoEWhDbbdsDkBhHMPavRHNn9PeBib00kAugzGq3YKc2hoBbLYOa/MpDxghJwjwaa8UtEl+cZqRjeHvCtd/eyNDBp9TU2RA08uZgpDmxe9dP9bzRbNBVaZhj0jWDk+aVaJKlhFRf9wt5fSrEjJ50CvUxzeJGCBJMPzD/dVVxlMDBj0x1/jhCLrqfEI5lPwVjChXeRcmdna1hOjGCzsRegWrLvd9t1CHLk4gM5mNKZR533feQlyipUxnki0Xw== 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=yh7pAZKj0wGKLAUjdR8z4sBrQYQ9sw6OsUwXcplE5aI=; b=Zu2fNtsZFSDBn4R0i7GdB41Wy3JzoBGoyK8rvAwlPVzTuzF73vxm68n0GVcUCuy7CbGO4/5vKaBOrgKDYnH/nFQbXSwnn9hALZVckrMKyNR6DyRvZlM95smMXxsTGymU5fpGaXF4eKHDVGPJZfBYtYH8GKXcbph84DONznihKDgcRUScqSR/zG8fzX/1ZbyPNCpJZrJYhlFwgFQJtaGT3EG310ZksKSHINF/GmH9fktMocAweKY10rdxWpV8FFtykCrAuYuQbOn9KvUEwwH5AZO2ZL/8HVFuQAwKuKAQXWdLyb6UvhvldaU4alxfhco4QLCnFd8wLrwaTV6MfkcS+Q== 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=yh7pAZKj0wGKLAUjdR8z4sBrQYQ9sw6OsUwXcplE5aI=; b=JAS4oCGe59BxMRWguAswftONk9F95u1/BXqJK1DohhYUUoMZZc4YuAOWFkBJTWA8lxEa08CxDazqgVqqEt2WyBBju246gqyxKl2b9U1q+F3sqzziP9kaQ73D/ks1nPPfUezE2A7MMDJDxkJt39ROS57zLvhXQbAJpW2Xs1nDo0E= Received: from CY5PR15CA0171.namprd15.prod.outlook.com (2603:10b6:930:81::17) by PH0PR12MB7011.namprd12.prod.outlook.com (2603:10b6:510:21c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.10; Fri, 2 Sep 2022 08:48:27 +0000 Received: from CY4PEPF0000B8E8.namprd05.prod.outlook.com (2603:10b6:930:81:cafe::4d) by CY5PR15CA0171.outlook.office365.com (2603:10b6:930:81::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.15 via Frontend Transport; Fri, 2 Sep 2022 08:48:27 +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 CY4PEPF0000B8E8.mail.protection.outlook.com (10.167.241.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5588.7 via Frontend Transport; Fri, 2 Sep 2022 08:48:27 +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; Fri, 2 Sep 2022 03:48:24 -0500 From: Bhagyada Modali To: , CC: , , Bhagyada Modali Subject: [PATCH v3 3/4] net/axgbe: fix length of each segment in scattered Rx Date: Fri, 2 Sep 2022 04:47:53 -0400 Message-ID: <20220902084754.99884-3-bhagyada.modali@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220902084754.99884-1-bhagyada.modali@amd.com> References: <20220901124948.97063-1-bhagyada.modali@amd.com> <20220902084754.99884-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-Office365-Filtering-Correlation-Id: 64871f28-cbcd-4077-629a-08da8cbfe764 X-MS-TrafficTypeDiagnostic: PH0PR12MB7011:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nnS51NmyVmvYVKX65IPTugDihN4H1K+L/Is9ea0uzA4JShzOorTXwfyrFo7dfIyO671+4g1syT+auYY70Jh77hwsQrXufyDxQ+LJ9rkXXDktfFFwJ8KQgaF0Kz6po61M1blZqXxA636YCjM2BuKIOmUNZqJNPEzjaMsnf6NDiwcZYdN9WL1lPFImM9UcCv8rK4QKjp1lEHGLAg9W81vGOC1WPmaE90c41tZrNNhNtSbNCyM43mcQKGTo67s3mnDLZIgf/0NGgc8Bb8x5hxx4awjs8Fd+SWxDWZeJ0/i6eePeMZPquptC5AnFN+jLjU9aO6966atwrPbia/qISq2HRfsscK5eo/dpqOYUcC/O7jT4tsobQo51LTcDl2p2d9muw1uKWs7+hBNTsqKBl0AfpDb/ZNgZuvnfL7q+LxJaOKSlzcllS/ErXny1Iwnc5vx59R6SGfVkNCtjpGyJHXbZ+gdGeDeEQ31iZFkWm1LKsZaZk+OZSxCkOcizuWC+0WMB5MAz2ro/RwCFc08c85uSqv0wIJUTLu/9U12zPQi3wF7RNgCDIp0zZEEFb4e6jLY6ScqnjXFvOO18TtxdUplFN+RuwaI9hPHAGRGllQWhPligQp0Wise7tdxHEwRAxVJAXxMoKfUKUjznqqkTlxpvUxXZIjmuCSzxFPgJO1B1EVW+Emxq21XGUkFobpGVezHLl5QhS8gU+mShX+XQ2NR2qJAfMWFIiITRu2VQ5X3NDgv2hbiWzAb0Py8RZ4BA8/4RYdtMyZV+D7i1Iq4HJg2Mn/ht9YsLS63andHZPSfWzdRSWdozOrshau/cI7vb7BxiapdY2L2kjzmALGQsepU0dg== 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)(376002)(346002)(136003)(396003)(39860400002)(46966006)(40470700004)(36840700001)(83380400001)(1076003)(26005)(2906002)(16526019)(86362001)(336012)(2616005)(70586007)(4326008)(40480700001)(186003)(426003)(47076005)(356005)(70206006)(82310400005)(8676002)(4744005)(36756003)(450100002)(36860700001)(478600001)(44832011)(40460700003)(8936002)(6666004)(110136005)(41300700001)(5660300002)(81166007)(6636002)(54906003)(82740400003)(316002)(7696005)(83323001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2022 08:48:27.3541 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 64871f28-cbcd-4077-629a-08da8cbfe764 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: CY4PEPF0000B8E8.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB7011 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 Updating mbuf data_len, Pkt_len for each segment before chaining them Fixes: 965b3127d425 ("net/axgbe: support scattered Rx") Cc: stable@dpdk.org Signed-off-by: Bhagyada Modali --- drivers/net/axgbe/axgbe_rxtx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index 2c2554e900..7c07fd90ef 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -412,6 +412,10 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, } } + /* Mbuf populate */ + mbuf->data_off = RTE_PKTMBUF_HEADROOM; + mbuf->data_len = data_len; + mbuf->pkt_len = data_len; if (first_seg != NULL) { if (rte_pktmbuf_chain(first_seg, mbuf) != 0) @@ -443,9 +447,6 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, mbuf->vlan_tci = 0; } } - /* Mbuf populate */ - mbuf->data_off = RTE_PKTMBUF_HEADROOM; - mbuf->data_len = data_len; err_set: rxq->cur++; From patchwork Fri Sep 2 08:47:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bhagyada Modali X-Patchwork-Id: 115786 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 3739DA0544; Fri, 2 Sep 2022 10:48:37 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 76E3642826; Fri, 2 Sep 2022 10:48:35 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2072.outbound.protection.outlook.com [40.107.223.72]) by mails.dpdk.org (Postfix) with ESMTP id 69FB6427F9; Fri, 2 Sep 2022 10:48:34 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Nk5I0A7BpVcFSHOiOeY9znIcjxua93aHVCUnRpm3M0siuTw6JFLY0KbUIUb5thaj9qS/ESpH6qZ3XSwnkXyhNGB3MQDX5GQAWvFMAT50PIWgj77I5LonlfklP8x188Evv8x0gjgwzBRhLoy7x5cR5GWsnFVnBIbAWcEQhLZLwjs+zSmtoxpKjU5Y6l44Az8O5/uQ+q9Es7vOT6+i2SC/GzEbxL2k9wMoNhdkcqaGPsflMX9l3CUeU843fv/ZHO6N2mysjx00SEnmhu0WWEM5OquZqsH5xulcZJFJEM11NoE+eR0Nfh9XsQDtmRSQx87ZvSvhjyLipuv/yn0A3OVdCg== 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=eAcZzJVfpEDVGVQO24f2o1DyzsW2/qYCg7bCCH/wxPE=; b=PgpAKCUeXJYfsQobcPpdeBIbNgqDIfZHX26+9Kp486xbfNM+B8nylQ6+Kc53aX68LqmlN5QjSRvjfaujyFUE3DD8GHuNXwsddM7T0CLgWTaVYqjX4GIvrldCXYr/+I4sFIe5uGZBfxhllJtar9M+UWB9D23s0TBDBxV2xDMl/qgfOW0p3rDtWQpUu4tGT7t8WLMw4WLaSZIlvW4ebPNACnbGrtn2KokTf8iwJ8Qg1l4IGAWU4ORwCZVLRab3jkw3EtM8kUy7+UbpGCthhG551gC7BxaWBtmPQuPcUtBydHUkovjYG+RffnypfWML396sVUS8jHm5DrZbAURy9aq7TA== 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=eAcZzJVfpEDVGVQO24f2o1DyzsW2/qYCg7bCCH/wxPE=; b=Oft7L143XzeF79HggNcIJpcUo+YT0O7ghG4QtUp6ebQGI0oIg7BlE2Rp5njlPU6uGCQcyOe6kzL++68sqelfUab04PfkVtsekFlvjwxCHmHmEa9tGPD5wL5xxoqAxp4JczO+Ek+7lHM2uG4I9Yi1rN01E1eAtNY11Y63RRRxWNQ= Received: from CY5PR18CA0041.namprd18.prod.outlook.com (2603:10b6:930:13::19) by BN9PR12MB5306.namprd12.prod.outlook.com (2603:10b6:408:103::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.11; Fri, 2 Sep 2022 08:48:31 +0000 Received: from CY4PEPF0000B8ED.namprd05.prod.outlook.com (2603:10b6:930:13:cafe::ec) by CY5PR18CA0041.outlook.office365.com (2603:10b6:930:13::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.16 via Frontend Transport; Fri, 2 Sep 2022 08:48:31 +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 CY4PEPF0000B8ED.mail.protection.outlook.com (10.167.241.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5588.7 via Frontend Transport; Fri, 2 Sep 2022 08:48:31 +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; Fri, 2 Sep 2022 03:48:28 -0500 From: Bhagyada Modali To: , CC: , , Bhagyada Modali Subject: [PATCH v3 4/4] net/axgbe: fix checksum and RSS in scattered Rx Date: Fri, 2 Sep 2022 04:47:54 -0400 Message-ID: <20220902084754.99884-4-bhagyada.modali@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220902084754.99884-1-bhagyada.modali@amd.com> References: <20220901124948.97063-1-bhagyada.modali@amd.com> <20220902084754.99884-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-Office365-Filtering-Correlation-Id: 6166c66a-fcab-4eff-9e51-08da8cbfe98f X-MS-TrafficTypeDiagnostic: BN9PR12MB5306:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DkpVD0HVffJ8HZH66Xs9sXi3e3Wd0g8/EcTPD3TQMqqvZYy5WOl6r6IGkXHOHSiF7jvAC3J69nA1vq4wlPP+2sTGG25Mn8DEaJXAExbe9hbj5N0ettnN1RrEitoTxFWFxOPlJ7iwZ8V3qugEo/zbT2fWx6mOuMIdEOpJBiiKQqbuhcAETXTjj28Pp+3LTFYpUcBGGlKAMTtINFkwAemZSeFfTQaAk8NryPLnZqzlG3agoWE0Ug4XflB+aqePoM0QjCebDzP06ev6MC8ohxsyXvC+Q+MeD1jwHyQm7YBJWQn4/M7L5SNCz48vu3uHS5NnaD7ecNmgHBaTo6EtbqzDJ76mWO8tBdODlV7I6FMuoRVd7h90yu6BHA/WRR5M3d4iFCjKhmHpHwwKzJ7KPqdIiLdf2PZp7JDJRbjHrW8wVX5U2npzlMfYqpO2fAJqhIdIzREXuTl/WlRuYModTpIBBuekZFyfxyNWsrhs0ld7qo3xrfmpHMytR6gDHdf0YhsUuQiXO+sY9UjJbUSNU00sAOvlpPlREFB3hwiyjP13g0pt5qSEnybB6ejzGzM7AnNMr99uUHTNVJ0II6yVPtYZt+vvc77Yk1QAGMxhtguhrLd9VUrGlx4znrk9Y+l2aApwMjX2wZEieJNx5r74L2h3ZGKDkv86k3o5TQ4RGdj0IvnO19EJ1FLIYYYcb9xUb0MJkWo06XX9nbuVaePAdnB43shnr2OPuuZzZd2dwmoNfwytF/U60nMmBAkbnjdnmAcveV1LrFADAVRGEGL4JTpCbFOfnKn3VVKRGWvzGhNR0pOnKQAS329cdcB9veOfpZ0b1dat1gK7611bg/wra6EL4w== 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)(39860400002)(346002)(396003)(376002)(36840700001)(40470700004)(46966006)(16526019)(7696005)(26005)(426003)(47076005)(336012)(2616005)(186003)(1076003)(44832011)(5660300002)(8936002)(36756003)(41300700001)(6666004)(86362001)(478600001)(36860700001)(83380400001)(356005)(81166007)(54906003)(6636002)(110136005)(82310400005)(2906002)(40480700001)(316002)(40460700003)(82740400003)(4326008)(8676002)(70206006)(70586007)(450100002)(83323001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2022 08:48:31.0242 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6166c66a-fcab-4eff-9e51-08da8cbfe98f 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: CY4PEPF0000B8ED.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5306 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 Updated the RSS hash and CSUM checks with first_seg instead of mbufs. Fixes: 965b3127d425 ("net/axgbe: support scattered Rx") Cc: stable@dpdk.org Signed-off-by: Bhagyada Modali --- drivers/net/axgbe/axgbe_rxtx.c | 41 +++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index 7c07fd90ef..2bad638f79 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -427,24 +427,27 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, /* Get the RSS hash */ if (AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, RSV)) - mbuf->hash.rss = rte_le_to_cpu_32(desc->write.desc1); + first_seg->hash.rss = + rte_le_to_cpu_32(desc->write.desc1); etlt = AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, ETLT); offloads = rxq->pdata->eth_dev->data->dev_conf.rxmode.offloads; if (!err || !etlt) { if (etlt == RX_CVLAN_TAG_PRESENT) { - mbuf->ol_flags |= RTE_MBUF_F_RX_VLAN; - mbuf->vlan_tci = + first_seg->ol_flags |= RTE_MBUF_F_RX_VLAN; + first_seg->vlan_tci = AXGMAC_GET_BITS_LE(desc->write.desc0, RX_NORMAL_DESC0, OVT); if (offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP) - mbuf->ol_flags |= RTE_MBUF_F_RX_VLAN_STRIPPED; + first_seg->ol_flags |= + RTE_MBUF_F_RX_VLAN_STRIPPED; else - mbuf->ol_flags &= ~RTE_MBUF_F_RX_VLAN_STRIPPED; + first_seg->ol_flags &= + ~RTE_MBUF_F_RX_VLAN_STRIPPED; } else { - mbuf->ol_flags &= + first_seg->ol_flags &= ~(RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED); - mbuf->vlan_tci = 0; + first_seg->vlan_tci = 0; } } @@ -468,18 +471,24 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, first_seg->port = rxq->port_id; if (rxq->pdata->rx_csum_enable) { - mbuf->ol_flags = 0; - mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD; - mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD; + first_seg->ol_flags = 0; + first_seg->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD; + first_seg->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD; if (unlikely(error_status == AXGBE_L3_CSUM_ERR)) { - mbuf->ol_flags &= ~RTE_MBUF_F_RX_IP_CKSUM_GOOD; - mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_BAD; - mbuf->ol_flags &= ~RTE_MBUF_F_RX_L4_CKSUM_GOOD; - mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN; + first_seg->ol_flags &= + ~RTE_MBUF_F_RX_IP_CKSUM_GOOD; + first_seg->ol_flags |= + RTE_MBUF_F_RX_IP_CKSUM_BAD; + first_seg->ol_flags &= + ~RTE_MBUF_F_RX_L4_CKSUM_GOOD; + first_seg->ol_flags |= + RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN; } else if (unlikely(error_status == AXGBE_L4_CSUM_ERR)) { - mbuf->ol_flags &= ~RTE_MBUF_F_RX_L4_CKSUM_GOOD; - mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_BAD; + first_seg->ol_flags &= + ~RTE_MBUF_F_RX_L4_CKSUM_GOOD; + first_seg->ol_flags |= + RTE_MBUF_F_RX_L4_CKSUM_BAD; } }