From patchwork Mon Dec 4 18:37:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 134819 X-Patchwork-Delegate: ajit.khaparde@broadcom.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 C435F4366C; Mon, 4 Dec 2023 19:38:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 095ED42D2A; Mon, 4 Dec 2023 19:37:30 +0100 (CET) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mails.dpdk.org (Postfix) with ESMTP id 63EAB427E1 for ; Mon, 4 Dec 2023 19:37:27 +0100 (CET) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-6ce49d9d874so1400226b3a.2 for ; Mon, 04 Dec 2023 10:37:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1701715046; x=1702319846; darn=dpdk.org; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=21T0anMGA8hqWP45ePk9zHhiTTidNl7o0HNEEVzcv/w=; b=Y2hW+XIkJaZzrfvKscEtHzB6JE4LWsgFqsBMI7Pxo14dRBdG4+lZNM6PfZIefeit6d GLtyqz96y/Q1/NGcTWi0L4cNjtZkIfZhN0Usap3xax7vbDbR9MlYOh4sUTbhR9r2R6HJ /UFjXPYYVpNNsIlydEqFL3MbAqFuRQC+5+/WY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701715046; x=1702319846; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=21T0anMGA8hqWP45ePk9zHhiTTidNl7o0HNEEVzcv/w=; b=X2sdwzA3y7/p5QBkA/6AbR248YFfcft7j+7Xzl8eBkgSMfgN83GpH4oM7oC2M3Rz47 gMpa2ZFY0EVmOPnXhsaVPx58qLyvxy6syMvAqF0Sz7vn14E3VGGqr8Yi2mYfPRDeXMP0 FFNvZ+6ySahi5PTldabmKulqU8L3PKYBIP2w6FCNiI0vvbsDMOmqm7H1RNiFAIwpE873 00rbtXstySMm1C3qgTIGFOiesI/BSrKQIAP4m7AdrU7OEguy7ntoG77ZHIP8sGOJrk5I Jbs3zOQ1EWTPcS+DMjM7ZJ8cLKCkcOM0JfPkl3bLBR2SidN9QrxaBskWVogd7ccGTDj9 xVQw== X-Gm-Message-State: AOJu0Yyys5HJ5ChEEy47LlI09UKS2QWMeWW72LtJ9mxz9/IKfT9DRFyW tszkJ1YfoFwm5M8ZAali/D1nHwurmBi/ybtRL3brdgcXlaFvi6qVkf6pL90UDhS1KkNKHNS+68P lWIng3yMrrhNo+iHSC8nQufTq0zVrv3odIh3woCtKUCde4vavJSQ2KKAB7udCiL2yMlT+ X-Google-Smtp-Source: AGHT+IEHXFZ9ua91QtfTL8qfXPsUOuSpzUGXfRsBs/vjgWFphvCLkdZAdVzTPq+1kUiHO6lh+huUmA== X-Received: by 2002:a05:6a00:3492:b0:6ce:4fd9:48af with SMTP id cp18-20020a056a00349200b006ce4fd948afmr2380725pfb.60.1701715046096; Mon, 04 Dec 2023 10:37:26 -0800 (PST) Received: from C02GC2QQMD6T.wifi.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id s3-20020a056a00178300b006be5af77f06sm4236664pfg.2.2023.12.04.10.37.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Dec 2023 10:37:25 -0800 (PST) From: Ajit Khaparde To: dev@dpdk.org Cc: Somnath Kotur , Kalesh AP Subject: [PATCH 05/14] net/bnxt: refactor mem zone allocation Date: Mon, 4 Dec 2023 10:37:01 -0800 Message-Id: <20231204183710.86921-6-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20231204183710.86921-1-ajit.khaparde@broadcom.com> References: <20231204183710.86921-1-ajit.khaparde@broadcom.com> MIME-Version: 1.0 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 Currently we are allocating memzone for VNIC attributes per VNIC. In cases where the firmware supports a higher VNIC count, this could lead to a higher number of memzone segments than supported. Move the memzone for VNIC attributes per function instead of per VNIC. Divide the memzone per VNIC as needed. Signed-off-by: Ajit Khaparde Reviewed-by: Somnath Kotur Reviewed-by: Kalesh AP --- drivers/net/bnxt/bnxt.h | 1 + drivers/net/bnxt/bnxt_vnic.c | 52 +++++++++++++++++++----------------- drivers/net/bnxt/bnxt_vnic.h | 1 - 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index 542ef13f7c..6af668e92f 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -772,6 +772,7 @@ struct bnxt { struct bnxt_vnic_info *vnic_info; STAILQ_HEAD(, bnxt_vnic_info) free_vnic_list; + const struct rte_memzone *vnic_rss_mz; struct bnxt_filter_info *filter_info; STAILQ_HEAD(, bnxt_filter_info) free_filter_list; diff --git a/drivers/net/bnxt/bnxt_vnic.c b/drivers/net/bnxt/bnxt_vnic.c index f86d27fd79..d40daf631e 100644 --- a/drivers/net/bnxt/bnxt_vnic.c +++ b/drivers/net/bnxt/bnxt_vnic.c @@ -123,13 +123,11 @@ void bnxt_free_vnic_attributes(struct bnxt *bp) for (i = 0; i < bp->max_vnics; i++) { vnic = &bp->vnic_info[i]; - if (vnic->rss_mz != NULL) { - rte_memzone_free(vnic->rss_mz); - vnic->rss_mz = NULL; - vnic->rss_hash_key = NULL; - vnic->rss_table = NULL; - } + vnic->rss_hash_key = NULL; + vnic->rss_table = NULL; } + rte_memzone_free(bp->vnic_rss_mz); + bp->vnic_rss_mz = NULL; } int bnxt_alloc_vnic_attributes(struct bnxt *bp, bool reconfig) @@ -153,31 +151,35 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp, bool reconfig) entry_length = RTE_CACHE_LINE_ROUNDUP(entry_length + rss_table_size); - for (i = 0; i < bp->max_vnics; i++) { - vnic = &bp->vnic_info[i]; - - snprintf(mz_name, RTE_MEMZONE_NAMESIZE, - "bnxt_" PCI_PRI_FMT "_vnicattr_%d", pdev->addr.domain, - pdev->addr.bus, pdev->addr.devid, pdev->addr.function, i); - mz_name[RTE_MEMZONE_NAMESIZE - 1] = 0; - mz = rte_memzone_lookup(mz_name); - if (mz == NULL) { - mz = rte_memzone_reserve(mz_name, - entry_length, + snprintf(mz_name, RTE_MEMZONE_NAMESIZE, + "bnxt_" PCI_PRI_FMT "_vnicattr", pdev->addr.domain, + pdev->addr.bus, pdev->addr.devid, pdev->addr.function); + mz_name[RTE_MEMZONE_NAMESIZE - 1] = 0; + mz = rte_memzone_lookup(mz_name); + if (mz == NULL) { + mz = rte_memzone_reserve_aligned(mz_name, + entry_length * bp->max_vnics, bp->eth_dev->device->numa_node, RTE_MEMZONE_2MB | RTE_MEMZONE_SIZE_HINT_ONLY | - RTE_MEMZONE_IOVA_CONTIG); - if (mz == NULL) { - PMD_DRV_LOG(ERR, "Cannot allocate bnxt vnic_attributes memory\n"); - return -ENOMEM; - } + RTE_MEMZONE_IOVA_CONTIG, + BNXT_PAGE_SIZE); + if (mz == NULL) { + PMD_DRV_LOG(ERR, + "Cannot allocate vnic_attributes memory\n"); + return -ENOMEM; } - vnic->rss_mz = mz; - mz_phys_addr = mz->iova; + } + bp->vnic_rss_mz = mz; + for (i = 0; i < bp->max_vnics; i++) { + uint32_t offset = entry_length * i; + + vnic = &bp->vnic_info[i]; + + mz_phys_addr = mz->iova + offset; /* Allocate rss table and hash key */ - vnic->rss_table = (void *)((char *)mz->addr); + vnic->rss_table = (void *)((char *)mz->addr + offset); vnic->rss_table_dma_addr = mz_phys_addr; memset(vnic->rss_table, -1, entry_length); diff --git a/drivers/net/bnxt/bnxt_vnic.h b/drivers/net/bnxt/bnxt_vnic.h index 4396d95bda..7a6a0aa739 100644 --- a/drivers/net/bnxt/bnxt_vnic.h +++ b/drivers/net/bnxt/bnxt_vnic.h @@ -47,7 +47,6 @@ struct bnxt_vnic_info { uint16_t hash_type; uint8_t hash_mode; uint8_t prev_hash_mode; - const struct rte_memzone *rss_mz; rte_iova_t rss_table_dma_addr; uint16_t *rss_table; rte_iova_t rss_hash_key_dma_addr;