diff for duplicates of <20170813013346.14002-8-npiggin@gmail.com> diff --git a/a/1.txt b/N1/1.txt index a1f8325..93b9357 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -124,7 +124,7 @@ index cbabb5adccd9..99eb8fd87d6f 100644 --- a/arch/powerpc/kernel/crash.c +++ b/arch/powerpc/kernel/crash.c @@ -230,7 +230,7 @@ static void __maybe_unused crash_kexec_wait_realmode(int cpu) - if (i = cpu) + if (i == cpu) continue; - while (paca[i].kexec_state < KEXEC_STATE_REAL_MODE) { @@ -188,7 +188,7 @@ index 5c12e21d0d1a..700cd25fbd28 100644 + * kexec_smp_wait(). */ for_each_online_cpu(i) { - if (i = my_cpu) + if (i == my_cpu) continue; - while (paca[i].kexec_state < wait_state) { @@ -330,7 +330,7 @@ index 35ad5f28f0c1..19439ca61d3e 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -108,7 +108,7 @@ void __init setup_tlb_core_data(void) - if (cpu_first_thread_sibling(boot_cpuid) = first) + if (cpu_first_thread_sibling(boot_cpuid) == first) first = boot_cpuid; - paca[cpu].tcd_ptr = &paca[first].tcd; @@ -481,7 +481,7 @@ index 1182cfd79857..f24406de4ebc 100644 - if (paca[cpu + i].kvm_hstate.kvm_vcore) + if (paca_ptrs[cpu + i]->kvm_hstate.kvm_vcore) break; - if (i = n_threads) { + if (i == n_threads) { HMT_medium(); @@ -2252,7 +2252,7 @@ static void kvmppc_wait_for_nap(void) } @@ -509,12 +509,14 @@ index 1182cfd79857..f24406de4ebc 100644 + if (paca_ptrs[first_cpu]->sibling_subcore_state) continue; - sibling_subcore_state @@ -4270,7 +4270,8 @@ static int kvm_init_subcore_bitmap(void) + sibling_subcore_state = +@@ -4270,7 +4270,8 @@ static int kvm_init_subcore_bitmap(void) for (j = 0; j < threads_per_core; j++) { int cpu = first_cpu + j; - paca[cpu].sibling_subcore_state = sibling_subcore_state; -+ paca_ptrs[cpu]->sibling_subcore_state + sibling_subcore_state; ++ paca_ptrs[cpu]->sibling_subcore_state = ++ sibling_subcore_state; } } return 0; @@ -546,7 +548,7 @@ index 16ae1bbe13f0..92ed44a97dcb 100644 +++ b/arch/powerpc/mm/tlb-radix.c @@ -486,7 +486,7 @@ extern void radix_kvm_prefetch_workaround(struct mm_struct *mm) for (; sib <= cpu_last_thread_sibling(cpu) && !flush; sib++) { - if (sib = cpu) + if (sib == cpu) continue; - if (paca[sib].kvm_hstate.kvm_vcpu) + if (paca_ptrs[sib]->kvm_hstate.kvm_vcpu) @@ -639,7 +641,9 @@ index 2abee070373f..d974a5c877c4 100644 + paca_ptrs[cpu]->thread_mask = 1 << j; if (!cpu_has_feature(CPU_FTR_POWER9_DD1)) continue; -- paca[cpu].thread_sibling_pacas + paca_ptrs[cpu]->thread_sibling_pacas kmalloc_node(paca_ptr_array_size, +- paca[cpu].thread_sibling_pacas = ++ paca_ptrs[cpu]->thread_sibling_pacas = + kmalloc_node(paca_ptr_array_size, GFP_KERNEL, node); } @@ -676,7 +676,8 @@ static int __init pnv_init_idle_states(void) @@ -647,7 +651,8 @@ index 2abee070373f..d974a5c877c4 100644 int j = base_cpu + i; - paca[j].thread_sibling_pacas[idx] = &paca[cpu]; -+ paca_ptrs[j]->thread_sibling_pacas[idx] + paca_ptrs[cpu]; ++ paca_ptrs[j]->thread_sibling_pacas[idx] = ++ paca_ptrs[cpu]; } } } @@ -665,7 +670,7 @@ index 897aa1400eb8..be563e913b43 100644 } @@ -216,7 +216,7 @@ static void pnv_kexec_wait_secondaries_down(void) - if (timeout-- = 0) { + if (timeout-- == 0) { printk(KERN_ERR "kexec: timed out waiting for " "cpu %d (physical %d) to enter OPAL\n", - i, paca[i].hw_cpu_id); @@ -758,7 +763,7 @@ index 24785f63fb40..942274c109ee 100644 - task_thread_info(paca[lcpu].__current)->preempt_count = 0; + task_thread_info(paca_ptrs[lcpu]->__current)->preempt_count = 0; #ifdef CONFIG_HOTPLUG_CPU - if (get_cpu_current_state(lcpu) = CPU_STATE_INACTIVE) + if (get_cpu_current_state(lcpu) == CPU_STATE_INACTIVE) goto out; @@ -162,7 +162,7 @@ static int smp_pSeries_kick_cpu(int nr) * cpu_start field to become non-zero After we set cpu_start, diff --git a/a/content_digest b/N1/content_digest index 73c211a..edcbd95 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020170812113416.15978-1-npiggin@gmail.com\0" "From\0Nicholas Piggin <npiggin@gmail.com>\0" "Subject\0[PATCH v2 8/9] powerpc/64: Use a table of paca pointers and allocate pacas individually\0" - "Date\0Sun, 13 Aug 2017 01:33:45 +0000\0" + "Date\0Sun, 13 Aug 2017 11:33:45 +1000\0" "To\0linuxppc-dev@lists.ozlabs.org\0" "Cc\0Nicholas Piggin <npiggin@gmail.com>" " kvm-ppc@vger.kernel.org\0" @@ -133,7 +133,7 @@ "--- a/arch/powerpc/kernel/crash.c\n" "+++ b/arch/powerpc/kernel/crash.c\n" "@@ -230,7 +230,7 @@ static void __maybe_unused crash_kexec_wait_realmode(int cpu)\n" - " \t\tif (i = cpu)\n" + " \t\tif (i == cpu)\n" " \t\t\tcontinue;\n" " \n" "-\t\twhile (paca[i].kexec_state < KEXEC_STATE_REAL_MODE) {\n" @@ -197,7 +197,7 @@ "+\t * kexec_smp_wait().\n" " \t */\n" " \tfor_each_online_cpu(i) {\n" - " \t\tif (i = my_cpu)\n" + " \t\tif (i == my_cpu)\n" " \t\t\tcontinue;\n" " \n" "-\t\twhile (paca[i].kexec_state < wait_state) {\n" @@ -339,7 +339,7 @@ "--- a/arch/powerpc/kernel/setup_64.c\n" "+++ b/arch/powerpc/kernel/setup_64.c\n" "@@ -108,7 +108,7 @@ void __init setup_tlb_core_data(void)\n" - " \t\tif (cpu_first_thread_sibling(boot_cpuid) = first)\n" + " \t\tif (cpu_first_thread_sibling(boot_cpuid) == first)\n" " \t\t\tfirst = boot_cpuid;\n" " \n" "-\t\tpaca[cpu].tcd_ptr = &paca[first].tcd;\n" @@ -490,7 +490,7 @@ "-\t\t\tif (paca[cpu + i].kvm_hstate.kvm_vcore)\n" "+\t\t\tif (paca_ptrs[cpu + i]->kvm_hstate.kvm_vcore)\n" " \t\t\t\tbreak;\n" - " \t\tif (i = n_threads) {\n" + " \t\tif (i == n_threads) {\n" " \t\t\tHMT_medium();\n" "@@ -2252,7 +2252,7 @@ static void kvmppc_wait_for_nap(void)\n" " \t}\n" @@ -518,12 +518,14 @@ "+\t\tif (paca_ptrs[first_cpu]->sibling_subcore_state)\n" " \t\t\tcontinue;\n" " \n" - " \t\tsibling_subcore_state @@ -4270,7 +4270,8 @@ static int kvm_init_subcore_bitmap(void)\n" + " \t\tsibling_subcore_state =\n" + "@@ -4270,7 +4270,8 @@ static int kvm_init_subcore_bitmap(void)\n" " \t\tfor (j = 0; j < threads_per_core; j++) {\n" " \t\t\tint cpu = first_cpu + j;\n" " \n" "-\t\t\tpaca[cpu].sibling_subcore_state = sibling_subcore_state;\n" - "+\t\t\tpaca_ptrs[cpu]->sibling_subcore_state +\t\t\t\t\t\tsibling_subcore_state;\n" + "+\t\t\tpaca_ptrs[cpu]->sibling_subcore_state =\n" + "+\t\t\t\t\t\tsibling_subcore_state;\n" " \t\t}\n" " \t}\n" " \treturn 0;\n" @@ -555,7 +557,7 @@ "+++ b/arch/powerpc/mm/tlb-radix.c\n" "@@ -486,7 +486,7 @@ extern void radix_kvm_prefetch_workaround(struct mm_struct *mm)\n" " \t\tfor (; sib <= cpu_last_thread_sibling(cpu) && !flush; sib++) {\n" - " \t\t\tif (sib = cpu)\n" + " \t\t\tif (sib == cpu)\n" " \t\t\t\tcontinue;\n" "-\t\t\tif (paca[sib].kvm_hstate.kvm_vcpu)\n" "+\t\t\tif (paca_ptrs[sib]->kvm_hstate.kvm_vcpu)\n" @@ -648,7 +650,9 @@ "+\t\t\tpaca_ptrs[cpu]->thread_mask = 1 << j;\n" " \t\t\tif (!cpu_has_feature(CPU_FTR_POWER9_DD1))\n" " \t\t\t\tcontinue;\n" - "-\t\t\tpaca[cpu].thread_sibling_pacas +\t\t\tpaca_ptrs[cpu]->thread_sibling_pacas \t\t\t\tkmalloc_node(paca_ptr_array_size,\n" + "-\t\t\tpaca[cpu].thread_sibling_pacas =\n" + "+\t\t\tpaca_ptrs[cpu]->thread_sibling_pacas =\n" + " \t\t\t\tkmalloc_node(paca_ptr_array_size,\n" " \t\t\t\t\t GFP_KERNEL, node);\n" " \t\t}\n" "@@ -676,7 +676,8 @@ static int __init pnv_init_idle_states(void)\n" @@ -656,7 +660,8 @@ " \t\t\t\tint j = base_cpu + i;\n" " \n" "-\t\t\t\tpaca[j].thread_sibling_pacas[idx] = &paca[cpu];\n" - "+\t\t\t\tpaca_ptrs[j]->thread_sibling_pacas[idx] +\t\t\t\t\tpaca_ptrs[cpu];\n" + "+\t\t\t\tpaca_ptrs[j]->thread_sibling_pacas[idx] =\n" + "+\t\t\t\t\tpaca_ptrs[cpu];\n" " \t\t\t}\n" " \t\t}\n" " \t}\n" @@ -674,7 +679,7 @@ " \t\t\t}\n" " \n" "@@ -216,7 +216,7 @@ static void pnv_kexec_wait_secondaries_down(void)\n" - " \t\t\tif (timeout-- = 0) {\n" + " \t\t\tif (timeout-- == 0) {\n" " \t\t\t\tprintk(KERN_ERR \"kexec: timed out waiting for \"\n" " \t\t\t\t \"cpu %d (physical %d) to enter OPAL\\n\",\n" "-\t\t\t\t i, paca[i].hw_cpu_id);\n" @@ -767,7 +772,7 @@ "-\ttask_thread_info(paca[lcpu].__current)->preempt_count\t= 0;\n" "+\ttask_thread_info(paca_ptrs[lcpu]->__current)->preempt_count\t= 0;\n" " #ifdef CONFIG_HOTPLUG_CPU\n" - " \tif (get_cpu_current_state(lcpu) = CPU_STATE_INACTIVE)\n" + " \tif (get_cpu_current_state(lcpu) == CPU_STATE_INACTIVE)\n" " \t\tgoto out;\n" "@@ -162,7 +162,7 @@ static int smp_pSeries_kick_cpu(int nr)\n" " \t * cpu_start field to become non-zero After we set cpu_start,\n" @@ -807,4 +812,4 @@ "-- \n" 2.13.3 -a25574d1318a4fb950995135b8ae9b171e279a9f616ff2056ac90460167b35ff +2e1c7e1d56042fc711ba2575536e1443f18171ec38c3632365c9f106960a9c66
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.