diff for duplicates of <1495762747.29205.63.camel@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 66d5c1b..ccd5185 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,12 +3,12 @@ On Thu, 2017-05-25 at 17:47 -0700, Andy Lutomirski wrote: > +++ b/arch/x86/mm/tlb.c > @@ -311,7 +311,7 @@ void flush_tlb_mm_range(struct mm_struct *mm, > unsigned long start, -> A goto out; -> A } -> A +> goto out; +> } +> > - if (!current->mm) { > + if (this_cpu_read(cpu_tlbstate.state) != TLBSTATE_OK) { -> A leave_mm(smp_processor_id()); +> leave_mm(smp_processor_id()); Unless -mm changed leave_mm (I did not check), this is not quite correct yet. @@ -21,16 +21,10 @@ assuming you haven't already done so in -mm. void leave_mm(int cpu) { -A A A A A A A A struct mm_struct *active_mm = + struct mm_struct *active_mm = this_cpu_read(cpu_tlbstate.active_mm); -A A A A A A A A if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK) -A A A A A A A A A A A A A A A A BUG(); -A A A A A A A A if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) { -A A A A A A A A A A A A A A A A cpumask_clear_cpu(cpu, mm_cpumask(active_mm)); -A A A A A A A A A A A A A A A A load_cr3(swapper_pg_dir); - --- -To unsubscribe, send a message with 'unsubscribe linux-mm' in -the body to majordomo@kvack.org. For more info on Linux MM, -see: http://www.linux-mm.org/ . -Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> + if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK) + BUG(); + if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) { + cpumask_clear_cpu(cpu, mm_cpumask(active_mm)); + load_cr3(swapper_pg_dir); diff --git a/a/content_digest b/N1/content_digest index d15cebb..a17c42f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -23,12 +23,12 @@ "> +++ b/arch/x86/mm/tlb.c\n" "> @@ -311,7 +311,7 @@ void flush_tlb_mm_range(struct mm_struct *mm,\n" "> unsigned long start,\n" - "> A \t\tgoto out;\n" - "> A \t}\n" - "> A \n" + "> \302\240\t\tgoto out;\n" + "> \302\240\t}\n" + "> \302\240\n" "> -\tif (!current->mm) {\n" "> +\tif (this_cpu_read(cpu_tlbstate.state) != TLBSTATE_OK) {\n" - "> A \t\tleave_mm(smp_processor_id());\n" + "> \302\240\t\tleave_mm(smp_processor_id());\n" "\n" "Unless -mm changed leave_mm (I did not check), this\n" "is not quite correct yet.\n" @@ -41,18 +41,12 @@ "\n" "void leave_mm(int cpu)\n" "{\n" - "A A A A A A A A struct mm_struct *active_mm =\n" + "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240struct mm_struct *active_mm =\n" "this_cpu_read(cpu_tlbstate.active_mm);\n" - "A A A A A A A A if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)\n" - "A A A A A A A A A A A A A A A A BUG();\n" - "A A A A A A A A if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {\n" - "A A A A A A A A A A A A A A A A cpumask_clear_cpu(cpu, mm_cpumask(active_mm));\n" - "A A A A A A A A A A A A A A A A load_cr3(swapper_pg_dir);\n" - "\n" - "--\n" - "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" - "the body to majordomo@kvack.org. For more info on Linux MM,\n" - "see: http://www.linux-mm.org/ .\n" - "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" + "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)\n" + "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240BUG();\n" + "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {\n" + "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240cpumask_clear_cpu(cpu, mm_cpumask(active_mm));\n" + "\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240load_cr3(swapper_pg_dir);" -04e4451ff61c962dc559898c1ba3dee366d2e82b9871e5eb87915374b698ebdb +e60856679d13a03870825b7e05478caa00e6bafe8d49cfcccde27dc9bc709887
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.