Skip to content

Commit

Permalink
be2net: Request RSS capability of Rx interface depending on number of…
Browse files Browse the repository at this point in the history 
… Rx rings

Currently we request RSS capability even if a single Rx ring is created.
As a result in few cases we unnecessarily consume an RSS capable interface
which is a limited resource in the chip.
This patch enables RSS on an interface only if more than one Rx ring
is created.

Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Ajit Khaparde authored and David S. Miller committed Feb 11, 2016
1 parent aaa5672 commit 6221906
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 29 deletions.
19 changes: 5 additions & 14 deletions drivers/net/ethernet/emulex/benet/be_cmds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1513,34 +1513,25 @@ int be_cmd_if_create(struct be_adapter *adapter, u32 cap_flags, u32 en_flags,
return status;
}

/* Uses MCCQ */
/* Uses MCCQ if available else MBOX */
int be_cmd_if_destroy(struct be_adapter *adapter, int interface_id, u32 domain)
{
struct be_mcc_wrb *wrb;
struct be_mcc_wrb wrb = {0};
struct be_cmd_req_if_destroy *req;
int status;

if (interface_id == -1)
return 0;

spin_lock_bh(&adapter->mcc_lock);

wrb = wrb_from_mccq(adapter);
if (!wrb) {
status = -EBUSY;
goto err;
}
req = embedded_payload(wrb);
req = embedded_payload(&wrb);

be_wrb_cmd_hdr_prepare(&req->hdr, CMD_SUBSYSTEM_COMMON,
OPCODE_COMMON_NTWK_INTERFACE_DESTROY,
sizeof(*req), wrb, NULL);
sizeof(*req), &wrb, NULL);
req->hdr.domain = domain;
req->interface_id = cpu_to_le32(interface_id);

status = be_mcc_notify_wait(adapter);
err:
spin_unlock_bh(&adapter->mcc_lock);
status = be_cmd_notify_wait(adapter, &wrb);
return status;
}

Expand Down
58 changes: 43 additions & 15 deletions drivers/net/ethernet/emulex/benet/be_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3365,6 +3365,7 @@ static void be_irq_unregister(struct be_adapter *adapter)

static void be_rx_qs_destroy(struct be_adapter *adapter)
{
struct rss_info *rss = &adapter->rss_info;
struct be_queue_info *q;
struct be_rx_obj *rxo;
int i;
Expand All @@ -3391,6 +3392,12 @@ static void be_rx_qs_destroy(struct be_adapter *adapter)
}
be_queue_free(adapter, q);
}

if (rss->rss_flags) {
rss->rss_flags = RSS_ENABLE_NONE;
be_cmd_rss_config(adapter, rss->rsstable, rss->rss_flags,
128, rss->rss_hkey);
}
}

static void be_disable_if_filters(struct be_adapter *adapter)
Expand Down Expand Up @@ -3511,20 +3518,21 @@ static int be_rx_qs_create(struct be_adapter *adapter)
if (!BEx_chip(adapter))
rss->rss_flags |= RSS_ENABLE_UDP_IPV4 |
RSS_ENABLE_UDP_IPV6;

netdev_rss_key_fill(rss_key, RSS_HASH_KEY_LEN);
rc = be_cmd_rss_config(adapter, rss->rsstable, rss->rss_flags,
RSS_INDIR_TABLE_LEN, rss_key);
if (rc) {
rss->rss_flags = RSS_ENABLE_NONE;
return rc;
}

memcpy(rss->rss_hkey, rss_key, RSS_HASH_KEY_LEN);
} else {
/* Disable RSS, if only default RX Q is created */
rss->rss_flags = RSS_ENABLE_NONE;
}

netdev_rss_key_fill(rss_key, RSS_HASH_KEY_LEN);
rc = be_cmd_rss_config(adapter, rss->rsstable, rss->rss_flags,
RSS_INDIR_TABLE_LEN, rss_key);
if (rc) {
rss->rss_flags = RSS_ENABLE_NONE;
return rc;
}

memcpy(rss->rss_hkey, rss_key, RSS_HASH_KEY_LEN);

/* Post 1 less than RXQ-len to avoid head being equal to tail,
* which is a queue empty condition
Expand Down Expand Up @@ -4306,6 +4314,23 @@ static int be_setup_queues(struct be_adapter *adapter)
return status;
}

static int be_if_create(struct be_adapter *adapter)
{
u32 en_flags = BE_IF_FLAGS_RSS | BE_IF_FLAGS_DEFQ_RSS;
u32 cap_flags = be_if_cap_flags(adapter);
int status;

if (adapter->cfg_num_qs == 1)
cap_flags &= ~(BE_IF_FLAGS_DEFQ_RSS | BE_IF_FLAGS_RSS);

en_flags &= cap_flags;
/* will enable all the needed filter flags in be_open() */
status = be_cmd_if_create(adapter, be_if_cap_flags(adapter), en_flags,
&adapter->if_handle, 0);

return status;
}

int be_update_queues(struct be_adapter *adapter)
{
struct net_device *netdev = adapter->netdev;
Expand All @@ -4323,13 +4348,20 @@ int be_update_queues(struct be_adapter *adapter)
be_msix_disable(adapter);

be_clear_queues(adapter);
status = be_cmd_if_destroy(adapter, adapter->if_handle, 0);
if (status)
return status;

if (!msix_enabled(adapter)) {
status = be_msix_enable(adapter);
if (status)
return status;
}

status = be_if_create(adapter);
if (status)
return status;

status = be_setup_queues(adapter);
if (status)
return status;
Expand Down Expand Up @@ -4394,7 +4426,6 @@ static int be_func_init(struct be_adapter *adapter)
static int be_setup(struct be_adapter *adapter)
{
struct device *dev = &adapter->pdev->dev;
u32 en_flags;
int status;

status = be_func_init(adapter);
Expand Down Expand Up @@ -4427,10 +4458,7 @@ static int be_setup(struct be_adapter *adapter)
goto err;

/* will enable all the needed filter flags in be_open() */
en_flags = BE_IF_FLAGS_RSS | BE_IF_FLAGS_DEFQ_RSS;
en_flags = en_flags & be_if_cap_flags(adapter);
status = be_cmd_if_create(adapter, be_if_cap_flags(adapter), en_flags,
&adapter->if_handle, 0);
status = be_if_create(adapter);
if (status)
goto err;

Expand Down Expand Up @@ -4803,7 +4831,7 @@ static void be_netdev_init(struct net_device *netdev)
netdev->hw_features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 |
NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM |
NETIF_F_HW_VLAN_CTAG_TX;
if (be_multi_rxq(adapter))
if ((be_if_cap_flags(adapter) & BE_IF_FLAGS_RSS))
netdev->hw_features |= NETIF_F_RXHASH;

netdev->features |= netdev->hw_features |
Expand Down

0 comments on commit 6221906

Please sign in to comment.