Commit 43bba3b1 authored by Przemek Kitszel's avatar Przemek Kitszel Committed by Jakub Kicinski
Browse files

ice: make use of DEFINE_FLEX() for struct ice_aqc_add_tx_qgrp 



Use DEFINE_FLEX() macro for 1-elem flex array use case
of struct ice_aqc_add_tx_qgrp.

Signed-off-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Link: https://lore.kernel.org/r/20230912115937.1645707-6-przemyslaw.kitszel@intel.com


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

drivers/net/ethernet/intel/ice/ice_lib.c

+5 −18
Original line number Diff line number Diff line
@@ -1832,21 +1832,14 @@ int ice_vsi_cfg_single_rxq(struct ice_vsi *vsi, u16 q_idx) 


int ice_vsi_cfg_single_txq(struct ice_vsi *vsi, struct ice_tx_ring **tx_rings, u16 q_idx)

{

	struct ice_aqc_add_tx_qgrp *qg_buf;

	int err;

	DEFINE_FLEX(struct ice_aqc_add_tx_qgrp, qg_buf, txqs, 1);



	if (q_idx >= vsi->alloc_txq || !tx_rings || !tx_rings[q_idx])

		return -EINVAL;



	qg_buf = kzalloc(struct_size(qg_buf, txqs, 1), GFP_KERNEL);

	if (!qg_buf)

		return -ENOMEM;



	qg_buf->num_txqs = 1;



	err = ice_vsi_cfg_txq(vsi, tx_rings[q_idx], qg_buf);

	kfree(qg_buf);

	return err;

	return ice_vsi_cfg_txq(vsi, tx_rings[q_idx], qg_buf);

}



/**
@@ -1888,24 +1881,18 @@ int ice_vsi_cfg_rxqs(struct ice_vsi *vsi) 
static int

ice_vsi_cfg_txqs(struct ice_vsi *vsi, struct ice_tx_ring **rings, u16 count)

{

	struct ice_aqc_add_tx_qgrp *qg_buf;

	u16 q_idx = 0;

	DEFINE_FLEX(struct ice_aqc_add_tx_qgrp, qg_buf, txqs, 1);

	int err = 0;



	qg_buf = kzalloc(struct_size(qg_buf, txqs, 1), GFP_KERNEL);

	if (!qg_buf)

		return -ENOMEM;

	u16 q_idx;



	qg_buf->num_txqs = 1;



	for (q_idx = 0; q_idx < count; q_idx++) {

		err = ice_vsi_cfg_txq(vsi, rings[q_idx], qg_buf);

		if (err)

			goto err_cfg_txqs;

			break;

	}



err_cfg_txqs:

	kfree(qg_buf);

	return err;

}

drivers/net/ethernet/intel/ice/ice_xsk.c

+8 −14
Original line number Diff line number Diff line
@@ -217,21 +217,16 @@ static int ice_qp_dis(struct ice_vsi *vsi, u16 q_idx) 
 */

static int ice_qp_ena(struct ice_vsi *vsi, u16 q_idx)

{

	struct ice_aqc_add_tx_qgrp *qg_buf;

	DEFINE_FLEX(struct ice_aqc_add_tx_qgrp, qg_buf, txqs, 1);

	u16 size = __struct_size(qg_buf);

	struct ice_q_vector *q_vector;

	struct ice_tx_ring *tx_ring;

	struct ice_rx_ring *rx_ring;

	u16 size;

	int err;



	if (q_idx >= vsi->num_rxq || q_idx >= vsi->num_txq)

		return -EINVAL;



	size = struct_size(qg_buf, txqs, 1);

	qg_buf = kzalloc(size, GFP_KERNEL);

	if (!qg_buf)

		return -ENOMEM;



	qg_buf->num_txqs = 1;



	tx_ring = vsi->tx_rings[q_idx];
@@ -240,7 +235,7 @@ static int ice_qp_ena(struct ice_vsi *vsi, u16 q_idx) 


	err = ice_vsi_cfg_txq(vsi, tx_ring, qg_buf);

	if (err)

		goto free_buf;

		return err;



	if (ice_is_xdp_ena_vsi(vsi)) {

		struct ice_tx_ring *xdp_ring = vsi->xdp_rings[q_idx];
@@ -249,29 +244,28 @@ static int ice_qp_ena(struct ice_vsi *vsi, u16 q_idx) 
		qg_buf->num_txqs = 1;

		err = ice_vsi_cfg_txq(vsi, xdp_ring, qg_buf);

		if (err)

			goto free_buf;

			return err;

		ice_set_ring_xdp(xdp_ring);

		ice_tx_xsk_pool(vsi, q_idx);

	}



	err = ice_vsi_cfg_rxq(rx_ring);

	if (err)

		goto free_buf;

		return err;



	ice_qvec_cfg_msix(vsi, q_vector);



	err = ice_vsi_ctrl_one_rx_ring(vsi, true, q_idx, true);

	if (err)

		goto free_buf;

		return err;



	clear_bit(ICE_CFG_BUSY, vsi->state);

	ice_qvec_toggle_napi(vsi, q_vector, true);

	ice_qvec_ena_irq(vsi, q_vector);



	netif_tx_start_queue(netdev_get_tx_queue(vsi->netdev, q_idx));

free_buf:

	kfree(qg_buf);

	return err;



	return 0;

}



/**