Skip to content

Commit

Permalink
netxen: bridged mode optimizations
Browse files Browse the repository at this point in the history 
When the interface is put in bridged mode, destination mac
addresses are unknown to firmware. So packets take a slow
path (lower priority) in firmware reducing performance.

Firmware can cache limited number of remote unicast mac
addresses for certain interval, if "dynamic mac learning"
mode is enabled.

Driver needs to enable this "mac learning" mode in firmware.
Currently this is done through net device class sysfs entry,
possibly this can also be done upon netlink notifications to
from bridge.

Signed-off-by: Narender Kumar <narender.kumar@qlogic.com>
Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Narender Kumar authored and David S. Miller committed Aug 26, 2009
1 parent 3ad4467 commit fa3ce35
Show file tree
Hide file tree
Showing 3 changed files with 116 additions and 2 deletions.
3 changes: 3 additions & 0 deletions drivers/net/netxen/netxen_nic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -964,6 +964,7 @@ typedef struct {
#define NX_NIC_H2C_OPCODE_PROXY_STOP_DONE 20
#define NX_NIC_H2C_OPCODE_GET_LINKEVENT 21
#define NX_NIC_C2C_OPCODE 22
#define NX_NIC_H2C_OPCODE_CONFIG_BRIDGING 23
#define NX_NIC_H2C_OPCODE_CONFIG_HW_LRO 24
#define NX_NIC_H2C_OPCODE_LAST 25

Expand Down Expand Up @@ -1085,6 +1086,7 @@ typedef struct {
#define NETXEN_NIC_MSI_ENABLED 0x02
#define NETXEN_NIC_MSIX_ENABLED 0x04
#define NETXEN_NIC_LRO_ENABLED 0x08
#define NETXEN_NIC_BRIDGE_ENABLED 0X10
#define NETXEN_IS_MSI_FAMILY(adapter) \
((adapter)->flags & (NETXEN_NIC_MSI_ENABLED | NETXEN_NIC_MSIX_ENABLED))

Expand Down Expand Up @@ -1332,6 +1334,7 @@ void netxen_advert_link_change(struct netxen_adapter *adapter, int linkup);
int nx_fw_cmd_set_mtu(struct netxen_adapter *adapter, int mtu);
int netxen_nic_change_mtu(struct net_device *netdev, int new_mtu);
int netxen_config_hw_lro(struct netxen_adapter *adapter, int enable);
int netxen_config_bridged_mode(struct netxen_adapter *adapter, int enable);
int netxen_send_lro_cleanup(struct netxen_adapter *adapter);

int netxen_nic_set_mac(struct net_device *netdev, void *p);
Expand Down
31 changes: 31 additions & 0 deletions drivers/net/netxen/netxen_nic_hw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -794,6 +794,37 @@ int netxen_config_hw_lro(struct netxen_adapter *adapter, int enable)
return rv;
}

int netxen_config_bridged_mode(struct netxen_adapter *adapter, int enable)
{
nx_nic_req_t req;
u64 word;
int rv = 0;

if (!!(adapter->flags & NETXEN_NIC_BRIDGE_ENABLED) == enable)
return rv;

memset(&req, 0, sizeof(nx_nic_req_t));

req.qhdr = cpu_to_le64(NX_HOST_REQUEST << 23);

word = NX_NIC_H2C_OPCODE_CONFIG_BRIDGING |
((u64)adapter->portnum << 16);
req.req_hdr = cpu_to_le64(word);

req.words[0] = cpu_to_le64(enable);

rv = netxen_send_cmd_descs(adapter, (struct cmd_desc_type0 *)&req, 1);
if (rv != 0) {
printk(KERN_ERR "ERROR. Could not send "
"configure bridge mode request\n");
}

adapter->flags ^= NETXEN_NIC_BRIDGE_ENABLED;

return rv;
}


#define RSS_HASHTYPE_IP_TCP 0x3

int netxen_config_rss(struct netxen_adapter *adapter, int enable)
Expand Down
84 changes: 82 additions & 2 deletions drivers/net/netxen/netxen_nic_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ static int netxen_nic_poll(struct napi_struct *napi, int budget);
#ifdef CONFIG_NET_POLL_CONTROLLER
static void netxen_nic_poll_controller(struct net_device *netdev);
#endif

static void netxen_create_sysfs_entries(struct netxen_adapter *adapter);
static void netxen_remove_sysfs_entries(struct netxen_adapter *adapter);

static irqreturn_t netxen_intr(int irq, void *data);
static irqreturn_t netxen_msi_intr(int irq, void *data);
static irqreturn_t netxen_msix_intr(int irq, void *data);
Expand All @@ -94,8 +98,6 @@ static struct pci_device_id netxen_pci_tbl[] __devinitdata = {

MODULE_DEVICE_TABLE(pci, netxen_pci_tbl);

static void netxen_watchdog(unsigned long);

static uint32_t crb_cmd_producer[4] = {
CRB_CMD_PRODUCER_OFFSET, CRB_CMD_PRODUCER_OFFSET_1,
CRB_CMD_PRODUCER_OFFSET_2, CRB_CMD_PRODUCER_OFFSET_3
Expand Down Expand Up @@ -995,6 +997,8 @@ netxen_nic_attach(struct netxen_adapter *adapter)
if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
netxen_nic_init_coalesce_defaults(adapter);

netxen_create_sysfs_entries(adapter);

adapter->is_up = NETXEN_ADAPTER_UP_MAGIC;
return 0;

Expand All @@ -1012,6 +1016,8 @@ netxen_nic_detach(struct netxen_adapter *adapter)
if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC)
return;

netxen_remove_sysfs_entries(adapter);

netxen_free_hw_resources(adapter);
netxen_release_rx_buffers(adapter);
netxen_nic_free_irq(adapter);
Expand Down Expand Up @@ -1959,6 +1965,80 @@ static void netxen_nic_poll_controller(struct net_device *netdev)
}
#endif

static ssize_t
netxen_store_bridged_mode(struct device *dev,
struct device_attribute *attr, const char *buf, size_t len)
{
struct net_device *net = to_net_dev(dev);
struct netxen_adapter *adapter = netdev_priv(net);
unsigned long new;
int ret = -EINVAL;

if (!(adapter->capabilities & NX_FW_CAPABILITY_BDG))
goto err_out;

if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC)
goto err_out;

if (strict_strtoul(buf, 2, &new))
goto err_out;

if (!netxen_config_bridged_mode(adapter, !!new))
ret = len;

err_out:
return ret;
}

static ssize_t
netxen_show_bridged_mode(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct net_device *net = to_net_dev(dev);
struct netxen_adapter *adapter;
int bridged_mode = 0;

adapter = netdev_priv(net);

if (adapter->capabilities & NX_FW_CAPABILITY_BDG)
bridged_mode = !!(adapter->flags & NETXEN_NIC_BRIDGE_ENABLED);

return sprintf(buf, "%d\n", bridged_mode);
}

static struct device_attribute dev_attr_bridged_mode = {
.attr = {.name = "bridged_mode", .mode = (S_IRUGO | S_IWUSR)},
.show = netxen_show_bridged_mode,
.store = netxen_store_bridged_mode,
};

static void
netxen_create_sysfs_entries(struct netxen_adapter *adapter)
{
struct net_device *netdev = adapter->netdev;
struct device *dev = &netdev->dev;

if (adapter->capabilities & NX_FW_CAPABILITY_BDG) {
/* bridged_mode control */
if (device_create_file(dev, &dev_attr_bridged_mode)) {
dev_warn(&netdev->dev,
"failed to create bridged_mode sysfs entry\n");
}
}
}

static void
netxen_remove_sysfs_entries(struct netxen_adapter *adapter)
{
struct net_device *netdev = adapter->netdev;
struct device *dev = &netdev->dev;

if (adapter->capabilities & NX_FW_CAPABILITY_BDG)
device_remove_file(dev, &dev_attr_bridged_mode);
}

static void netxen_watchdog(unsigned long);

#ifdef CONFIG_INET

#define is_netxen_netdev(dev) (dev->netdev_ops == &netxen_netdev_ops)
Expand Down

0 comments on commit fa3ce35

Please sign in to comment.