Skip to content

Commit

Permalink
net: ena: change num_queues to num_io_queues for clarity and consistency
Browse files Browse the repository at this point in the history 
Most places in the code refer to the IO queues as io_queues and not
simply queues. Examples - max_io_queues_per_vf, ENA_MAX_NUM_IO_QUEUES,
ena_destroy_all_io_queues() etc..

We are also adding the new max_num_io_queues field to struct ena_adapter
in the following commit.

The changes included in this commit are:
struct ena_adapter->num_queues => struct ena_adapter->num_io_queues

Signed-off-by: Arthur Kiyanovski <akiyano@amazon.com>
Signed-off-by: Sameeh Jubran <sameehj@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Sameeh Jubran authored and David S. Miller committed Oct 7, 2019
1 parent 9b75803 commit faa615f
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 44 deletions.
20 changes: 10 additions & 10 deletions drivers/net/ethernet/amazon/ena/ena_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ static void ena_queue_stats(struct ena_adapter *adapter, u64 **data)
u64 *ptr;
int i, j;

for (i = 0; i < adapter->num_queues; i++) {
for (i = 0; i < adapter->num_io_queues; i++) {
/* Tx stats */
ring = &adapter->tx_ring[i];

Expand Down Expand Up @@ -205,7 +205,7 @@ int ena_get_sset_count(struct net_device *netdev, int sset)
if (sset != ETH_SS_STATS)
return -EOPNOTSUPP;

return adapter->num_queues * (ENA_STATS_ARRAY_TX + ENA_STATS_ARRAY_RX)
return adapter->num_io_queues * (ENA_STATS_ARRAY_TX + ENA_STATS_ARRAY_RX)
+ ENA_STATS_ARRAY_GLOBAL + ENA_STATS_ARRAY_ENA_COM;
}

Expand All @@ -214,7 +214,7 @@ static void ena_queue_strings(struct ena_adapter *adapter, u8 **data)
const struct ena_stats *ena_stats;
int i, j;

for (i = 0; i < adapter->num_queues; i++) {
for (i = 0; i < adapter->num_io_queues; i++) {
/* Tx stats */
for (j = 0; j < ENA_STATS_ARRAY_TX; j++) {
ena_stats = &ena_stats_tx_strings[j];
Expand Down Expand Up @@ -333,7 +333,7 @@ static void ena_update_tx_rings_intr_moderation(struct ena_adapter *adapter)

val = ena_com_get_nonadaptive_moderation_interval_tx(adapter->ena_dev);

for (i = 0; i < adapter->num_queues; i++)
for (i = 0; i < adapter->num_io_queues; i++)
adapter->tx_ring[i].smoothed_interval = val;
}

Expand All @@ -344,7 +344,7 @@ static void ena_update_rx_rings_intr_moderation(struct ena_adapter *adapter)

val = ena_com_get_nonadaptive_moderation_interval_rx(adapter->ena_dev);

for (i = 0; i < adapter->num_queues; i++)
for (i = 0; i < adapter->num_io_queues; i++)
adapter->rx_ring[i].smoothed_interval = val;
}

Expand Down Expand Up @@ -612,7 +612,7 @@ static int ena_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *info,

switch (info->cmd) {
case ETHTOOL_GRXRINGS:
info->data = adapter->num_queues;
info->data = adapter->num_io_queues;
rc = 0;
break;
case ETHTOOL_GRXFH:
Expand Down Expand Up @@ -734,12 +734,12 @@ static void ena_get_channels(struct net_device *netdev,
{
struct ena_adapter *adapter = netdev_priv(netdev);

channels->max_rx = adapter->num_queues;
channels->max_tx = adapter->num_queues;
channels->max_rx = adapter->num_io_queues;
channels->max_tx = adapter->num_io_queues;
channels->max_other = 0;
channels->max_combined = 0;
channels->rx_count = adapter->num_queues;
channels->tx_count = adapter->num_queues;
channels->rx_count = adapter->num_io_queues;
channels->tx_count = adapter->num_io_queues;
channels->other_count = 0;
channels->combined_count = 0;
}
Expand Down
66 changes: 33 additions & 33 deletions drivers/net/ethernet/amazon/ena/ena_netdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ static void update_rx_ring_mtu(struct ena_adapter *adapter, int mtu)
{
int i;

for (i = 0; i < adapter->num_queues; i++)
for (i = 0; i < adapter->num_io_queues; i++)
adapter->rx_ring[i].mtu = mtu;
}

Expand Down Expand Up @@ -129,10 +129,10 @@ static int ena_init_rx_cpu_rmap(struct ena_adapter *adapter)
u32 i;
int rc;

adapter->netdev->rx_cpu_rmap = alloc_irq_cpu_rmap(adapter->num_queues);
adapter->netdev->rx_cpu_rmap = alloc_irq_cpu_rmap(adapter->num_io_queues);
if (!adapter->netdev->rx_cpu_rmap)
return -ENOMEM;
for (i = 0; i < adapter->num_queues; i++) {
for (i = 0; i < adapter->num_io_queues; i++) {
int irq_idx = ENA_IO_IRQ_IDX(i);

rc = irq_cpu_rmap_add(adapter->netdev->rx_cpu_rmap,
Expand Down Expand Up @@ -172,7 +172,7 @@ static void ena_init_io_rings(struct ena_adapter *adapter)

ena_dev = adapter->ena_dev;

for (i = 0; i < adapter->num_queues; i++) {
for (i = 0; i < adapter->num_io_queues; i++) {
txr = &adapter->tx_ring[i];
rxr = &adapter->rx_ring[i];

Expand Down Expand Up @@ -294,7 +294,7 @@ static int ena_setup_all_tx_resources(struct ena_adapter *adapter)
{
int i, rc = 0;

for (i = 0; i < adapter->num_queues; i++) {
for (i = 0; i < adapter->num_io_queues; i++) {
rc = ena_setup_tx_resources(adapter, i);
if (rc)
goto err_setup_tx;
Expand Down Expand Up @@ -322,7 +322,7 @@ static void ena_free_all_io_tx_resources(struct ena_adapter *adapter)
{
int i;

for (i = 0; i < adapter->num_queues; i++)
for (i = 0; i < adapter->num_io_queues; i++)
ena_free_tx_resources(adapter, i);
}

Expand Down Expand Up @@ -428,7 +428,7 @@ static int ena_setup_all_rx_resources(struct ena_adapter *adapter)
{
int i, rc = 0;

for (i = 0; i < adapter->num_queues; i++) {
for (i = 0; i < adapter->num_io_queues; i++) {
rc = ena_setup_rx_resources(adapter, i);
if (rc)
goto err_setup_rx;
Expand Down Expand Up @@ -456,7 +456,7 @@ static void ena_free_all_io_rx_resources(struct ena_adapter *adapter)
{
int i;

for (i = 0; i < adapter->num_queues; i++)
for (i = 0; i < adapter->num_io_queues; i++)
ena_free_rx_resources(adapter, i);
}

Expand Down Expand Up @@ -600,7 +600,7 @@ static void ena_refill_all_rx_bufs(struct ena_adapter *adapter)
struct ena_ring *rx_ring;
int i, rc, bufs_num;

for (i = 0; i < adapter->num_queues; i++) {
for (i = 0; i < adapter->num_io_queues; i++) {
rx_ring = &adapter->rx_ring[i];
bufs_num = rx_ring->ring_size - 1;
rc = ena_refill_rx_bufs(rx_ring, bufs_num);
Expand All @@ -616,7 +616,7 @@ static void ena_free_all_rx_bufs(struct ena_adapter *adapter)
{
int i;

for (i = 0; i < adapter->num_queues; i++)
for (i = 0; i < adapter->num_io_queues; i++)
ena_free_rx_bufs(adapter, i);
}

Expand Down Expand Up @@ -688,7 +688,7 @@ static void ena_free_all_tx_bufs(struct ena_adapter *adapter)
struct ena_ring *tx_ring;
int i;

for (i = 0; i < adapter->num_queues; i++) {
for (i = 0; i < adapter->num_io_queues; i++) {
tx_ring = &adapter->tx_ring[i];
ena_free_tx_bufs(tx_ring);
}
Expand All @@ -699,7 +699,7 @@ static void ena_destroy_all_tx_queues(struct ena_adapter *adapter)
u16 ena_qid;
int i;

for (i = 0; i < adapter->num_queues; i++) {
for (i = 0; i < adapter->num_io_queues; i++) {
ena_qid = ENA_IO_TXQ_IDX(i);
ena_com_destroy_io_queue(adapter->ena_dev, ena_qid);
}
Expand All @@ -710,7 +710,7 @@ static void ena_destroy_all_rx_queues(struct ena_adapter *adapter)
u16 ena_qid;
int i;

for (i = 0; i < adapter->num_queues; i++) {
for (i = 0; i < adapter->num_io_queues; i++) {
ena_qid = ENA_IO_RXQ_IDX(i);
cancel_work_sync(&adapter->ena_napi[i].dim.work);
ena_com_destroy_io_queue(adapter->ena_dev, ena_qid);
Expand Down Expand Up @@ -1359,7 +1359,7 @@ static int ena_enable_msix(struct ena_adapter *adapter, int num_queues)
netif_notice(adapter, probe, adapter->netdev,
"enable only %d MSI-X (out of %d), reduce the number of queues\n",
irq_cnt, msix_vecs);
adapter->num_queues = irq_cnt - ENA_ADMIN_MSIX_VEC;
adapter->num_io_queues = irq_cnt - ENA_ADMIN_MSIX_VEC;
}

if (ena_init_rx_cpu_rmap(adapter))
Expand Down Expand Up @@ -1397,7 +1397,7 @@ static void ena_setup_io_intr(struct ena_adapter *adapter)

netdev = adapter->netdev;

for (i = 0; i < adapter->num_queues; i++) {
for (i = 0; i < adapter->num_io_queues; i++) {
irq_idx = ENA_IO_IRQ_IDX(i);
cpu = i % num_online_cpus();

Expand Down Expand Up @@ -1529,7 +1529,7 @@ static void ena_del_napi(struct ena_adapter *adapter)
{
int i;

for (i = 0; i < adapter->num_queues; i++)
for (i = 0; i < adapter->num_io_queues; i++)
netif_napi_del(&adapter->ena_napi[i].napi);
}

Expand All @@ -1538,7 +1538,7 @@ static void ena_init_napi(struct ena_adapter *adapter)
struct ena_napi *napi;
int i;

for (i = 0; i < adapter->num_queues; i++) {
for (i = 0; i < adapter->num_io_queues; i++) {
napi = &adapter->ena_napi[i];

netif_napi_add(adapter->netdev,
Expand All @@ -1555,15 +1555,15 @@ static void ena_napi_disable_all(struct ena_adapter *adapter)
{
int i;

for (i = 0; i < adapter->num_queues; i++)
for (i = 0; i < adapter->num_io_queues; i++)
napi_disable(&adapter->ena_napi[i].napi);
}

static void ena_napi_enable_all(struct ena_adapter *adapter)
{
int i;

for (i = 0; i < adapter->num_queues; i++)
for (i = 0; i < adapter->num_io_queues; i++)
napi_enable(&adapter->ena_napi[i].napi);
}

Expand Down Expand Up @@ -1673,7 +1673,7 @@ static int ena_create_all_io_tx_queues(struct ena_adapter *adapter)
struct ena_com_dev *ena_dev = adapter->ena_dev;
int rc, i;

for (i = 0; i < adapter->num_queues; i++) {
for (i = 0; i < adapter->num_io_queues; i++) {
rc = ena_create_io_tx_queue(adapter, i);
if (rc)
goto create_err;
Expand Down Expand Up @@ -1741,7 +1741,7 @@ static int ena_create_all_io_rx_queues(struct ena_adapter *adapter)
struct ena_com_dev *ena_dev = adapter->ena_dev;
int rc, i;

for (i = 0; i < adapter->num_queues; i++) {
for (i = 0; i < adapter->num_io_queues; i++) {
rc = ena_create_io_rx_queue(adapter, i);
if (rc)
goto create_err;
Expand All @@ -1764,7 +1764,7 @@ static void set_io_rings_size(struct ena_adapter *adapter,
{
int i;

for (i = 0; i < adapter->num_queues; i++) {
for (i = 0; i < adapter->num_io_queues; i++) {
adapter->tx_ring[i].ring_size = new_tx_size;
adapter->rx_ring[i].ring_size = new_rx_size;
}
Expand Down Expand Up @@ -1902,14 +1902,14 @@ static int ena_up(struct ena_adapter *adapter)
set_bit(ENA_FLAG_DEV_UP, &adapter->flags);

/* Enable completion queues interrupt */
for (i = 0; i < adapter->num_queues; i++)
for (i = 0; i < adapter->num_io_queues; i++)
ena_unmask_interrupt(&adapter->tx_ring[i],
&adapter->rx_ring[i]);

/* schedule napi in case we had pending packets
* from the last time we disable napi
*/
for (i = 0; i < adapter->num_queues; i++)
for (i = 0; i < adapter->num_io_queues; i++)
napi_schedule(&adapter->ena_napi[i].napi);

return rc;
Expand Down Expand Up @@ -1984,13 +1984,13 @@ static int ena_open(struct net_device *netdev)
int rc;

/* Notify the stack of the actual queue counts. */
rc = netif_set_real_num_tx_queues(netdev, adapter->num_queues);
rc = netif_set_real_num_tx_queues(netdev, adapter->num_io_queues);
if (rc) {
netif_err(adapter, ifup, netdev, "Can't set num tx queues\n");
return rc;
}

rc = netif_set_real_num_rx_queues(netdev, adapter->num_queues);
rc = netif_set_real_num_rx_queues(netdev, adapter->num_io_queues);
if (rc) {
netif_err(adapter, ifup, netdev, "Can't set num rx queues\n");
return rc;
Expand Down Expand Up @@ -2495,7 +2495,7 @@ static void ena_get_stats64(struct net_device *netdev,
if (!test_bit(ENA_FLAG_DEV_UP, &adapter->flags))
return;

for (i = 0; i < adapter->num_queues; i++) {
for (i = 0; i < adapter->num_io_queues; i++) {
u64 bytes, packets;

tx_ring = &adapter->tx_ring[i];
Expand Down Expand Up @@ -2783,7 +2783,7 @@ static int ena_restore_device(struct ena_adapter *adapter)
}

rc = ena_enable_msix_and_set_admin_interrupts(adapter,
adapter->num_queues);
adapter->num_io_queues);
if (rc) {
dev_err(&pdev->dev, "Enable MSI-X failed\n");
goto err_device_destroy;
Expand Down Expand Up @@ -2948,7 +2948,7 @@ static void check_for_missing_completions(struct ena_adapter *adapter)

budget = ENA_MONITORED_TX_QUEUES;

for (i = adapter->last_monitored_tx_qid; i < adapter->num_queues; i++) {
for (i = adapter->last_monitored_tx_qid; i < adapter->num_io_queues; i++) {
tx_ring = &adapter->tx_ring[i];
rx_ring = &adapter->rx_ring[i];

Expand All @@ -2965,7 +2965,7 @@ static void check_for_missing_completions(struct ena_adapter *adapter)
break;
}

adapter->last_monitored_tx_qid = i % adapter->num_queues;
adapter->last_monitored_tx_qid = i % adapter->num_io_queues;
}

/* trigger napi schedule after 2 consecutive detections */
Expand Down Expand Up @@ -2995,7 +2995,7 @@ static void check_for_empty_rx_ring(struct ena_adapter *adapter)
if (test_bit(ENA_FLAG_TRIGGER_RESET, &adapter->flags))
return;

for (i = 0; i < adapter->num_queues; i++) {
for (i = 0; i < adapter->num_io_queues; i++) {
rx_ring = &adapter->rx_ring[i];

refill_required =
Expand Down Expand Up @@ -3302,7 +3302,7 @@ static int ena_rss_init_default(struct ena_adapter *adapter)
}

for (i = 0; i < ENA_RX_RSS_TABLE_SIZE; i++) {
val = ethtool_rxfh_indir_default(i, adapter->num_queues);
val = ethtool_rxfh_indir_default(i, adapter->num_io_queues);
rc = ena_com_indirect_table_fill_entry(ena_dev, i,
ENA_IO_RXQ_IDX(val));
if (unlikely(rc && (rc != -EOPNOTSUPP))) {
Expand Down Expand Up @@ -3545,7 +3545,7 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
adapter->max_tx_sgl_size = calc_queue_ctx.max_tx_sgl_size;
adapter->max_rx_sgl_size = calc_queue_ctx.max_rx_sgl_size;

adapter->num_queues = io_queue_num;
adapter->num_io_queues = io_queue_num;
adapter->last_monitored_tx_qid = 0;

adapter->rx_copybreak = ENA_DEFAULT_RX_COPYBREAK;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/amazon/ena/ena_netdev.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ struct ena_adapter {
u32 rx_copybreak;
u32 max_mtu;

int num_queues;
int num_io_queues;

int msix_vecs;

Expand Down

0 comments on commit faa615f

Please sign in to comment.