|
@@ -66,14 +66,14 @@ LIST_HEAD(fcoe_hostlist);
|
|
|
DEFINE_PER_CPU(struct fcoe_percpu_s, fcoe_percpu);
|
|
|
|
|
|
/* Function Prototypes */
|
|
|
-static int fcoe_reset(struct Scsi_Host *shost);
|
|
|
+static int fcoe_reset(struct Scsi_Host *);
|
|
|
static int fcoe_xmit(struct fc_lport *, struct fc_frame *);
|
|
|
static int fcoe_rcv(struct sk_buff *, struct net_device *,
|
|
|
struct packet_type *, struct net_device *);
|
|
|
-static int fcoe_percpu_receive_thread(void *arg);
|
|
|
-static void fcoe_clean_pending_queue(struct fc_lport *lp);
|
|
|
-static void fcoe_percpu_clean(struct fc_lport *lp);
|
|
|
-static int fcoe_link_ok(struct fc_lport *lp);
|
|
|
+static int fcoe_percpu_receive_thread(void *);
|
|
|
+static void fcoe_clean_pending_queue(struct fc_lport *);
|
|
|
+static void fcoe_percpu_clean(struct fc_lport *);
|
|
|
+static int fcoe_link_ok(struct fc_lport *);
|
|
|
|
|
|
static struct fc_lport *fcoe_hostlist_lookup(const struct net_device *);
|
|
|
static int fcoe_hostlist_add(const struct fc_lport *);
|
|
@@ -82,21 +82,68 @@ static void fcoe_check_wait_queue(struct fc_lport *, struct sk_buff *);
|
|
|
static int fcoe_device_notification(struct notifier_block *, ulong, void *);
|
|
|
static void fcoe_dev_setup(void);
|
|
|
static void fcoe_dev_cleanup(void);
|
|
|
-static struct fcoe_interface *
|
|
|
- fcoe_hostlist_lookup_port(const struct net_device *dev);
|
|
|
+static struct fcoe_interface
|
|
|
+*fcoe_hostlist_lookup_port(const struct net_device *);
|
|
|
+
|
|
|
+static int fcoe_fip_recv(struct sk_buff *, struct net_device *,
|
|
|
+ struct packet_type *, struct net_device *);
|
|
|
+
|
|
|
+static void fcoe_fip_send(struct fcoe_ctlr *, struct sk_buff *);
|
|
|
+static void fcoe_update_src_mac(struct fc_lport *, u8 *);
|
|
|
+static u8 *fcoe_get_src_mac(struct fc_lport *);
|
|
|
+static void fcoe_destroy_work(struct work_struct *);
|
|
|
+
|
|
|
+static int fcoe_ddp_setup(struct fc_lport *, u16, struct scatterlist *,
|
|
|
+ unsigned int);
|
|
|
+static int fcoe_ddp_done(struct fc_lport *, u16);
|
|
|
+
|
|
|
+static int fcoe_cpu_callback(struct notifier_block *, unsigned long, void *);
|
|
|
+
|
|
|
+static int fcoe_create(const char *, struct kernel_param *);
|
|
|
+static int fcoe_destroy(const char *, struct kernel_param *);
|
|
|
+
|
|
|
+static u8 *fcoe_get_src_mac(struct fc_lport *);
|
|
|
+static void fcoe_destroy_work(struct work_struct *);
|
|
|
|
|
|
-/* notification function from net device */
|
|
|
+static struct fc_seq *fcoe_elsct_send(struct fc_lport *,
|
|
|
+ u32 did, struct fc_frame *,
|
|
|
+ unsigned int op,
|
|
|
+ void (*resp)(struct fc_seq *,
|
|
|
+ struct fc_frame *,
|
|
|
+ void *),
|
|
|
+ void *, u32 timeout);
|
|
|
+
|
|
|
+module_param_call(create, fcoe_create, NULL, NULL, S_IWUSR);
|
|
|
+__MODULE_PARM_TYPE(create, "string");
|
|
|
+MODULE_PARM_DESC(create, "Create fcoe fcoe using net device passed in.");
|
|
|
+module_param_call(destroy, fcoe_destroy, NULL, NULL, S_IWUSR);
|
|
|
+__MODULE_PARM_TYPE(destroy, "string");
|
|
|
+MODULE_PARM_DESC(destroy, "Destroy fcoe fcoe");
|
|
|
+
|
|
|
+/* notification function for packets from net device */
|
|
|
static struct notifier_block fcoe_notifier = {
|
|
|
.notifier_call = fcoe_device_notification,
|
|
|
};
|
|
|
|
|
|
+/* notification function for CPU hotplug events */
|
|
|
+static struct notifier_block fcoe_cpu_notifier = {
|
|
|
+ .notifier_call = fcoe_cpu_callback,
|
|
|
+};
|
|
|
+
|
|
|
static struct scsi_transport_template *fcoe_transport_template;
|
|
|
static struct scsi_transport_template *fcoe_vport_transport_template;
|
|
|
|
|
|
-static int fcoe_vport_destroy(struct fc_vport *vport);
|
|
|
-static int fcoe_vport_create(struct fc_vport *vport, bool disabled);
|
|
|
-static int fcoe_vport_disable(struct fc_vport *vport, bool disable);
|
|
|
-static void fcoe_set_vport_symbolic_name(struct fc_vport *vport);
|
|
|
+static int fcoe_vport_destroy(struct fc_vport *);
|
|
|
+static int fcoe_vport_create(struct fc_vport *, bool disabled);
|
|
|
+static int fcoe_vport_disable(struct fc_vport *, bool disable);
|
|
|
+static void fcoe_set_vport_symbolic_name(struct fc_vport *);
|
|
|
+
|
|
|
+static struct libfc_function_template fcoe_libfc_fcn_templ = {
|
|
|
+ .frame_send = fcoe_xmit,
|
|
|
+ .ddp_setup = fcoe_ddp_setup,
|
|
|
+ .ddp_done = fcoe_ddp_done,
|
|
|
+ .elsct_send = fcoe_elsct_send,
|
|
|
+};
|
|
|
|
|
|
struct fc_function_template fcoe_transport_function = {
|
|
|
.show_host_node_name = 1,
|
|
@@ -192,13 +239,10 @@ static struct scsi_host_template fcoe_shost_template = {
|
|
|
.max_sectors = 0xffff,
|
|
|
};
|
|
|
|
|
|
-static int fcoe_fip_recv(struct sk_buff *skb, struct net_device *dev,
|
|
|
- struct packet_type *ptype,
|
|
|
- struct net_device *orig_dev);
|
|
|
/**
|
|
|
- * fcoe_interface_setup()
|
|
|
- * @fcoe: new fcoe_interface
|
|
|
- * @netdev : ptr to the associated netdevice struct
|
|
|
+ * fcoe_interface_setup() - Setup a FCoE interface
|
|
|
+ * @fcoe: The new FCoE interface
|
|
|
+ * @netdev: The net device that the fcoe interface is on
|
|
|
*
|
|
|
* Returns : 0 for success
|
|
|
* Locking: must be called with the RTNL mutex held
|
|
@@ -273,14 +317,9 @@ static int fcoe_interface_setup(struct fcoe_interface *fcoe,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static void fcoe_fip_send(struct fcoe_ctlr *fip, struct sk_buff *skb);
|
|
|
-static void fcoe_update_src_mac(struct fc_lport *lport, u8 *addr);
|
|
|
-static u8 *fcoe_get_src_mac(struct fc_lport *lport);
|
|
|
-static void fcoe_destroy_work(struct work_struct *work);
|
|
|
-
|
|
|
/**
|
|
|
- * fcoe_interface_create()
|
|
|
- * @netdev: network interface
|
|
|
+ * fcoe_interface_create() - Create a FCoE interface on a net device
|
|
|
+ * @netdev: The net device to create the FCoE interface on
|
|
|
*
|
|
|
* Returns: pointer to a struct fcoe_interface or NULL on error
|
|
|
*/
|
|
@@ -311,8 +350,8 @@ static struct fcoe_interface *fcoe_interface_create(struct net_device *netdev)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_interface_cleanup() - clean up netdev configurations
|
|
|
- * @fcoe:
|
|
|
+ * fcoe_interface_cleanup() - Clean up a FCoE interface
|
|
|
+ * @fcoe: The FCoE interface to be cleaned up
|
|
|
*
|
|
|
* Caller must be holding the RTNL mutex
|
|
|
*/
|
|
@@ -351,7 +390,7 @@ void fcoe_interface_cleanup(struct fcoe_interface *fcoe)
|
|
|
|
|
|
/**
|
|
|
* fcoe_interface_release() - fcoe_port kref release function
|
|
|
- * @kref: embedded reference count in an fcoe_interface struct
|
|
|
+ * @kref: Embedded reference count in an fcoe_interface struct
|
|
|
*/
|
|
|
static void fcoe_interface_release(struct kref *kref)
|
|
|
{
|
|
@@ -367,8 +406,8 @@ static void fcoe_interface_release(struct kref *kref)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_interface_get()
|
|
|
- * @fcoe:
|
|
|
+ * fcoe_interface_get() - Get a reference to a FCoE interface
|
|
|
+ * @fcoe: The FCoE interface to be held
|
|
|
*/
|
|
|
static inline void fcoe_interface_get(struct fcoe_interface *fcoe)
|
|
|
{
|
|
@@ -376,8 +415,8 @@ static inline void fcoe_interface_get(struct fcoe_interface *fcoe)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_interface_put()
|
|
|
- * @fcoe:
|
|
|
+ * fcoe_interface_put() - Put a reference to a FCoE interface
|
|
|
+ * @fcoe: The FCoE interface to be released
|
|
|
*/
|
|
|
static inline void fcoe_interface_put(struct fcoe_interface *fcoe)
|
|
|
{
|
|
@@ -385,15 +424,16 @@ static inline void fcoe_interface_put(struct fcoe_interface *fcoe)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_fip_recv - handle a received FIP frame.
|
|
|
- * @skb: the receive skb
|
|
|
- * @dev: associated &net_device
|
|
|
- * @ptype: the &packet_type structure which was used to register this handler.
|
|
|
- * @orig_dev: original receive &net_device, in case @dev is a bond.
|
|
|
+ * fcoe_fip_recv() - Handler for received FIP frames
|
|
|
+ * @skb: The receive skb
|
|
|
+ * @netdev: The associated net device
|
|
|
+ * @ptype: The packet_type structure which was used to register this handler
|
|
|
+ * @orig_dev: The original net_device the the skb was received on.
|
|
|
+ * (in case dev is a bond)
|
|
|
*
|
|
|
* Returns: 0 for success
|
|
|
*/
|
|
|
-static int fcoe_fip_recv(struct sk_buff *skb, struct net_device *dev,
|
|
|
+static int fcoe_fip_recv(struct sk_buff *skb, struct net_device *netdev,
|
|
|
struct packet_type *ptype,
|
|
|
struct net_device *orig_dev)
|
|
|
{
|
|
@@ -405,9 +445,9 @@ static int fcoe_fip_recv(struct sk_buff *skb, struct net_device *dev,
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_fip_send() - send an Ethernet-encapsulated FIP frame.
|
|
|
- * @fip: FCoE controller.
|
|
|
- * @skb: FIP Packet.
|
|
|
+ * fcoe_fip_send() - Send an Ethernet-encapsulated FIP frame
|
|
|
+ * @fip: The FCoE controller
|
|
|
+ * @skb: The FIP packet to be sent
|
|
|
*/
|
|
|
static void fcoe_fip_send(struct fcoe_ctlr *fip, struct sk_buff *skb)
|
|
|
{
|
|
@@ -416,9 +456,9 @@ static void fcoe_fip_send(struct fcoe_ctlr *fip, struct sk_buff *skb)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_update_src_mac() - Update Ethernet MAC filters.
|
|
|
- * @lport: libfc lport
|
|
|
- * @addr: Unicast MAC address to add.
|
|
|
+ * fcoe_update_src_mac() - Update the Ethernet MAC filters
|
|
|
+ * @lport: The local port to update the source MAC on
|
|
|
+ * @addr: Unicast MAC address to add
|
|
|
*
|
|
|
* Remove any previously-set unicast MAC filter.
|
|
|
* Add secondary FCoE MAC address filter for our OUI.
|
|
@@ -449,60 +489,59 @@ static u8 *fcoe_get_src_mac(struct fc_lport *lport)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_lport_config() - sets up the fc_lport
|
|
|
- * @lp: ptr to the fc_lport
|
|
|
+ * fcoe_lport_config() - Set up a local port
|
|
|
+ * @lport: The local port to be setup
|
|
|
*
|
|
|
* Returns: 0 for success
|
|
|
*/
|
|
|
-static int fcoe_lport_config(struct fc_lport *lp)
|
|
|
+static int fcoe_lport_config(struct fc_lport *lport)
|
|
|
{
|
|
|
- lp->link_up = 0;
|
|
|
- lp->qfull = 0;
|
|
|
- lp->max_retry_count = 3;
|
|
|
- lp->max_rport_retry_count = 3;
|
|
|
- lp->e_d_tov = 2 * 1000; /* FC-FS default */
|
|
|
- lp->r_a_tov = 2 * 2 * 1000;
|
|
|
- lp->service_params = (FCP_SPPF_INIT_FCN | FCP_SPPF_RD_XRDY_DIS |
|
|
|
- FCP_SPPF_RETRY | FCP_SPPF_CONF_COMPL);
|
|
|
- lp->does_npiv = 1;
|
|
|
-
|
|
|
- fc_lport_init_stats(lp);
|
|
|
+ lport->link_up = 0;
|
|
|
+ lport->qfull = 0;
|
|
|
+ lport->max_retry_count = 3;
|
|
|
+ lport->max_rport_retry_count = 3;
|
|
|
+ lport->e_d_tov = 2 * 1000; /* FC-FS default */
|
|
|
+ lport->r_a_tov = 2 * 2 * 1000;
|
|
|
+ lport->service_params = (FCP_SPPF_INIT_FCN | FCP_SPPF_RD_XRDY_DIS |
|
|
|
+ FCP_SPPF_RETRY | FCP_SPPF_CONF_COMPL);
|
|
|
+ lport->does_npiv = 1;
|
|
|
+
|
|
|
+ fc_lport_init_stats(lport);
|
|
|
|
|
|
/* lport fc_lport related configuration */
|
|
|
- fc_lport_config(lp);
|
|
|
+ fc_lport_config(lport);
|
|
|
|
|
|
/* offload related configuration */
|
|
|
- lp->crc_offload = 0;
|
|
|
- lp->seq_offload = 0;
|
|
|
- lp->lro_enabled = 0;
|
|
|
- lp->lro_xid = 0;
|
|
|
- lp->lso_max = 0;
|
|
|
+ lport->crc_offload = 0;
|
|
|
+ lport->seq_offload = 0;
|
|
|
+ lport->lro_enabled = 0;
|
|
|
+ lport->lro_xid = 0;
|
|
|
+ lport->lso_max = 0;
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_queue_timer() - fcoe queue timer
|
|
|
- * @lp: the fc_lport pointer
|
|
|
+ * fcoe_queue_timer() - The fcoe queue timer
|
|
|
+ * @lport: The local port
|
|
|
*
|
|
|
* Calls fcoe_check_wait_queue on timeout
|
|
|
- *
|
|
|
*/
|
|
|
-static void fcoe_queue_timer(ulong lp)
|
|
|
+static void fcoe_queue_timer(ulong lport)
|
|
|
{
|
|
|
- fcoe_check_wait_queue((struct fc_lport *)lp, NULL);
|
|
|
+ fcoe_check_wait_queue((struct fc_lport *)lport, NULL);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_netdev_config() - Set up netdev for SW FCoE
|
|
|
- * @lp : ptr to the fc_lport
|
|
|
- * @netdev : ptr to the associated netdevice struct
|
|
|
+ * fcoe_netdev_config() - Set up net devive for SW FCoE
|
|
|
+ * @lport: The local port that is associated with the net device
|
|
|
+ * @netdev: The associated net device
|
|
|
*
|
|
|
- * Must be called after fcoe_lport_config() as it will use lport mutex
|
|
|
+ * Must be called after fcoe_lport_config() as it will use local port mutex
|
|
|
*
|
|
|
- * Returns : 0 for success
|
|
|
+ * Returns: 0 for success
|
|
|
*/
|
|
|
-static int fcoe_netdev_config(struct fc_lport *lp, struct net_device *netdev)
|
|
|
+static int fcoe_netdev_config(struct fc_lport *lport, struct net_device *netdev)
|
|
|
{
|
|
|
u32 mfs;
|
|
|
u64 wwnn, wwpn;
|
|
@@ -510,7 +549,7 @@ static int fcoe_netdev_config(struct fc_lport *lp, struct net_device *netdev)
|
|
|
struct fcoe_port *port;
|
|
|
|
|
|
/* Setup lport private data to point to fcoe softc */
|
|
|
- port = lport_priv(lp);
|
|
|
+ port = lport_priv(lport);
|
|
|
fcoe = port->fcoe;
|
|
|
|
|
|
/*
|
|
@@ -524,91 +563,100 @@ static int fcoe_netdev_config(struct fc_lport *lp, struct net_device *netdev)
|
|
|
FCOE_NETDEV_DBG(netdev, "Supports FCOE_MTU of %d bytes\n", mfs);
|
|
|
}
|
|
|
mfs -= (sizeof(struct fcoe_hdr) + sizeof(struct fcoe_crc_eof));
|
|
|
- if (fc_set_mfs(lp, mfs))
|
|
|
+ if (fc_set_mfs(lport, mfs))
|
|
|
return -EINVAL;
|
|
|
|
|
|
/* offload features support */
|
|
|
if (netdev->features & NETIF_F_SG)
|
|
|
- lp->sg_supp = 1;
|
|
|
+ lport->sg_supp = 1;
|
|
|
|
|
|
if (netdev->features & NETIF_F_FCOE_CRC) {
|
|
|
- lp->crc_offload = 1;
|
|
|
+ lport->crc_offload = 1;
|
|
|
FCOE_NETDEV_DBG(netdev, "Supports FCCRC offload\n");
|
|
|
}
|
|
|
if (netdev->features & NETIF_F_FSO) {
|
|
|
- lp->seq_offload = 1;
|
|
|
- lp->lso_max = netdev->gso_max_size;
|
|
|
+ lport->seq_offload = 1;
|
|
|
+ lport->lso_max = netdev->gso_max_size;
|
|
|
FCOE_NETDEV_DBG(netdev, "Supports LSO for max len 0x%x\n",
|
|
|
- lp->lso_max);
|
|
|
+ lport->lso_max);
|
|
|
}
|
|
|
if (netdev->fcoe_ddp_xid) {
|
|
|
- lp->lro_enabled = 1;
|
|
|
- lp->lro_xid = netdev->fcoe_ddp_xid;
|
|
|
+ lport->lro_enabled = 1;
|
|
|
+ lport->lro_xid = netdev->fcoe_ddp_xid;
|
|
|
FCOE_NETDEV_DBG(netdev, "Supports LRO for max xid 0x%x\n",
|
|
|
- lp->lro_xid);
|
|
|
+ lport->lro_xid);
|
|
|
}
|
|
|
skb_queue_head_init(&port->fcoe_pending_queue);
|
|
|
port->fcoe_pending_queue_active = 0;
|
|
|
- setup_timer(&port->timer, fcoe_queue_timer, (unsigned long)lp);
|
|
|
+ setup_timer(&port->timer, fcoe_queue_timer, (unsigned long)lport);
|
|
|
|
|
|
- if (!lp->vport) {
|
|
|
+ if (!lport->vport) {
|
|
|
wwnn = fcoe_wwn_from_mac(netdev->dev_addr, 1, 0);
|
|
|
- fc_set_wwnn(lp, wwnn);
|
|
|
+ fc_set_wwnn(lport, wwnn);
|
|
|
/* XXX - 3rd arg needs to be vlan id */
|
|
|
wwpn = fcoe_wwn_from_mac(netdev->dev_addr, 2, 0);
|
|
|
- fc_set_wwpn(lp, wwpn);
|
|
|
+ fc_set_wwpn(lport, wwpn);
|
|
|
}
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_shost_config() - Sets up fc_lport->host
|
|
|
- * @lp : ptr to the fc_lport
|
|
|
- * @shost : ptr to the associated scsi host
|
|
|
- * @dev : device associated to scsi host
|
|
|
+ * fcoe_shost_config() - Set up the SCSI host associated with a local port
|
|
|
+ * @lport: The local port
|
|
|
+ * @shost: The SCSI host to associate with the local port
|
|
|
+ * @dev: The device associated with the SCSI host
|
|
|
*
|
|
|
* Must be called after fcoe_lport_config() and fcoe_netdev_config()
|
|
|
*
|
|
|
- * Returns : 0 for success
|
|
|
+ * Returns: 0 for success
|
|
|
*/
|
|
|
-static int fcoe_shost_config(struct fc_lport *lp, struct Scsi_Host *shost,
|
|
|
- struct device *dev)
|
|
|
+static int fcoe_shost_config(struct fc_lport *lport, struct Scsi_Host *shost,
|
|
|
+ struct device *dev)
|
|
|
{
|
|
|
int rc = 0;
|
|
|
|
|
|
/* lport scsi host config */
|
|
|
- lp->host->max_lun = FCOE_MAX_LUN;
|
|
|
- lp->host->max_id = FCOE_MAX_FCP_TARGET;
|
|
|
- lp->host->max_channel = 0;
|
|
|
- if (lp->vport)
|
|
|
- lp->host->transportt = fcoe_vport_transport_template;
|
|
|
+ lport->host->max_lun = FCOE_MAX_LUN;
|
|
|
+ lport->host->max_id = FCOE_MAX_FCP_TARGET;
|
|
|
+ lport->host->max_channel = 0;
|
|
|
+ if (lport->vport)
|
|
|
+ lport->host->transportt = fcoe_vport_transport_template;
|
|
|
else
|
|
|
- lp->host->transportt = fcoe_transport_template;
|
|
|
+ lport->host->transportt = fcoe_transport_template;
|
|
|
|
|
|
/* add the new host to the SCSI-ml */
|
|
|
- rc = scsi_add_host(lp->host, dev);
|
|
|
+ rc = scsi_add_host(lport->host, dev);
|
|
|
if (rc) {
|
|
|
- FCOE_NETDEV_DBG(fcoe_netdev(lp), "fcoe_shost_config: "
|
|
|
+ FCOE_NETDEV_DBG(fcoe_netdev(lport), "fcoe_shost_config: "
|
|
|
"error on scsi_add_host\n");
|
|
|
return rc;
|
|
|
}
|
|
|
|
|
|
- if (!lp->vport)
|
|
|
- fc_host_max_npiv_vports(lp->host) = USHORT_MAX;
|
|
|
+ if (!lport->vport)
|
|
|
+ fc_host_max_npiv_vports(lport->host) = USHORT_MAX;
|
|
|
|
|
|
- snprintf(fc_host_symbolic_name(lp->host), FC_SYMBOLIC_NAME_SIZE,
|
|
|
+ snprintf(fc_host_symbolic_name(lport->host), FC_SYMBOLIC_NAME_SIZE,
|
|
|
"%s v%s over %s", FCOE_NAME, FCOE_VERSION,
|
|
|
- fcoe_netdev(lp)->name);
|
|
|
+ fcoe_netdev(lport)->name);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-/*
|
|
|
- * fcoe_oem_match() - match for read types IO
|
|
|
- * @fp: the fc_frame for new IO.
|
|
|
+/**
|
|
|
+ * fcoe_oem_match() - The match routine for the offloaded exchange manager
|
|
|
+ * @fp: The I/O frame
|
|
|
*
|
|
|
- * Returns : true for read types IO, otherwise returns false.
|
|
|
+ * This routine will be associated with an exchange manager (EM). When
|
|
|
+ * the libfc exchange handling code is looking for an EM to use it will
|
|
|
+ * call this routine and pass it the frame that it wishes to send. This
|
|
|
+ * routine will return True if the associated EM is to be used and False
|
|
|
+ * if the echange code should continue looking for an EM.
|
|
|
+ *
|
|
|
+ * The offload EM that this routine is associated with will handle any
|
|
|
+ * packets that are for SCSI read requests.
|
|
|
+ *
|
|
|
+ * Returns: True for read types I/O, otherwise returns false.
|
|
|
*/
|
|
|
bool fcoe_oem_match(struct fc_frame *fp)
|
|
|
{
|
|
@@ -617,14 +665,14 @@ bool fcoe_oem_match(struct fc_frame *fp)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_em_config() - allocates em for this lport
|
|
|
- * @lp: the fcoe that em is to allocated for
|
|
|
+ * fcoe_em_config() - Allocate and configure an exchange manager
|
|
|
+ * @lport: The local port that the new EM will be associated with
|
|
|
*
|
|
|
- * Returns : 0 on success
|
|
|
+ * Returns: 0 on success
|
|
|
*/
|
|
|
-static inline int fcoe_em_config(struct fc_lport *lp)
|
|
|
+static inline int fcoe_em_config(struct fc_lport *lport)
|
|
|
{
|
|
|
- struct fcoe_port *port = lport_priv(lp);
|
|
|
+ struct fcoe_port *port = lport_priv(lport);
|
|
|
struct fcoe_interface *fcoe = port->fcoe;
|
|
|
struct fcoe_interface *oldfcoe = NULL;
|
|
|
struct net_device *old_real_dev, *cur_real_dev;
|
|
@@ -635,8 +683,9 @@ static inline int fcoe_em_config(struct fc_lport *lp)
|
|
|
* Check if need to allocate an em instance for
|
|
|
* offload exchange ids to be shared across all VN_PORTs/lport.
|
|
|
*/
|
|
|
- if (!lp->lro_enabled || !lp->lro_xid || (lp->lro_xid >= max_xid)) {
|
|
|
- lp->lro_xid = 0;
|
|
|
+ if (!lport->lro_enabled || !lport->lro_xid ||
|
|
|
+ (lport->lro_xid >= max_xid)) {
|
|
|
+ lport->lro_xid = 0;
|
|
|
goto skip_oem;
|
|
|
}
|
|
|
|
|
@@ -662,16 +711,16 @@ static inline int fcoe_em_config(struct fc_lport *lp)
|
|
|
}
|
|
|
|
|
|
if (fcoe->oem) {
|
|
|
- if (!fc_exch_mgr_add(lp, fcoe->oem, fcoe_oem_match)) {
|
|
|
+ if (!fc_exch_mgr_add(lport, fcoe->oem, fcoe_oem_match)) {
|
|
|
printk(KERN_ERR "fcoe_em_config: failed to add "
|
|
|
"offload em:%p on interface:%s\n",
|
|
|
fcoe->oem, fcoe->netdev->name);
|
|
|
return -ENOMEM;
|
|
|
}
|
|
|
} else {
|
|
|
- fcoe->oem = fc_exch_mgr_alloc(lp, FC_CLASS_3,
|
|
|
- FCOE_MIN_XID, lp->lro_xid,
|
|
|
- fcoe_oem_match);
|
|
|
+ fcoe->oem = fc_exch_mgr_alloc(lport, FC_CLASS_3,
|
|
|
+ FCOE_MIN_XID, lport->lro_xid,
|
|
|
+ fcoe_oem_match);
|
|
|
if (!fcoe->oem) {
|
|
|
printk(KERN_ERR "fcoe_em_config: failed to allocate "
|
|
|
"em for offload exches on interface:%s\n",
|
|
@@ -683,10 +732,10 @@ static inline int fcoe_em_config(struct fc_lport *lp)
|
|
|
/*
|
|
|
* Exclude offload EM xid range from next EM xid range.
|
|
|
*/
|
|
|
- min_xid += lp->lro_xid + 1;
|
|
|
+ min_xid += lport->lro_xid + 1;
|
|
|
|
|
|
skip_oem:
|
|
|
- if (!fc_exch_mgr_alloc(lp, FC_CLASS_3, min_xid, max_xid, NULL)) {
|
|
|
+ if (!fc_exch_mgr_alloc(lport, FC_CLASS_3, min_xid, max_xid, NULL)) {
|
|
|
printk(KERN_ERR "fcoe_em_config: failed to "
|
|
|
"allocate em on interface %s\n", fcoe->netdev->name);
|
|
|
return -ENOMEM;
|
|
@@ -696,8 +745,8 @@ skip_oem:
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_if_destroy() - FCoE software HBA tear-down function
|
|
|
- * @lport: fc_lport to destroy
|
|
|
+ * fcoe_if_destroy() - Tear down a SW FCoE instance
|
|
|
+ * @lport: The local port to be destroyed
|
|
|
*/
|
|
|
static void fcoe_if_destroy(struct fc_lport *lport)
|
|
|
{
|
|
@@ -745,72 +794,62 @@ static void fcoe_if_destroy(struct fc_lport *lport)
|
|
|
scsi_host_put(lport->host);
|
|
|
}
|
|
|
|
|
|
-/*
|
|
|
- * fcoe_ddp_setup - calls LLD's ddp_setup through net_device
|
|
|
- * @lp: the corresponding fc_lport
|
|
|
- * @xid: the exchange id for this ddp transfer
|
|
|
- * @sgl: the scatterlist describing this transfer
|
|
|
- * @sgc: number of sg items
|
|
|
+/**
|
|
|
+ * fcoe_ddp_setup() - Call a LLD's ddp_setup through the net device
|
|
|
+ * @lport: The local port to setup DDP for
|
|
|
+ * @xid: The exchange ID for this DDP transfer
|
|
|
+ * @sgl: The scatterlist describing this transfer
|
|
|
+ * @sgc: The number of sg items
|
|
|
*
|
|
|
- * Returns : 0 no ddp
|
|
|
+ * Returns: 0 if the DDP context was not configured
|
|
|
*/
|
|
|
-static int fcoe_ddp_setup(struct fc_lport *lp, u16 xid,
|
|
|
- struct scatterlist *sgl, unsigned int sgc)
|
|
|
+static int fcoe_ddp_setup(struct fc_lport *lport, u16 xid,
|
|
|
+ struct scatterlist *sgl, unsigned int sgc)
|
|
|
{
|
|
|
- struct net_device *n = fcoe_netdev(lp);
|
|
|
+ struct net_device *netdev = fcoe_netdev(lport);
|
|
|
|
|
|
- if (n->netdev_ops->ndo_fcoe_ddp_setup)
|
|
|
- return n->netdev_ops->ndo_fcoe_ddp_setup(n, xid, sgl, sgc);
|
|
|
+ if (netdev->netdev_ops->ndo_fcoe_ddp_setup)
|
|
|
+ return netdev->netdev_ops->ndo_fcoe_ddp_setup(netdev,
|
|
|
+ xid, sgl,
|
|
|
+ sgc);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-/*
|
|
|
- * fcoe_ddp_done - calls LLD's ddp_done through net_device
|
|
|
- * @lp: the corresponding fc_lport
|
|
|
- * @xid: the exchange id for this ddp transfer
|
|
|
+/**
|
|
|
+ * fcoe_ddp_done() - Call a LLD's ddp_done through the net device
|
|
|
+ * @lport: The local port to complete DDP on
|
|
|
+ * @xid: The exchange ID for this DDP transfer
|
|
|
*
|
|
|
- * Returns : the length of data that have been completed by ddp
|
|
|
+ * Returns: the length of data that have been completed by DDP
|
|
|
*/
|
|
|
-static int fcoe_ddp_done(struct fc_lport *lp, u16 xid)
|
|
|
+static int fcoe_ddp_done(struct fc_lport *lport, u16 xid)
|
|
|
{
|
|
|
- struct net_device *n = fcoe_netdev(lp);
|
|
|
+ struct net_device *netdev = fcoe_netdev(lport);
|
|
|
|
|
|
- if (n->netdev_ops->ndo_fcoe_ddp_done)
|
|
|
- return n->netdev_ops->ndo_fcoe_ddp_done(n, xid);
|
|
|
+ if (netdev->netdev_ops->ndo_fcoe_ddp_done)
|
|
|
+ return netdev->netdev_ops->ndo_fcoe_ddp_done(netdev, xid);
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static struct fc_seq *fcoe_elsct_send(struct fc_lport *lport,
|
|
|
- u32 did, struct fc_frame *fp, unsigned int op,
|
|
|
- void (*resp)(struct fc_seq *, struct fc_frame *, void *),
|
|
|
- void *arg, u32 timeout);
|
|
|
-
|
|
|
-static struct libfc_function_template fcoe_libfc_fcn_templ = {
|
|
|
- .frame_send = fcoe_xmit,
|
|
|
- .ddp_setup = fcoe_ddp_setup,
|
|
|
- .ddp_done = fcoe_ddp_done,
|
|
|
- .elsct_send = fcoe_elsct_send,
|
|
|
-};
|
|
|
-
|
|
|
/**
|
|
|
- * fcoe_if_create() - this function creates the fcoe port
|
|
|
- * @fcoe: fcoe_interface structure to create an fc_lport instance on
|
|
|
- * @parent: device pointer to be the parent in sysfs for the SCSI host
|
|
|
- * @npiv: is this a vport?
|
|
|
+ * fcoe_if_create() - Create a FCoE instance on an interface
|
|
|
+ * @fcoe: The FCoE interface to create a local port on
|
|
|
+ * @parent: The device pointer to be the parent in sysfs for the SCSI host
|
|
|
+ * @npiv: Indicates if the port is a vport or not
|
|
|
*
|
|
|
- * Creates fc_lport struct and scsi_host for lport, configures lport.
|
|
|
+ * Creates a fc_lport instance and a Scsi_Host instance and configure them.
|
|
|
*
|
|
|
- * Returns : The allocated fc_lport or an error pointer
|
|
|
+ * Returns: The allocated fc_lport or an error pointer
|
|
|
*/
|
|
|
static struct fc_lport *fcoe_if_create(struct fcoe_interface *fcoe,
|
|
|
struct device *parent, int npiv)
|
|
|
{
|
|
|
- int rc;
|
|
|
+ struct net_device *netdev = fcoe->netdev;
|
|
|
struct fc_lport *lport = NULL;
|
|
|
struct fcoe_port *port;
|
|
|
struct Scsi_Host *shost;
|
|
|
- struct net_device *netdev = fcoe->netdev;
|
|
|
+ int rc;
|
|
|
/*
|
|
|
* parent is only a vport if npiv is 1,
|
|
|
* but we'll only use vport in that case so go ahead and set it
|
|
@@ -837,7 +876,7 @@ static struct fc_lport *fcoe_if_create(struct fcoe_interface *fcoe,
|
|
|
port->fcoe = fcoe;
|
|
|
INIT_WORK(&port->destroy_work, fcoe_destroy_work);
|
|
|
|
|
|
- /* configure fc_lport, e.g., em */
|
|
|
+ /* configure a fc_lport including the exchange manager */
|
|
|
rc = fcoe_lport_config(lport);
|
|
|
if (rc) {
|
|
|
FCOE_NETDEV_DBG(netdev, "Could not configure lport for the "
|
|
@@ -847,7 +886,7 @@ static struct fc_lport *fcoe_if_create(struct fcoe_interface *fcoe,
|
|
|
|
|
|
if (npiv) {
|
|
|
FCOE_NETDEV_DBG(netdev, "Setting vport names, 0x%llX 0x%llX\n",
|
|
|
- vport->node_name, vport->port_name);
|
|
|
+ vport->node_name, vport->port_name);
|
|
|
fc_set_wwnn(lport, vport->node_name);
|
|
|
fc_set_wwpn(lport, vport->port_name);
|
|
|
}
|
|
@@ -891,7 +930,7 @@ static struct fc_lport *fcoe_if_create(struct fcoe_interface *fcoe,
|
|
|
rc = fcoe_em_config(lport);
|
|
|
if (rc) {
|
|
|
FCOE_NETDEV_DBG(netdev, "Could not configure the EM "
|
|
|
- "for the interface\n");
|
|
|
+ "for the interface\n");
|
|
|
goto out_lp_destroy;
|
|
|
}
|
|
|
}
|
|
@@ -908,9 +947,11 @@ out:
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_if_init() - attach to scsi transport
|
|
|
+ * fcoe_if_init() - Initialization routine for fcoe.ko
|
|
|
*
|
|
|
- * Returns : 0 on success
|
|
|
+ * Attaches the SW FCoE transport to the FC transport
|
|
|
+ *
|
|
|
+ * Returns: 0 on success
|
|
|
*/
|
|
|
static int __init fcoe_if_init(void)
|
|
|
{
|
|
@@ -928,9 +969,11 @@ static int __init fcoe_if_init(void)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_if_exit() - detach from scsi transport
|
|
|
+ * fcoe_if_exit() - Tear down fcoe.ko
|
|
|
+ *
|
|
|
+ * Detaches the SW FCoE transport from the FC transport
|
|
|
*
|
|
|
- * Returns : 0 on success
|
|
|
+ * Returns: 0 on success
|
|
|
*/
|
|
|
int __exit fcoe_if_exit(void)
|
|
|
{
|
|
@@ -942,8 +985,8 @@ int __exit fcoe_if_exit(void)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_percpu_thread_create() - Create a receive thread for an online cpu
|
|
|
- * @cpu: cpu index for the online cpu
|
|
|
+ * fcoe_percpu_thread_create() - Create a receive thread for an online CPU
|
|
|
+ * @cpu: The CPU index of the CPU to create a receive thread for
|
|
|
*/
|
|
|
static void fcoe_percpu_thread_create(unsigned int cpu)
|
|
|
{
|
|
@@ -966,8 +1009,8 @@ static void fcoe_percpu_thread_create(unsigned int cpu)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_percpu_thread_destroy() - removes the rx thread for the given cpu
|
|
|
- * @cpu: cpu index the rx thread is to be removed
|
|
|
+ * fcoe_percpu_thread_destroy() - Remove the receive thread of a CPU
|
|
|
+ * @cpu: The CPU index of the CPU whose receive thread is to be destroyed
|
|
|
*
|
|
|
* Destroys a per-CPU Rx thread. Any pending skbs are moved to the
|
|
|
* current CPU's Rx thread. If the thread being destroyed is bound to
|
|
@@ -1015,7 +1058,7 @@ static void fcoe_percpu_thread_destroy(unsigned int cpu)
|
|
|
} else {
|
|
|
/*
|
|
|
* The targeted CPU is not initialized and cannot accept
|
|
|
- * new skbs. Unlock the targeted CPU and drop the skbs
|
|
|
+ * new skbs. Unlock the targeted CPU and drop the skbs
|
|
|
* on the CPU that is going offline.
|
|
|
*/
|
|
|
while ((skb = __skb_dequeue(&p->fcoe_rx_list)) != NULL)
|
|
@@ -1056,12 +1099,12 @@ static void fcoe_percpu_thread_destroy(unsigned int cpu)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_cpu_callback() - fcoe cpu hotplug event callback
|
|
|
- * @nfb: callback data block
|
|
|
- * @action: event triggering the callback
|
|
|
- * @hcpu: index for the cpu of this event
|
|
|
+ * fcoe_cpu_callback() - Handler for CPU hotplug events
|
|
|
+ * @nfb: The callback data block
|
|
|
+ * @action: The event triggering the callback
|
|
|
+ * @hcpu: The index of the CPU that the event is for
|
|
|
*
|
|
|
- * This creates or destroys per cpu data for fcoe
|
|
|
+ * This creates or destroys per-CPU data for fcoe
|
|
|
*
|
|
|
* Returns NOTIFY_OK always.
|
|
|
*/
|
|
@@ -1087,25 +1130,22 @@ static int fcoe_cpu_callback(struct notifier_block *nfb,
|
|
|
return NOTIFY_OK;
|
|
|
}
|
|
|
|
|
|
-static struct notifier_block fcoe_cpu_notifier = {
|
|
|
- .notifier_call = fcoe_cpu_callback,
|
|
|
-};
|
|
|
-
|
|
|
/**
|
|
|
- * fcoe_rcv() - this is the fcoe receive function called by NET_RX_SOFTIRQ
|
|
|
- * @skb: the receive skb
|
|
|
- * @dev: associated net device
|
|
|
- * @ptype: context
|
|
|
- * @olddev: last device
|
|
|
+ * fcoe_rcv() - Receive packets from a net device
|
|
|
+ * @skb: The received packet
|
|
|
+ * @netdev: The net device that the packet was received on
|
|
|
+ * @ptype: The packet type context
|
|
|
+ * @olddev: The last device net device
|
|
|
*
|
|
|
- * this function will receive the packet and build fc frame and pass it up
|
|
|
+ * This routine is called by NET_RX_SOFTIRQ. It receives a packet, builds a
|
|
|
+ * FC frame and passes the frame to libfc.
|
|
|
*
|
|
|
* Returns: 0 for success
|
|
|
*/
|
|
|
-int fcoe_rcv(struct sk_buff *skb, struct net_device *dev,
|
|
|
+int fcoe_rcv(struct sk_buff *skb, struct net_device *netdev,
|
|
|
struct packet_type *ptype, struct net_device *olddev)
|
|
|
{
|
|
|
- struct fc_lport *lp;
|
|
|
+ struct fc_lport *lport;
|
|
|
struct fcoe_rcv_info *fr;
|
|
|
struct fcoe_interface *fcoe;
|
|
|
struct fc_frame_header *fh;
|
|
@@ -1113,15 +1153,15 @@ int fcoe_rcv(struct sk_buff *skb, struct net_device *dev,
|
|
|
unsigned int cpu;
|
|
|
|
|
|
fcoe = container_of(ptype, struct fcoe_interface, fcoe_packet_type);
|
|
|
- lp = fcoe->ctlr.lp;
|
|
|
- if (unlikely(lp == NULL)) {
|
|
|
- FCOE_NETDEV_DBG(dev, "Cannot find hba structure");
|
|
|
+ lport = fcoe->ctlr.lp;
|
|
|
+ if (unlikely(!lport)) {
|
|
|
+ FCOE_NETDEV_DBG(netdev, "Cannot find hba structure");
|
|
|
goto err2;
|
|
|
}
|
|
|
- if (!lp->link_up)
|
|
|
+ if (!lport->link_up)
|
|
|
goto err2;
|
|
|
|
|
|
- FCOE_NETDEV_DBG(dev, "skb_info: len:%d data_len:%d head:%p "
|
|
|
+ FCOE_NETDEV_DBG(netdev, "skb_info: len:%d data_len:%d head:%p "
|
|
|
"data:%p tail:%p end:%p sum:%d dev:%s",
|
|
|
skb->len, skb->data_len, skb->head, skb->data,
|
|
|
skb_tail_pointer(skb), skb_end_pointer(skb),
|
|
@@ -1129,7 +1169,7 @@ int fcoe_rcv(struct sk_buff *skb, struct net_device *dev,
|
|
|
|
|
|
/* check for FCOE packet type */
|
|
|
if (unlikely(eth_hdr(skb)->h_proto != htons(ETH_P_FCOE))) {
|
|
|
- FCOE_NETDEV_DBG(dev, "Wrong FC type frame");
|
|
|
+ FCOE_NETDEV_DBG(netdev, "Wrong FC type frame");
|
|
|
goto err;
|
|
|
}
|
|
|
|
|
@@ -1138,14 +1178,14 @@ int fcoe_rcv(struct sk_buff *skb, struct net_device *dev,
|
|
|
* and FC headers are pulled into the linear data area.
|
|
|
*/
|
|
|
if (unlikely((skb->len < FCOE_MIN_FRAME) ||
|
|
|
- !pskb_may_pull(skb, FCOE_HEADER_LEN)))
|
|
|
+ !pskb_may_pull(skb, FCOE_HEADER_LEN)))
|
|
|
goto err;
|
|
|
|
|
|
skb_set_transport_header(skb, sizeof(struct fcoe_hdr));
|
|
|
fh = (struct fc_frame_header *) skb_transport_header(skb);
|
|
|
|
|
|
fr = fcoe_dev_from_skb(skb);
|
|
|
- fr->fr_dev = lp;
|
|
|
+ fr->fr_dev = lport;
|
|
|
fr->ptype = ptype;
|
|
|
|
|
|
/*
|
|
@@ -1167,7 +1207,7 @@ int fcoe_rcv(struct sk_buff *skb, struct net_device *dev,
|
|
|
* the first CPU now. For non-SMP systems this
|
|
|
* will check the same CPU twice.
|
|
|
*/
|
|
|
- FCOE_NETDEV_DBG(dev, "CPU is online, but no receive thread "
|
|
|
+ FCOE_NETDEV_DBG(netdev, "CPU is online, but no receive thread "
|
|
|
"ready for incoming skb- using first online "
|
|
|
"CPU.\n");
|
|
|
|
|
@@ -1194,7 +1234,7 @@ int fcoe_rcv(struct sk_buff *skb, struct net_device *dev,
|
|
|
|
|
|
return 0;
|
|
|
err:
|
|
|
- fc_lport_get_stats(lp)->ErrorFrames++;
|
|
|
+ fc_lport_get_stats(lport)->ErrorFrames++;
|
|
|
|
|
|
err2:
|
|
|
kfree_skb(skb);
|
|
@@ -1202,8 +1242,11 @@ err2:
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_start_io() - pass to netdev to start xmit for fcoe
|
|
|
- * @skb: the skb to be xmitted
|
|
|
+ * fcoe_start_io() - Start FCoE I/O
|
|
|
+ * @skb: The packet to be transmitted
|
|
|
+ *
|
|
|
+ * This routine is called from the net device to start transmitting
|
|
|
+ * FCoE packets.
|
|
|
*
|
|
|
* Returns: 0 for success
|
|
|
*/
|
|
@@ -1220,9 +1263,15 @@ static inline int fcoe_start_io(struct sk_buff *skb)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_get_paged_crc_eof() - in case we need to alloc a page for crc_eof
|
|
|
- * @skb: the skb to be xmitted
|
|
|
- * @tlen: total len
|
|
|
+ * fcoe_get_paged_crc_eof() - Allocate a page to be used for the trailer CRC
|
|
|
+ * @skb: The packet to be transmitted
|
|
|
+ * @tlen: The total length of the trailer
|
|
|
+ *
|
|
|
+ * This routine allocates a page for frame trailers. The page is re-used if
|
|
|
+ * there is enough room left on it for the current trailer. If there isn't
|
|
|
+ * enough buffer left a new page is allocated for the trailer. Reference to
|
|
|
+ * the page from this function as well as the skbs using the page fragments
|
|
|
+ * ensure that the page is freed at the appropriate time.
|
|
|
*
|
|
|
* Returns: 0 for success
|
|
|
*/
|
|
@@ -1261,11 +1310,12 @@ static int fcoe_get_paged_crc_eof(struct sk_buff *skb, int tlen)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_fc_crc() - calculates FC CRC in this fcoe skb
|
|
|
- * @fp: the fc_frame containing data to be checksummed
|
|
|
+ * fcoe_fc_crc() - Calculates the CRC for a given frame
|
|
|
+ * @fp: The frame to be checksumed
|
|
|
*
|
|
|
- * This uses crc32() to calculate the crc for port frame
|
|
|
- * Return : 32 bit crc
|
|
|
+ * This uses crc32() routine to calculate the CRC for a frame
|
|
|
+ *
|
|
|
+ * Return: The 32 bit CRC value
|
|
|
*/
|
|
|
u32 fcoe_fc_crc(struct fc_frame *fp)
|
|
|
{
|
|
@@ -1296,13 +1346,13 @@ u32 fcoe_fc_crc(struct fc_frame *fp)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_xmit() - FCoE frame transmit function
|
|
|
- * @lp: the associated local fcoe
|
|
|
- * @fp: the fc_frame to be transmitted
|
|
|
+ * fcoe_xmit() - Transmit a FCoE frame
|
|
|
+ * @lport: The local port that the frame is to be transmitted for
|
|
|
+ * @fp: The frame to be transmitted
|
|
|
*
|
|
|
- * Return : 0 for success
|
|
|
+ * Return: 0 for success
|
|
|
*/
|
|
|
-int fcoe_xmit(struct fc_lport *lp, struct fc_frame *fp)
|
|
|
+int fcoe_xmit(struct fc_lport *lport, struct fc_frame *fp)
|
|
|
{
|
|
|
int wlen;
|
|
|
u32 crc;
|
|
@@ -1314,7 +1364,7 @@ int fcoe_xmit(struct fc_lport *lp, struct fc_frame *fp)
|
|
|
unsigned int hlen; /* header length implies the version */
|
|
|
unsigned int tlen; /* trailer length */
|
|
|
unsigned int elen; /* eth header, may include vlan */
|
|
|
- struct fcoe_port *port = lport_priv(lp);
|
|
|
+ struct fcoe_port *port = lport_priv(lport);
|
|
|
struct fcoe_interface *fcoe = port->fcoe;
|
|
|
u8 sof, eof;
|
|
|
struct fcoe_hdr *hp;
|
|
@@ -1325,13 +1375,13 @@ int fcoe_xmit(struct fc_lport *lp, struct fc_frame *fp)
|
|
|
skb = fp_skb(fp);
|
|
|
wlen = skb->len / FCOE_WORD_TO_BYTE;
|
|
|
|
|
|
- if (!lp->link_up) {
|
|
|
+ if (!lport->link_up) {
|
|
|
kfree_skb(skb);
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
if (unlikely(fh->fh_r_ctl == FC_RCTL_ELS_REQ) &&
|
|
|
- fcoe_ctlr_els_send(&fcoe->ctlr, lp, skb))
|
|
|
+ fcoe_ctlr_els_send(&fcoe->ctlr, lport, skb))
|
|
|
return 0;
|
|
|
|
|
|
sof = fr_sof(fp);
|
|
@@ -1343,7 +1393,7 @@ int fcoe_xmit(struct fc_lport *lp, struct fc_frame *fp)
|
|
|
wlen = (skb->len - tlen + sizeof(crc)) / FCOE_WORD_TO_BYTE;
|
|
|
|
|
|
/* crc offload */
|
|
|
- if (likely(lp->crc_offload)) {
|
|
|
+ if (likely(lport->crc_offload)) {
|
|
|
skb->ip_summed = CHECKSUM_PARTIAL;
|
|
|
skb->csum_start = skb_headroom(skb);
|
|
|
skb->csum_offset = skb->len;
|
|
@@ -1405,7 +1455,7 @@ int fcoe_xmit(struct fc_lport *lp, struct fc_frame *fp)
|
|
|
hp->fcoe_sof = sof;
|
|
|
|
|
|
/* fcoe lso, mss is in max_payload which is non-zero for FCP data */
|
|
|
- if (lp->seq_offload && fr_max_payload(fp)) {
|
|
|
+ if (lport->seq_offload && fr_max_payload(fp)) {
|
|
|
skb_shinfo(skb)->gso_type = SKB_GSO_FCOE;
|
|
|
skb_shinfo(skb)->gso_size = fr_max_payload(fp);
|
|
|
} else {
|
|
@@ -1413,23 +1463,23 @@ int fcoe_xmit(struct fc_lport *lp, struct fc_frame *fp)
|
|
|
skb_shinfo(skb)->gso_size = 0;
|
|
|
}
|
|
|
/* update tx stats: regardless if LLD fails */
|
|
|
- stats = fc_lport_get_stats(lp);
|
|
|
+ stats = fc_lport_get_stats(lport);
|
|
|
stats->TxFrames++;
|
|
|
stats->TxWords += wlen;
|
|
|
|
|
|
/* send down to lld */
|
|
|
- fr_dev(fp) = lp;
|
|
|
+ fr_dev(fp) = lport;
|
|
|
if (port->fcoe_pending_queue.qlen)
|
|
|
- fcoe_check_wait_queue(lp, skb);
|
|
|
+ fcoe_check_wait_queue(lport, skb);
|
|
|
else if (fcoe_start_io(skb))
|
|
|
- fcoe_check_wait_queue(lp, skb);
|
|
|
+ fcoe_check_wait_queue(lport, skb);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_percpu_flush_done() - Indicate percpu queue flush completion.
|
|
|
- * @skb: the skb being completed.
|
|
|
+ * fcoe_percpu_flush_done() - Indicate per-CPU queue flush completion
|
|
|
+ * @skb: The completed skb (argument required by destructor)
|
|
|
*/
|
|
|
static void fcoe_percpu_flush_done(struct sk_buff *skb)
|
|
|
{
|
|
@@ -1437,8 +1487,8 @@ static void fcoe_percpu_flush_done(struct sk_buff *skb)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_percpu_receive_thread() - recv thread per cpu
|
|
|
- * @arg: ptr to the fcoe per cpu struct
|
|
|
+ * fcoe_percpu_receive_thread() - The per-CPU packet receive thread
|
|
|
+ * @arg: The per-CPU context
|
|
|
*
|
|
|
* Return: 0 for success
|
|
|
*/
|
|
@@ -1446,7 +1496,7 @@ int fcoe_percpu_receive_thread(void *arg)
|
|
|
{
|
|
|
struct fcoe_percpu_s *p = arg;
|
|
|
u32 fr_len;
|
|
|
- struct fc_lport *lp;
|
|
|
+ struct fc_lport *lport;
|
|
|
struct fcoe_rcv_info *fr;
|
|
|
struct fcoe_dev_stats *stats;
|
|
|
struct fc_frame_header *fh;
|
|
@@ -1473,8 +1523,8 @@ int fcoe_percpu_receive_thread(void *arg)
|
|
|
}
|
|
|
spin_unlock_bh(&p->fcoe_rx_list.lock);
|
|
|
fr = fcoe_dev_from_skb(skb);
|
|
|
- lp = fr->fr_dev;
|
|
|
- if (unlikely(lp == NULL)) {
|
|
|
+ lport = fr->fr_dev;
|
|
|
+ if (unlikely(!lport)) {
|
|
|
if (skb->destructor != fcoe_percpu_flush_done)
|
|
|
FCOE_NETDEV_DBG(skb->dev, "NULL lport in skb");
|
|
|
kfree_skb(skb);
|
|
@@ -1491,7 +1541,7 @@ int fcoe_percpu_receive_thread(void *arg)
|
|
|
/*
|
|
|
* Save source MAC address before discarding header.
|
|
|
*/
|
|
|
- port = lport_priv(lp);
|
|
|
+ port = lport_priv(lport);
|
|
|
if (skb_is_nonlinear(skb))
|
|
|
skb_linearize(skb); /* not ideal */
|
|
|
mac = eth_hdr(skb)->h_source;
|
|
@@ -1503,7 +1553,7 @@ int fcoe_percpu_receive_thread(void *arg)
|
|
|
hp = (struct fcoe_hdr *) skb_network_header(skb);
|
|
|
fh = (struct fc_frame_header *) skb_transport_header(skb);
|
|
|
|
|
|
- stats = fc_lport_get_stats(lp);
|
|
|
+ stats = fc_lport_get_stats(lport);
|
|
|
if (unlikely(FC_FCOE_DECAPS_VER(hp) != FC_FCOE_VER)) {
|
|
|
if (stats->ErrorFrames < 5)
|
|
|
printk(KERN_WARNING "fcoe: FCoE version "
|
|
@@ -1525,7 +1575,7 @@ int fcoe_percpu_receive_thread(void *arg)
|
|
|
|
|
|
fp = (struct fc_frame *)skb;
|
|
|
fc_frame_init(fp);
|
|
|
- fr_dev(fp) = lp;
|
|
|
+ fr_dev(fp) = lport;
|
|
|
fr_sof(fp) = hp->fcoe_sof;
|
|
|
|
|
|
/* Copy out the CRC and EOF trailer for access */
|
|
@@ -1545,7 +1595,8 @@ int fcoe_percpu_receive_thread(void *arg)
|
|
|
* it's solicited data, in which case, the FCP layer would
|
|
|
* check it during the copy.
|
|
|
*/
|
|
|
- if (lp->crc_offload && skb->ip_summed == CHECKSUM_UNNECESSARY)
|
|
|
+ if (lport->crc_offload &&
|
|
|
+ skb->ip_summed == CHECKSUM_UNNECESSARY)
|
|
|
fr_flags(fp) &= ~FCPHF_CRC_UNCHECKED;
|
|
|
else
|
|
|
fr_flags(fp) |= FCPHF_CRC_UNCHECKED;
|
|
@@ -1553,7 +1604,7 @@ int fcoe_percpu_receive_thread(void *arg)
|
|
|
fh = fc_frame_header_get(fp);
|
|
|
if (fh->fh_r_ctl == FC_RCTL_DD_SOL_DATA &&
|
|
|
fh->fh_type == FC_TYPE_FCP) {
|
|
|
- fc_exch_recv(lp, fp);
|
|
|
+ fc_exch_recv(lport, fp);
|
|
|
continue;
|
|
|
}
|
|
|
if (fr_flags(fp) & FCPHF_CRC_UNCHECKED) {
|
|
@@ -1569,27 +1620,27 @@ int fcoe_percpu_receive_thread(void *arg)
|
|
|
}
|
|
|
fr_flags(fp) &= ~FCPHF_CRC_UNCHECKED;
|
|
|
}
|
|
|
- fc_exch_recv(lp, fp);
|
|
|
+ fc_exch_recv(lport, fp);
|
|
|
}
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_check_wait_queue() - attempt to clear the transmit backlog
|
|
|
- * @lp: the fc_lport
|
|
|
+ * fcoe_check_wait_queue() - Attempt to clear the transmit backlog
|
|
|
+ * @lport: The local port whose backlog is to be cleared
|
|
|
*
|
|
|
- * This empties the wait_queue, dequeue the head of the wait_queue queue
|
|
|
- * and calls fcoe_start_io() for each packet, if all skb have been
|
|
|
- * transmitted, return qlen or -1 if a error occurs, then restore
|
|
|
- * wait_queue and try again later.
|
|
|
+ * This empties the wait_queue, dequeues the head of the wait_queue queue
|
|
|
+ * and calls fcoe_start_io() for each packet. If all skb have been
|
|
|
+ * transmitted it returns the qlen. If an error occurs it restores
|
|
|
+ * wait_queue (to try again later) and returns -1.
|
|
|
*
|
|
|
- * The wait_queue is used when the skb transmit fails. skb will go
|
|
|
- * in the wait_queue which will be emptied by the timer function or
|
|
|
+ * The wait_queue is used when the skb transmit fails. The failed skb
|
|
|
+ * will go in the wait_queue which will be emptied by the timer function or
|
|
|
* by the next skb transmit.
|
|
|
*/
|
|
|
-static void fcoe_check_wait_queue(struct fc_lport *lp, struct sk_buff *skb)
|
|
|
+static void fcoe_check_wait_queue(struct fc_lport *lport, struct sk_buff *skb)
|
|
|
{
|
|
|
- struct fcoe_port *port = lport_priv(lp);
|
|
|
+ struct fcoe_port *port = lport_priv(lport);
|
|
|
int rc;
|
|
|
|
|
|
spin_lock_bh(&port->fcoe_pending_queue.lock);
|
|
@@ -1621,19 +1672,19 @@ static void fcoe_check_wait_queue(struct fc_lport *lp, struct sk_buff *skb)
|
|
|
}
|
|
|
|
|
|
if (port->fcoe_pending_queue.qlen < FCOE_LOW_QUEUE_DEPTH)
|
|
|
- lp->qfull = 0;
|
|
|
+ lport->qfull = 0;
|
|
|
if (port->fcoe_pending_queue.qlen && !timer_pending(&port->timer))
|
|
|
mod_timer(&port->timer, jiffies + 2);
|
|
|
port->fcoe_pending_queue_active = 0;
|
|
|
out:
|
|
|
if (port->fcoe_pending_queue.qlen > FCOE_MAX_QUEUE_DEPTH)
|
|
|
- lp->qfull = 1;
|
|
|
+ lport->qfull = 1;
|
|
|
spin_unlock_bh(&port->fcoe_pending_queue.lock);
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_dev_setup() - setup link change notification interface
|
|
|
+ * fcoe_dev_setup() - Setup the link change notification interface
|
|
|
*/
|
|
|
static void fcoe_dev_setup(void)
|
|
|
{
|
|
@@ -1641,7 +1692,7 @@ static void fcoe_dev_setup(void)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_dev_cleanup() - cleanup link change notification interface
|
|
|
+ * fcoe_dev_cleanup() - Cleanup the link change notification interface
|
|
|
*/
|
|
|
static void fcoe_dev_cleanup(void)
|
|
|
{
|
|
@@ -1649,19 +1700,19 @@ static void fcoe_dev_cleanup(void)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_device_notification() - netdev event notification callback
|
|
|
- * @notifier: context of the notification
|
|
|
- * @event: type of event
|
|
|
- * @ptr: fixed array for output parsed ifname
|
|
|
+ * fcoe_device_notification() - Handler for net device events
|
|
|
+ * @notifier: The context of the notification
|
|
|
+ * @event: The type of event
|
|
|
+ * @ptr: The net device that the event was on
|
|
|
*
|
|
|
- * This function is called by the ethernet driver in case of link change event
|
|
|
+ * This function is called by the Ethernet driver in case of link change event.
|
|
|
*
|
|
|
* Returns: 0 for success
|
|
|
*/
|
|
|
static int fcoe_device_notification(struct notifier_block *notifier,
|
|
|
ulong event, void *ptr)
|
|
|
{
|
|
|
- struct fc_lport *lp = NULL;
|
|
|
+ struct fc_lport *lport = NULL;
|
|
|
struct net_device *netdev = ptr;
|
|
|
struct fcoe_interface *fcoe;
|
|
|
struct fcoe_port *port;
|
|
@@ -1672,11 +1723,11 @@ static int fcoe_device_notification(struct notifier_block *notifier,
|
|
|
|
|
|
list_for_each_entry(fcoe, &fcoe_hostlist, list) {
|
|
|
if (fcoe->netdev == netdev) {
|
|
|
- lp = fcoe->ctlr.lp;
|
|
|
+ lport = fcoe->ctlr.lp;
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
- if (lp == NULL) {
|
|
|
+ if (!lport) {
|
|
|
rc = NOTIFY_DONE;
|
|
|
goto out;
|
|
|
}
|
|
@@ -1695,7 +1746,7 @@ static int fcoe_device_notification(struct notifier_block *notifier,
|
|
|
mfs = netdev->mtu - (sizeof(struct fcoe_hdr) +
|
|
|
sizeof(struct fcoe_crc_eof));
|
|
|
if (mfs >= FC_MIN_MAX_FRAME)
|
|
|
- fc_set_mfs(lp, mfs);
|
|
|
+ fc_set_mfs(lport, mfs);
|
|
|
break;
|
|
|
case NETDEV_REGISTER:
|
|
|
break;
|
|
@@ -1710,22 +1761,22 @@ static int fcoe_device_notification(struct notifier_block *notifier,
|
|
|
FCOE_NETDEV_DBG(netdev, "Unknown event %ld "
|
|
|
"from netdev netlink\n", event);
|
|
|
}
|
|
|
- if (link_possible && !fcoe_link_ok(lp))
|
|
|
+ if (link_possible && !fcoe_link_ok(lport))
|
|
|
fcoe_ctlr_link_up(&fcoe->ctlr);
|
|
|
else if (fcoe_ctlr_link_down(&fcoe->ctlr)) {
|
|
|
- stats = fc_lport_get_stats(lp);
|
|
|
+ stats = fc_lport_get_stats(lport);
|
|
|
stats->LinkFailureCount++;
|
|
|
- fcoe_clean_pending_queue(lp);
|
|
|
+ fcoe_clean_pending_queue(lport);
|
|
|
}
|
|
|
out:
|
|
|
return rc;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_if_to_netdev() - parse a name buffer to get netdev
|
|
|
- * @buffer: incoming buffer to be copied
|
|
|
+ * fcoe_if_to_netdev() - Parse a name buffer to get a net device
|
|
|
+ * @buffer: The name of the net device
|
|
|
*
|
|
|
- * Returns: NULL or ptr to net_device
|
|
|
+ * Returns: NULL or a ptr to net_device
|
|
|
*/
|
|
|
static struct net_device *fcoe_if_to_netdev(const char *buffer)
|
|
|
{
|
|
@@ -1743,9 +1794,11 @@ static struct net_device *fcoe_if_to_netdev(const char *buffer)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_destroy() - handles the destroy from sysfs
|
|
|
- * @buffer: expected to be an eth if name
|
|
|
- * @kp: associated kernel param
|
|
|
+ * fcoe_destroy() - Destroy a FCoE interface
|
|
|
+ * @buffer: The name of the Ethernet interface to be destroyed
|
|
|
+ * @kp: The associated kernel parameter
|
|
|
+ *
|
|
|
+ * Called from sysfs.
|
|
|
*
|
|
|
* Returns: 0 for success
|
|
|
*/
|
|
@@ -1792,6 +1845,10 @@ out_nodev:
|
|
|
return rc;
|
|
|
}
|
|
|
|
|
|
+/**
|
|
|
+ * fcoe_destroy_work() - Destroy a FCoE port in a deferred work context
|
|
|
+ * @work: Handle to the FCoE port to be destroyed
|
|
|
+ */
|
|
|
static void fcoe_destroy_work(struct work_struct *work)
|
|
|
{
|
|
|
struct fcoe_port *port;
|
|
@@ -1803,9 +1860,11 @@ static void fcoe_destroy_work(struct work_struct *work)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_create() - Handles the create call from sysfs
|
|
|
- * @buffer: expected to be an eth if name
|
|
|
- * @kp: associated kernel param
|
|
|
+ * fcoe_create() - Create a fcoe interface
|
|
|
+ * @buffer: The name of the Ethernet interface to create on
|
|
|
+ * @kp: The associated kernel param
|
|
|
+ *
|
|
|
+ * Called from sysfs.
|
|
|
*
|
|
|
* Returns: 0 for success
|
|
|
*/
|
|
@@ -1884,16 +1943,9 @@ out_nodev:
|
|
|
return rc;
|
|
|
}
|
|
|
|
|
|
-module_param_call(create, fcoe_create, NULL, NULL, S_IWUSR);
|
|
|
-__MODULE_PARM_TYPE(create, "string");
|
|
|
-MODULE_PARM_DESC(create, "Create fcoe fcoe using net device passed in.");
|
|
|
-module_param_call(destroy, fcoe_destroy, NULL, NULL, S_IWUSR);
|
|
|
-__MODULE_PARM_TYPE(destroy, "string");
|
|
|
-MODULE_PARM_DESC(destroy, "Destroy fcoe fcoe");
|
|
|
-
|
|
|
/**
|
|
|
- * fcoe_link_ok() - Check if link is ok for the fc_lport
|
|
|
- * @lp: ptr to the fc_lport
|
|
|
+ * fcoe_link_ok() - Check if the link is OK for a local port
|
|
|
+ * @lport: The local port to check link on
|
|
|
*
|
|
|
* Any permanently-disqualifying conditions have been previously checked.
|
|
|
* This also updates the speed setting, which may change with link for 100/1000.
|
|
@@ -1905,26 +1957,26 @@ MODULE_PARM_DESC(destroy, "Destroy fcoe fcoe");
|
|
|
* Returns: 0 if link is OK for use by FCoE.
|
|
|
*
|
|
|
*/
|
|
|
-int fcoe_link_ok(struct fc_lport *lp)
|
|
|
+int fcoe_link_ok(struct fc_lport *lport)
|
|
|
{
|
|
|
- struct fcoe_port *port = lport_priv(lp);
|
|
|
- struct net_device *dev = port->fcoe->netdev;
|
|
|
+ struct fcoe_port *port = lport_priv(lport);
|
|
|
+ struct net_device *netdev = port->fcoe->netdev;
|
|
|
struct ethtool_cmd ecmd = { ETHTOOL_GSET };
|
|
|
|
|
|
- if ((dev->flags & IFF_UP) && netif_carrier_ok(dev) &&
|
|
|
- (!dev_ethtool_get_settings(dev, &ecmd))) {
|
|
|
- lp->link_supported_speeds &=
|
|
|
+ if ((netdev->flags & IFF_UP) && netif_carrier_ok(netdev) &&
|
|
|
+ (!dev_ethtool_get_settings(netdev, &ecmd))) {
|
|
|
+ lport->link_supported_speeds &=
|
|
|
~(FC_PORTSPEED_1GBIT | FC_PORTSPEED_10GBIT);
|
|
|
if (ecmd.supported & (SUPPORTED_1000baseT_Half |
|
|
|
SUPPORTED_1000baseT_Full))
|
|
|
- lp->link_supported_speeds |= FC_PORTSPEED_1GBIT;
|
|
|
+ lport->link_supported_speeds |= FC_PORTSPEED_1GBIT;
|
|
|
if (ecmd.supported & SUPPORTED_10000baseT_Full)
|
|
|
- lp->link_supported_speeds |=
|
|
|
+ lport->link_supported_speeds |=
|
|
|
FC_PORTSPEED_10GBIT;
|
|
|
if (ecmd.speed == SPEED_1000)
|
|
|
- lp->link_speed = FC_PORTSPEED_1GBIT;
|
|
|
+ lport->link_speed = FC_PORTSPEED_1GBIT;
|
|
|
if (ecmd.speed == SPEED_10000)
|
|
|
- lp->link_speed = FC_PORTSPEED_10GBIT;
|
|
|
+ lport->link_speed = FC_PORTSPEED_10GBIT;
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
@@ -1932,8 +1984,8 @@ int fcoe_link_ok(struct fc_lport *lp)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_percpu_clean() - Clear the pending skbs for an lport
|
|
|
- * @lp: the fc_lport
|
|
|
+ * fcoe_percpu_clean() - Clear all pending skbs for an local port
|
|
|
+ * @lport: The local port whose skbs are to be cleared
|
|
|
*
|
|
|
* Must be called with fcoe_create_mutex held to single-thread completion.
|
|
|
*
|
|
@@ -1942,7 +1994,7 @@ int fcoe_link_ok(struct fc_lport *lp)
|
|
|
* there no packets that will be handled by the lport, but also that any
|
|
|
* threads already handling packet have returned.
|
|
|
*/
|
|
|
-void fcoe_percpu_clean(struct fc_lport *lp)
|
|
|
+void fcoe_percpu_clean(struct fc_lport *lport)
|
|
|
{
|
|
|
struct fcoe_percpu_s *pp;
|
|
|
struct fcoe_rcv_info *fr;
|
|
@@ -1960,7 +2012,7 @@ void fcoe_percpu_clean(struct fc_lport *lp)
|
|
|
skb = next) {
|
|
|
next = skb->next;
|
|
|
fr = fcoe_dev_from_skb(skb);
|
|
|
- if (fr->fr_dev == lp) {
|
|
|
+ if (fr->fr_dev == lport) {
|
|
|
__skb_unlink(skb, list);
|
|
|
kfree_skb(skb);
|
|
|
}
|
|
@@ -1989,13 +2041,11 @@ void fcoe_percpu_clean(struct fc_lport *lp)
|
|
|
|
|
|
/**
|
|
|
* fcoe_clean_pending_queue() - Dequeue a skb and free it
|
|
|
- * @lp: the corresponding fc_lport
|
|
|
- *
|
|
|
- * Returns: none
|
|
|
+ * @lport: The local port to dequeue a skb on
|
|
|
*/
|
|
|
-void fcoe_clean_pending_queue(struct fc_lport *lp)
|
|
|
+void fcoe_clean_pending_queue(struct fc_lport *lport)
|
|
|
{
|
|
|
- struct fcoe_port *port = lport_priv(lp);
|
|
|
+ struct fcoe_port *port = lport_priv(lport);
|
|
|
struct sk_buff *skb;
|
|
|
|
|
|
spin_lock_bh(&port->fcoe_pending_queue.lock);
|
|
@@ -2008,10 +2058,10 @@ void fcoe_clean_pending_queue(struct fc_lport *lp)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_reset() - Resets the fcoe
|
|
|
- * @shost: shost the reset is from
|
|
|
+ * fcoe_reset() - Reset a local port
|
|
|
+ * @shost: The SCSI host associated with the local port to be reset
|
|
|
*
|
|
|
- * Returns: always 0
|
|
|
+ * Returns: Always 0 (return value required by FC transport template)
|
|
|
*/
|
|
|
int fcoe_reset(struct Scsi_Host *shost)
|
|
|
{
|
|
@@ -2021,30 +2071,33 @@ int fcoe_reset(struct Scsi_Host *shost)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_hostlist_lookup_port() - find the corresponding lport by a given device
|
|
|
- * @dev: this is currently ptr to net_device
|
|
|
+ * fcoe_hostlist_lookup_port() - Find the FCoE interface associated with a net device
|
|
|
+ * @netdev: The net device used as a key
|
|
|
*
|
|
|
- * Returns: NULL or the located fcoe_port
|
|
|
- * Locking: must be called with the RNL mutex held
|
|
|
+ * Locking: Must be called with the RNL mutex held.
|
|
|
+ *
|
|
|
+ * Returns: NULL or the FCoE interface
|
|
|
*/
|
|
|
static struct fcoe_interface *
|
|
|
-fcoe_hostlist_lookup_port(const struct net_device *dev)
|
|
|
+fcoe_hostlist_lookup_port(const struct net_device *netdev)
|
|
|
{
|
|
|
struct fcoe_interface *fcoe;
|
|
|
|
|
|
list_for_each_entry(fcoe, &fcoe_hostlist, list) {
|
|
|
- if (fcoe->netdev == dev)
|
|
|
+ if (fcoe->netdev == netdev)
|
|
|
return fcoe;
|
|
|
}
|
|
|
return NULL;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_hostlist_lookup() - Find the corresponding lport by netdev
|
|
|
- * @netdev: ptr to net_device
|
|
|
+ * fcoe_hostlist_lookup() - Find the local port associated with a
|
|
|
+ * given net device
|
|
|
+ * @netdev: The netdevice used as a key
|
|
|
*
|
|
|
- * Returns: 0 for success
|
|
|
- * Locking: must be called with the RTNL mutex held
|
|
|
+ * Locking: Must be called with the RTNL mutex held
|
|
|
+ *
|
|
|
+ * Returns: NULL or the local port
|
|
|
*/
|
|
|
static struct fc_lport *fcoe_hostlist_lookup(const struct net_device *netdev)
|
|
|
{
|
|
@@ -2055,11 +2108,13 @@ static struct fc_lport *fcoe_hostlist_lookup(const struct net_device *netdev)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_hostlist_add() - Add a lport to lports list
|
|
|
- * @lp: ptr to the fc_lport to be added
|
|
|
+ * fcoe_hostlist_add() - Add the FCoE interface identified by a local
|
|
|
+ * port to the hostlist
|
|
|
+ * @lport: The local port that identifies the FCoE interface to be added
|
|
|
*
|
|
|
- * Returns: 0 for success
|
|
|
* Locking: must be called with the RTNL mutex held
|
|
|
+ *
|
|
|
+ * Returns: 0 for success
|
|
|
*/
|
|
|
static int fcoe_hostlist_add(const struct fc_lport *lport)
|
|
|
{
|
|
@@ -2076,15 +2131,15 @@ static int fcoe_hostlist_add(const struct fc_lport *lport)
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * fcoe_init() - fcoe module loading initialization
|
|
|
+ * fcoe_init() - Initialize fcoe.ko
|
|
|
*
|
|
|
- * Returns 0 on success, negative on failure
|
|
|
+ * Returns: 0 on success, or a negative value on failure
|
|
|
*/
|
|
|
static int __init fcoe_init(void)
|
|
|
{
|
|
|
+ struct fcoe_percpu_s *p;
|
|
|
unsigned int cpu;
|
|
|
int rc = 0;
|
|
|
- struct fcoe_percpu_s *p;
|
|
|
|
|
|
mutex_lock(&fcoe_config_mutex);
|
|
|
|
|
@@ -2121,15 +2176,15 @@ out_free:
|
|
|
module_init(fcoe_init);
|
|
|
|
|
|
/**
|
|
|
- * fcoe_exit() - fcoe module unloading cleanup
|
|
|
+ * fcoe_exit() - Clean up fcoe.ko
|
|
|
*
|
|
|
- * Returns 0 on success, negative on failure
|
|
|
+ * Returns: 0 on success or a negative value on failure
|
|
|
*/
|
|
|
static void __exit fcoe_exit(void)
|
|
|
{
|
|
|
- unsigned int cpu;
|
|
|
struct fcoe_interface *fcoe, *tmp;
|
|
|
struct fcoe_port *port;
|
|
|
+ unsigned int cpu;
|
|
|
|
|
|
mutex_lock(&fcoe_config_mutex);
|
|
|
|
|
@@ -2230,10 +2285,12 @@ static void fcoe_logo_resp(struct fc_seq *seq, struct fc_frame *fp, void *arg)
|
|
|
*
|
|
|
* Most of the work here is just handed off to the libfc routine.
|
|
|
*/
|
|
|
-static struct fc_seq *fcoe_elsct_send(struct fc_lport *lport,
|
|
|
- u32 did, struct fc_frame *fp, unsigned int op,
|
|
|
- void (*resp)(struct fc_seq *, struct fc_frame *, void *),
|
|
|
- void *arg, u32 timeout)
|
|
|
+static struct fc_seq *fcoe_elsct_send(struct fc_lport *lport, u32 did,
|
|
|
+ struct fc_frame *fp, unsigned int op,
|
|
|
+ void (*resp)(struct fc_seq *,
|
|
|
+ struct fc_frame *,
|
|
|
+ void *),
|
|
|
+ void *arg, u32 timeout)
|
|
|
{
|
|
|
struct fcoe_port *port = lport_priv(lport);
|
|
|
struct fcoe_interface *fcoe = port->fcoe;
|
|
@@ -2362,4 +2419,3 @@ static void fcoe_set_vport_symbolic_name(struct fc_vport *vport)
|
|
|
lport->tt.elsct_send(lport, FC_FID_DIR_SERV, fp, FC_NS_RSPN_ID,
|
|
|
NULL, NULL, lport->e_d_tov);
|
|
|
}
|
|
|
-
|