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 411994554D; Tue, 2 Jul 2024 14:21:36 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 08DE640665; Tue, 2 Jul 2024 14:21:36 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.14]) by mails.dpdk.org (Postfix) with ESMTP id 0BD65402D2 for ; Tue, 2 Jul 2024 14:21:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1719922894; x=1751458894; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=cUofuiJGnFRmzkeM9i8oFSNMAQ362TyHhRQ4hTjX/8E=; b=C4tt/4KfLXw0380zVegOPFEtF6OdvB3aIloLZUY2w4OQn5gxP4tYIXoE pOAj3Q0CRvRyra6+mLQll1S9u0VADMUhiArVrT892j+TnMlXFpn8OaEFi FkM5grtzFxsPGpm/AtIx4bLKZYjKDEy+6Ui6qGafAViy9iDHeBwz/fy0l YUbdgzwu+vjluLBOB0HyocQC64NGZQ04Hl4zvJ26zBoODsWk2fYHu5/eq FDdJj++50eSYU7Zaeb7onoo87PVtMWRJAmSPoIWsa1TW4ocs2qrm6scBN jqiLjet1nzrgqL8IEoJRRVNaszBGpnNoCp0d3uN+kxMJOpvq77psh18cC g==; X-CSE-ConnectionGUID: 8VfYV5i4TvmkWJquw70Uhw== X-CSE-MsgGUID: Zm87rlB0TGSlCkDvDV8CwA== X-IronPort-AV: E=McAfee;i="6700,10204,11120"; a="17306117" X-IronPort-AV: E=Sophos;i="6.09,178,1716274800"; d="scan'208";a="17306117" Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa108.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Jul 2024 05:21:30 -0700 X-CSE-ConnectionGUID: ETwanaapStS27HDr1c3W6w== X-CSE-MsgGUID: OT0DqhPwT/iFEOMz6V70Hg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.09,178,1716274800"; d="scan'208";a="51077500" Received: from sivswdev19.ir.intel.com ([10.237.217.69]) by orviesa004.jf.intel.com with ESMTP; 02 Jul 2024 05:21:30 -0700 From: Ian Stokes To: dev@dpdk.org Cc: bruce.richardson@intel.com, Ian Stokes Subject: [PATCH] net/ice: fix use of ice_bitmap_t in promisc functions Date: Tue, 2 Jul 2024 13:21:27 +0100 Message-Id: <20240702122127.22401-1-ian.stokes@intel.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Promisc functions were modified to use ice_bitmap_t. However use of ice_bitmap_t requires specific helper functions to ensure correctness. Fix this by adding correct calls to declare, zero and set ice_bitmap_t within the promisc functions. Signed-off-by: Ian Stokes --- drivers/net/ice/ice_ethdev.c | 59 +++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index f7189b2dfe..23f14d7c42 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -3807,7 +3807,8 @@ ice_dev_start(struct rte_eth_dev *dev) uint8_t timer = hw->func_caps.ts_func_info.tmr_index_owned; uint32_t pin_idx = ad->devargs.pin_idx; struct rte_tm_error tm_err; - ice_bitmap_t pmask; + ice_declare_bitmap(pmask, ICE_PROMISC_MAX); + ice_zero_bitmap(pmask, ICE_PROMISC_MAX); /* program Tx queues' context in hardware */ for (nb_txq = 0; nb_txq < data->nb_tx_queues; nb_txq++) { @@ -3864,9 +3865,12 @@ ice_dev_start(struct rte_eth_dev *dev) return -EIO; /* Enable receiving broadcast packets and transmitting packets */ - pmask = ICE_PROMISC_BCAST_RX | ICE_PROMISC_BCAST_TX | - ICE_PROMISC_UCAST_TX | ICE_PROMISC_MCAST_TX; - ret = ice_set_vsi_promisc(hw, vsi->idx, &pmask, 0); + ice_set_bit(ICE_PROMISC_BCAST_RX, pmask); + ice_set_bit(ICE_PROMISC_BCAST_TX, pmask); + ice_set_bit(ICE_PROMISC_UCAST_TX, pmask); + ice_set_bit(ICE_PROMISC_MCAST_TX, pmask); + + ret = ice_set_vsi_promisc(hw, vsi->idx, pmask, 0); if (ret != ICE_SUCCESS) PMD_DRV_LOG(INFO, "fail to set vsi broadcast"); @@ -5211,12 +5215,15 @@ ice_promisc_enable(struct rte_eth_dev *dev) struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private); struct ice_vsi *vsi = pf->main_vsi; int status, ret = 0; - ice_bitmap_t pmask; + ice_declare_bitmap(pmask, ICE_PROMISC_MAX); + ice_zero_bitmap(pmask, ICE_PROMISC_MAX); - pmask = ICE_PROMISC_UCAST_RX | ICE_PROMISC_UCAST_TX | - ICE_PROMISC_MCAST_RX | ICE_PROMISC_MCAST_TX; + ice_set_bit(ICE_PROMISC_UCAST_RX, pmask); + ice_set_bit(ICE_PROMISC_UCAST_TX, pmask); + ice_set_bit(ICE_PROMISC_MCAST_RX, pmask); + ice_set_bit(ICE_PROMISC_MCAST_TX, pmask); - status = ice_set_vsi_promisc(hw, vsi->idx, &pmask, 0); + status = ice_set_vsi_promisc(hw, vsi->idx, pmask, 0); switch (status) { case ICE_ERR_ALREADY_EXISTS: PMD_DRV_LOG(DEBUG, "Promisc mode has already been enabled"); @@ -5237,15 +5244,21 @@ ice_promisc_disable(struct rte_eth_dev *dev) struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private); struct ice_vsi *vsi = pf->main_vsi; int status, ret = 0; - ice_bitmap_t pmask; + ice_declare_bitmap(pmask, ICE_PROMISC_MAX); + ice_zero_bitmap(pmask, ICE_PROMISC_MAX); - if (dev->data->all_multicast == 1) - pmask = ICE_PROMISC_UCAST_RX | ICE_PROMISC_UCAST_TX; - else - pmask = ICE_PROMISC_UCAST_RX | ICE_PROMISC_UCAST_TX | - ICE_PROMISC_MCAST_RX | ICE_PROMISC_MCAST_TX; + if (dev->data->all_multicast == 1) { + ice_set_bit(ICE_PROMISC_UCAST_RX, pmask); + ice_set_bit(ICE_PROMISC_UCAST_TX, pmask); + } + else { + ice_set_bit(ICE_PROMISC_UCAST_RX, pmask); + ice_set_bit(ICE_PROMISC_UCAST_TX, pmask); + ice_set_bit(ICE_PROMISC_MCAST_RX, pmask); + ice_set_bit(ICE_PROMISC_MCAST_TX, pmask); + } - status = ice_clear_vsi_promisc(hw, vsi->idx, &pmask, 0); + status = ice_clear_vsi_promisc(hw, vsi->idx, pmask, 0); if (status != ICE_SUCCESS) { PMD_DRV_LOG(ERR, "Failed to clear promisc, err=%d", status); ret = -EAGAIN; @@ -5261,11 +5274,13 @@ ice_allmulti_enable(struct rte_eth_dev *dev) struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private); struct ice_vsi *vsi = pf->main_vsi; int status, ret = 0; - ice_bitmap_t pmask; + ice_declare_bitmap(pmask, ICE_PROMISC_MAX); + ice_zero_bitmap(pmask, ICE_PROMISC_MAX); - pmask = ICE_PROMISC_MCAST_RX | ICE_PROMISC_MCAST_TX; + ice_set_bit(ICE_PROMISC_MCAST_RX, pmask); + ice_set_bit(ICE_PROMISC_MCAST_TX, pmask); - status = ice_set_vsi_promisc(hw, vsi->idx, &pmask, 0); + status = ice_set_vsi_promisc(hw, vsi->idx, pmask, 0); switch (status) { case ICE_ERR_ALREADY_EXISTS: @@ -5287,14 +5302,16 @@ ice_allmulti_disable(struct rte_eth_dev *dev) struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private); struct ice_vsi *vsi = pf->main_vsi; int status, ret = 0; - ice_bitmap_t pmask; + ice_declare_bitmap(pmask, ICE_PROMISC_MAX); + ice_zero_bitmap(pmask, ICE_PROMISC_MAX); if (dev->data->promiscuous == 1) return 0; /* must remain in all_multicast mode */ - pmask = ICE_PROMISC_MCAST_RX | ICE_PROMISC_MCAST_TX; + ice_set_bit(ICE_PROMISC_MCAST_RX, pmask); + ice_set_bit(ICE_PROMISC_MCAST_TX, pmask); - status = ice_clear_vsi_promisc(hw, vsi->idx, &pmask, 0); + status = ice_clear_vsi_promisc(hw, vsi->idx, pmask, 0); if (status != ICE_SUCCESS) { PMD_DRV_LOG(ERR, "Failed to clear allmulti, err=%d", status); ret = -EAGAIN; -- 2.34.1