Skip to content

Commit

Permalink
[SCSI] fcoe: Initialize all possilbe skb_queue(s) when module is loaded
Browse files Browse the repository at this point in the history
Currently the skb_queue is initialized every time the associated
CPU goes online. This patch has libfcoe initializing the skb_queue
for all possible CPUs when the module is loaded.

This patch also re-orders some declarations in the fcoe_rcv()
function so the structure declarations are grouped before
the primitive declarations.

Lastly, this patch converts all CPU indicies to use unsigned int
since CPU indicies should not be negative.

Signed-off-by: Robert Love <robert.w.love@intel.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
  • Loading branch information
Robert Love authored and James Bottomley committed Apr 3, 2009
1 parent 2df71b1 commit 38eccab
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
21 changes: 12 additions & 9 deletions drivers/scsi/fcoe/libfcoe.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ static struct notifier_block fcoe_cpu_notifier = {
*
* Returns: none
*/
static void fcoe_create_percpu_data(int cpu)
static void fcoe_create_percpu_data(unsigned int cpu)
{
struct fc_lport *lp;
struct fcoe_softc *fc;
Expand All @@ -121,7 +121,7 @@ static void fcoe_create_percpu_data(int cpu)
*
* Retuns: none
*/
static void fcoe_destroy_percpu_data(int cpu)
static void fcoe_destroy_percpu_data(unsigned int cpu)
{
struct fc_lport *lp;
struct fcoe_softc *fc;
Expand Down Expand Up @@ -183,9 +183,9 @@ int fcoe_rcv(struct sk_buff *skb, struct net_device *dev,
struct fcoe_softc *fc;
struct fcoe_dev_stats *stats;
struct fc_frame_header *fh;
unsigned short oxid;
int cpu_idx;
struct fcoe_percpu_s *fps;
unsigned short oxid;
unsigned int cpu_idx;

fc = container_of(ptype, struct fcoe_softc, fcoe_packet_type);
lp = fc->lp;
Expand Down Expand Up @@ -292,7 +292,7 @@ static int fcoe_get_paged_crc_eof(struct sk_buff *skb, int tlen)
{
struct fcoe_percpu_s *fps;
struct page *page;
int cpu_idx;
unsigned int cpu_idx;

cpu_idx = get_cpu();
fps = fcoe_percpu[cpu_idx];
Expand Down Expand Up @@ -1366,17 +1366,22 @@ EXPORT_SYMBOL_GPL(fcoe_libfc_config);
*/
static int __init fcoe_init(void)
{
int cpu;
unsigned int cpu;
struct fcoe_percpu_s *p;


INIT_LIST_HEAD(&fcoe_hostlist);
rwlock_init(&fcoe_hostlist_lock);

#ifdef CONFIG_HOTPLUG_CPU
register_cpu_notifier(&fcoe_cpu_notifier);
#endif /* CONFIG_HOTPLUG_CPU */

for_each_possible_cpu(cpu) {
p = fcoe_percpu[cpu];
p->cpu = cpu;
skb_queue_head_init(&p->fcoe_rx_list);
}

/*
* initialize per CPU interrupt thread
*/
Expand All @@ -1392,9 +1397,7 @@ static int __init fcoe_init(void)
* initialize the semaphore and skb queue head
*/
if (likely(!IS_ERR(p->thread))) {
p->cpu = cpu;
fcoe_percpu[cpu] = p;
skb_queue_head_init(&p->fcoe_rx_list);
kthread_bind(p->thread, cpu);
wake_up_process(p->thread);
} else {
Expand Down
2 changes: 1 addition & 1 deletion include/scsi/libfcoe.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* this percpu struct for fcoe
*/
struct fcoe_percpu_s {
int cpu;
unsigned int cpu;
struct task_struct *thread;
struct sk_buff_head fcoe_rx_list;
struct page *crc_eof_page;
Expand Down

0 comments on commit 38eccab

Please sign in to comment.