From patchwork Fri Aug 18 04:01:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Satheesh Paul Antonysamy X-Patchwork-Id: 130499 X-Patchwork-Delegate: jerinj@marvell.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 2D81A4305F; Fri, 18 Aug 2023 06:01:50 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A7C0440ED9; Fri, 18 Aug 2023 06:01:49 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 555F740395 for ; Fri, 18 Aug 2023 06:01:48 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 37I1aR5o028723 for ; Thu, 17 Aug 2023 21:01:47 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=G9IcxMwJmmhDbP/b+EcaPFth6Sw+3YWs90g9JfHw2Lc=; b=MN7DBTHqpnGbnUGHCeINdkWu4S94XoQqaWUJjgBf5kNZeZQI5Ui2w1W557zvNa2EUL3n VJGBRnN6nEO5OIlUOW79hPI+nWn0jvJlG3vnSyQ1ihbwMT6e5SnoE03OAqzmeZQKQOeJ 0OwX1x7tBmmdmLSm8URdV+ZbFlBdLHaN358JcruZ9Qp69zcgjn3cAugQ32pZKi1Qkrfy SO8/MzRMpPUjDwPGxIwp+tIFL8tJ/dXpO00B+3/BcaoLJsTLZkQKtKitWn8t5ZSu8w49 2yYIjjJq6CMFlcWJbEFcTiPwQ0k7FaTKvmkN1YtyV0NIpQ7jUo4KndO4JhMpTzYGJd2I 1w== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3shy4d0ax9-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Thu, 17 Aug 2023 21:01:47 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Thu, 17 Aug 2023 21:01:45 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.48 via Frontend Transport; Thu, 17 Aug 2023 21:01:45 -0700 Received: from satheeshpaullabpc.. (unknown [10.28.34.33]) by maili.marvell.com (Postfix) with ESMTP id C1CF23F707E; Thu, 17 Aug 2023 21:01:42 -0700 (PDT) From: To: Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao CC: , Satheesh Paul , Jerin Jacob Subject: [dpdk-dev] [PATCH ] common/cnxk: fix ROC naming convention Date: Fri, 18 Aug 2023 09:31:39 +0530 Message-ID: <20230818040139.626967-1-psatheesh@marvell.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: iWxUrE4Ek66QrRjRGatAyoANiXgjxXyx X-Proofpoint-GUID: iWxUrE4Ek66QrRjRGatAyoANiXgjxXyx X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.601,FMLib:17.11.176.26 definitions=2023-08-18_03,2023-08-17_02,2023-05-22_02 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 From: Satheesh Paul Fix ROC code naming convention. Fixes: d110c44d29e7 ("common/cnxk: support flow aging") Signed-off-by: Satheesh Paul Reviewed-by: Jerin Jacob --- drivers/common/cnxk/roc_npc.h | 2 +- drivers/common/cnxk/roc_npc_aging.c | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/common/cnxk/roc_npc.h b/drivers/common/cnxk/roc_npc.h index 2fb0aa7a4e..84c92f4c28 100644 --- a/drivers/common/cnxk/roc_npc.h +++ b/drivers/common/cnxk/roc_npc.h @@ -224,7 +224,7 @@ struct roc_npc_action_port_id { struct roc_npc_action_age { uint32_t timeout : 24; /**< Time in seconds. */ uint32_t reserved : 8; /**< Reserved, must be zero. */ - /** The user flow context, NULL means the rte_flow pointer. */ + /** The user flow context, NULL means the flow pointer. */ void *context; }; diff --git a/drivers/common/cnxk/roc_npc_aging.c b/drivers/common/cnxk/roc_npc_aging.c index 94126fe9fd..874a7cd4ff 100644 --- a/drivers/common/cnxk/roc_npc_aging.c +++ b/drivers/common/cnxk/roc_npc_aging.c @@ -62,7 +62,7 @@ check_timeout_cycles(struct roc_npc *roc_npc, uint32_t mcam_id) list = &npc->age_flow_list; TAILQ_FOREACH(fl_iter, list, next) { if (fl_iter->flow->mcam_id == mcam_id && - fl_iter->flow->timeout_cycles < rte_get_timer_cycles()) { + fl_iter->flow->timeout_cycles < plt_tsc_cycles()) { /* update bitmap */ plt_bitmap_set(flow_age->aged_flows, mcam_id); if (!aging_enabled) { @@ -90,8 +90,8 @@ update_timeout_cycles(struct roc_npc *roc_npc, uint32_t mcam_id) list = &npc->age_flow_list; TAILQ_FOREACH(fl_iter, list, next) { if (fl_iter->flow->mcam_id == mcam_id) { - fl_iter->flow->timeout_cycles = rte_get_timer_cycles() + - fl_iter->flow->timeout * rte_get_timer_hz(); + fl_iter->flow->timeout_cycles = plt_tsc_cycles() + + fl_iter->flow->timeout * plt_tsc_hz(); break; } } @@ -214,6 +214,11 @@ npc_age_flow_list_entry_add(struct roc_npc *roc_npc, struct roc_npc_flow *flow) struct npc_age_flow_entry *new_entry; new_entry = plt_zmalloc(sizeof(*new_entry), 0); + if (new_entry == NULL) { + plt_err("flow entry alloc failed"); + return; + } + new_entry->flow = flow; roc_npc->flow_age.age_flow_refcnt++; /* List in ascending order of mcam entries */ @@ -269,8 +274,7 @@ npc_aging_ctrl_thread_create(struct roc_npc *roc_npc, flow->age_context = age->context == NULL ? flow : age->context; flow->timeout = age->timeout; - flow->timeout_cycles = rte_get_timer_cycles() + age->timeout * - rte_get_timer_hz(); + flow->timeout_cycles = plt_tsc_cycles() + age->timeout * plt_tsc_hz(); if (flow_age->age_flow_refcnt == 0) { flow_age->aged_flows_get_thread_exit = false;