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 BF5B5430C3; Mon, 21 Aug 2023 17:30:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AF21E42BC9; Mon, 21 Aug 2023 17:30:19 +0200 (CEST) Received: from mail-vs1-f46.google.com (mail-vs1-f46.google.com [209.85.217.46]) by mails.dpdk.org (Postfix) with ESMTP id 0A522427E9 for ; Mon, 21 Aug 2023 17:30:18 +0200 (CEST) Received: by mail-vs1-f46.google.com with SMTP id ada2fe7eead31-44ac87147fdso2143096137.1 for ; Mon, 21 Aug 2023 08:30:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692631817; x=1693236617; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=1+ZI/NibR/YdebtVOkSavomoVom711Ir8O1Xl7j00SI=; b=duOGP1oZdEamUgaz2x4t6TMiKYB3ghl8idDx5XLC3hXL/1h0cIZ2/UvtqH/Tw0we6N DNl8y5bvVJjTx79q09epxrAcS9jEYG0uxjbpBrFRJESjfvAlcRSgXKedUMHAmAgndamA sBZJkAH9w/rUhDsydmncxE9l8trDFkR/fb1arT+tFuLBTfgzaH36kojH4RV8SDOSMQTV Y4Rtn9zkytNo35QZyX8YWEUhtrcLCouy9JrVsJLjDnoHLl6xz7zoojkCWQz61AeeykxE DP311HoziU2KYG/WVSeK1qi6owFqUjOck2xc21l7oFROJA03Rq/rz2fWoGIR+Avc6BAl 9N+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692631817; x=1693236617; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1+ZI/NibR/YdebtVOkSavomoVom711Ir8O1Xl7j00SI=; b=TuqEkB3qVIUBBe2TrBrRK5ZA8cvx7emZje+M2I2HdBM2VXRCSyztMfxrCWZAGGsC9x T3cQOOW7gwDp94n93/iZQR3QgmwR45q0hqnemSWycPqJSO5XodlvQKzZ4yaO5FMONT5n c0jpEMbWgAIGYZFFrEEyw9kX7Yv6Z8WGgHvEYSE0UpeC3Nkz1ufMzOLMe1j6rZec28pW Ixd62iDEITKNsUipq7/P34js0dw+r7DrNY+00ZGZFal1zY6LzIEaroFFSRtDoKTGeCJb CpgBnzVo43yAz4S2Vd+wvCx/BFXA3zb/tGpS1pJGyDtcORFKCblpVEtWRZHVgC/f69xb txEA== X-Gm-Message-State: AOJu0YxyDrzTP3F6OMNVM8ayxOpuc+N2Qlu6HAShVwb+DrJCq0egUDQ6 IpINh0iF1SeCkzyTD5tKk5adejcuYPvdm6AB2wVtcDOJxBc= X-Google-Smtp-Source: AGHT+IEW+wIf7cDPSO2BxjWA+1VsSjscPv4Yf1baVL3Mjvrxoe+VmHfu+H2Kcvsgyc5WfnyOnwfYLpCt94cA0IU3m5U= X-Received: by 2002:a67:b644:0:b0:446:e025:fa53 with SMTP id e4-20020a67b644000000b00446e025fa53mr4161945vsm.2.1692631817170; Mon, 21 Aug 2023 08:30:17 -0700 (PDT) MIME-Version: 1.0 References: <20230818040139.626967-1-psatheesh@marvell.com> In-Reply-To: <20230818040139.626967-1-psatheesh@marvell.com> From: Jerin Jacob Date: Mon, 21 Aug 2023 20:59:51 +0530 Message-ID: Subject: Re: [dpdk-dev] [PATCH ] common/cnxk: fix ROC naming convention To: psatheesh@marvell.com Cc: Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao , dev@dpdk.org, Jerin Jacob Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 On Fri, Aug 18, 2023 at 9:31=E2=80=AFAM wrote: > > From: Satheesh Paul > > Fix ROC code naming convention. > > Fixes: d110c44d29e7 ("common/cnxk: support flow aging") > > Signed-off-by: Satheesh Paul > Reviewed-by: Jerin Jacob Applied to dpdk-next-net-mrvl/for-next-net. Thanks > --- > 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/ro= c_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 =3D &npc->age_flow_list; > TAILQ_FOREACH(fl_iter, list, next) { > if (fl_iter->flow->mcam_id =3D=3D 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 =3D &npc->age_flow_list; > TAILQ_FOREACH(fl_iter, list, next) { > if (fl_iter->flow->mcam_id =3D=3D mcam_id) { > - fl_iter->flow->timeout_cycles =3D rte_get_timer_c= ycles() + > - fl_iter->flow->timeout * rte_get_timer_hz= (); > + fl_iter->flow->timeout_cycles =3D 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 =3D plt_zmalloc(sizeof(*new_entry), 0); > + if (new_entry =3D=3D NULL) { > + plt_err("flow entry alloc failed"); > + return; > + } > + > new_entry->flow =3D 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 =3D age->context =3D=3D NULL ? flow : age->cont= ext; > flow->timeout =3D age->timeout; > - flow->timeout_cycles =3D rte_get_timer_cycles() + age->timeout * > - rte_get_timer_hz(); > + flow->timeout_cycles =3D plt_tsc_cycles() + age->timeout * plt_ts= c_hz(); > > if (flow_age->age_flow_refcnt =3D=3D 0) { > flow_age->aged_flows_get_thread_exit =3D false; > -- > 2.39.2 >