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 38B62A04A5 for ; Thu, 3 Mar 2022 06:59:53 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2DCFD42762; Thu, 3 Mar 2022 06:59:53 +0100 (CET) Received: from mail-il1-f182.google.com (mail-il1-f182.google.com [209.85.166.182]) by mails.dpdk.org (Postfix) with ESMTP id 641BB40141; Thu, 3 Mar 2022 06:59:51 +0100 (CET) Received: by mail-il1-f182.google.com with SMTP id i14so3234466ilv.4; Wed, 02 Mar 2022 21:59:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=2VLz2nAdHgLsnnXG9URiDGkkgoFjD70k/fKLa1oAH1s=; b=Yrw+mIlE0as5vzFxifGfnIS57OSHnXjqZuFHnFe4izIWeSHBSGxZYEPA2jYf/CAW1M RbsXDV2n+zHuoEyXO/hZqhK6lBPPJErbPtTkhOpHvS0Ae274mYVM9/MAarSHbyqJirkL MHvSDq1bxgneBvQ9axf/vPIUpopgAEcwlvBAfwk8dsfPX652mcF2mZXrVpq7ueeAfN3i nYmv3JF7HS741DADW9agEchBlknGaPsxpw2e1hObwwkHRVLCyL0EUD4YzfDeC3eoCca0 4dzvh33aUVfLoUcL/YL1+ZVVHRZeZsqir5oHkQSjVt4ZfW688mfG7oMHi/1KppE5H4Vc ijUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=2VLz2nAdHgLsnnXG9URiDGkkgoFjD70k/fKLa1oAH1s=; b=w0ffi7LW1w9VK1/9WNkspAh+nqDS7pTl2UTnSe9OF/fXCFTdp1Qpb/GADZCr5vWWIV b7g/wvSvMt/vFvp2oWfPTrQZsHc4ugeIJtgNfGa/3v/z2zVo8qoyTjULNp/FHv+Ei4y3 YNLlF/09KANICxMFFYDwFoHzVYiWErTOzZGe0ahksdxnOI6cP5nUWowzY21g3TbhF3BI FdzO7FuBciH+zyJMtKXpBQ6Ax4eMczKFn7QHMWtrViH/dla0FlMpIaYRVR1oJ10WsaSt qAJSXy9rJFpBkV6btDVohBSWJ7dQkGYy8kq5DqYJ1bVCleAiNRvPDzVn3zp0axbOyrTh yiZg== X-Gm-Message-State: AOAM530VANmnRAHDi/pHc2+uUN6di2OllgCZNZ1yF67put+4jST5Soxp dnpqE/XZUgLESUSYOTY/tAslKgRu8uwIuyhiIYU= X-Google-Smtp-Source: ABdhPJwes2lnzoWVZCmTZPFv/OR31izCueaZYzTOneOVvSppMhXH4huFSUrmZZGTFapcUUjkXzr8i+MgQHUXVyGvEPE= X-Received: by 2002:a05:6e02:1c22:b0:2b9:dcbb:e810 with SMTP id m2-20020a056e021c2200b002b9dcbbe810mr28996010ilh.262.1646287190543; Wed, 02 Mar 2022 21:59:50 -0800 (PST) MIME-Version: 1.0 References: <20220302120701.2749772-1-vattunuru@marvell.com> <20220302134654.2760076-1-vattunuru@marvell.com> In-Reply-To: <20220302134654.2760076-1-vattunuru@marvell.com> From: Jerin Jacob Date: Thu, 3 Mar 2022 11:29:24 +0530 Message-ID: Subject: Re: [PATCH v2 1/1] common/cnxk: fix static assertion failure To: Vamsi Attunuru , Ferruh Yigit Cc: dpdk-dev , Jerin Jacob , Nithin Dabilpuram , YuX , dpdk stable , Wei Ling , Srikanth Yalavarthi Content-Type: text/plain; charset="UTF-8" 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 Wed, Mar 2, 2022 at 7:18 PM Vamsi Attunuru wrote: > > Use dynamically allocated memory for storing soft expiry > ring base addresses which fixes the static assertion failure, > as the size of dynamic allocation depends on RTE_MAX_ETHPORTS > which varies based on the build config. > > Bugzilla ID: 940 > Fixes: d26185716d3f ("net/cnxk: support outbound soft expiry notification") > Cc: stable@dpdk.org > > Reported-by: Wei Ling > Reported-by: Yu Jiang > Signed-off-by: Vamsi Attunuru > Signed-off-by: Srikanth Yalavarthi Acked-by: Jerin Jacob Applied to dpdk-next-net-mrvl/for-next-net. Thanks > --- > V2: Add bugzilla & reportee details, remove unused changes. > --- > drivers/common/cnxk/roc_nix_inl.c | 23 +++++++++++++---------- > drivers/common/cnxk/roc_nix_inl.h | 2 +- > drivers/common/cnxk/roc_nix_inl_dev.c | 11 ++++++++++- > drivers/common/cnxk/roc_nix_inl_priv.h | 2 +- > drivers/common/cnxk/roc_platform.h | 7 +++++++ > 5 files changed, 32 insertions(+), 13 deletions(-) > > diff --git a/drivers/common/cnxk/roc_nix_inl.c b/drivers/common/cnxk/roc_nix_inl.c > index 11ed157703..826c6e99c1 100644 > --- a/drivers/common/cnxk/roc_nix_inl.c > +++ b/drivers/common/cnxk/roc_nix_inl.c > @@ -330,12 +330,13 @@ roc_nix_inl_outb_init(struct roc_nix *roc_nix) > struct dev *dev = &nix->dev; > struct msix_offset_rsp *rsp; > struct nix_inl_dev *inl_dev; > + size_t sa_sz, ring_sz; > uint16_t sso_pffunc; > uint8_t eng_grpmask; > uint64_t blkaddr, i; > + uint64_t *ring_base; > uint16_t nb_lf; > void *sa_base; > - size_t sa_sz; > int j, rc; > void *sa; > > @@ -468,16 +469,16 @@ roc_nix_inl_outb_init(struct roc_nix *roc_nix) > /* Allocate memory to be used as a ring buffer to poll for > * soft expiry event from ucode > */ > + ring_sz = (ROC_IPSEC_ERR_RING_MAX_ENTRY + 1) * sizeof(uint64_t); > + ring_base = inl_dev->sa_soft_exp_ring; > for (i = 0; i < nix->outb_se_ring_cnt; i++) { > - inl_dev->sa_soft_exp_ring[nix->outb_se_ring_base + i] = > - plt_zmalloc((ROC_IPSEC_ERR_RING_MAX_ENTRY + 1) * > - sizeof(uint64_t), > - 0); > - if (!inl_dev->sa_soft_exp_ring[i]) { > + ring_base[nix->outb_se_ring_base + i] = > + PLT_U64_CAST(plt_zmalloc(ring_sz, 0)); > + if (!ring_base[nix->outb_se_ring_base + i]) { > plt_err("Couldn't allocate memory for soft exp ring"); > while (i--) > - plt_free(inl_dev->sa_soft_exp_ring > - [nix->outb_se_ring_base + i]); > + plt_free(PLT_PTR_CAST( > + ring_base[nix->outb_se_ring_base + i])); > rc = -ENOMEM; > goto lf_fini; > } > @@ -504,6 +505,7 @@ roc_nix_inl_outb_fini(struct roc_nix *roc_nix) > struct idev_cfg *idev = idev_get_cfg(); > struct dev *dev = &nix->dev; > struct nix_inl_dev *inl_dev; > + uint64_t *ring_base; > int i, rc, ret = 0; > > if (!nix->inl_outb_ena) > @@ -537,10 +539,11 @@ roc_nix_inl_outb_fini(struct roc_nix *roc_nix) > > if (idev && idev->nix_inl_dev) { > inl_dev = idev->nix_inl_dev; > + ring_base = inl_dev->sa_soft_exp_ring; > > for (i = 0; i < ROC_NIX_INL_MAX_SOFT_EXP_RNGS; i++) { > - if (inl_dev->sa_soft_exp_ring[i]) > - plt_free(inl_dev->sa_soft_exp_ring[i]); > + if (ring_base[i]) > + plt_free(PLT_PTR_CAST(ring_base[i])); > } > } > > diff --git a/drivers/common/cnxk/roc_nix_inl.h b/drivers/common/cnxk/roc_nix_inl.h > index 1dc58f2da2..2c2a4d76f2 100644 > --- a/drivers/common/cnxk/roc_nix_inl.h > +++ b/drivers/common/cnxk/roc_nix_inl.h > @@ -137,7 +137,7 @@ struct roc_nix_inl_dev { > bool set_soft_exp_poll; > /* End of input parameters */ > > -#define ROC_NIX_INL_MEM_SZ (2304) > +#define ROC_NIX_INL_MEM_SZ (1280) > uint8_t reserved[ROC_NIX_INL_MEM_SZ] __plt_cache_aligned; > } __plt_cache_aligned; > > diff --git a/drivers/common/cnxk/roc_nix_inl_dev.c b/drivers/common/cnxk/roc_nix_inl_dev.c > index 1cfcdba3f2..5a032aab52 100644 > --- a/drivers/common/cnxk/roc_nix_inl_dev.c > +++ b/drivers/common/cnxk/roc_nix_inl_dev.c > @@ -653,7 +653,7 @@ inl_outb_soft_exp_poll(struct nix_inl_dev *inl_dev, uint32_t ring_idx) > uint32_t port_id; > > port_id = ring_idx / ROC_NIX_SOFT_EXP_PER_PORT_MAX_RINGS; > - ring_base = inl_dev->sa_soft_exp_ring[ring_idx]; > + ring_base = PLT_PTR_CAST(inl_dev->sa_soft_exp_ring[ring_idx]); > if (!ring_base) { > plt_err("Invalid soft exp ring base"); > return; > @@ -751,6 +751,14 @@ nix_inl_outb_poll_thread_setup(struct nix_inl_dev *inl_dev) > > inl_dev->soft_exp_ring_bmap_mem = mem; > inl_dev->soft_exp_ring_bmap = bmap; > + inl_dev->sa_soft_exp_ring = plt_zmalloc( > + ROC_NIX_INL_MAX_SOFT_EXP_RNGS * sizeof(uint64_t), 0); > + if (!inl_dev->sa_soft_exp_ring) { > + plt_err("soft expiry ring pointer array alloc failed"); > + plt_free(mem); > + rc = -ENOMEM; > + goto exit; > + } > > for (i = 0; i < ROC_NIX_INL_MAX_SOFT_EXP_RNGS; i++) > plt_bitmap_clear(inl_dev->soft_exp_ring_bmap, i); > @@ -896,6 +904,7 @@ roc_nix_inl_dev_fini(struct roc_nix_inl_dev *roc_inl_dev) > pthread_join(inl_dev->soft_exp_poll_thread, NULL); > plt_bitmap_free(inl_dev->soft_exp_ring_bmap); > plt_free(inl_dev->soft_exp_ring_bmap_mem); > + plt_free(inl_dev->sa_soft_exp_ring); > } > > /* Flush Inbound CTX cache entries */ > diff --git a/drivers/common/cnxk/roc_nix_inl_priv.h b/drivers/common/cnxk/roc_nix_inl_priv.h > index da6d6e9b03..0fa5e090d4 100644 > --- a/drivers/common/cnxk/roc_nix_inl_priv.h > +++ b/drivers/common/cnxk/roc_nix_inl_priv.h > @@ -58,7 +58,7 @@ struct nix_inl_dev { > /* OUTB soft expiry poll thread */ > pthread_t soft_exp_poll_thread; > uint32_t soft_exp_poll_freq; > - void *sa_soft_exp_ring[ROC_NIX_INL_MAX_SOFT_EXP_RNGS]; > + uint64_t *sa_soft_exp_ring; > > /* Soft expiry ring bitmap */ > struct plt_bitmap *soft_exp_ring_bmap; > diff --git a/drivers/common/cnxk/roc_platform.h b/drivers/common/cnxk/roc_platform.h > index fa285446bd..28004b1743 100644 > --- a/drivers/common/cnxk/roc_platform.h > +++ b/drivers/common/cnxk/roc_platform.h > @@ -63,6 +63,13 @@ > #ifndef PLT_ETHER_ADDR_LEN > #define PLT_ETHER_ADDR_LEN RTE_ETHER_ADDR_LEN > #endif > + > +/* Cast to specific datatypes */ > +#define PLT_PTR_CAST(val) ((void *)(val)) > +#define PLT_U64_CAST(val) ((uint64_t)(val)) > +#define PLT_U32_CAST(val) ((uint32_t)(val)) > +#define PLT_U16_CAST(val) ((uint16_t)(val)) > + > /** Divide ceil */ > #define PLT_DIV_CEIL(x, y) \ > ({ \ > -- > 2.25.1 >