Merge branches 'x86-fixes-for-linus', 'sched-fixes-for-linus', 'timers-fixes-for...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Apr 2011 19:12:58 +0000 (12:12 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Apr 2011 19:12:58 +0000 (12:12 -0700)
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86-32, fpu: Fix FPU exception handling on non-SSE systems
  x86, hibernate: Initialize mmu_cr4_features during boot
  x86-32, NUMA: Fix ACPI NUMA init broken by recent x86-64 change
  x86: visws: Fixup irq overhaul fallout

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: Clean up rebalance_domains() load-balance interval calculation

* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86/mrst/vrtc: Fix boot crash in mrst_rtc_init()
  rtc, x86/mrst/vrtc: Fix boot crash in rtc_read_alarm()

* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: Fix cpumask leak in __setup_irq()

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf probe: Fix listing incorrect line number with inline function
  perf probe: Fix to find recursively inlined function
  perf probe: Fix multiple --vars options behavior
  perf probe: Fix to remove redundant close
  perf probe: Fix to ensure function declared file

arch/x86/include/asm/i387.h
arch/x86/kernel/setup.c
arch/x86/mm/srat_32.c
arch/x86/platform/mrst/vrtc.c
arch/x86/platform/visws/visws_quirks.c
drivers/rtc/rtc-mrst.c
kernel/irq/manage.c
kernel/sched.c
kernel/sched_fair.c
tools/perf/util/probe-event.c
tools/perf/util/probe-finder.c

index ef32890..c9e09ea 100644 (file)
@@ -237,7 +237,7 @@ static inline void fpu_save_init(struct fpu *fpu)
        } else if (use_fxsr()) {
                fpu_fxsave(fpu);
        } else {
-               asm volatile("fsave %[fx]; fwait"
+               asm volatile("fnsave %[fx]; fwait"
                             : [fx] "=m" (fpu->state->fsave));
                return;
        }
index 5a0484a..4be9b39 100644 (file)
@@ -976,6 +976,11 @@ void __init setup_arch(char **cmdline_p)
        paging_init();
        x86_init.paging.pagetable_setup_done(swapper_pg_dir);
 
+       if (boot_cpu_data.cpuid_level >= 0) {
+               /* A CPU has %cr4 if and only if it has CPUID */
+               mmu_cr4_features = read_cr4();
+       }
+
 #ifdef CONFIG_X86_32
        /* sync back kernel address range */
        clone_pgd_range(initial_page_table + KERNEL_PGD_BOUNDARY,
index 48651c6..364f36b 100644 (file)
@@ -211,10 +211,12 @@ int __init get_memcfg_from_srat(void)
 {
        int i, j, nid;
 
-
        if (srat_disabled())
                goto out_fail;
 
+       if (acpi_numa_init() < 0)
+               goto out_fail;
+
        if (num_memory_chunks == 0) {
                printk(KERN_DEBUG
                         "could not find any ACPI SRAT memory areas.\n");
index 04cf645..73d70d6 100644 (file)
@@ -100,9 +100,11 @@ int vrtc_set_mmss(unsigned long nowtime)
 
 void __init mrst_rtc_init(void)
 {
-       unsigned long vrtc_paddr = sfi_mrtc_array[0].phys_addr;
+       unsigned long vrtc_paddr;
 
        sfi_table_parse(SFI_SIG_MRTC, NULL, NULL, sfi_parse_mrtc);
+
+       vrtc_paddr = sfi_mrtc_array[0].phys_addr;
        if (!sfi_mrtc_num || !vrtc_paddr)
                return;
 
index fe4cf82..c7abf13 100644 (file)
@@ -471,15 +471,7 @@ static unsigned int startup_piix4_master_irq(struct irq_data *data)
 {
        legacy_pic->init(0);
        enable_cobalt_irq(data);
-}
-
-static void end_piix4_master_irq(struct irq_data *data)
-{
-       unsigned long flags;
-
-       spin_lock_irqsave(&cobalt_lock, flags);
-       enable_cobalt_irq(data);
-       spin_unlock_irqrestore(&cobalt_lock, flags);
+       return 0;
 }
 
 static struct irq_chip piix4_master_irq_type = {
@@ -492,7 +484,7 @@ static void pii4_mask(struct irq_data *data) { }
 
 static struct irq_chip piix4_virtual_irq_type = {
        .name           = "PIIX4-virtual",
-       .mask           = pii4_mask,
+       .irq_mask       = pii4_mask,
 };
 
 /*
@@ -580,9 +572,9 @@ static struct irqaction cascade_action = {
 
 static inline void set_piix4_virtual_irq_type(void)
 {
-       piix4_virtual_irq_type.enable = i8259A_chip.unmask;
-       piix4_virtual_irq_type.disable = i8259A_chip.mask;
-       piix4_virtual_irq_type.unmask = i8259A_chip.unmask;
+       piix4_virtual_irq_type.irq_enable = i8259A_chip.irq_unmask;
+       piix4_virtual_irq_type.irq_disable = i8259A_chip.irq_mask;
+       piix4_virtual_irq_type.irq_unmask = i8259A_chip.irq_unmask;
 }
 
 static void __init visws_pre_intr_init(void)
@@ -599,7 +591,7 @@ static void __init visws_pre_intr_init(void)
                else if (i == CO_IRQ_IDE0)
                        chip = &cobalt_irq_type;
                else if (i == CO_IRQ_IDE1)
-                       >chip = &cobalt_irq_type;
+                       chip = &cobalt_irq_type;
                else if (i == CO_IRQ_8259)
                        chip = &piix4_master_irq_type;
                else if (i < CO_IRQ_APIC0)
index 332a2c4..b2f0968 100644 (file)
@@ -342,6 +342,8 @@ vrtc_mrst_do_probe(struct device *dev, struct resource *iomem, int rtc_irq)
 
        mrst_rtc.irq = rtc_irq;
        mrst_rtc.iomem = iomem;
+       mrst_rtc.dev = dev;
+       dev_set_drvdata(dev, &mrst_rtc);
 
        mrst_rtc.rtc = rtc_device_register(driver_name, dev,
                                &mrst_rtc_ops, THIS_MODULE);
@@ -350,8 +352,6 @@ vrtc_mrst_do_probe(struct device *dev, struct resource *iomem, int rtc_irq)
                goto cleanup0;
        }
 
-       mrst_rtc.dev = dev;
-       dev_set_drvdata(dev, &mrst_rtc);
        rename_region(iomem, dev_name(&mrst_rtc.rtc->dev));
 
        spin_lock_irq(&rtc_lock);
@@ -376,9 +376,10 @@ vrtc_mrst_do_probe(struct device *dev, struct resource *iomem, int rtc_irq)
        return 0;
 
 cleanup1:
-       mrst_rtc.dev = NULL;
        rtc_device_unregister(mrst_rtc.rtc);
 cleanup0:
+       dev_set_drvdata(dev, NULL);
+       mrst_rtc.dev = NULL;
        release_region(iomem->start, iomem->end + 1 - iomem->start);
        dev_err(dev, "rtc-mrst: unable to initialise\n");
        return retval;
index 12a80fd..07c1611 100644 (file)
@@ -1051,6 +1051,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
        register_irq_proc(irq, desc);
        new->dir = NULL;
        register_handler_proc(irq, new);
+       free_cpumask_var(mask);
 
        return 0;
 
index dc7ca5c..4801363 100644 (file)
@@ -6331,6 +6331,9 @@ migration_call(struct notifier_block *nfb, unsigned long action, void *hcpu)
                break;
 #endif
        }
+
+       update_max_interval();
+
        return NOTIFY_OK;
 }
 
index 4104533..7f00772 100644 (file)
@@ -3820,6 +3820,17 @@ void select_nohz_load_balancer(int stop_tick)
 
 static DEFINE_SPINLOCK(balancing);
 
+static unsigned long __read_mostly max_load_balance_interval = HZ/10;
+
+/*
+ * Scale the max load_balance interval with the number of CPUs in the system.
+ * This trades load-balance latency on larger machines for less cross talk.
+ */
+static void update_max_interval(void)
+{
+       max_load_balance_interval = HZ*num_online_cpus()/10;
+}
+
 /*
  * It checks each scheduling domain to see if it is due to be balanced,
  * and initiates a balancing operation if so.
@@ -3849,10 +3860,7 @@ static void rebalance_domains(int cpu, enum cpu_idle_type idle)
 
                /* scale ms to jiffies */
                interval = msecs_to_jiffies(interval);
-               if (unlikely(!interval))
-                       interval = 1;
-               if (interval > HZ*num_online_cpus()/10)
-                       interval = HZ*num_online_cpus()/10;
+               interval = clamp(interval, 1UL, max_load_balance_interval);
 
                need_serialize = sd->flags & SD_SERIALIZE;
 
index 5ddee66..f022316 100644 (file)
@@ -234,7 +234,6 @@ static int try_to_find_probe_trace_events(struct perf_probe_event *pev,
 
        /* Searching trace events corresponding to probe event */
        ntevs = find_probe_trace_events(fd, pev, tevs, max_tevs);
-       close(fd);
 
        if (ntevs > 0) {        /* Succeeded to find trace events */
                pr_debug("find %d probe_trace_events.\n", ntevs);
@@ -388,7 +387,6 @@ int show_line_range(struct line_range *lr, const char *module)
        }
 
        ret = find_line_range(fd, lr);
-       close(fd);
        if (ret == 0) {
                pr_warning("Specified source line is not found.\n");
                return -ENOENT;
@@ -512,19 +510,18 @@ int show_available_vars(struct perf_probe_event *pevs, int npevs,
        if (ret < 0)
                return ret;
 
-       fd = open_vmlinux(module);
-       if (fd < 0) {
-               pr_warning("Failed to open debug information file.\n");
-               return fd;
-       }
-
        setup_pager();
 
-       for (i = 0; i < npevs && ret >= 0; i++)
+       for (i = 0; i < npevs && ret >= 0; i++) {
+               fd = open_vmlinux(module);
+               if (fd < 0) {
+                       pr_warning("Failed to open debug information file.\n");
+                       ret = fd;
+                       break;
+               }
                ret = show_available_vars_at(fd, &pevs[i], max_vls, _filter,
                                             externs);
-
-       close(fd);
+       }
        return ret;
 }
 
index 194f9e2..b7c85ce 100644 (file)
@@ -273,6 +273,25 @@ static const char *cu_get_comp_dir(Dwarf_Die *cu_die)
        return dwarf_formstring(&attr);
 }
 
+/* Get a line number and file name for given address */
+static int cu_find_lineinfo(Dwarf_Die *cudie, unsigned long addr,
+                           const char **fname, int *lineno)
+{
+       Dwarf_Line *line;
+       Dwarf_Addr laddr;
+
+       line = dwarf_getsrc_die(cudie, (Dwarf_Addr)addr);
+       if (line && dwarf_lineaddr(line, &laddr) == 0 &&
+           addr == (unsigned long)laddr && dwarf_lineno(line, lineno) == 0) {
+               *fname = dwarf_linesrc(line, NULL, NULL);
+               if (!*fname)
+                       /* line number is useless without filename */
+                       *lineno = 0;
+       }
+
+       return *lineno ?: -ENOENT;
+}
+
 /* Compare diename and tname */
 static bool die_compare_name(Dwarf_Die *dw_die, const char *tname)
 {
@@ -497,7 +516,20 @@ static int __die_find_inline_cb(Dwarf_Die *die_mem, void *data)
 static Dwarf_Die *die_find_inlinefunc(Dwarf_Die *sp_die, Dwarf_Addr addr,
                                      Dwarf_Die *die_mem)
 {
-       return die_find_child(sp_die, __die_find_inline_cb, &addr, die_mem);
+       Dwarf_Die tmp_die;
+
+       sp_die = die_find_child(sp_die, __die_find_inline_cb, &addr, &tmp_die);
+       if (!sp_die)
+               return NULL;
+
+       /* Inlined function could be recursive. Trace it until fail */
+       while (sp_die) {
+               memcpy(die_mem, sp_die, sizeof(Dwarf_Die));
+               sp_die = die_find_child(sp_die, __die_find_inline_cb, &addr,
+                                       &tmp_die);
+       }
+
+       return die_mem;
 }
 
 /* Walker on lines (Note: line number will not be sorted) */
@@ -1395,6 +1427,10 @@ static int probe_point_search_cb(Dwarf_Die *sp_die, void *data)
            !die_compare_name(sp_die, pp->function))
                return DWARF_CB_OK;
 
+       /* Check declared file */
+       if (pp->file && strtailcmp(pp->file, dwarf_decl_file(sp_die)))
+               return DWARF_CB_OK;
+
        pf->fname = dwarf_decl_file(sp_die);
        if (pp->line) { /* Function relative line */
                dwarf_decl_line(sp_die, &pf->lno);
@@ -1451,6 +1487,7 @@ static int find_probes(int fd, struct probe_finder *pf)
        if (!dbg) {
                pr_warning("No debug information found in the vmlinux - "
                        "please rebuild with CONFIG_DEBUG_INFO=y.\n");
+               close(fd);      /* Without dwfl_end(), fd isn't closed. */
                return -EBADF;
        }
 
@@ -1686,11 +1723,9 @@ int find_perf_probe_point(unsigned long addr, struct perf_probe_point *ppt)
        Dwarf_Die cudie, spdie, indie;
        Dwarf *dbg = NULL;
        Dwfl *dwfl = NULL;
-       Dwarf_Line *line;
-       Dwarf_Addr laddr, eaddr, bias = 0;
-       const char *tmp;
-       int lineno, ret = 0;
-       bool found = false;
+       Dwarf_Addr _addr, baseaddr, bias = 0;
+       const char *fname = NULL, *func = NULL, *tmp;
+       int baseline = 0, lineno = 0, ret = 0;
 
        /* Open the live linux kernel */
        dbg = dwfl_init_live_kernel_dwarf(addr, &dwfl, &bias);
@@ -1711,68 +1746,79 @@ int find_perf_probe_point(unsigned long addr, struct perf_probe_point *ppt)
                goto end;
        }
 
-       /* Find a corresponding line */
-       line = dwarf_getsrc_die(&cudie, (Dwarf_Addr)addr);
-       if (line) {
-               if (dwarf_lineaddr(line, &laddr) == 0 &&
-                   (Dwarf_Addr)addr == laddr &&
-                   dwarf_lineno(line, &lineno) == 0) {
-                       tmp = dwarf_linesrc(line, NULL, NULL);
-                       if (tmp) {
-                               ppt->line = lineno;
-                               ppt->file = strdup(tmp);
-                               if (ppt->file == NULL) {
-                                       ret = -ENOMEM;
-                                       goto end;
-                               }
-                               found = true;
-                       }
-               }
-       }
+       /* Find a corresponding line (filename and lineno) */
+       cu_find_lineinfo(&cudie, addr, &fname, &lineno);
+       /* Don't care whether it failed or not */
 
-       /* Find a corresponding function */
+       /* Find a corresponding function (name, baseline and baseaddr) */
        if (die_find_real_subprogram(&cudie, (Dwarf_Addr)addr, &spdie)) {
+               /* Get function entry information */
                tmp = dwarf_diename(&spdie);
-               if (!tmp || dwarf_entrypc(&spdie, &eaddr) != 0)
-                       goto end;
-
-               if (ppt->line) {
-                       if (die_find_inlinefunc(&spdie, (Dwarf_Addr)addr,
-                                               &indie)) {
-                               /* addr in an inline function */
+               if (!tmp ||
+                   dwarf_entrypc(&spdie, &baseaddr) != 0 ||
+                   dwarf_decl_line(&spdie, &baseline) != 0)
+                       goto post;
+               func = tmp;
+
+               if (addr == (unsigned long)baseaddr)
+                       /* Function entry - Relative line number is 0 */
+                       lineno = baseline;
+               else if (die_find_inlinefunc(&spdie, (Dwarf_Addr)addr,
+                                            &indie)) {
+                       if (dwarf_entrypc(&indie, &_addr) == 0 &&
+                           _addr == addr)
+                               /*
+                                * addr is at an inline function entry.
+                                * In this case, lineno should be the call-site
+                                * line number.
+                                */
+                               lineno = die_get_call_lineno(&indie);
+                       else {
+                               /*
+                                * addr is in an inline function body.
+                                * Since lineno points one of the lines
+                                * of the inline function, baseline should
+                                * be the entry line of the inline function.
+                                */
                                tmp = dwarf_diename(&indie);
-                               if (!tmp)
-                                       goto end;
-                               ret = dwarf_decl_line(&indie, &lineno);
-                       } else {
-                               if (eaddr == addr) {    /* Function entry */
-                                       lineno = ppt->line;
-                                       ret = 0;
-                               } else
-                                       ret = dwarf_decl_line(&spdie, &lineno);
-                       }
-                       if (ret == 0) {
-                               /* Make a relative line number */
-                               ppt->line -= lineno;
-                               goto found;
+                               if (tmp &&
+                                   dwarf_decl_line(&spdie, &baseline) == 0)
+                                       func = tmp;
                        }
                }
-               /* We don't have a line number, let's use offset */
-               ppt->offset = addr - (unsigned long)eaddr;
-found:
-               ppt->function = strdup(tmp);
+       }
+
+post:
+       /* Make a relative line number or an offset */
+       if (lineno)
+               ppt->line = lineno - baseline;
+       else if (func)
+               ppt->offset = addr - (unsigned long)baseaddr;
+
+       /* Duplicate strings */
+       if (func) {
+               ppt->function = strdup(func);
                if (ppt->function == NULL) {
                        ret = -ENOMEM;
                        goto end;
                }
-               found = true;
        }
-
+       if (fname) {
+               ppt->file = strdup(fname);
+               if (ppt->file == NULL) {
+                       if (ppt->function) {
+                               free(ppt->function);
+                               ppt->function = NULL;
+                       }
+                       ret = -ENOMEM;
+                       goto end;
+               }
+       }
 end:
        if (dwfl)
                dwfl_end(dwfl);
-       if (ret >= 0)
-               ret = found ? 1 : 0;
+       if (ret == 0 && (fname || func))
+               ret = 1;        /* Found a point */
        return ret;
 }
 
@@ -1840,6 +1886,10 @@ static int line_range_search_cb(Dwarf_Die *sp_die, void *data)
        struct line_finder *lf = param->data;
        struct line_range *lr = lf->lr;
 
+       /* Check declared file */
+       if (lr->file && strtailcmp(lr->file, dwarf_decl_file(sp_die)))
+               return DWARF_CB_OK;
+
        if (dwarf_tag(sp_die) == DW_TAG_subprogram &&
            die_compare_name(sp_die, lr->function)) {
                lf->fname = dwarf_decl_file(sp_die);
@@ -1892,6 +1942,7 @@ int find_line_range(int fd, struct line_range *lr)
        if (!dbg) {
                pr_warning("No debug information found in the vmlinux - "
                        "please rebuild with CONFIG_DEBUG_INFO=y.\n");
+               close(fd);      /* Without dwfl_end(), fd isn't closed. */
                return -EBADF;
        }