Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b8bec829c90d45a2d115a52f3a928ce841afc3d4

Authored by Jeff Dike
Committed by Linus Torvalds
1 parent 6b7e967484
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

uml: host TLS diagnostics 

Add some diagnostics when TLS operations on the host fail.  Also spit out more
information about the TLS environment on the host at boot time.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 21 additions and 9 deletions Side-by-side Diff

arch/um/sys-i386/tls.c
Diff comments   View file @ b8bec82
... ... @@ -26,6 +26,11 @@
26 26 cpu = get_cpu();
27 27 ret = os_set_thread_area(info, userspace_pid[cpu]);
28 28 put_cpu();
  29 +
  30 + if (ret)
  31 + printk(KERN_ERR "PTRACE_SET_THREAD_AREA failed, err = %d, "
  32 + "index = %d\n", ret, info->entry_number);
  33 +
29 34 return ret;
30 35 }
31 36  
... ... @@ -37,6 +42,11 @@
37 42 cpu = get_cpu();
38 43 ret = os_get_thread_area(info, userspace_pid[cpu]);
39 44 put_cpu();
  45 +
  46 + if (ret)
  47 + printk(KERN_ERR "PTRACE_GET_THREAD_AREA failed, err = %d, "
  48 + "index = %d\n", ret, info->entry_number);
  49 +
40 50 return ret;
41 51 }
42 52  
43 53  
... ... @@ -356,10 +366,9 @@
356 366 return ret;
357 367 }
358 368  
359   -
360 369 /*
361   - * XXX: This part is probably common to i386 and x86-64. Don't create a common
362   - * file for now, do that when implementing x86-64 support.
  370 + * This code is really i386-only, but it detects and logs x86_64 GDT indexes
  371 + * if a 32-bit UML is running on a 64-bit host.
363 372 */
364 373 static int __init __setup_host_supports_tls(void)
365 374 {
366 375  
... ... @@ -368,13 +377,16 @@
368 377 printk(KERN_INFO "Host TLS support detected\n");
369 378 printk(KERN_INFO "Detected host type: ");
370 379 switch (host_gdt_entry_tls_min) {
371   - case GDT_ENTRY_TLS_MIN_I386:
372   - printk("i386\n");
373   - break;
374   - case GDT_ENTRY_TLS_MIN_X86_64:
375   - printk("x86_64\n");
376   - break;
  380 + case GDT_ENTRY_TLS_MIN_I386:
  381 + printk(KERN_CONT "i386");
  382 + break;
  383 + case GDT_ENTRY_TLS_MIN_X86_64:
  384 + printk(KERN_CONT "x86_64");
  385 + break;
377 386 }
  387 + printk(KERN_CONT " (GDT indexes %d to %d)\n",
  388 + host_gdt_entry_tls_min,
  389 + host_gdt_entry_tls_min + GDT_ENTRY_TLS_ENTRIES);
378 390 } else
379 391 printk(KERN_ERR " Host TLS support NOT detected! "
380 392 "TLS support inside UML will not work\n");