From patchwork Fri Oct 7 17:43:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Boyer, Andrew" X-Patchwork-Id: 117594 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 C21A9A04FD; Fri, 7 Oct 2022 19:45:57 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 86C8B42BB2; Fri, 7 Oct 2022 19:44:45 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2047.outbound.protection.outlook.com [40.107.220.47]) by mails.dpdk.org (Postfix) with ESMTP id 9065D42B93 for ; Fri, 7 Oct 2022 19:44:41 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jN69QajAUyLeyPCm7wi1/zH4xkXwaUd2mQ6XVJY9YjjcOXumMC161S/AOqRJsFy+oIsEaf6Hj5Dr0yfAbW/rn3aE01nSut6QD/L+SpYUs0atJmYbT1rW9bbYnYAZ3MiVtH0iSm66EH4OI/jz0tXFWtkOlFTsMgpeNEf71DR9E0zZL9xvjMpL6w/d8jsBfjoElTvj8qLhMgAMLx1GZ/XVgVZsESUwR0/BRyvgP30viouXydayQKYd7kl1Qp7t5BoAQwGsGf5uFrD/FvLtiM+1YThYarRl4GYadG1/YblAe/CnH+/NstbylBlLtG/ZuQ2mRGDhdgcswgvpG757iW2HUw== 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=k3SLRhI9DdmDKqOykpgkn1AkjHwlctLo119a98TK4MJ2RK9Bznr4zrZUGEmUNGCiifxzwPlVeED7JQfkPgbO8/O0R5oc6CGqKhLEgLFOni5FLJFlImnViJEi2ulu+jL5VwGiYZbZkR+QOnY3LIQTj6socxHtvEz3Z0sffsDAjMngjgtEALEcyzYp0ICmHlFLuD9rMPfmAFQVQQi6rCcHgg+nA3x7KaWUVdBTKbSsQAS5ErWj2liL/V+elRFLdifkZx7GB2Sov0fsASOM1Fn1jE05vclg+p9dDZMaCRMePtIFLUhRJIedcI5zhIeloj2F7CF30thyWU+J+zaEyopslA== 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=brYwaWx9qvkvQTZuJb3sZvjb+wnIrnk2DlEdHrNIywELkQ4E1uLShkwnRU9zkuKIhxPdTZlFzUZW7aJPtOWLgqAqk+mHJb6Q9yKHO+lkmdMkaGx00GzardtYSaVFAzoVC6HZ+m0iAr/QhKxdnNpl0fixM9zDoiSe/V4yF/yazMM= Received: from MW3PR05CA0003.namprd05.prod.outlook.com (2603:10b6:303:2b::8) by CH3PR12MB7668.namprd12.prod.outlook.com (2603:10b6:610:14d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.17; Fri, 7 Oct 2022 17:44:39 +0000 Received: from CO1NAM11FT015.eop-nam11.prod.protection.outlook.com (2603:10b6:303:2b:cafe::25) by MW3PR05CA0003.outlook.office365.com (2603:10b6:303:2b::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5723.10 via Frontend Transport; Fri, 7 Oct 2022 17:44:39 +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 CO1NAM11FT015.mail.protection.outlook.com (10.13.175.130) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5709.10 via Frontend Transport; Fri, 7 Oct 2022 17:44:38 +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; Fri, 7 Oct 2022 12:44:38 -0500 From: Andrew Boyer To: CC: Andrew Boyer Subject: [PATCH 14/35] net/ionic: replace void pointer with actual type Date: Fri, 7 Oct 2022 10:43:15 -0700 Message-ID: <20221007174336.54354-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 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: CO1NAM11FT015:EE_|CH3PR12MB7668:EE_ X-MS-Office365-Filtering-Correlation-Id: 5f8c0d7d-0bd7-4483-5c5a-08daa88b9b7b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mHlsNFp1BHtkriQkrIpY4TjkHg1WaE3nk424uuRJMAgGUK7Bji8ShTOV2Ds1fJLf9QMLC0W047fIRg4fE1qEA9QYogd8H1+Q2YRwhwv/GUfisJZJ7m/MsNW1RCt10Q4wSKjeKTS9AbrTGmfQQw2jMwbItsva4rZ+B/AdmjhJTUhsstA7B7yL2HQZEDdT33AAnYUjZGE/aTaUz8PE6T1lQVU6oUt+3Wkw71RTr7Y5YzyzA8jjhPjHtsr4UQ3m7vVh6/X6bh+VOuPhQX0+xz5YuEaZVmiy4Hw2kA/3eskUyIbApDt4sofMUyJtHqfPhxvIjWzOzguQjn4sgXUap5iYI1V28WUafv5sKUSAKjPUuvxBruqTgebkxaxO9rqJvFn7VQTRTavVI28K6gUr4huChpcGCAt/yXC00xj9SSLdow+OW218y4eBbbditOxddHp0ZennAarqiLcpH+JIDAg4V3XXSCxg+/dUDFM5Uq5CgUSoVEk5bEwdfeycsB0RAKM9LudzHyPefeAOMwalDe5ww5MlrMrrbZ4trCG8yZ/lcZ67hG9HgVdw6nKpEA9xmv8oT2HzL7TyozOC0YUwTEPJxqWc4Mq4n/LcIiAvNT9odVgPAfkBqxcemU+WmFqltvE2YPcfLbj2lZ6TAbAPQxsiDkFqUFbdBvbx7mvOGOonBqwPWoRYQEoIUIK/Q+Js//s7ub/jtVvAgORy5ATqErm8y1lXzYQcDbQ0Qmw5zR1ZrcPhnQQ1L+TPrxs9jK+Z7oFgidE0PZ1aTniaXNFS/t83HgcwB6ndgvI0TCEg5R96x70= 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)(39860400002)(346002)(136003)(396003)(376002)(451199015)(46966006)(40470700004)(36840700001)(356005)(16526019)(336012)(82310400005)(2906002)(186003)(1076003)(2616005)(40460700003)(4326008)(6916009)(6666004)(8676002)(41300700001)(36756003)(316002)(70586007)(70206006)(5660300002)(44832011)(40480700001)(478600001)(26005)(8936002)(86362001)(36860700001)(47076005)(426003)(81166007)(82740400003)(83380400001)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2022 17:44:38.7257 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5f8c0d7d-0bd7-4483-5c5a-08daa88b9b7b 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: CO1NAM11FT015.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB7668 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; }