Commit 5aee3324 authored by Nelson Escobar's avatar Nelson Escobar Committed by Jakub Kicinski
Browse files

enic: Save resource counts we read from HW 



Save the resources counts for wq,rq,cq, and interrupts in *_avail variables
so that we don't lose the information when adjusting the counts we are
actually using.

Report the wq_avail and rq_avail as the channel maximums in 'ethtool -l'
output.

Co-developed-by: default avatarJohn Daley <johndale@cisco.com>
Signed-off-by: default avatarJohn Daley <johndale@cisco.com>
Co-developed-by: default avatarSatish Kharat <satishkh@cisco.com>
Signed-off-by: default avatarSatish Kharat <satishkh@cisco.com>
Signed-off-by: default avatarNelson Escobar <neescoba@cisco.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Reviewed-by: default avatarVadim Fedorenko <vadim.fedorenko@linux.dev>
Link: https://patch.msgid.link/20241113-remove_vic_resource_limits-v4-3-a34cf8570c67@cisco.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 231646cb

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

+4 −0
Original line number Diff line number Diff line
@@ -206,23 +206,27 @@ struct enic { 


	/* work queue cache line section */

	____cacheline_aligned struct enic_wq wq[ENIC_WQ_MAX];

	unsigned int wq_avail;

	unsigned int wq_count;

	u16 loop_enable;

	u16 loop_tag;



	/* receive queue cache line section */

	____cacheline_aligned struct enic_rq rq[ENIC_RQ_MAX];

	unsigned int rq_avail;

	unsigned int rq_count;

	struct vxlan_offload vxlan;

	struct napi_struct napi[ENIC_RQ_MAX + ENIC_WQ_MAX];



	/* interrupt resource cache line section */

	____cacheline_aligned struct vnic_intr intr[ENIC_INTR_MAX];

	unsigned int intr_avail;

	unsigned int intr_count;

	u32 __iomem *legacy_pba;		/* memory-mapped */



	/* completion queue cache line section */

	____cacheline_aligned struct vnic_cq cq[ENIC_CQ_MAX];

	unsigned int cq_avail;

	unsigned int cq_count;

	struct enic_rfs_flw_tbl rfs_h;

	u32 rx_copybreak;

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

+2 −2
Original line number Diff line number Diff line
@@ -695,8 +695,8 @@ static void enic_get_channels(struct net_device *netdev, 


	switch (vnic_dev_get_intr_mode(enic->vdev)) {

	case VNIC_DEV_INTR_MODE_MSIX:

		channels->max_rx = ENIC_RQ_MAX;

		channels->max_tx = ENIC_WQ_MAX;

		channels->max_rx = min(enic->rq_avail, ENIC_RQ_MAX);

		channels->max_tx = min(enic->wq_avail, ENIC_WQ_MAX);

		channels->rx_count = enic->rq_count;

		channels->tx_count = enic->wq_count;

		break;

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

+12 −7
Original line number Diff line number Diff line
@@ -187,16 +187,21 @@ void enic_free_vnic_resources(struct enic *enic) 


void enic_get_res_counts(struct enic *enic)

{

	enic->wq_count = vnic_dev_get_res_count(enic->vdev, RES_TYPE_WQ);

	enic->rq_count = vnic_dev_get_res_count(enic->vdev, RES_TYPE_RQ);

	enic->cq_count = vnic_dev_get_res_count(enic->vdev, RES_TYPE_CQ);

	enic->intr_count = vnic_dev_get_res_count(enic->vdev,

	enic->wq_avail = vnic_dev_get_res_count(enic->vdev, RES_TYPE_WQ);

	enic->rq_avail = vnic_dev_get_res_count(enic->vdev, RES_TYPE_RQ);

	enic->cq_avail = vnic_dev_get_res_count(enic->vdev, RES_TYPE_CQ);

	enic->intr_avail = vnic_dev_get_res_count(enic->vdev,

						  RES_TYPE_INTR_CTRL);



	enic->wq_count = enic->wq_avail;

	enic->rq_count = enic->rq_avail;

	enic->cq_count = enic->cq_avail;

	enic->intr_count = enic->intr_avail;



	dev_info(enic_get_dev(enic),

		"vNIC resources avail: wq %d rq %d cq %d intr %d\n",

		enic->wq_count, enic->rq_count,

		enic->cq_count, enic->intr_count);

		enic->wq_avail, enic->rq_avail,

		enic->cq_avail, enic->intr_avail);

}



void enic_init_vnic_resources(struct enic *enic)