[dpdk-dev] [PATCH v2 04/18] ixgbe: Support cloud mode in IXGBE base code

[Neil Horman]

On Mon, Sep 29, 2014 at 03:16:12PM +0800, Ouyang Changchun wrote:
> This patch supports cloud mode in IXGBE base code.
> 
> Signed-off-by: Changchun Ouyang <changchun.ouyang at intel.com>
> ---
>  lib/librte_pmd_ixgbe/ixgbe/ixgbe_82599.c | 70 ++++++++++++++++++++++++++++++++
>  lib/librte_pmd_ixgbe/ixgbe/ixgbe_type.h  | 10 +++++
>  2 files changed, 80 insertions(+)
> 
Could you please add a little bit of description as to what cloude mode is here?
The changelogs in this entire series are a bit spartan.  More detail would be
appreciated accross the board.

Also (and this is likely just my lack of understanding regarding how this module
works), but I notice there are two implementations of
ixgbe_fdir_set_input_mask_82599 (one in the kni library and one in the pmd
here).  All the call sites for this function appear to use the former
implementation (to judge by the function prototype used).  How is an application
expected to reach this function?  I don't see any generic api for this sort of
work.

Neil

> diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_82599.c b/lib/librte_pmd_ixgbe/ixgbe/ixgbe_82599.c
> index 126aa24..adf0e52 100644
> --- a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_82599.c
> +++ b/lib/librte_pmd_ixgbe/ixgbe/ixgbe_82599.c
> @@ -1497,6 +1497,9 @@ s32 ixgbe_init_fdir_perfect_82599(struct ixgbe_hw *hw, u32 fdirctrl,
>  		    (0xA << IXGBE_FDIRCTRL_MAX_LENGTH_SHIFT) |
>  		    (4 << IXGBE_FDIRCTRL_FULL_THRESH_SHIFT);
>  
> +	if (cloud_mode)
> +		fdirctrl |=(IXGBE_FDIRCTRL_FILTERMODE_CLOUD <<
> +					IXGBE_FDIRCTRL_FILTERMODE_SHIFT);
>  
>  	/* write hashes and fdirctrl register, poll for completion */
>  	ixgbe_fdir_enable_82599(hw, fdirctrl);
> @@ -1766,6 +1769,7 @@ s32 ixgbe_fdir_set_input_mask_82599(struct ixgbe_hw *hw,
>  	/* mask IPv6 since it is currently not supported */
>  	u32 fdirm = IXGBE_FDIRM_DIPv6;
>  	u32 fdirtcpm;
> +	u32 fdirip6m;
>  	DEBUGFUNC("ixgbe_fdir_set_atr_input_mask_82599");
>  
>  	/*
> @@ -1838,6 +1842,49 @@ s32 ixgbe_fdir_set_input_mask_82599(struct ixgbe_hw *hw,
>  		return IXGBE_ERR_CONFIG;
>  	}
>  
> +	if (cloud_mode) {
> +		fdirm |= IXGBE_FDIRM_L3P;
> +		fdirip6m = ((u32) 0xFFFFU << IXGBE_FDIRIP6M_DIPM_SHIFT);
> +		fdirip6m |= IXGBE_FDIRIP6M_ALWAYS_MASK;
> +
> +		switch (input_mask->formatted.inner_mac[0] & 0xFF) {
> +		case 0x00:
> +			/* Mask inner MAC, fall through */
> +			fdirip6m |= IXGBE_FDIRIP6M_INNER_MAC;
> +		case 0xFF:
> +			break;
> +		default:
> +			DEBUGOUT(" Error on inner_mac byte mask\n");
> +			return IXGBE_ERR_CONFIG;
> +		}
> +
> +		switch (input_mask->formatted.tni_vni & 0xFFFFFFFF) {
> +		case 0x0:
> +			/* Mask vxlan id */
> +			fdirip6m |= IXGBE_FDIRIP6M_TNI_VNI;
> +			break;
> +		case 0x00FFFFFF:
> +			fdirip6m |= IXGBE_FDIRIP6M_TNI_VNI_24;
> +			break;
> +		case 0xFFFFFFFF:
> +			break;
> +		default:
> +			DEBUGOUT(" Error on TNI/VNI byte mask\n");
> +			return IXGBE_ERR_CONFIG;
> +		}
> +
> +		switch (input_mask->formatted.tunnel_type & 0xFFFF) {
> +		case 0x0:
> +			/* Mask turnnel type, fall through */
> +			fdirip6m |= IXGBE_FDIRIP6M_TUNNEL_TYPE;
> +		case 0xFFFF:
> +			break;
> +		default:
> +			DEBUGOUT(" Error on tunnel type byte mask\n");
> +			return IXGBE_ERR_CONFIG;
> +		}
> +		IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRIP6M, fdirip6m);
> +	}
>  
>  	/* Now mask VM pool and destination IPv6 - bits 5 and 2 */
>  	IXGBE_WRITE_REG(hw, IXGBE_FDIRM, fdirm);
> @@ -1863,6 +1910,9 @@ s32 ixgbe_fdir_write_perfect_filter_82599(struct ixgbe_hw *hw,
>  					  u16 soft_id, u8 queue, bool cloud_mode)
>  {
>  	u32 fdirport, fdirvlan, fdirhash, fdircmd;
> +	u32 addr_low, addr_high;
> +	u32 cloud_type = 0;
> +	s32 err;
>  
>  	DEBUGFUNC("ixgbe_fdir_write_perfect_filter_82599");
>  
> @@ -1892,6 +1942,21 @@ s32 ixgbe_fdir_write_perfect_filter_82599(struct ixgbe_hw *hw,
>  	fdirvlan |= IXGBE_NTOHS(input->formatted.vlan_id);
>  	IXGBE_WRITE_REG(hw, IXGBE_FDIRVLAN, fdirvlan);
>  
> +	if (cloud_mode) {
> +		if (input->formatted.tunnel_type != 0)
> +			cloud_type = 0x80000000;
> +
> +		addr_low = ((u32)input->formatted.inner_mac[0] |
> +				((u32)input->formatted.inner_mac[1] << 8) |
> +				((u32)input->formatted.inner_mac[2] << 16) |
> +				((u32)input->formatted.inner_mac[3] << 24));
> +		addr_high = ((u32)input->formatted.inner_mac[4] |
> +				((u32)input->formatted.inner_mac[5] << 8));
> +		cloud_type |= addr_high;
> +		IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRSIPv6(0), addr_low);
> +		IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRSIPv6(1), cloud_type);
> +		IXGBE_WRITE_REG_BE32(hw, IXGBE_FDIRSIPv6(2), input->formatted.tni_vni);
> +	}
>  
>  	/* configure FDIRHASH register */
>  	fdirhash = input->formatted.bkt_hash;
> @@ -1916,6 +1981,11 @@ s32 ixgbe_fdir_write_perfect_filter_82599(struct ixgbe_hw *hw,
>  	fdircmd |= (u32)input->formatted.vm_pool << IXGBE_FDIRCMD_VT_POOL_SHIFT;
>  
>  	IXGBE_WRITE_REG(hw, IXGBE_FDIRCMD, fdircmd);
> +	err = ixgbe_fdir_check_cmd_complete(hw);
> +	if (err) {
> +		DEBUGOUT("Flow Director command did not complete!\n");
> +		return err;
> +	}
>  
>  	return IXGBE_SUCCESS;
>  }
> diff --git a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_type.h b/lib/librte_pmd_ixgbe/ixgbe/ixgbe_type.h
> index 18ac227..f4c2534 100644
> --- a/lib/librte_pmd_ixgbe/ixgbe/ixgbe_type.h
> +++ b/lib/librte_pmd_ixgbe/ixgbe/ixgbe_type.h
> @@ -2369,6 +2369,9 @@ enum ixgbe_fdir_pballoc_type {
>  #define IXGBE_FDIRCTRL_REPORT_STATUS_ALWAYS	0x00000080
>  #define IXGBE_FDIRCTRL_DROP_Q_SHIFT		8
>  #define IXGBE_FDIRCTRL_FLEX_SHIFT		16
> +#define IXGBE_FDIRCTRL_FILTERMODE_SHIFT		21
> +#define IXGBE_FDIRCTRL_FILTERMODE_MACVLAN	0x0001 /* bit 23:21, 001b */
> +#define IXGBE_FDIRCTRL_FILTERMODE_CLOUD		0x0002 /* bit 23:21, 010b */
>  #define IXGBE_FDIRCTRL_SEARCHLIM		0x00800000
>  #define IXGBE_FDIRCTRL_FILTERMODE_MASK		0x00E00000
>  #define IXGBE_FDIRCTRL_MAX_LENGTH_SHIFT		24
> @@ -2384,6 +2387,13 @@ enum ixgbe_fdir_pballoc_type {
>  #define IXGBE_FDIRM_L4P				0x00000008
>  #define IXGBE_FDIRM_FLEX			0x00000010
>  #define IXGBE_FDIRM_DIPv6			0x00000020
> +#define IXGBE_FDIRM_L3P				0x00000040
> +
> +#define IXGBE_FDIRIP6M_INNER_MAC	0x03F0 /* bit 9:4 */
> +#define IXGBE_FDIRIP6M_TUNNEL_TYPE	0x0800 /* bit 11 */
> +#define IXGBE_FDIRIP6M_TNI_VNI		0xF000 /* bit 15:12 */
> +#define IXGBE_FDIRIP6M_TNI_VNI_24	0x1000 /* bit 12 */
> +#define IXGBE_FDIRIP6M_ALWAYS_MASK	0x040F /* bit 10, 3:0 */
>  
>  #define IXGBE_FDIRFREE_FREE_MASK		0xFFFF
>  #define IXGBE_FDIRFREE_FREE_SHIFT		0
> -- 
> 1.8.4.2
> 
>