Install the callbacks via the state machine. No functional change. This is the minimal fixup so we can remove the hotplug notifier mess completely. The real rework of this driver to use work queues is still stuck in review/testing on the SCSI mailing list.
Unified · Split
| @@ -70,14 +70,6 @@ u64 iscsi_error_mask = 0x00; · 69 unmodified lines | ||
| 70 | 70 | |
| 71 | 71 | DEFINE_PER_CPU(struct bnx2i_percpu_s, bnx2i_percpu); |
| 72 | 72 | |
| 73 | −static int bnx2i_cpu_callback(struct notifier_block *nfb, | |
| 74 | − unsigned long action, void *hcpu); | |
| 75 | −/* notification function for CPU hotplug events */ | |
| 76 | −static struct notifier_block bnx2i_cpu_notifier = { | |
| 77 | − .notifier_call = bnx2i_cpu_callback, | |
| 78 | −}; | |
| 79 | − | |
| 80 | − | |
| 81 | 73 | /** |
| 82 | 74 | * bnx2i_identify_device - identifies NetXtreme II device type |
| 83 | 75 | * @hba: Adapter structure pointer |
| @@ -461,41 +453,21 @@ static void bnx2i_percpu_thread_destroy(unsigned int cpu) · 377 unmodified lines | ||
| 461 | 453 | kthread_stop(thread); |
| 462 | 454 | } |
| 463 | 455 | |
| 464 | − | |
| 465 | −/** | |
| 466 | − * bnx2i_cpu_callback - Handler for CPU hotplug events | |
| 467 | − * | |
| 468 | − * @nfb: The callback data block | |
| 469 | − * @action: The event triggering the callback | |
| 470 | − * @hcpu: The index of the CPU that the event is for | |
| 471 | − * | |
| 472 | − * This creates or destroys per-CPU data for iSCSI | |
| 473 | − * | |
| 474 | − * Returns NOTIFY_OK always. | |
| 475 | − */ | |
| 476 | −static int bnx2i_cpu_callback(struct notifier_block *nfb, | |
| 477 | − unsigned long action, void *hcpu) | |
| 456 | +static int bnx2i_cpu_online(unsigned int cpu) | |
| 478 | 457 | { |
| 479 | − unsigned cpu = (unsigned long)hcpu; | |
| 458 | + pr_info("bnx2i: CPU %x online: Create Rx thread\n", cpu); | |
| 459 | + bnx2i_percpu_thread_create(cpu); | |
| 460 | + return 0; | |
| 461 | +} | |
| 480 | 462 | |
| 481 | − switch (action) { | |
| 482 | − case CPU_ONLINE: | |
| 483 | − case CPU_ONLINE_FROZEN: | |
| 484 | − printk(KERN_INFO "bnx2i: CPU %x online: Create Rx thread\n", | |
| 485 | − cpu); | |
| 486 | − bnx2i_percpu_thread_create(cpu); | |
| 487 | − break; | |
| 488 | − case CPU_DEAD: | |
| 489 | − case CPU_DEAD_FROZEN: | |
| 490 | − printk(KERN_INFO "CPU %x offline: Remove Rx thread\n", cpu); | |
| 491 | − bnx2i_percpu_thread_destroy(cpu); | |
| 492 | − break; | |
| 493 | − default: | |
| 494 | − break; | |
| 495 | − } | |
| 496 | − return NOTIFY_OK; | |
| 463 | +static int bnx2i_cpu_dead(unsigned int cpu) | |
| 464 | +{ | |
| 465 | + pr_info("CPU %x offline: Remove Rx thread\n", cpu); | |
| 466 | + bnx2i_percpu_thread_destroy(cpu); | |
| 467 | + return 0; | |
| 497 | 468 | } |
| 498 | 469 | |
| 470 | +static enum cpuhp_state bnx2i_online_state; | |
| 499 | 471 | |
| 500 | 472 | /** |
| 501 | 473 | * bnx2i_mod_init - module init entry point |
| @@ -539,18 +511,28 @@ static int __init bnx2i_mod_init(void) · 37 unmodified lines | ||
| 539 | 511 | p->iothread = NULL; |
| 540 | 512 | } |
| 541 | 513 | |
| 542 | − cpu_notifier_register_begin(); | |
| 514 | + get_online_cpus(); | |
| 543 | 515 | |
| 544 | 516 | for_each_online_cpu(cpu) |
| 545 | 517 | bnx2i_percpu_thread_create(cpu); |
| 546 | 518 | |
| 547 | − /* Initialize per CPU interrupt thread */ | |
| 548 | − __register_hotcpu_notifier(&bnx2i_cpu_notifier); | |
| 549 | − | |
| 550 | − cpu_notifier_register_done(); | |
| 519 | + err = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN, | |
| 520 | + "scsi/bnx2i:online", | |
| 521 | + bnx2i_cpu_online, NULL); | |
| 522 | + if (err < 0) | |
| 523 | + goto remove_threads; | |
| 524 | + bnx2i_online_state = err; | |
| 551 | 525 | |
| 526 | + cpuhp_setup_state_nocalls(CPUHP_SCSI_BNX2I_DEAD, "scsi/bnx2i:dead", | |
| 527 | + NULL, bnx2i_cpu_dead); | |
| 528 | + put_online_cpus(); | |
| 552 | 529 | return 0; |
| 553 | 530 | |
| 531 | +remove_threads: | |
| 532 | + for_each_online_cpu(cpu) | |
| 533 | + bnx2i_percpu_thread_destroy(cpu); | |
| 534 | + put_online_cpus(); | |
| 535 | + cnic_unregister_driver(CNIC_ULP_ISCSI); | |
| 554 | 536 | unreg_xport: |
| 555 | 537 | iscsi_unregister_transport(&bnx2i_iscsi_transport); |
| 556 | 538 | out: |
| @@ -587,14 +569,14 @@ static void __exit bnx2i_mod_exit(void) · 30 unmodified lines | ||
| 587 | 569 | } |
| 588 | 570 | mutex_unlock(&bnx2i_dev_lock); |
| 589 | 571 | |
| 590 | − cpu_notifier_register_begin(); | |
| 572 | + get_online_cpus(); | |
| 591 | 573 | |
| 592 | 574 | for_each_online_cpu(cpu) |
| 593 | 575 | bnx2i_percpu_thread_destroy(cpu); |
| 594 | 576 | |
| 595 | − __unregister_hotcpu_notifier(&bnx2i_cpu_notifier); | |
| 596 | − | |
| 597 | − cpu_notifier_register_done(); | |
| 577 | + cpuhp_remove_state_nocalls(bnx2i_online_state); | |
| 578 | + cpuhp_remove_state_nocalls(CPUHP_SCSI_BNX2I_DEAD); | |
| 579 | + put_online_cpus(); | |
| 598 | 580 | |
| 599 | 581 | iscsi_unregister_transport(&bnx2i_iscsi_transport); |
| 600 | 582 | cnic_unregister_driver(CNIC_ULP_ISCSI); |
| @@ -42,6 +42,7 @@ enum cpuhp_state { · 41 unmodified lines | ||
| 42 | 42 | CPUHP_PCI_XGENE_DEAD, |
| 43 | 43 | CPUHP_IOMMU_INTEL_DEAD, |
| 44 | 44 | CPUHP_SCSI_BNX2FC_DEAD, |
| 45 | + CPUHP_SCSI_BNX2I_DEAD, | |
| 45 | 46 | CPUHP_WORKQUEUE_PREP, |
| 46 | 47 | CPUHP_POWER_NUMA_PREPARE, |
| 47 | 48 | CPUHP_HRTIMERS_PREPARE, |