Commit 40587f74 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'enic-enable-32-64-byte-cqes-and-get-max-rx-tx-ring-size-from-hw' 



Satish Kharat via says:

====================
enic: enable 32, 64 byte cqes and get max rx/tx ring size from hw

This series enables using the max rx and tx ring sizes read from hw.
For newer hw that can be up to 16k entries. This requires bigger
completion entries for rx queues. This series enables the use of the
32 and 64 byte completion queues entries for enic rx queues on
supported hw versions. This is in addition to the exiting (default)
16 byte rx cqes.

Signed-off-by: default avatarSatish Kharat <satishkh@cisco.com>
====================

Link: https://patch.msgid.link/20250304-enic_cleanup_and_ext_cq-v2-0-85804263dad8@cisco.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 71ca3561 df9fd2a3

drivers/net/ethernet/cisco/enic/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,5 +3,5 @@ obj-$(CONFIG_ENIC) := enic.o 


enic-y := enic_main.o vnic_cq.o vnic_intr.o vnic_wq.o \

	enic_res.o enic_dev.o enic_pp.o vnic_dev.o vnic_rq.o vnic_vic.o \

	enic_ethtool.o enic_api.o enic_clsf.o enic_rq.o

	enic_ethtool.o enic_api.o enic_clsf.o enic_rq.o enic_wq.o

drivers/net/ethernet/cisco/enic/cq_desc.h

+2 −23
Original line number Diff line number Diff line
@@ -40,28 +40,7 @@ struct cq_desc { 
#define CQ_DESC_COMP_NDX_BITS    12

#define CQ_DESC_COMP_NDX_MASK    ((1 << CQ_DESC_COMP_NDX_BITS) - 1)



static inline void cq_desc_dec(const struct cq_desc *desc_arg,

	u8 *type, u8 *color, u16 *q_number, u16 *completed_index)

{

	const struct cq_desc *desc = desc_arg;

	const u8 type_color = desc->type_color;



	*color = (type_color >> CQ_DESC_COLOR_SHIFT) & CQ_DESC_COLOR_MASK;



	/*

	 * Make sure color bit is read from desc *before* other fields

	 * are read from desc.  Hardware guarantees color bit is last

	 * bit (byte) written.  Adding the rmb() prevents the compiler

	 * and/or CPU from reordering the reads which would potentially

	 * result in reading stale values.

	 */



	rmb();



	*type = type_color & CQ_DESC_TYPE_MASK;

	*q_number = le16_to_cpu(desc->q_number) & CQ_DESC_Q_NUM_MASK;

	*completed_index = le16_to_cpu(desc->completed_index) &

		CQ_DESC_COMP_NDX_MASK;

}

#define CQ_DESC_32_FI_MASK (BIT(0) | BIT(1))

#define CQ_DESC_64_FI_MASK (BIT(0) | BIT(1))



#endif /* _CQ_DESC_H_ */

drivers/net/ethernet/cisco/enic/cq_enet_desc.h

+55 −87
Original line number Diff line number Diff line
@@ -17,12 +17,22 @@ struct cq_enet_wq_desc { 
	u8 type_color;

};



static inline void cq_enet_wq_desc_dec(struct cq_enet_wq_desc *desc,

	u8 *type, u8 *color, u16 *q_number, u16 *completed_index)

{

	cq_desc_dec((struct cq_desc *)desc, type,

		color, q_number, completed_index);

}

/*

 * Defines and Capabilities for CMD_CQ_ENTRY_SIZE_SET

 */

#define VNIC_RQ_ALL (~0ULL)



#define VNIC_RQ_CQ_ENTRY_SIZE_16 0

#define VNIC_RQ_CQ_ENTRY_SIZE_32 1

#define VNIC_RQ_CQ_ENTRY_SIZE_64 2



#define VNIC_RQ_CQ_ENTRY_SIZE_16_CAPABLE BIT(VNIC_RQ_CQ_ENTRY_SIZE_16)

#define VNIC_RQ_CQ_ENTRY_SIZE_32_CAPABLE BIT(VNIC_RQ_CQ_ENTRY_SIZE_32)

#define VNIC_RQ_CQ_ENTRY_SIZE_64_CAPABLE BIT(VNIC_RQ_CQ_ENTRY_SIZE_64)



#define VNIC_RQ_CQ_ENTRY_SIZE_ALL_BIT  (VNIC_RQ_CQ_ENTRY_SIZE_16_CAPABLE | \

					VNIC_RQ_CQ_ENTRY_SIZE_32_CAPABLE | \

					VNIC_RQ_CQ_ENTRY_SIZE_64_CAPABLE)



/* Completion queue descriptor: Ethernet receive queue, 16B */

struct cq_enet_rq_desc {
@@ -36,6 +46,45 @@ struct cq_enet_rq_desc { 
	u8 type_color;

};



/* Completion queue descriptor: Ethernet receive queue, 32B */

struct cq_enet_rq_desc_32 {

	__le16 completed_index_flags;

	__le16 q_number_rss_type_flags;

	__le32 rss_hash;

	__le16 bytes_written_flags;

	__le16 vlan;

	__le16 checksum_fcoe;

	u8 flags;

	u8 fetch_index_flags;

	__le32 time_stamp;

	__le16 time_stamp2;

	__le16 pie_info;

	__le32 pie_info2;

	__le16 pie_info3;

	u8 pie_info4;

	u8 type_color;

};



/* Completion queue descriptor: Ethernet receive queue, 64B */

struct cq_enet_rq_desc_64 {

	__le16 completed_index_flags;

	__le16 q_number_rss_type_flags;

	__le32 rss_hash;

	__le16 bytes_written_flags;

	__le16 vlan;

	__le16 checksum_fcoe;

	u8 flags;

	u8 fetch_index_flags;

	__le32 time_stamp;

	__le16 time_stamp2;

	__le16 pie_info;

	__le32 pie_info2;

	__le16 pie_info3;

	u8 pie_info4;

	u8 reserved[32];

	u8 type_color;

};



#define CQ_ENET_RQ_DESC_FLAGS_INGRESS_PORT          (0x1 << 12)

#define CQ_ENET_RQ_DESC_FLAGS_FCOE                  (0x1 << 13)

#define CQ_ENET_RQ_DESC_FLAGS_EOP                   (0x1 << 14)
@@ -88,85 +137,4 @@ struct cq_enet_rq_desc { 
#define CQ_ENET_RQ_DESC_FLAGS_IPV4_FRAGMENT         (0x1 << 6)

#define CQ_ENET_RQ_DESC_FLAGS_FCS_OK                (0x1 << 7)



static inline void cq_enet_rq_desc_dec(struct cq_enet_rq_desc *desc,

	u8 *type, u8 *color, u16 *q_number, u16 *completed_index,

	u8 *ingress_port, u8 *fcoe, u8 *eop, u8 *sop, u8 *rss_type,

	u8 *csum_not_calc, u32 *rss_hash, u16 *bytes_written, u8 *packet_error,

	u8 *vlan_stripped, u16 *vlan_tci, u16 *checksum, u8 *fcoe_sof,

	u8 *fcoe_fc_crc_ok, u8 *fcoe_enc_error, u8 *fcoe_eof,

	u8 *tcp_udp_csum_ok, u8 *udp, u8 *tcp, u8 *ipv4_csum_ok,

	u8 *ipv6, u8 *ipv4, u8 *ipv4_fragment, u8 *fcs_ok)

{

	u16 completed_index_flags;

	u16 q_number_rss_type_flags;

	u16 bytes_written_flags;



	cq_desc_dec((struct cq_desc *)desc, type,

		color, q_number, completed_index);



	completed_index_flags = le16_to_cpu(desc->completed_index_flags);

	q_number_rss_type_flags =

		le16_to_cpu(desc->q_number_rss_type_flags);

	bytes_written_flags = le16_to_cpu(desc->bytes_written_flags);



	*ingress_port = (completed_index_flags &

		CQ_ENET_RQ_DESC_FLAGS_INGRESS_PORT) ? 1 : 0;

	*fcoe = (completed_index_flags & CQ_ENET_RQ_DESC_FLAGS_FCOE) ?

		1 : 0;

	*eop = (completed_index_flags & CQ_ENET_RQ_DESC_FLAGS_EOP) ?

		1 : 0;

	*sop = (completed_index_flags & CQ_ENET_RQ_DESC_FLAGS_SOP) ?

		1 : 0;



	*rss_type = (u8)((q_number_rss_type_flags >> CQ_DESC_Q_NUM_BITS) &

		CQ_ENET_RQ_DESC_RSS_TYPE_MASK);

	*csum_not_calc = (q_number_rss_type_flags &

		CQ_ENET_RQ_DESC_FLAGS_CSUM_NOT_CALC) ? 1 : 0;



	*rss_hash = le32_to_cpu(desc->rss_hash);



	*bytes_written = bytes_written_flags &

		CQ_ENET_RQ_DESC_BYTES_WRITTEN_MASK;

	*packet_error = (bytes_written_flags &

		CQ_ENET_RQ_DESC_FLAGS_TRUNCATED) ? 1 : 0;

	*vlan_stripped = (bytes_written_flags &

		CQ_ENET_RQ_DESC_FLAGS_VLAN_STRIPPED) ? 1 : 0;



	/*

	 * Tag Control Information(16) = user_priority(3) + cfi(1) + vlan(12)

	 */

	*vlan_tci = le16_to_cpu(desc->vlan);



	if (*fcoe) {

		*fcoe_sof = (u8)(le16_to_cpu(desc->checksum_fcoe) &

			CQ_ENET_RQ_DESC_FCOE_SOF_MASK);

		*fcoe_fc_crc_ok = (desc->flags &

			CQ_ENET_RQ_DESC_FCOE_FC_CRC_OK) ? 1 : 0;

		*fcoe_enc_error = (desc->flags &

			CQ_ENET_RQ_DESC_FCOE_ENC_ERROR) ? 1 : 0;

		*fcoe_eof = (u8)((le16_to_cpu(desc->checksum_fcoe) >>

			CQ_ENET_RQ_DESC_FCOE_EOF_SHIFT) &

			CQ_ENET_RQ_DESC_FCOE_EOF_MASK);

		*checksum = 0;

	} else {

		*fcoe_sof = 0;

		*fcoe_fc_crc_ok = 0;

		*fcoe_enc_error = 0;

		*fcoe_eof = 0;

		*checksum = le16_to_cpu(desc->checksum_fcoe);

	}



	*tcp_udp_csum_ok =

		(desc->flags & CQ_ENET_RQ_DESC_FLAGS_TCP_UDP_CSUM_OK) ? 1 : 0;

	*udp = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_UDP) ? 1 : 0;

	*tcp = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_TCP) ? 1 : 0;

	*ipv4_csum_ok =

		(desc->flags & CQ_ENET_RQ_DESC_FLAGS_IPV4_CSUM_OK) ? 1 : 0;

	*ipv6 = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_IPV6) ? 1 : 0;

	*ipv4 = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_IPV4) ? 1 : 0;

	*ipv4_fragment =

		(desc->flags & CQ_ENET_RQ_DESC_FLAGS_IPV4_FRAGMENT) ? 1 : 0;

	*fcs_ok = (desc->flags & CQ_ENET_RQ_DESC_FLAGS_FCS_OK) ? 1 : 0;

}



#endif /* _CQ_ENET_DESC_H_ */

drivers/net/ethernet/cisco/enic/enic.h

+13 −0
Original line number Diff line number Diff line
@@ -31,6 +31,13 @@ 


#define ENIC_AIC_LARGE_PKT_DIFF	3



enum ext_cq {

	ENIC_RQ_CQ_ENTRY_SIZE_16,

	ENIC_RQ_CQ_ENTRY_SIZE_32,

	ENIC_RQ_CQ_ENTRY_SIZE_64,

	ENIC_RQ_CQ_ENTRY_SIZE_MAX,

};



struct enic_msix_entry {

	int requested;

	char devname[IFNAMSIZ + 8];
@@ -76,6 +83,10 @@ struct enic_rx_coal { 
#define ENIC_SET_INSTANCE		(1 << 3)

#define ENIC_SET_HOST			(1 << 4)



#define MAX_TSO			BIT(16)

#define WQ_ENET_MAX_DESC_LEN	BIT(WQ_ENET_LEN_BITS)

#define ENIC_DESC_MAX_SPLITS	(MAX_TSO / WQ_ENET_MAX_DESC_LEN + 1)



struct enic_port_profile {

	u32 set;

	u8 request;
@@ -228,6 +239,7 @@ struct enic { 
	struct enic_rfs_flw_tbl rfs_h;

	u8 rss_key[ENIC_RSS_LEN];

	struct vnic_gen_stats gen_stats;

	enum ext_cq ext_cq;

};



static inline struct net_device *vnic_get_netdev(struct vnic_dev *vdev)
@@ -349,5 +361,6 @@ int enic_is_valid_vf(struct enic *enic, int vf); 
int enic_is_dynamic(struct enic *enic);

void enic_set_ethtool_ops(struct net_device *netdev);

int __enic_set_rsskey(struct enic *enic);

void enic_ext_cq(struct enic *enic);



#endif /* _ENIC_H_ */

drivers/net/ethernet/cisco/enic/enic_ethtool.c

+6 −6
Original line number Diff line number Diff line
@@ -222,9 +222,9 @@ static void enic_get_ringparam(struct net_device *netdev, 
	struct enic *enic = netdev_priv(netdev);

	struct vnic_enet_config *c = &enic->config;



	ring->rx_max_pending = ENIC_MAX_RQ_DESCS;

	ring->rx_max_pending = c->max_rq_ring;

	ring->rx_pending = c->rq_desc_count;

	ring->tx_max_pending = ENIC_MAX_WQ_DESCS;

	ring->tx_max_pending = c->max_wq_ring;

	ring->tx_pending = c->wq_desc_count;

}
@@ -252,18 +252,18 @@ static int enic_set_ringparam(struct net_device *netdev, 
	}

	rx_pending = c->rq_desc_count;

	tx_pending = c->wq_desc_count;

	if (ring->rx_pending > ENIC_MAX_RQ_DESCS ||

	if (ring->rx_pending > c->max_rq_ring ||

	    ring->rx_pending < ENIC_MIN_RQ_DESCS) {

		netdev_info(netdev, "rx pending (%u) not in range [%u,%u]",

			    ring->rx_pending, ENIC_MIN_RQ_DESCS,

			    ENIC_MAX_RQ_DESCS);

	      c->max_rq_ring);

		return -EINVAL;

	}

	if (ring->tx_pending > ENIC_MAX_WQ_DESCS ||

	if (ring->tx_pending > c->max_wq_ring ||

	    ring->tx_pending < ENIC_MIN_WQ_DESCS) {

		netdev_info(netdev, "tx pending (%u) not in range [%u,%u]",

			    ring->tx_pending, ENIC_MIN_WQ_DESCS,

			    ENIC_MAX_WQ_DESCS);

			c->max_wq_ring);

		return -EINVAL;

	}

	if (running)