[dpdk-dev] [PATCH v2 02/18] net/ixgbe: store flow director filter

Xing, Beilei beilei.xing at intel.com
Mon Jan 2 10:59:01 CET 2017


> From: dev [mailto:dev-bounces at dpdk.org] On Behalf Of Wei Zhao
> Sent: Friday, December 30, 2016 3:53 PM
> To: dev at dpdk.org
> Cc: Lu, Wenzhuo <wenzhuo.lu at intel.com>; Zhao1, Wei <wei.zhao1 at intel.com>
> Subject: [dpdk-dev] [PATCH v2 02/18] net/ixgbe: store flow director filter
> 
> Add support for storing flow director filter in SW.
> 
> Signed-off-by: Wenzhuo Lu <wenzhuo.lu at intel.com>
> Signed-off-by: Wei Zhao <wei.zhao1 at intel.com>
> ---
> 
> v2:
> --add a fdir initialization function in device start process
> ---

> 
> +static inline struct ixgbe_fdir_filter *
> +ixgbe_fdir_filter_lookup(struct ixgbe_hw_fdir_info *fdir_info,
> +			 union ixgbe_atr_input *key)
> +{
> +	int ret = 0;

Needless initialization here since ret will be set below.

> +	ret = rte_hash_lookup(fdir_info->hash_handle, (const void *)key);
> +	if (ret < 0)
> +		return NULL;
> +
> +	return fdir_info->hash_map[ret];
> +}
> +
> +static inline int
> +ixgbe_insert_fdir_filter(struct ixgbe_hw_fdir_info *fdir_info,
> +			 struct ixgbe_fdir_filter *fdir_filter) {
> +	int ret = 0;

Same above.

> +
> +	ret = rte_hash_add_key(fdir_info->hash_handle,
> +			       &fdir_filter->ixgbe_fdir);
> +
> +	if (ret < 0) {
> +		PMD_DRV_LOG(ERR,
> +			    "Failed to insert fdir filter to hash table %d!",
> +			    ret);
> +		return ret;
> +	}
> +
> +	fdir_info->hash_map[ret] = fdir_filter;
> +
> +	TAILQ_INSERT_TAIL(&fdir_info->fdir_list, fdir_filter, entries);
> +
> +	return 0;
> +}
> +
> +static inline int
> +ixgbe_remove_fdir_filter(struct ixgbe_hw_fdir_info *fdir_info,
> +			 union ixgbe_atr_input *key)
> +{
> +	int ret = 0;

Same above.

> +	struct ixgbe_fdir_filter *fdir_filter;
> +
> +	ret = rte_hash_del_key(fdir_info->hash_handle, key);
> +
> +	if (ret < 0) {
> +		PMD_DRV_LOG(ERR, "No such fdir filter to delete %d!", ret);
> +		return ret;
> +	}
> +
> +	fdir_filter = fdir_info->hash_map[ret];
> +	fdir_info->hash_map[ret] = NULL;
> +
> +	TAILQ_REMOVE(&fdir_info->fdir_list, fdir_filter, entries);
> +	rte_free(fdir_filter);
> +
> +	return 0;
> +}
> +
>  /*
>   * ixgbe_add_del_fdir_filter - add or remove a flow diretor filter.
>   * @dev: pointer to the structure rte_eth_dev @@ -1098,6 +1158,8 @@
> ixgbe_add_del_fdir_filter(struct rte_eth_dev *dev,
>  	struct ixgbe_hw_fdir_info *info =
>  		IXGBE_DEV_PRIVATE_TO_FDIR_INFO(dev->data->dev_private);
>  	enum rte_fdir_mode fdir_mode = dev->data->dev_conf.fdir_conf.mode;
> +	struct ixgbe_fdir_filter *node;
> +	bool add_node = FALSE;
> 
>  	if (fdir_mode == RTE_FDIR_MODE_NONE)
>  		return -ENOTSUP;
> @@ -1148,6 +1210,10 @@ ixgbe_add_del_fdir_filter(struct rte_eth_dev *dev,
>  						      dev->data->dev_conf.fdir_conf.pballoc);
> 
>  	if (del) {
> +		err = ixgbe_remove_fdir_filter(info, &input);
> +		if (err < 0)
> +			return err;
> +
>  		err = fdir_erase_filter_82599(hw, fdirhash);
>  		if (err < 0)
>  			PMD_DRV_LOG(ERR, "Fail to delete FDIR filter!"); @@ -1172,6
> +1238,37 @@ ixgbe_add_del_fdir_filter(struct rte_eth_dev *dev,
>  	else
>  		return -EINVAL;
> 
> +	node = ixgbe_fdir_filter_lookup(info, &input);
> +	if (node) {
> +		if (update) {
> +			node->fdirflags = fdircmd_flags;
> +			node->fdirhash = fdirhash;
> +			node->queue = queue;
> +		} else {
> +			PMD_DRV_LOG(ERR, "Conflict with existing fdir filter!");
> +			return -EINVAL;
> +		}
> +	} else {
> +		add_node = TRUE;
> +		node = rte_zmalloc("ixgbe_fdir",
> +				   sizeof(struct ixgbe_fdir_filter),
> +				   0);
> +		if (!node)
> +			return -ENOMEM;
> +		(void)rte_memcpy(&node->ixgbe_fdir,
> +				 &input,
> +				 sizeof(union ixgbe_atr_input));
> +		node->fdirflags = fdircmd_flags;
> +		node->fdirhash = fdirhash;
> +		node->queue = queue;
> +
> +		err = ixgbe_insert_fdir_filter(info, node);
> +		if (err < 0) {
> +			rte_free(node);
> +			return err;
> +		}
> +	}
> +
>  	if (is_perfect) {
>  		err = fdir_write_perfect_filter_82599(hw, &input, queue,
>  						      fdircmd_flags, fdirhash,
> @@ -1180,10 +1277,14 @@ ixgbe_add_del_fdir_filter(struct rte_eth_dev
> *dev,
>  		err = fdir_add_signature_filter_82599(hw, &input, queue,
>  						      fdircmd_flags, fdirhash);
>  	}
> -	if (err < 0)
> +	if (err < 0) {
>  		PMD_DRV_LOG(ERR, "Fail to add FDIR filter!");
> -	else
> +
> +		if (add_node)
> +			(void)ixgbe_remove_fdir_filter(info, &input);
> +	} else {
>  		PMD_DRV_LOG(DEBUG, "Success to add FDIR filter");
> +	}
> 
>  	return err;
>  }
> --
> 2.5.5



More information about the dev mailing list