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 8AA8648BBD for ; Thu, 27 Nov 2025 05:49:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6405C4013F; Thu, 27 Nov 2025 05:49:46 +0100 (CET) Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by mails.dpdk.org (Postfix) with ESMTP id 7266040A75 for ; Thu, 27 Nov 2025 05:49:45 +0100 (CET) Received: by mail-qt1-f175.google.com with SMTP id d75a77b69052e-4ed9c19248bso4557981cf.1 for ; Wed, 26 Nov 2025 20:49:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764218985; x=1764823785; darn=dpdk.org; 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=1XIMqWQnfNOIlY3RVYr1Ke+XkDqjmPmOAIQOXkeVeLc=; b=FBgCKQMitvdPKLtjKinyJEBQfGxsrfZXBMkinsU8gVpRADfhwc22R0lWpW9F+nHs6k QHk6jVog84L9ZzaVtx/bsJvnLGup+ghTMozx6Ry1iXdr9rW/KnnP+nNEzGedffeD66+a gR3qzINSseijuO8xcxO2lZ/csCwRcnPwAd9iVbcQNyv4AWitZ3WXQPX49QiTsghczeh8 5exzRoTmjlUngteLUA/W5QP5gLB5Fr3R+DCOGrd+DWBrRnyleWdfm2ALtAkltZ2JFvAC 7LO9xEKbMbH78hyCPOR5V8reAm9uuSHxzJ5UGHPFalKh5WcZcWf3enQ9rs2BdsX6GIBK OodA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764218985; x=1764823785; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=1XIMqWQnfNOIlY3RVYr1Ke+XkDqjmPmOAIQOXkeVeLc=; b=nsu9OnR4Z2KasITlUMc68tty4yXSsuCSsITcfx7dIW2mePGRdUcXF1RQU/2Rq0CDrM n8tDSDvLSJZYNy5Uq9Um5lNOonrNt3GicoE1Qw4Qg5QbDM8O3IP7C875DNMWIeFuIOql ozlPrMLWqP1lS3GrZuI5k5Gdx7X6l1nmT7E3pMLyC97XmF2tKI66J953+CTbDMpqet8s 7oxo0OV3eZbL5sEak/HU3x5tTmBs9Yr55V+B2n7ZDG+LXcyo8B01FzGgXx+XDLNfEPVi S2NVa4MH6yTFOeHiQxY9JbKNyrblE0N/oV5OAlkLKyZP2o/7gFLAgP7tn42D2UauEmfW /I7Q== X-Forwarded-Encrypted: i=1; AJvYcCWmCFZVieSQnnicyRoruvGGtKCsEHIcjDcStNJHV+Jc2FSZBUSNExhPrw0nWZSDe4LjD0GamAU=@dpdk.org X-Gm-Message-State: AOJu0YwOIINbiaN79PvtKymAatYBn080O+wG3qpBhGxYhsLCmXFdzIzW TvBPBFwbGEXObJRUYE9C8Azkp6jDfmX0PSw9eTtA6f+QSnxBQbD84/I5y8KhojdoTxoTTfsZl1C By1GX6pWn7GZhwnNZGrFA0c8HUKb0+14= X-Gm-Gg: ASbGnctiJi3V1MBjLbZ2ruG8Hgn2UXebYJvEVs/MmMMVF4sGSnBzPT6OZAGWTLjl1Gk vUJVbawJJEfYznnw5sEkBlNHOuk8Xzk9+5p2ZLdJ8bUFunQZw2buUodGdPF3q3VYKT4SZ9S06C1 w3XxAcolFn9flUZcmWH7YGLa8vJ74JDcMz6V5+/aVH9bvJRbZP47FcmtCx01RYEmv6a526iuyh1 C/m5UBFfIe0I3E7yoFDmREnGjXW9NpeLr0ioGM4ADtQgCmSsnzCOU//I8TYwwxLKN6hhA== X-Google-Smtp-Source: AGHT+IHNhZQRaAKqQazBdwHLWgTX8PeQIaIypUCVwRLfA+bEeU/5elVxJrBs27mDaMhZuUMH2IhTHwuvPaN2izUMkjM= X-Received: by 2002:ac8:7d0f:0:b0:4ec:f285:4256 with SMTP id d75a77b69052e-4ee5885405amr304562651cf.25.1764218984543; Wed, 26 Nov 2025 20:49:44 -0800 (PST) MIME-Version: 1.0 References: <20251126081353.85811-1-pbhagavatula@marvell.com> <20251126155358.16973-1-pbhagavatula@marvell.com> In-Reply-To: From: Jerin Jacob Date: Thu, 27 Nov 2025 10:19:18 +0530 X-Gm-Features: AWmQ_bm16s72j2-tkS1z61aEgMtRA4UE58g5Qko0GIrQ89H93RbAmBtLbuIWlqg Message-ID: Subject: Re: [PATCH v4] event/cnxk: fix offload flags To: pbhagavatula@marvell.com, Thomas Monjalon Cc: jerinj@marvell.com, Shijith Thotton , Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao , Harman Kalra , dev@dpdk.org, stable@dpdk.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org On Thu, Nov 27, 2025 at 10:17=E2=80=AFAM Jerin Jacob wrote: > > On Wed, Nov 26, 2025 at 9:41=E2=80=AFPM wrote: > > > > From: Pavan Nikhilesh > > > > Use device configured Rx offloads instead of hardcoded values while > > draining work. > > > > Fixes: e8594de2731d ("event/cnxk: implement event port quiesce function= ") > > Cc: stable@dpdk.org > > > > Signed-off-by: Pavan Nikhilesh > > Acked-by: Jerin Jacob @Thomas Monjalon Please merge this patch in this release. > > > > --- > > drivers/event/cnxk/cn10k_eventdev.c | 9 +++------ > > drivers/event/cnxk/cn10k_worker.h | 6 +++--- > > drivers/event/cnxk/cn20k_eventdev.c | 8 +++----- > > drivers/event/cnxk/cn20k_worker.h | 4 ++-- > > drivers/net/cnxk/cn10k_rx.h | 6 +++--- > > drivers/net/cnxk/cn20k_rx.h | 6 +++--- > > 6 files changed, 17 insertions(+), 22 deletions(-) > > > > diff --git a/drivers/event/cnxk/cn10k_eventdev.c b/drivers/event/cnxk/c= n10k_eventdev.c > > index 3832eb7e000f..0c1431b4e70c 100644 > > --- a/drivers/event/cnxk/cn10k_eventdev.c > > +++ b/drivers/event/cnxk/cn10k_eventdev.c > > @@ -126,8 +126,7 @@ cn10k_sso_hws_flush_events(void *hws, uint8_t queue= _id, uintptr_t base, > > > > while (aq_cnt || cq_ds_cnt || ds_cnt) { > > plt_write64(req, ws->base + SSOW_LF_GWS_OP_GET_WORK0); > > - cn10k_sso_hws_get_work_empty( > > - ws, &ev, (NIX_RX_OFFLOAD_MAX - 1) | NIX_RX_REAS= _F | NIX_RX_MULTI_SEG_F); > > + cn10k_sso_hws_get_work_empty(ws, &ev, dev->rx_offloads)= ; > > if (fn !=3D NULL && ev.u64 !=3D 0) > > fn(arg, ev); > > if (ev.sched_type !=3D SSO_TT_EMPTY) > > @@ -473,8 +472,7 @@ cn10k_sso_port_quiesce(struct rte_eventdev *event_d= ev, void *port, > > } while (ptag & > > (BIT_ULL(62) | BIT_ULL(58) | BIT_ULL(56) | BIT_ULL(54)= )); > > > > - cn10k_sso_hws_get_work_empty(ws, &ev, > > - (NIX_RX_OFFLOAD_MAX - 1) | NIX_RX_= REAS_F | NIX_RX_MULTI_SEG_F); > > + cn10k_sso_hws_get_work_empty(ws, &ev, dev->rx_offloads); > > if (is_pend && ev.u64) > > if (flush_cb) > > flush_cb(event_dev->data->dev_id, ev, args); > > @@ -503,8 +501,7 @@ cn10k_sso_port_quiesce(struct rte_eventdev *event_d= ev, void *port, > > SSO_TT_EMPTY) { > > plt_write64(BIT_ULL(16) | 1, > > ws->base + SSOW_LF_GWS_OP_GET_WORK0); > > - cn10k_sso_hws_get_work_empty( > > - ws, &ev, (NIX_RX_OFFLOAD_MAX - 1) | NIX_RX_REAS= _F | NIX_RX_MULTI_SEG_F); > > + cn10k_sso_hws_get_work_empty(ws, &ev, dev->rx_offloads)= ; > > if (ev.u64) { > > if (flush_cb) > > flush_cb(event_dev->data->dev_id, ev, a= rgs); > > diff --git a/drivers/event/cnxk/cn10k_worker.h b/drivers/event/cnxk/cn1= 0k_worker.h > > index 954dee5a2a9e..9b6abdf18db2 100644 > > --- a/drivers/event/cnxk/cn10k_worker.h > > +++ b/drivers/event/cnxk/cn10k_worker.h > > @@ -52,12 +52,12 @@ cn10k_process_vwqe(uintptr_t vwqe, uint16_t port_id= , const uint32_t flags, struc > > uint64_t mbuf_init =3D 0x100010000ULL | RTE_PKTMBUF_HEADROOM; > > struct cnxk_timesync_info *tstamp =3D ws->tstamp[port_id]; > > void *lookup_mem =3D ws->lookup_mem; > > + uint64_t meta_aura =3D 0, laddr =3D 0; > > + uint16_t lmt_id =3D 0, d_off =3D 0; > > uintptr_t lbase =3D ws->lmt_base; > > - uint64_t meta_aura =3D 0, laddr; > > + struct rte_mempool *mp =3D NULL; > > struct rte_event_vector *vec; > > uint16_t nb_mbufs, non_vec; > > - struct rte_mempool *mp; > > - uint16_t lmt_id, d_off; > > struct rte_mbuf **wqe; > > struct rte_mbuf *mbuf; > > uint64_t sa_base =3D 0; > > diff --git a/drivers/event/cnxk/cn20k_eventdev.c b/drivers/event/cnxk/c= n20k_eventdev.c > > index b25e570211f1..1c5d9272398a 100644 > > --- a/drivers/event/cnxk/cn20k_eventdev.c > > +++ b/drivers/event/cnxk/cn20k_eventdev.c > > @@ -192,7 +192,7 @@ cn20k_sso_hws_flush_events(void *hws, uint8_t queue= _id, uintptr_t base, cnxk_han > > > > while (aq_cnt || cq_ds_cnt || ds_cnt) { > > plt_write64(req, ws->base + SSOW_LF_GWS_OP_GET_WORK0); > > - cn20k_sso_hws_get_work_empty(ws, &ev, 0); > > + cn20k_sso_hws_get_work_empty(ws, &ev, dev->rx_offloads)= ; > > if (fn !=3D NULL && ev.u64 !=3D 0) > > fn(arg, ev); > > if (ev.sched_type !=3D SSO_TT_EMPTY) > > @@ -521,8 +521,7 @@ cn20k_sso_port_quiesce(struct rte_eventdev *event_d= ev, void *port, > > ptag =3D plt_read64(ws->base + SSOW_LF_GWS_PENDSTATE); > > } while (ptag & (BIT_ULL(62) | BIT_ULL(58) | BIT_ULL(56) | BIT_= ULL(54))); > > > > - cn20k_sso_hws_get_work_empty(ws, &ev, > > - (NIX_RX_OFFLOAD_MAX - 1) | NIX_RX_= REAS_F | NIX_RX_MULTI_SEG_F); > > + cn20k_sso_hws_get_work_empty(ws, &ev, dev->rx_offloads); > > if (is_pend && ev.u64) > > if (flush_cb) > > flush_cb(event_dev->data->dev_id, ev, args); > > @@ -548,8 +547,7 @@ cn20k_sso_port_quiesce(struct rte_eventdev *event_d= ev, void *port, > > > > if (CNXK_TT_FROM_TAG(plt_read64(ws->base + SSOW_LF_GWS_PRF_WQE0= )) !=3D SSO_TT_EMPTY) { > > plt_write64(BIT_ULL(16) | 1, ws->base + SSOW_LF_GWS_OP_= GET_WORK0); > > - cn20k_sso_hws_get_work_empty( > > - ws, &ev, (NIX_RX_OFFLOAD_MAX - 1) | NIX_RX_REAS= _F | NIX_RX_MULTI_SEG_F); > > + cn20k_sso_hws_get_work_empty(ws, &ev, dev->rx_offloads)= ; > > if (ev.u64) { > > if (flush_cb) > > flush_cb(event_dev->data->dev_id, ev, a= rgs); > > diff --git a/drivers/event/cnxk/cn20k_worker.h b/drivers/event/cnxk/cn2= 0k_worker.h > > index df0abd9202fd..608f93dcd465 100644 > > --- a/drivers/event/cnxk/cn20k_worker.h > > +++ b/drivers/event/cnxk/cn20k_worker.h > > @@ -54,12 +54,12 @@ cn20k_process_vwqe(uintptr_t vwqe, uint16_t port_id= , const uint32_t flags, struc > > struct cnxk_timesync_info *tstamp =3D ws->tstamp[port_id]; > > uint8_t m_sz =3D sizeof(struct rte_mbuf); > > void *lookup_mem =3D ws->lookup_mem; > > + uint64_t meta_aura =3D 0, laddr =3D 0; > > uintptr_t lbase =3D ws->lmt_base; > > - uint64_t meta_aura =3D 0, laddr; > > + uint16_t lmt_id =3D 0, d_off =3D 0; > > struct rte_event_vector *vec; > > uint16_t nb_mbufs, non_vec; > > struct rte_mempool *mp; > > - uint16_t lmt_id, d_off; > > struct rte_mbuf **wqe; > > struct rte_mbuf *mbuf; > > uint64_t sa_base =3D 0; > > diff --git a/drivers/net/cnxk/cn10k_rx.h b/drivers/net/cnxk/cn10k_rx.h > > index e79306e6467f..e55910b57599 100644 > > --- a/drivers/net/cnxk/cn10k_rx.h > > +++ b/drivers/net/cnxk/cn10k_rx.h > > @@ -572,7 +572,7 @@ nix_sec_meta_to_mbuf(uint64_t cq_w1, uint64_t cq_w5= , uintptr_t inb_sa, > > const struct cpt_cn10k_parse_hdr_s *hdr =3D > > (const struct cpt_cn10k_parse_hdr_s *)cpth; > > uint64_t mbuf_init =3D vgetq_lane_u64(*rearm, 0); > > - struct cn10k_inb_priv_data *inb_priv; > > + struct cn10k_inb_priv_data *inb_priv =3D NULL; > > uintptr_t p; > > > > /* Clear checksum flags */ > > @@ -1464,9 +1464,9 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte= _mbuf **mbufs, uint16_t pkts, > > struct rte_mbuf *mbuf0, *mbuf1, *mbuf2, *mbuf3; > > uint8_t loff =3D 0, lnum =3D 0, shft =3D 0; > > struct rte_mempool *meta_pool =3D NULL; > > + uint16_t lmt_id =3D 0, d_off =3D 0; > > + uint64_t lbase =3D 0, laddr =3D 0; > > uint8x16_t f0, f1, f2, f3; > > - uint16_t lmt_id, d_off; > > - uint64_t lbase, laddr; > > uintptr_t sa_base =3D 0; > > uint16_t packets =3D 0; > > uint16_t pkts_left; > > diff --git a/drivers/net/cnxk/cn20k_rx.h b/drivers/net/cnxk/cn20k_rx.h > > index 56826318151a..1944e507b0b2 100644 > > --- a/drivers/net/cnxk/cn20k_rx.h > > +++ b/drivers/net/cnxk/cn20k_rx.h > > @@ -307,7 +307,7 @@ nix_cqe_xtract_mseg(const union nix_rx_parse_u *rx,= struct rte_mbuf *mbuf, uint6 > > const struct cpt_parse_hdr_s *hdr =3D (const struct cpt_parse_h= dr_s *)cpth; > > struct cn20k_inb_priv_data *inb_priv =3D NULL; > > const struct cpt_frag_info_s *finfo =3D NULL; > > - uint64_t fsz_w1 =3D 0, cq_w1, cq_w5, sg; > > + uint64_t fsz_w1 =3D 0, cq_w1, cq_w5 =3D 0, sg; > > uint32_t offset =3D hdr->w2.ptr_offset; > > uint8_t num_frags =3D 0, nxt_frag =3D 0; > > struct rte_mbuf *head, *last_mbuf; > > @@ -845,10 +845,10 @@ cn20k_nix_recv_pkts_vector(void *args, struct rte= _mbuf **mbufs, uint16_t pkts, c > > uint64x2_t rearm2 =3D vdupq_n_u64(mbuf_initializer); > > uint64x2_t rearm3 =3D vdupq_n_u64(mbuf_initializer); > > struct rte_mbuf *mbuf0, *mbuf1, *mbuf2, *mbuf3; > > + uint64_t lbase =3D 0, laddr =3D 0, buf_sz =3D 0; > > uint8_t loff =3D 0, lnum =3D 0, shft =3D 0; > > - uint64_t lbase, laddr, buf_sz; > > + uint16_t lmt_id =3D 0, d_off; > > uint8x16_t f0, f1, f2, f3; > > - uint16_t lmt_id, d_off; > > uintptr_t sa_base =3D 0; > > uint16_t packets =3D 0; > > uint16_t pkts_left; > > -- > > 2.50.1 (Apple Git-155) > >