Showing the changes to kernel (1 of 4 files). Show all
Unified · Split
| @@ -778,6 +778,24 @@ void rcu_irq_exit_preempt(void) · 777 unmodified lines | |||
| 778 | "RCU in extended quiescent state!"); | 778 | "RCU in extended quiescent state!"); |
| 779 | } | 779 | } |
| 780 | 780 | ||
| 781 | #ifdef CONFIG_PROVE_RCU | ||
| 782 | /** | ||
| 783 | * rcu_irq_exit_check_preempt - Validate that scheduling is possible | ||
| 784 | */ | ||
| 785 | void rcu_irq_exit_check_preempt(void) | ||
| 786 | { | ||
| 787 | lockdep_assert_irqs_disabled(); | ||
| 788 | |||
| 789 | RCU_LOCKDEP_WARN(__this_cpu_read(rcu_data.dynticks_nesting) <= 0, | ||
| 790 | "RCU dynticks_nesting counter underflow/zero!"); | ||
| 791 | RCU_LOCKDEP_WARN(__this_cpu_read(rcu_data.dynticks_nmi_nesting) != | ||
| 792 | DYNTICK_IRQ_NONIDLE, | ||
| 793 | "Bad RCU dynticks_nmi_nesting counter\n"); | ||
| 794 | RCU_LOCKDEP_WARN(rcu_dynticks_curr_cpu_in_eqs(), | ||
| 795 | "RCU in extended quiescent state!"); | ||
| 796 | } | ||
| 797 | #endif /* #ifdef CONFIG_PROVE_RCU */ | ||
| 798 | |||
| 781 | /* | 799 | /* |
| 782 | * Wrapper for rcu_irq_exit() where interrupts are enabled. | 800 | * Wrapper for rcu_irq_exit() where interrupts are enabled. |
| 783 | * | 801 | * |
| @@ -861,6 +879,67 @@ void noinstr rcu_user_exit(void) · 77 unmodified lines | |||
| 861 | { | 879 | { |
| 862 | rcu_eqs_exit(1); | 880 | rcu_eqs_exit(1); |
| 863 | } | 881 | } |
| 882 | |||
| 883 | /** | ||
| 884 | * __rcu_irq_enter_check_tick - Enable scheduler tick on CPU if RCU needs it. | ||
| 885 | * | ||
| 886 | * The scheduler tick is not normally enabled when CPUs enter the kernel | ||
| 887 | * from nohz_full userspace execution. After all, nohz_full userspace | ||
| 888 | * execution is an RCU quiescent state and the time executing in the kernel | ||
| 889 | * is quite short. Except of course when it isn't. And it is not hard to | ||
| 890 | * cause a large system to spend tens of seconds or even minutes looping | ||
| 891 | * in the kernel, which can cause a number of problems, include RCU CPU | ||
| 892 | * stall warnings. | ||
| 893 | * | ||
| 894 | * Therefore, if a nohz_full CPU fails to report a quiescent state | ||
| 895 | * in a timely manner, the RCU grace-period kthread sets that CPU's | ||
| 896 | * ->rcu_urgent_qs flag with the expectation that the next interrupt or | ||
| 897 | * exception will invoke this function, which will turn on the scheduler | ||
| 898 | * tick, which will enable RCU to detect that CPU's quiescent states, | ||
| 899 | * for example, due to cond_resched() calls in CONFIG_PREEMPT=n kernels. | ||
| 900 | * The tick will be disabled once a quiescent state is reported for | ||
| 901 | * this CPU. | ||
| 902 | * | ||
| 903 | * Of course, in carefully tuned systems, there might never be an | ||
| 904 | * interrupt or exception. In that case, the RCU grace-period kthread | ||
| 905 | * will eventually cause one to happen. However, in less carefully | ||
| 906 | * controlled environments, this function allows RCU to get what it | ||
| 907 | * needs without creating otherwise useless interruptions. | ||
| 908 | */ | ||
| 909 | void __rcu_irq_enter_check_tick(void) | ||
| 910 | { | ||
| 911 | struct rcu_data *rdp = this_cpu_ptr(&rcu_data); | ||
| 912 | |||
| 913 | // Enabling the tick is unsafe in NMI handlers. | ||
| 914 | if (WARN_ON_ONCE(in_nmi())) | ||
| 915 | return; | ||
| 916 | |||
| 917 | RCU_LOCKDEP_WARN(rcu_dynticks_curr_cpu_in_eqs(), | ||
| 918 | "Illegal rcu_irq_enter_check_tick() from extended quiescent state"); | ||
| 919 | |||
| 920 | if (!tick_nohz_full_cpu(rdp->cpu) || | ||
| 921 | !READ_ONCE(rdp->rcu_urgent_qs) || | ||
| 922 | READ_ONCE(rdp->rcu_forced_tick)) { | ||
| 923 | // RCU doesn't need nohz_full help from this CPU, or it is | ||
| 924 | // already getting that help. | ||
| 925 | return; | ||
| 926 | } | ||
| 927 | |||
| 928 | // We get here only when not in an extended quiescent state and | ||
| 929 | // from interrupts (as opposed to NMIs). Therefore, (1) RCU is | ||
| 930 | // already watching and (2) The fact that we are in an interrupt | ||
| 931 | // handler and that the rcu_node lock is an irq-disabled lock | ||
| 932 | // prevents self-deadlock. So we can safely recheck under the lock. | ||
| 933 | // Note that the nohz_full state currently cannot change. | ||
| 934 | raw_spin_lock_rcu_node(rdp->mynode); | ||
| 935 | if (rdp->rcu_urgent_qs && !rdp->rcu_forced_tick) { | ||
| 936 | // A nohz_full CPU is in the kernel and RCU needs a | ||
| 937 | // quiescent state. Turn on the tick! | ||
| 938 | WRITE_ONCE(rdp->rcu_forced_tick, true); | ||
| 939 | tick_dep_set_cpu(rdp->cpu, TICK_DEP_BIT_RCU); | ||
| 940 | } | ||
| 941 | raw_spin_unlock_rcu_node(rdp->mynode); | ||
| 942 | } | ||
| 864 | #endif /* CONFIG_NO_HZ_FULL */ | 943 | #endif /* CONFIG_NO_HZ_FULL */ |
| 865 | 944 | ||
| 866 | /** | 945 | /** |
| @@ -907,26 +986,7 @@ noinstr void rcu_nmi_enter(void) · 40 unmodified lines | |||
| 907 | incby = 1; | 986 | incby = 1; |
| 908 | } else if (!in_nmi()) { | 987 | } else if (!in_nmi()) { |
| 909 | instrumentation_begin(); | 988 | instrumentation_begin(); |
| 910 | if (tick_nohz_full_cpu(rdp->cpu) && | 989 | rcu_irq_enter_check_tick(); |
| 911 | rdp->dynticks_nmi_nesting == DYNTICK_IRQ_NONIDLE && | ||
| 912 | READ_ONCE(rdp->rcu_urgent_qs) && | ||
| 913 | !READ_ONCE(rdp->rcu_forced_tick)) { | ||
| 914 | // We get here only if we had already exited the | ||
| 915 | // extended quiescent state and this was an | ||
| 916 | // interrupt (not an NMI). Therefore, (1) RCU is | ||
| 917 | // already watching and (2) The fact that we are in | ||
| 918 | // an interrupt handler and that the rcu_node lock | ||
| 919 | // is an irq-disabled lock prevents self-deadlock. | ||
| 920 | // So we can safely recheck under the lock. | ||
| 921 | raw_spin_lock_rcu_node(rdp->mynode); | ||
| 922 | if (rdp->rcu_urgent_qs && !rdp->rcu_forced_tick) { | ||
| 923 | // A nohz_full CPU is in the kernel and RCU | ||
| 924 | // needs a quiescent state. Turn on the tick! | ||
| 925 | WRITE_ONCE(rdp->rcu_forced_tick, true); | ||
| 926 | tick_dep_set_cpu(rdp->cpu, TICK_DEP_BIT_RCU); | ||
| 927 | } | ||
| 928 | raw_spin_unlock_rcu_node(rdp->mynode); | ||
| 929 | } | ||
| 930 | instrumentation_end(); | 990 | instrumentation_end(); |
| 931 | } | 991 | } |
| 932 | instrumentation_begin(); | 992 | instrumentation_begin(); |