Commit 7aa6dc35 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Jakub Kicinski
Browse files

net: ena: take into account xdp_features setting tx/rx queues 



ena nic allows xdp just if enough hw queues are available for XDP.
Take into account queues configuration setting xdp_features.

Fixes: 66c0e13a ("drivers: net: turn on XDP features")
Reviewed-by: default avatarShay Agroskin <shayagr@amazon.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 3c249fe4

drivers/net/ethernet/amazon/ena/ena_ethtool.c

+12 −3
Original line number Diff line number Diff line
@@ -850,11 +850,20 @@ static int ena_set_channels(struct net_device *netdev, 
	struct ena_adapter *adapter = netdev_priv(netdev);

	u32 count = channels->combined_count;

	/* The check for max value is already done in ethtool */

	if (count < ENA_MIN_NUM_IO_QUEUES ||

	    (ena_xdp_present(adapter) &&

	    !ena_xdp_legal_queue_count(adapter, count)))

	if (count < ENA_MIN_NUM_IO_QUEUES)

		return -EINVAL;



	if (!ena_xdp_legal_queue_count(adapter, count)) {

		if (ena_xdp_present(adapter))

			return -EINVAL;



		xdp_clear_features_flag(netdev);

	} else {

		xdp_set_features_flag(netdev,

				      NETDEV_XDP_ACT_BASIC |

				      NETDEV_XDP_ACT_REDIRECT);

	}



	return ena_update_queue_count(adapter, count);

}

drivers/net/ethernet/amazon/ena/ena_netdev.c

+4 −2
Original line number Diff line number Diff line
@@ -4105,8 +4105,6 @@ static void ena_set_conf_feat_params(struct ena_adapter *adapter, 
	/* Set offload features */

	ena_set_dev_offloads(feat, netdev);



	netdev->xdp_features = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT;



	adapter->max_mtu = feat->dev_attr.max_mtu;

	netdev->max_mtu = adapter->max_mtu;

	netdev->min_mtu = ENA_MIN_MTU;
@@ -4393,6 +4391,10 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 


	ena_config_debug_area(adapter);



	if (ena_xdp_legal_queue_count(adapter, adapter->num_io_queues))

		netdev->xdp_features = NETDEV_XDP_ACT_BASIC |

				       NETDEV_XDP_ACT_REDIRECT;



	memcpy(adapter->netdev->perm_addr, adapter->mac_addr, netdev->addr_len);



	netif_carrier_off(netdev);