From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9B653A0544; Tue, 11 Oct 2022 02:52:45 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0B9E042BE5; Tue, 11 Oct 2022 02:52:02 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2076.outbound.protection.outlook.com [40.107.237.76]) by mails.dpdk.org (Postfix) with ESMTP id 38DE942BE5 for ; Tue, 11 Oct 2022 02:51:59 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CFHorTqJSTqQPMkdWnfu8x8pfBvve5UsspD5c7dLslOXurnQ4kfkkO0oyX3uxBz9vhivgjObYTUyxoy1cP/4Ggv9fwzZM6aoPUhgeoswlF81Pb6Enq86wZWu0TU0Qj7/8sUO0XcqCPaj3TdDAXhGc+DqKpguYzB9raDhkQYyKAfm6QsqUChyNgt8/ihDLv8ODr7AfnSjkokl9l0v1Sn0c5dfy9/egrf1ItwFjKpi6vYryeTHmq6eJAatcG2MKjBHynnu5L/FNTcFHDxHIPyyl53m7xJBt/G+XUIu+OhRmRx/N7748HoVXzNYg3YokwmQjBV5eFX0bQMgerTGWleAKg== 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=h9guIeGpOFUsOeRCE7bcwkYVvsNY0CE3jeezWZYWi1Q=; b=NxpuqmDRjoIMkkHgF1zyYv1+f1j5/2pIZWCCDvckxaJYyaEPM1zPgIN8A3PHvPfL7HFvI4K6e06zQ1/nVlzbuEI56vzY0ETPoMJcqFCuaQhvr/mbO82UQ35qOgP1Z81JkQjBKRIwTiwJDqYlj+4cJNwT2Ws4fRkRovhOSQcu65ySpnei/gj/RLRKyMytQV85bVjIg8dHp5pGKF3+LkViarU1nJXQmu62PLM7CNPRtqrFCunkToecp1nsQ3aB24nLn/9ESvsfJZ8EyyuwTzNlX4pYY4zyLdnu/jsycnRr1N4H/tCg6vpSg3uLu1fLFaLAEcWAsF25DOO0d8f4fOv1oQ== 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=h9guIeGpOFUsOeRCE7bcwkYVvsNY0CE3jeezWZYWi1Q=; b=pm1CHbgw4Aj+RQXSvIe8YZmTQjtg5GygSkQRh3CVT4kvDoPQVUq1FvwBzoTris2OkElH47QVsFAYcKyYLKQVqHhLHRSmGVTtXZndQxKgJdrmnA+xd8spWhJ7TLI8ghLjZMx1P6VdPRxYaix3Ezak5HjGD5OpVmcZo1aZ/e4umEg= Received: from BN9PR03CA0416.namprd03.prod.outlook.com (2603:10b6:408:111::31) by PH7PR12MB5711.namprd12.prod.outlook.com (2603:10b6:510:1e2::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Tue, 11 Oct 2022 00:51:57 +0000 Received: from BN8NAM11FT090.eop-nam11.prod.protection.outlook.com (2603:10b6:408:111:cafe::1e) by BN9PR03CA0416.outlook.office365.com (2603:10b6:408:111::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15 via Frontend Transport; Tue, 11 Oct 2022 00:51:57 +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 BN8NAM11FT090.mail.protection.outlook.com (10.13.177.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5709.10 via Frontend Transport; Tue, 11 Oct 2022 00:51:57 +0000 Received: from driver-dev1.pensando.io (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; Mon, 10 Oct 2022 19:51:56 -0500 From: Andrew Boyer To: CC: Andrew Boyer Subject: [PATCH v1 14/35] net/ionic: replace void pointer with actual type Date: Mon, 10 Oct 2022 17:50:11 -0700 Message-ID: <20221011005032.47584-15-andrew.boyer@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221007174336.54354-1-andrew.boyer@amd.com> References: <20221007174336.54354-1-andrew.boyer@amd.com> MIME-Version: 1.0 Content-Type: text/plain 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: BN8NAM11FT090:EE_|PH7PR12MB5711:EE_ X-MS-Office365-Filtering-Correlation-Id: 59afac6b-1091-4dbb-1672-08daab22cc65 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: G0VjenGEbBkVhj9HRfANz2mj8hK065AmqrDu37gDrun2z3P0tbyxXg7V1z0POgCoe2xRUC0KgR04ZqrYV/kYvPPfvanh3t2pQCg/s1dL2GZszmjVkpk8PYkV7faZ8VJiipu46y5Q8wbec9tAr9nPFyneFKNJbDnqOQLE4sDpuUAT1rlp3aTabi0x0/Lgc6kYfhneqb7vceFSY93dzHvYORBymxEJXVfFVzB3hiSBelqk9CXvV11tkeJxKJqSOjFPLLY8/95ElXLq+LEyGAWF5mv/Q/ZOpIxjeucgz+crLOBLupLPAyQ1pktfwLmEEb4eAmA/uFbFDq2xIf+gIK9Q0oE+ZuZWdLzcWaQZPmvKAx6YUbHYrc8hFFOw/yW06h3h9guKSE0QPuedkmy1qViLH5O5SZJB6P4Og5SeTpmjuY++xgZBKTrnLyg830fi1vXINh0o3oBaUghpV1oETvk+B4DkaqD81hLwOQFBf1Bvgsep4Ub0wbLEPLiK7APx+4EuMaEw4hI7l59h/AbuC63HTCw+NOlXgtLDnzGgcpEPo6a9YUoNgy2IJMX03dJDOP/ZepHe1to3wQXi+/IF7kyV8TPqukeSWN/tBLFN8lSpvbX5x+MjAp0lOFbZfY5j3uR0wnf6m688y5g3hPAZ4Nu0kM9Oa4yeHQhJPMNo7ppmENm8s9JH8XAFB2ijQ0HTrxk6MU2xgePEv/wK5Oyw+RZOyTiGJV7yODL8YOFvCqbiDjZA/8szGyOctMv9CdH+17HCbAvclqQW2iSiIlubvXJMGO1jsCT5xDmARGx5Bn7OIdU= 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:(13230022)(4636009)(346002)(136003)(376002)(39860400002)(396003)(451199015)(46966006)(40470700004)(36840700001)(356005)(81166007)(2906002)(82740400003)(86362001)(36860700001)(26005)(40460700003)(82310400005)(6916009)(44832011)(5660300002)(40480700001)(8936002)(478600001)(426003)(47076005)(186003)(1076003)(316002)(336012)(2616005)(16526019)(70586007)(70206006)(8676002)(6666004)(41300700001)(36756003)(83380400001)(4326008)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2022 00:51:57.2292 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 59afac6b-1091-4dbb-1672-08daab22cc65 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: BN8NAM11FT090.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5711 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 This makes the code safer by helping the compiler catch errors. Rename the variables, too; they're not callbacks anymore. Signed-off-by: Andrew Boyer --- drivers/net/ionic/ionic_rxtx.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/drivers/net/ionic/ionic_rxtx.c b/drivers/net/ionic/ionic_rxtx.c index d77f06c022..440e655e63 100644 --- a/drivers/net/ionic/ionic_rxtx.c +++ b/drivers/net/ionic/ionic_rxtx.c @@ -765,7 +765,7 @@ ionic_dev_rx_queue_setup(struct rte_eth_dev *eth_dev, static __rte_always_inline void ionic_rx_clean(struct ionic_rx_qcq *rxq, uint32_t q_desc_index, uint32_t cq_desc_index, - void *service_cb_arg) + struct ionic_rx_service *rx_svc) { struct ionic_queue *q = &rxq->qcq.q; struct ionic_cq *cq = &rxq->qcq.cq; @@ -775,8 +775,6 @@ ionic_rx_clean(struct ionic_rx_qcq *rxq, uint64_t pkt_flags = 0; uint32_t pkt_type; struct ionic_rx_stats *stats = &rxq->stats; - struct ionic_rx_service *recv_args = (struct ionic_rx_service *) - service_cb_arg; uint32_t buf_size = (uint16_t) (rte_pktmbuf_data_room_size(rxq->mb_pool) - RTE_PKTMBUF_HEADROOM); @@ -789,7 +787,7 @@ ionic_rx_clean(struct ionic_rx_qcq *rxq, rxm = info[0]; - if (!recv_args) { + if (!rx_svc) { stats->no_cb_arg++; /* Flush */ rte_pktmbuf_free(rxm); @@ -806,7 +804,7 @@ ionic_rx_clean(struct ionic_rx_qcq *rxq, return; } - if (recv_args->nb_rx >= recv_args->nb_pkts) { + if (rx_svc->nb_rx >= rx_svc->nb_pkts) { stats->no_room++; ionic_rx_recycle(q, q_desc_index, rxm); return; @@ -907,8 +905,8 @@ ionic_rx_clean(struct ionic_rx_qcq *rxq, rxm->packet_type = pkt_type; - recv_args->rx_pkts[recv_args->nb_rx] = rxm; - recv_args->nb_rx++; + rx_svc->rx_pkts[rx_svc->nb_rx] = rxm; + rx_svc->nb_rx++; stats->packets++; stats->bytes += rxm->pkt_len; @@ -1052,7 +1050,7 @@ ionic_dev_rx_queue_start(struct rte_eth_dev *eth_dev, uint16_t rx_queue_id) static __rte_always_inline void ionic_rxq_service(struct ionic_rx_qcq *rxq, uint32_t work_to_do, - void *service_cb_arg) + struct ionic_rx_service *rx_svc) { struct ionic_cq *cq = &rxq->qcq.cq; struct ionic_queue *q = &rxq->qcq.q; @@ -1088,7 +1086,7 @@ ionic_rxq_service(struct ionic_rx_qcq *rxq, uint32_t work_to_do, rte_prefetch0(&q->info[q->tail_idx]); ionic_rx_clean(rxq, curr_q_tail_idx, curr_cq_tail_idx, - service_cb_arg); + rx_svc); } while (more); @@ -1127,15 +1125,15 @@ ionic_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts) { struct ionic_rx_qcq *rxq = rx_queue; - struct ionic_rx_service service_cb_arg; + struct ionic_rx_service rx_svc; - service_cb_arg.rx_pkts = rx_pkts; - service_cb_arg.nb_pkts = nb_pkts; - service_cb_arg.nb_rx = 0; + rx_svc.rx_pkts = rx_pkts; + rx_svc.nb_pkts = nb_pkts; + rx_svc.nb_rx = 0; - ionic_rxq_service(rxq, nb_pkts, &service_cb_arg); + ionic_rxq_service(rxq, nb_pkts, &rx_svc); ionic_rx_fill(rxq); - return service_cb_arg.nb_rx; + return rx_svc.nb_rx; } -- 2.17.1