From patchwork Wed Feb 21 21:20:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 136984 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 0965343B67; Wed, 21 Feb 2024 22:21:59 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DDBCA40E28; Wed, 21 Feb 2024 22:21:15 +0100 (CET) Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by mails.dpdk.org (Postfix) with ESMTP id 323A440DCB for ; Wed, 21 Feb 2024 22:21:13 +0100 (CET) Received: by mail-qt1-f176.google.com with SMTP id d75a77b69052e-42c7c1cb2e9so41331031cf.3 for ; Wed, 21 Feb 2024 13:21:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1708550472; x=1709155272; 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=neb84x1GKXUlAcqC5AYj/hMESukNk2NoxtJ+/bFkU3w=; b=hXjdBGFCLfJJYma0qz4/UehPcpaoUz7f226/hld6JfK4sAmhEeT9v1VXUA3TWjD+rV 6jpRD8RNbyO7kWs36RYYvPBhbllXMbyLpgKAlENUa+iVy+vcd4PpnqyRb4RRbEBbDwDU ikn6o16+5RH6kzkAoxa32fZxiUQ1Fbe9azFyY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708550472; x=1709155272; 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=neb84x1GKXUlAcqC5AYj/hMESukNk2NoxtJ+/bFkU3w=; b=udh9bEU8I69vPzasrxerVPU+zCOYAqK/pM5AXKPlBcaitFUCYs2UX85krntqBEjjoC IiG3F9VCcd0ONOhxeLgO4woG2sRYoe3JsNFx9k3A2uMkutvXzV9tl/mb+Ygwt9UQHxUE rU9/vN7/RdDuzWUQWmcw5mIKbYAuvrqGxLYD1g3wJI5m822hw0AuGKekmoWTo30vcIHX VNZkcmX2aTj8txYU6nVqQewTMd2M6JGccbjFFRUgTXM1ewoR/b2Y+ghYrMd/1xfVWJCa qvs4MEVqNKNcvCbhL5mF1ArDxriRVF69m38SMzStqfbvASBZbuPHWOXKTkCg7FO+MXj6 1cmg== X-Gm-Message-State: AOJu0Yx98cOEOoRJ/fMa8/iOGWGXKaxLUSwRqnZsEygPpKqzeur176MM LAEDqviimw6YMoXxRowCbnbsYXhRJ7oPEiETFornv1ro0JG5BMmepWp2ytsulObIDecz7aB9h2u NmwFsNAdkfWRTrsNBXu/VvioKbyA2k5dEcDXTP66iq80VxVX9k1lEJu50BaYBl3LnaoT+80fdus hklMXDylzCgyr/r/L01DovQFoeHWc6 X-Google-Smtp-Source: AGHT+IFLthHQWem0K+F7UdAIcC2hE92vucmH3GzZKylVWXcQ390E9+HwmFFduXnlCD9AjpS1kkQDNw== X-Received: by 2002:ac8:7f05:0:b0:42c:7bb1:20f8 with SMTP id f5-20020ac87f05000000b0042c7bb120f8mr23915011qtk.59.1708550472002; Wed, 21 Feb 2024 13:21:12 -0800 (PST) Received: from C02GC2QQMD6T.wifi.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id 20-20020ac84e94000000b0042bff97d9a3sm4743467qtp.40.2024.02.21.13.21.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 13:21:11 -0800 (PST) From: Ajit Khaparde To: dev@dpdk.org Cc: ferruh.yigit@amd.com, thomas@monjalon.net Subject: [PATCH 07/10] net/bnxt: add IPv6 flow label based RSS support Date: Wed, 21 Feb 2024 13:20:42 -0800 Message-Id: <20240221212044.27209-8-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.39.2 (Apple Git-143) In-Reply-To: <20240221212044.27209-1-ajit.khaparde@broadcom.com> References: <20240221212044.27209-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 P7 hardware family can support IPv6 flow label based RSS. Check if the firmware indicates capability bit to support IPv6 flow label based RSS and parse the RSS hash types appropriately. Signed-off-by: Ajit Khaparde --- drivers/net/bnxt/bnxt.h | 1 + drivers/net/bnxt/bnxt_ethdev.c | 2 ++ drivers/net/bnxt/bnxt_hwrm.c | 7 +++++++ drivers/net/bnxt/bnxt_vnic.c | 9 +++++++-- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index fcf2b8be97..4203e6a055 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -868,6 +868,7 @@ struct bnxt { #define BNXT_VNIC_CAP_OUTER_RSS_TRUSTED_VF BIT(4) #define BNXT_VNIC_CAP_XOR_MODE BIT(5) #define BNXT_VNIC_CAP_CHKSM_MODE BIT(6) +#define BNXT_VNIC_CAP_IPV6_FLOW_LABEL_MODE BIT(7) #define BNXT_VNIC_CAP_L2_CQE_MODE BIT(8) #define BNXT_VNIC_CAP_AH_SPI4_CAP BIT(9) #define BNXT_VNIC_CAP_AH_SPI6_CAP BIT(10) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index f8d83662f4..d5a4312c5b 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1087,6 +1087,8 @@ uint64_t bnxt_eth_rss_support(struct bnxt *bp) if (bp->vnic_cap_flags & BNXT_VNIC_CAP_CHKSM_MODE) support |= RTE_ETH_RSS_IPV4_CHKSUM | RTE_ETH_RSS_L4_CHKSUM; + if (bp->vnic_cap_flags & BNXT_VNIC_CAP_IPV6_FLOW_LABEL_MODE) + support |= RTE_ETH_RSS_IPV6_FLOW_LABEL; if (bp->vnic_cap_flags & BNXT_VNIC_CAP_AH_SPI_CAP) support |= RTE_ETH_RSS_AH; if (bp->vnic_cap_flags & BNXT_VNIC_CAP_ESP_SPI_CAP) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 7f49b4b40e..6ea7089a3f 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -1308,6 +1308,9 @@ int bnxt_hwrm_vnic_qcaps(struct bnxt *bp) if (flags & HWRM_VNIC_QCAPS_OUTPUT_FLAGS_RING_SELECT_MODE_TOEPLITZ_CHKSM_CAP) bp->vnic_cap_flags |= BNXT_VNIC_CAP_CHKSM_MODE; + if (flags & HWRM_VNIC_QCAPS_OUTPUT_FLAGS_RSS_IPV6_FLOW_LABEL_CAP) + bp->vnic_cap_flags |= BNXT_VNIC_CAP_IPV6_FLOW_LABEL_MODE; + if (flags & HWRM_VNIC_QCAPS_OUTPUT_FLAGS_L2_CQE_MODE_CAP) bp->vnic_cap_flags |= BNXT_VNIC_CAP_L2_CQE_MODE; @@ -2773,6 +2776,10 @@ static uint32_t bnxt_sanitize_rss_type(struct bnxt *bp, uint32_t types) { uint32_t hwrm_type = types; + if (types & HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV6_FLOW_LABEL && + !(bp->vnic_cap_flags & BNXT_VNIC_CAP_IPV6_FLOW_LABEL_MODE)) + hwrm_type &= ~HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV6_FLOW_LABEL; + if (types & HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_ESP_SPI_IPV4 && !(bp->vnic_cap_flags & BNXT_VNIC_CAP_ESP_SPI4_CAP)) hwrm_type &= ~HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_ESP_SPI_IPV4; diff --git a/drivers/net/bnxt/bnxt_vnic.c b/drivers/net/bnxt/bnxt_vnic.c index 5092a7d774..76905ebdd1 100644 --- a/drivers/net/bnxt/bnxt_vnic.c +++ b/drivers/net/bnxt/bnxt_vnic.c @@ -280,6 +280,8 @@ uint32_t bnxt_rte_to_hwrm_hash_types(uint64_t rte_type) hwrm_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_TCP_IPV6; if (rte_type & RTE_ETH_RSS_NONFRAG_IPV6_UDP) hwrm_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_UDP_IPV6; + if (rte_type & RTE_ETH_RSS_IPV6_FLOW_LABEL) + hwrm_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV6_FLOW_LABEL; if (rte_type & RTE_ETH_RSS_ESP) hwrm_type |= HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_ESP_SPI_IPV4 | HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_ESP_SPI_IPV6; @@ -302,6 +304,7 @@ int bnxt_rte_to_hwrm_hash_level(struct bnxt *bp, uint64_t hash_f, uint32_t lvl) bool l3_and_l4 = l3 && l4; bool cksum = !!(hash_f & (RTE_ETH_RSS_IPV4_CHKSUM | RTE_ETH_RSS_L4_CHKSUM)); + bool fl = !!(hash_f & RTE_ETH_RSS_IPV6_FLOW_LABEL); /* If FW has not advertised capability to configure outer/inner * RSS hashing , just log a message. HW will work in default RSS mode. @@ -317,12 +320,12 @@ int bnxt_rte_to_hwrm_hash_level(struct bnxt *bp, uint64_t hash_f, uint32_t lvl) switch (lvl) { case BNXT_RSS_LEVEL_INNERMOST: /* Irrespective of what RTE says, FW always does 4 tuple */ - if (l3_and_l4 || l4 || l3_only || cksum) + if (l3_and_l4 || l4 || l3_only || cksum || fl) mode = BNXT_HASH_MODE_INNERMOST; break; case BNXT_RSS_LEVEL_OUTERMOST: /* Irrespective of what RTE says, FW always does 4 tuple */ - if (l3_and_l4 || l4 || l3_only || cksum) + if (l3_and_l4 || l4 || l3_only || cksum || fl) mode = BNXT_HASH_MODE_OUTERMOST; break; default: @@ -1415,6 +1418,8 @@ void bnxt_hwrm_rss_to_rte_hash_conf(struct bnxt_vnic_info *vnic, *rss_conf |= RTE_ETH_RSS_NONFRAG_IPV6_TCP; if (hash_types & HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_UDP_IPV6) *rss_conf |= RTE_ETH_RSS_NONFRAG_IPV6_UDP; + if (hash_types & HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_IPV6_FLOW_LABEL) + *rss_conf |= RTE_ETH_RSS_IPV6_FLOW_LABEL; if (hash_types & HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_AH_SPI_IPV6 || hash_types & HWRM_VNIC_RSS_CFG_INPUT_HASH_TYPE_AH_SPI_IPV4) *rss_conf |= RTE_ETH_RSS_AH;