Re: [Intel-wired-lan] [PATCH iwl-next v1 1/5] virtchnl: support queue rate limit and quanta size configuration

[Tony Nguyen <anthony.l.nguyen@intel.com>]

On 7/26/2023 7:10 PM, Wenjun Wu wrote:
> This patch adds new virtchnl opcodes and structures for rate limit
> and quanta size configuration, which include:
> 1. VIRTCHNL_OP_CONFIG_QUEUE_BW, to configure max bandwidth for each
> VF per queue.
> 2. VIRTCHNL_OP_CONFIG_QUANTA, to configure quanta size per queue.
> 3. VIRTCHNL_OP_GET_QOS_CAPS, VF queries current QoS configuration, such
> as enabled TCs, arbiter type, up2tc and bandwidth of VSI node. The
> configuration is previously set by DCB and PF, and now is the potential
> QoS capability of VF. VF can take it as reference to configure queue TC
> mapping.
> 
> Signed-off-by: Wenjun Wu <wenjun1.wu@intel.com>
> ---
>   include/linux/avf/virtchnl.h | 113 +++++++++++++++++++++++++++++++++++
>   1 file changed, 113 insertions(+)
> 
> diff --git a/include/linux/avf/virtchnl.h b/include/linux/avf/virtchnl.h
> index c15221dcb75e..f1250ddd063d 100644
> --- a/include/linux/avf/virtchnl.h
> +++ b/include/linux/avf/virtchnl.h
> @@ -84,6 +84,9 @@ enum virtchnl_rx_hsplit {
>   	VIRTCHNL_RX_HSPLIT_SPLIT_SCTP    = 8,
>   };
>   
> +enum virtchnl_bw_limit_type {
> +	VIRTCHNL_BW_SHAPER = 0,
> +};
>   /* END GENERIC DEFINES */
>   
>   /* Opcodes for VF-PF communication. These are placed in the v_opcode field
> @@ -145,6 +148,11 @@ enum virtchnl_ops {
>   	VIRTCHNL_OP_DISABLE_VLAN_STRIPPING_V2 = 55,
>   	VIRTCHNL_OP_ENABLE_VLAN_INSERTION_V2 = 56,
>   	VIRTCHNL_OP_DISABLE_VLAN_INSERTION_V2 = 57,
> +	/* opcode 57 - 65 are reserved */
> +	VIRTCHNL_OP_GET_QOS_CAPS = 66,
> +	/* opcode 68 through 111 are reserved */
> +	VIRTCHNL_OP_CONFIG_QUEUE_BW = 112,
> +	VIRTCHNL_OP_CONFIG_QUANTA = 113,
>   	VIRTCHNL_OP_MAX,
>   };
>   
> @@ -253,6 +261,7 @@ VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_vsi_resource);
>   #define VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC	BIT(26)
>   #define VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF		BIT(27)
>   #define VIRTCHNL_VF_OFFLOAD_FDIR_PF		BIT(28)
> +#define VIRTCHNL_VF_OFFLOAD_QOS			BIT(29)
>   
>   #define VF_BASE_MODE_OFFLOADS (VIRTCHNL_VF_OFFLOAD_L2 | \
>   			       VIRTCHNL_VF_OFFLOAD_VLAN | \
> @@ -1367,6 +1376,83 @@ struct virtchnl_fdir_del {
>   
>   VIRTCHNL_CHECK_STRUCT_LEN(12, virtchnl_fdir_del);
>   
> +struct virtchnl_shaper_bw {
> +	/* Unit is Kbps */
> +	u32 committed;
> +	u32 peak;
> +};
> +
> +VIRTCHNL_CHECK_STRUCT_LEN(8, virtchnl_shaper_bw);
> +
> +/* VIRTCHNL_OP_GET_QOS_CAPS
> + * VF sends this message to get its QoS Caps, such as
> + * TC number, Arbiter and Bandwidth.
> + */
> +struct virtchnl_qos_cap_elem {
> +	u8 tc_num;
> +	u8 tc_prio;
> +#define VIRTCHNL_ABITER_STRICT      0
> +#define VIRTCHNL_ABITER_ETS         2
> +	u8 arbiter;
> +#define VIRTCHNL_STRICT_WEIGHT      1
> +	u8 weight;
> +	enum virtchnl_bw_limit_type type;
> +	union {
> +		struct virtchnl_shaper_bw shaper;
> +		u8 pad2[32];
> +	};
> +};
> +
> +VIRTCHNL_CHECK_STRUCT_LEN(40, virtchnl_qos_cap_elem);
> +
> +struct virtchnl_qos_cap_list {
> +	u16 vsi_id;
> +	u16 num_elem;
> +	struct virtchnl_qos_cap_elem cap[1];
> +};

If it's not too late to use a flex arrays, we should. Otherwise, this 
should model after Olek's work [1].

Adding Olek in case he has input.

> +
> +VIRTCHNL_CHECK_STRUCT_LEN(44, virtchnl_qos_cap_list);
> +
> +/* VIRTCHNL_OP_CONFIG_QUEUE_BW */
> +struct virtchnl_queue_bw {
> +	u16 queue_id;
> +	u8 tc;
> +	u8 pad;
> +	struct virtchnl_shaper_bw shaper;
> +};
> +
> +VIRTCHNL_CHECK_STRUCT_LEN(12, virtchnl_queue_bw);
> +
> +struct virtchnl_queues_bw_cfg {
> +	u16 vsi_id;
> +	u16 num_queues;
> +	struct virtchnl_queue_bw cfg[1];

same here

> +};
> +
> +VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_queues_bw_cfg);
> +
> +enum virtchnl_queue_type {
> +	VIRTCHNL_QUEUE_TYPE_TX			= 0,
> +	VIRTCHNL_QUEUE_TYPE_RX			= 1,
> +};
> +
> +/* structure to specify a chunk of contiguous queues */
> +struct virtchnl_queue_chunk {
> +	/* see enum virtchnl_queue_type */
> +	s32 type;
> +	u16 start_queue_id;
> +	u16 num_queues;
> +};
> +
> +VIRTCHNL_CHECK_STRUCT_LEN(8, virtchnl_queue_chunk);
> +
> +struct virtchnl_quanta_cfg {
> +	u16 quanta_size;
> +	struct virtchnl_queue_chunk queue_select;
> +};
> +
> +VIRTCHNL_CHECK_STRUCT_LEN(12, virtchnl_quanta_cfg);
> +
>   /**
>    * virtchnl_vc_validate_vf_msg
>    * @ver: Virtchnl version info
> @@ -1558,6 +1644,33 @@ virtchnl_vc_validate_vf_msg(struct virtchnl_version_info *ver, u32 v_opcode,
>   	case VIRTCHNL_OP_DISABLE_VLAN_INSERTION_V2:
>   		valid_len = sizeof(struct virtchnl_vlan_setting);
>   		break;
> +	case VIRTCHNL_OP_GET_QOS_CAPS:
> +		break;
> +	case VIRTCHNL_OP_CONFIG_QUEUE_BW:
> +		valid_len = sizeof(struct virtchnl_queues_bw_cfg);
> +		if (msglen >= valid_len) {
> +			struct virtchnl_queues_bw_cfg *q_bw =
> +				(struct virtchnl_queues_bw_cfg *)msg;

missing newline here.

> +			if (q_bw->num_queues == 0) {
> +				err_msg_format = true;
> +				break;
> +			}
> +			valid_len += (q_bw->num_queues - 1) *
> +					 sizeof(q_bw->cfg[0]);

See referenced series for changes to this too.

> +		}
> +		break;
> +	case VIRTCHNL_OP_CONFIG_QUANTA:
> +		valid_len = sizeof(struct virtchnl_quanta_cfg);
> +		if (msglen >= valid_len) {
> +			struct virtchnl_quanta_cfg *q_quanta =
> +				(struct virtchnl_quanta_cfg *)msg;

need newline

> +			if (q_quanta->quanta_size == 0 ||
> +			    q_quanta->queue_select.num_queues == 0) {
> +				err_msg_format = true;
> +				break;
> +			}
> +		}
> +		break;
>   	/* These are always errors coming from the VF. */
>   	case VIRTCHNL_OP_EVENT:
>   	case VIRTCHNL_OP_UNKNOWN:

[1] 
https://lore.kernel.org/netdev/20230728155207.10042-1-aleksander.lobakin@intel.com/#t
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan