From patchwork Sat Dec 23 04:21:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 13503902 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-qv1-f44.google.com (mail-qv1-f44.google.com [209.85.219.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 558649441 for ; Sat, 23 Dec 2023 04:22:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="Bmi8Voko" Received: by mail-qv1-f44.google.com with SMTP id 6a1803df08f44-67f5132e8fcso16321886d6.2 for ; Fri, 22 Dec 2023 20:22:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1703305358; x=1703910158; darn=vger.kernel.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=cPj9JeqzF2lbyQJdTWNGDNcfJ8lmKpqZ83bQ12tFo28=; b=Bmi8VokovorxrVOFPiQ90DRK5GihVlkJwKo6U9Qva3bjh/UpA7+P8nJ6d1unFvsHnQ 8D9MMW6Hs5meYHfy8ubAMcZynek/m1Gjc+yD/G489CIf/ZiHPfah8Jb2eK+TVYItnKx6 HYHxyYpZ/fQLB2jkfsEf4QRQs+nQtGmbAYiRA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703305358; x=1703910158; 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=cPj9JeqzF2lbyQJdTWNGDNcfJ8lmKpqZ83bQ12tFo28=; b=tlVv82yZlAhx9o1Ag7Z3RABm51rByQyZXL8Fb51IjUd+FOsKVpJA0WRAAvkMQbqZLN dStFPHMYKQVM0r1K3zVQgqDL/kpuauuS/DND3G3EC3/1mt9ebTwofqoaLxs3w8EuLfTL nGzl7bE3o/w9M4bM5OkQ0axJQzCqWCW1Vqfsow3fynN9zczokapxrnp/ejPnv+UmqJPn QsnSPqJjQPC4EaxZtRstTICzQZQQ6SZgN1P5U+Uxalih4DmkDRactbIwIAy0ejgErLZf IDZq59VieBKtCGKTdbEiMV6YyDeM5we0CCB/9FQSJge4UGtbHpY7YdLcwjR9YHePhqed 3s5g== X-Gm-Message-State: AOJu0YwA1wXDY2n4lC6Ynzck7g2fdiq0eSBE2oHAY2zhzp4YcSH/UHQN oARfqDOBVEeWcD950kQ6UHALGdv2Kebk X-Google-Smtp-Source: AGHT+IEN4Pv9AmRiFy7gUTAsa3n/4Ds3bCV/s/wNzZaVv77IpsiR4zAQp5ddQisPaHzDv2I2hacSvQ== X-Received: by 2002:a05:6214:769:b0:67f:1830:b634 with SMTP id f9-20020a056214076900b0067f1830b634mr3659810qvz.93.1703305358128; Fri, 22 Dec 2023 20:22:38 -0800 (PST) Received: from lvnvda5233.lvn.broadcom.net ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id ek5-20020ad45985000000b0067f8046a1acsm1299916qvb.144.2023.12.22.20.22.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Dec 2023 20:22:37 -0800 (PST) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, pavan.chebbi@broadcom.com, andrew.gospodarek@broadcom.com Subject: [PATCH net-next v2 01/13] bnxt_en: Refactor bnxt_ntuple_filter structure. Date: Fri, 22 Dec 2023 20:21:58 -0800 Message-Id: <20231223042210.102485-2-michael.chan@broadcom.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20231223042210.102485-1-michael.chan@broadcom.com> References: <20231223042210.102485-1-michael.chan@broadcom.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org This is in preparation to support user defined L2 (ether) filters, which will have many similarities with ntuple filters. Refactor bnxt_ntuple_filter structure to have a bnxt_filter_base structure that can be re-used by the L2 filters. Reviewed-by: Vasundhara Volam Reviewed-by: Andy Gospodarek Reviewed-by: Pavan Chebbi Signed-off-by: Michael Chan Reviewed-by: Simon Horman --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 39 ++++++++++--------- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 25 +++++++++--- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 10 ++--- 3 files changed, 44 insertions(+), 30 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 1f956929191d..bf3b9b2cad76 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -4803,8 +4803,8 @@ static void bnxt_free_ntp_fltrs(struct bnxt *bp, bool irq_reinit) struct bnxt_ntuple_filter *fltr; head = &bp->ntp_fltr_hash_tbl[i]; - hlist_for_each_entry_safe(fltr, tmp, head, hash) { - hlist_del(&fltr->hash); + hlist_for_each_entry_safe(fltr, tmp, head, base.hash) { + hlist_del(&fltr->base.hash); kfree(fltr); } } @@ -5301,7 +5301,7 @@ static int bnxt_hwrm_cfa_ntuple_filter_free(struct bnxt *bp, if (rc) return rc; - req->ntuple_filter_id = fltr->filter_id; + req->ntuple_filter_id = fltr->base.filter_id; return hwrm_req_send(bp, req); } @@ -5342,9 +5342,9 @@ static int bnxt_hwrm_cfa_ntuple_filter_alloc(struct bnxt *bp, if (bp->fw_cap & BNXT_FW_CAP_CFA_RFS_RING_TBL_IDX_V2) { flags = CFA_NTUPLE_FILTER_ALLOC_REQ_FLAGS_DEST_RFS_RING_IDX; - req->dst_id = cpu_to_le16(fltr->rxq); + req->dst_id = cpu_to_le16(fltr->base.rxq); } else { - vnic = &bp->vnic_info[fltr->rxq + 1]; + vnic = &bp->vnic_info[fltr->base.rxq + 1]; req->dst_id = cpu_to_le16(vnic->fw_vnic_id); } req->flags = cpu_to_le32(flags); @@ -5389,7 +5389,7 @@ static int bnxt_hwrm_cfa_ntuple_filter_alloc(struct bnxt *bp, resp = hwrm_req_hold(bp, req); rc = hwrm_req_send(bp, req); if (!rc) - fltr->filter_id = resp->ntuple_filter_id; + fltr->base.filter_id = resp->ntuple_filter_id; hwrm_req_drop(bp, req); return rc; } @@ -13653,9 +13653,9 @@ static int bnxt_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb, idx = skb_get_hash_raw(skb) & BNXT_NTP_FLTR_HASH_MASK; head = &bp->ntp_fltr_hash_tbl[idx]; rcu_read_lock(); - hlist_for_each_entry_rcu(fltr, head, hash) { + hlist_for_each_entry_rcu(fltr, head, base.hash) { if (bnxt_fltr_match(fltr, new_fltr)) { - rc = fltr->sw_id; + rc = fltr->base.sw_id; rcu_read_unlock(); goto err_free; } @@ -13671,17 +13671,18 @@ static int bnxt_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb, goto err_free; } - new_fltr->sw_id = (u16)bit_id; + new_fltr->base.sw_id = (u16)bit_id; new_fltr->flow_id = flow_id; new_fltr->l2_fltr_idx = l2_idx; - new_fltr->rxq = rxq_index; - hlist_add_head_rcu(&new_fltr->hash, head); + new_fltr->base.rxq = rxq_index; + new_fltr->base.type = BNXT_FLTR_TYPE_NTUPLE; + hlist_add_head_rcu(&new_fltr->base.hash, head); bp->ntp_fltr_count++; spin_unlock_bh(&bp->ntp_fltr_lock); bnxt_queue_sp_work(bp, BNXT_RX_NTP_FLTR_SP_EVENT); - return new_fltr->sw_id; + return new_fltr->base.sw_id; err_free: kfree(new_fltr); @@ -13699,13 +13700,13 @@ static void bnxt_cfg_ntp_filters(struct bnxt *bp) int rc; head = &bp->ntp_fltr_hash_tbl[i]; - hlist_for_each_entry_safe(fltr, tmp, head, hash) { + hlist_for_each_entry_safe(fltr, tmp, head, base.hash) { bool del = false; - if (test_bit(BNXT_FLTR_VALID, &fltr->state)) { - if (rps_may_expire_flow(bp->dev, fltr->rxq, + if (test_bit(BNXT_FLTR_VALID, &fltr->base.state)) { + if (rps_may_expire_flow(bp->dev, fltr->base.rxq, fltr->flow_id, - fltr->sw_id)) { + fltr->base.sw_id)) { bnxt_hwrm_cfa_ntuple_filter_free(bp, fltr); del = true; @@ -13716,16 +13717,16 @@ static void bnxt_cfg_ntp_filters(struct bnxt *bp) if (rc) del = true; else - set_bit(BNXT_FLTR_VALID, &fltr->state); + set_bit(BNXT_FLTR_VALID, &fltr->base.state); } if (del) { spin_lock_bh(&bp->ntp_fltr_lock); - hlist_del_rcu(&fltr->hash); + hlist_del_rcu(&fltr->base.hash); bp->ntp_fltr_count--; spin_unlock_bh(&bp->ntp_fltr_lock); synchronize_rcu(); - clear_bit(fltr->sw_id, bp->ntp_fltr_bmap); + clear_bit(fltr->base.sw_id, bp->ntp_fltr_bmap); kfree(fltr); } } diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h index d0f3e74fa025..4653abbd2fe4 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h @@ -1332,21 +1332,34 @@ struct bnxt_pf_info { struct bnxt_vf_info *vf; }; -struct bnxt_ntuple_filter { +struct bnxt_filter_base { struct hlist_node hash; - u8 dst_mac_addr[ETH_ALEN]; - u8 src_mac_addr[ETH_ALEN]; - struct flow_keys fkeys; __le64 filter_id; + u8 type; +#define BNXT_FLTR_TYPE_NTUPLE 1 +#define BNXT_FLTR_TYPE_L2 2 + u8 flags; +#define BNXT_ACT_DROP 1 +#define BNXT_ACT_RING_DST 2 +#define BNXT_ACT_FUNC_DST 4 u16 sw_id; - u8 l2_fltr_idx; u16 rxq; - u32 flow_id; + u16 fw_vnic_id; + u16 vf_idx; unsigned long state; #define BNXT_FLTR_VALID 0 #define BNXT_FLTR_UPDATE 1 }; +struct bnxt_ntuple_filter { + struct bnxt_filter_base base; + u8 dst_mac_addr[ETH_ALEN]; + u8 src_mac_addr[ETH_ALEN]; + struct flow_keys fkeys; + u8 l2_fltr_idx; + u32 flow_id; +}; + struct bnxt_link_info { u8 phy_type; u8 media_type; diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c index 7e49953a93fa..65edad2cfeab 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c @@ -1024,10 +1024,10 @@ static int bnxt_grxclsrlall(struct bnxt *bp, struct ethtool_rxnfc *cmd, head = &bp->ntp_fltr_hash_tbl[i]; rcu_read_lock(); - hlist_for_each_entry_rcu(fltr, head, hash) { + hlist_for_each_entry_rcu(fltr, head, base.hash) { if (j == cmd->rule_cnt) break; - rule_locs[j++] = fltr->sw_id; + rule_locs[j++] = fltr->base.sw_id; } rcu_read_unlock(); if (j == cmd->rule_cnt) @@ -1053,8 +1053,8 @@ static int bnxt_grxclsrule(struct bnxt *bp, struct ethtool_rxnfc *cmd) head = &bp->ntp_fltr_hash_tbl[i]; rcu_read_lock(); - hlist_for_each_entry_rcu(fltr, head, hash) { - if (fltr->sw_id == fs->location) + hlist_for_each_entry_rcu(fltr, head, base.hash) { + if (fltr->base.sw_id == fs->location) goto fltr_found; } rcu_read_unlock(); @@ -1107,7 +1107,7 @@ static int bnxt_grxclsrule(struct bnxt *bp, struct ethtool_rxnfc *cmd) fs->m_u.tcp_ip6_spec.pdst = cpu_to_be16(~0); } - fs->ring_cookie = fltr->rxq; + fs->ring_cookie = fltr->base.rxq; rc = 0; fltr_err: