3.0.78-stable review
Subsystems (12)
Greg Kroah-Hartman
maintainercover 3.0.78-stable review
This is the start of the stable review cycle for the 3.0.78 release. There are 12 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat May 11 22:34:47 UTC 2013. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v3.0/stable-review/patch-3.0.78-rc1.gz
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 3.0.78-rc1
Jerry Hoemann <[email protected]>
x86/mm: account for PGDIR_SIZE alignment
Chen Gang <[email protected]>
kernel/audit_tree.c: tree will leak memory when failure occurs in audit_trim_trees()
Steven Rostedt (Red Hat) <[email protected]>
tracing: Fix ftrace_dump()
Alex Deucher <[email protected]>
drm/radeon: fix possible segfault when parsing pm tables
Alex Deucher <[email protected]>
drm/radeon: fix endian bugs in atom_allocate_fb_scratch()
Alex Deucher <[email protected]>
drm/radeon/evergreen+: don't enable HPD interrupts on eDP/LVDS
Alex Deucher <[email protected]>
drm/radeon: don't use get_engine_clock() on APUs
David Müller <[email protected]>
drm/i915: Fall back to bit banging mode for DVO transmitter detection
Christian Lamparter <[email protected]>
drm/i915: Add no-lvds quirk for Fujitsu Esprimo Q900
Hans Schillstrom <[email protected]>
ipvs: ip_vs_sip_fill_param() BUG: bad check of return value
David Jeffery <[email protected]>
autofs - remove autofs dentry mount check
Vaidyanathan Srinivasan <[email protected]>
powerpc: fix numa distance for form0 device tree
-------------
Diffstat:
Makefile | 4 +-- arch/powerpc/mm/numa.c | 2 +- arch/x86/mm/init.c | 5 ++++ drivers/gpu/drm/i915/intel_dvo.c | 13 +++++++- drivers/gpu/drm/i915/intel_lvds.c | 8 +++++ drivers/gpu/drm/radeon/atom.c | 6 ++-- drivers/gpu/drm/radeon/evergreen.c | 10 +++++++ drivers/gpu/drm/radeon/radeon_atombios.c | 10 ++++++- drivers/gpu/drm/radeon/radeon_pm.c | 6 +++- fs/autofs4/expire.c | 9 ------ kernel/audit_tree.c | 2 +- kernel/trace/trace.c | 51 +++++++++++++------------------- kernel/trace/trace_selftest.c | 9 +++--- net/netfilter/ipvs/ip_vs_pe_sip.c | 6 +--- 14 files changed, 83 insertions(+), 58 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/12 powerpc: fix numa distance for form0 device tree
3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vaidyanathan Srinivasan <[email protected]>
commit 7122beeee7bc1757682049780179d7c216dd1c83 upstream.
The following commit breaks numa distance setup for old powerpc systems that use form0 encoding in device tree.
commit 41eab6f88f24124df89e38067b3766b7bef06ddb powerpc/numa: Use form 1 affinity to setup node distance
Device tree node /rtas/ibm,associativity-reference-points would index into /cpus/PowerPCxxxx/ibm,associativity based on form0 or form1 encoding detected by ibm,architecture-vec-5 property.
All modern systems use form1 and current kernel code is correct. However, on older systems with form0 encoding, the numa distance will get hard coded as LOCAL_DISTANCE for all nodes. This causes task scheduling anomaly since scheduler will skip building numa level domain (topmost domain with all cpus) if all numa distances are same. (value of 'level' in sched_init_numa() will remain 0)
Prior to the above commit:
((from) == (to) ? LOCAL_DISTANCE : REMOTE_DISTANCE)
Restoring compatible behavior with this patch for old powerpc systems with device tree where numa distance are encoded as form0.
--- arch/powerpc/mm/numa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/mm/numa.c +1 -1
@@ -221,7 +221,7 @@ int __node_distance(int a, int b)int distance =LOCAL_DISTANCE ;if (!form1_affinity) -return distance; +return ((a == b) ?LOCAL_DISTANCE :REMOTE_DISTANCE );for (i =0 ; i < distance_ref_points_depth; i++) {if (distance_lookup_table[a][i] == distance_lookup_table[b][i])
Greg Kroah-Hartman
maintainerPATCH 2/12 autofs - remove autofs dentry mount check
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Jeffery <[email protected]>
commit ce8a5dbdf9e709bdaf4618d7ef8cceb91e8adc69 upstream.
When checking if an autofs mount point is busy it isn't sufficient to only check if it's a mount point.
For example, if the mount of an offset mountpoint in a tree is denied for this host by its export and the dentry becomes a process working directory the check incorrectly returns the mount as not in use at expire.
This can happen since the default when mounting within a tree is nostrict, which means ingnore mount fails on mounts within the tree and continue. The nostrict option is meant to allow mounting in this case.
--- fs/autofs4/expire.c | 9 --------- 1 file changed, 9 deletions(-)
fs/autofs4/expire.c +0 -9
@@ -61,15 +61,6 @@ static int autofs4_mount_busy(struct vfs/* This is an autofs submount, we can't expire it */ if (autofs_type_indirect (sbi->type)) goto done; - -/* -* Otherwise it's an offset mount and we need to check -* if we can umount its mount, if there is one. -*/ -if (!d_mountpoint (path.dentry)) { - status =0 ; - goto done; - } }/* Update the expiry counter if fs is busy */
Greg Kroah-Hartman
maintainerPATCH 3/12 ipvs: ip_vs_sip_fill_param() BUG: bad check of return value
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans Schillstrom <[email protected]>
commit f7a1dd6e3ad59f0cfd51da29dfdbfd54122c5916 upstream.
The reason for this patch is crash in kmemdup caused by returning from get_callid with uniialized matchoff and matchlen.
Removing Zero check of matchlen since it's done by ct_sip_get_header()
BUG: unable to handle kernel paging request at ffff880457b5763f IP: [<ffffffff810df7fc>] kmemdup+0x2e/0x35 PGD 27f6067 PUD 0 Oops: 0000 [#1] PREEMPT SMP Modules linked in: xt_state xt_helper nf_conntrack_ipv6 nf_defrag_ipv6 ip6table_mangle xt_connmark xt_conntrack ip6_tables nf_conntrack_ftp ip_vs_ftp nf_nat xt_tcpudp iptable_mangle xt_mark ip_tables x_tables ip_vs_rr ip_vs_lblcr ip_vs_pe_sip ip_vs nf_conntrack_sip nf_conntrack bonding igb i2c_algo_bit i2c_core CPU 5 Pid: 0, comm: swapper/5 Not tainted 3.9.0-rc5+ #5 /S1200KP RIP: 0010:[<ffffffff810df7fc>] [<ffffffff810df7fc>] kmemdup+0x2e/0x35 RSP: 0018:ffff8803fea03648 EFLAGS: 00010282 RAX: ffff8803d61063e0 RBX: 0000000000000003 RCX: 0000000000000003 RDX: 0000000000000003 RSI: ffff880457b5763f RDI: ffff8803d61063e0 RBP: ffff8803fea03658 R08: 0000000000000008 R09: 0000000000000011 R10: 0000000000000011 R11: 00ffffffff81a8a3 R12: ffff880457b5763f R13: ffff8803d67f786a R14: ffff8803fea03730 R15: ffffffffa0098e90 FS: 0000000000000000(0000) GS:ffff8803fea00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: ffff880457b5763f CR3: 0000000001a0c000 CR4: 00000000001407e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process swapper/5 (pid: 0, threadinfo ffff8803ee18c000, task ffff8803ee18a480) Stack: ffff8803d822a080 000000000000001c ffff8803fea036c8 ffffffffa000937a ffffffff81f0d8a0 000000038135fdd5 ffff880300000014 ffff880300110000 ffffffff150118ac ffff8803d7e8a000 ffff88031e0118ac 0000000000000000 Call Trace: <IRQ> [<ffffffffa000937a>] ip_vs_sip_fill_param+0x13a/0x187 [ip_vs_pe_sip] [<ffffffffa007b209>] ip_vs_sched_persist+0x2c6/0x9c3 [ip_vs] [<ffffffff8107dc53>] ? __lock_acquire+0x677/0x1697 [<ffffffff8100972e>] ? native_sched_clock+0x3c/0x7d [<ffffffff8100972e>] ? native_sched_clock+0x3c/0x7d [<ffffffff810649bc>] ? sched_clock_cpu+0x43/0xcf [<ffffffffa007bb1e>] ip_vs_schedule+0x181/0x4ba [ip_vs]
...
--- net/netfilter/ipvs/ip_vs_pe_sip.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
net/netfilter/ipvs/ip_vs_pe_sip.c +1 -5
@@ -37,14 +37,10 @@ static int get_callid(const char *dptr,if (ret >0 )break ;if (!ret) -return 0 ; +return -EINVAL ; dataoff += *matchoff; } -/* Empty callid is useless */ -if (!*matchlen) -return -EINVAL ; -/* Too large is useless */ if (*matchlen >IP_VS_PEDATA_MAXLEN )return -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 4/12 drm/i915: Add no-lvds quirk for Fujitsu Esprimo Q900
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Lamparter <[email protected]>
commit 9e9dd0e889c76c786e8f2e164c825c3c06dea30c upstream.
The "Mobile Sandy Bridge CPUs" in the Fujitsu Esprimo Q900 mini desktop PCs are probably misleading the LVDS detection code in intel_lvds_supported. Nothing is connected to the LVDS ports in these systems.
--- drivers/gpu/drm/i915/intel_lvds.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/i915/intel_lvds.c +8 -0
@@ -767,6 +767,14 @@ static const struct dmi_system_id intel_ DMI_MATCH(DMI_PRODUCT_NAME, "X7SPA-H"), }, }, + { + .callback = intel_no_lvds_dmi_callback, + .ident = "Fujitsu Esprimo Q900", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), + DMI_MATCH(DMI_PRODUCT_NAME, "ESPRIMO Q900"), + }, + }, { }/* terminating entry */ };
Greg Kroah-Hartman
maintainerPATCH 5/12 drm/i915: Fall back to bit banging mode for DVO transmitter detection
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Müller <[email protected]>
commit e4bfff54ed3f5de88f5358504c78c2cb037813aa upstream.
As discussed in this thread
http://lists.freedesktop.org/archives/dri-devel/2013-April/037411.html
GMBUS based DVO transmitter detection seems to be unreliable which could result in an unusable DVO port.
The attached patch fixes this by falling back to bit banging mode for the time DVO transmitter detection is in progress.
--- drivers/gpu/drm/i915/intel_dvo.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dvo.c +12 -1
@@ -371,6 +371,7 @@ void intel_dvo_init(struct drm_device *dconst struct intel_dvo_device *dvo = &intel_dvo_devices[i];struct i2c_adapter *i2c;int gpio; +bool dvoinit;/* Allow the I2C driver info to specify the GPIO to be used in * special cases, but otherwise default to what's defined
@@ -390,7 +391,17 @@ void intel_dvo_init(struct drm_device *d i2c = &dev_priv->gmbus[gpio].adapter; intel_dvo->dev = *dvo; -if (!dvo->dev_ops->init (&intel_dvo->dev, i2c)) + +/* GMBUS NAK handling seems to be unstable, hence let the +* transmitter detection run in bit banging mode for now. +*/ +intel_gmbus_force_bit (i2c, true); + + dvoinit = dvo->dev_ops->init (&intel_dvo->dev, i2c); + +intel_gmbus_force_bit (i2c, false); + +if (!dvoinit)continue ; intel_encoder->type =INTEL_OUTPUT_DVO ;
Greg Kroah-Hartman
maintainerPATCH 6/12 drm/radeon: dont use get_engine_clock() on APUs
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit bf05d9985111f85ed6922c134567b96eb789283b upstream.
It doesn't work reliably. Just report back the currently selected engine clock.
Partially fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=62493
--- drivers/gpu/drm/radeon/radeon_pm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/radeon_pm.c +5 -1
@@ -845,7 +845,11 @@ static int radeon_debugfs_pm_info(structstruct radeon_device *rdev = dev->dev_private;seq_printf (m,"default engine clock: %u0 kHz\n" , rdev->pm.default_sclk); -seq_printf (m,"current engine clock: %u0 kHz\n" ,radeon_get_engine_clock (rdev)); +/* radeon_get_engine_clock is not reliable on APUs so just print the current clock */ +if ((rdev->family >=CHIP_PALM ) && (rdev->flags &RADEON_IS_IGP )) +seq_printf (m,"current engine clock: %u0 kHz\n" , rdev->pm.current_sclk); +else +seq_printf (m,"current engine clock: %u0 kHz\n" ,radeon_get_engine_clock (rdev));seq_printf (m,"default memory clock: %u0 kHz\n" , rdev->pm.default_mclk);if (rdev->asic->get_memory_clock)seq_printf (m,"current memory clock: %u0 kHz\n" ,radeon_get_memory_clock (rdev));
Greg Kroah-Hartman
maintainerPATCH 7/12 drm/radeon/evergreen+: dont enable HPD interrupts on eDP/LVDS
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit 2e97be73e5f74a317232740ae82eb8f95326a660 upstream.
Avoids potential interrupt storms when the display is disabled.
May fix:
https://bugzilla.kernel.org/show_bug.cgi?id=56041
--- drivers/gpu/drm/radeon/evergreen.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/gpu/drm/radeon/evergreen.c +10 -0
@@ -330,6 +330,16 @@ void evergreen_hpd_init(struct radeon_delist_for_each_entry (connector, &dev->mode_config.connector_list, head) {struct radeon_connector *radeon_connector =to_radeon_connector (connector); + +if (connector->connector_type == DRM_MODE_CONNECTOR_eDP || + connector->connector_type ==DRM_MODE_CONNECTOR_LVDS ) { +/* don't try to enable hpd on eDP or LVDS avoid breaking the +* aux dp channel on imac and help (but not completely fix) +* https://bugzilla.redhat.com/show_bug.cgi?id=726143 +* also avoid interrupt storms during dpms. +*/ +continue ; + }switch (radeon_connector->hpd.hpd) {case RADEON_HPD_1 :WREG32 (DC_HPD1_CONTROL , tmp);
Greg Kroah-Hartman
maintainerPATCH 8/12 drm/radeon: fix endian bugs in atom_allocate_fb_scratch()
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit beb71fc61c2cad64e347f164991b8ef476529e64 upstream.
--- drivers/gpu/drm/radeon/atom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/radeon/atom.c +3 -3
@@ -1384,10 +1384,10 @@ int atom_allocate_fb_scratch(struct atom firmware_usage = (struct _ATOM_VRAM_USAGE_BY_FIRMWARE *)(ctx->bios + data_offset);DRM_DEBUG ("atom firmware requested %08x %dkb\n" , - firmware_usage->asFirmwareVramReserveInfo[0 ].ulStartAddrUsedByFirmware, - firmware_usage->asFirmwareVramReserveInfo[0 ].usFirmwareUseInKb); +le32_to_cpu (firmware_usage->asFirmwareVramReserveInfo[0 ].ulStartAddrUsedByFirmware), +le16_to_cpu (firmware_usage->asFirmwareVramReserveInfo[0 ].usFirmwareUseInKb)); - usage_bytes = firmware_usage->asFirmwareVramReserveInfo[0 ].usFirmwareUseInKb *1024 ; + usage_bytes =le16_to_cpu (firmware_usage->asFirmwareVramReserveInfo[0 ].usFirmwareUseInKb) *1024 ; } ctx->scratch_size_bytes =0 ;if (usage_bytes ==0 )
Greg Kroah-Hartman
maintainerPATCH 9/12 drm/radeon: fix possible segfault when parsing pm tables
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
commit f8e6bfc2ce162855fa4f9822a45659f4b542c960 upstream.
If we have a empty power table, bail early and allocate the default power state.
Should fix:
https://bugs.freedesktop.org/show_bug.cgi?id=63865
--- drivers/gpu/drm/radeon/radeon_atombios.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/gpu/drm/radeon/radeon_atombios.c +9 -1
@@ -2031,6 +2031,8 @@ static int radeon_atombios_parse_power_t num_modes = power_info->info.ucNumOfPowerModeEntries;if (num_modes >ATOM_MAX_NUMBEROF_POWER_BLOCK ) num_modes =ATOM_MAX_NUMBEROF_POWER_BLOCK ; +if (num_modes ==0 ) +return state_index; rdev->pm.power_state =kzalloc (sizeof (struct radeon_power_state ) * num_modes,GFP_KERNEL );if (!rdev->pm.power_state)return state_index;
@@ -2401,6 +2403,8 @@ static int radeon_atombios_parse_power_t power_info = (union power_info *)(mode_info->atom_context->bios + data_offset);radeon_atombios_add_pplib_thermal_controller (rdev, &power_info->pplib.sThermalController); +if (power_info->pplib.ucNumStates ==0 ) +return state_index; rdev->pm.power_state =kzalloc (sizeof (struct radeon_power_state ) * power_info->pplib.ucNumStates,GFP_KERNEL );if (!rdev->pm.power_state)
@@ -2485,6 +2489,8 @@ static int radeon_atombios_parse_power_t non_clock_info_array = (struct NonClockInfoArray *) (mode_info->atom_context->bios + data_offset +le16_to_cpu (power_info->pplib.usNonClockInfoArrayOffset)); +if (state_array->ucNumEntries ==0 ) +return state_index; rdev->pm.power_state =kzalloc (sizeof (struct radeon_power_state ) * state_array->ucNumEntries,GFP_KERNEL );if (!rdev->pm.power_state)
@@ -2561,7 +2567,9 @@ void radeon_atombios_get_power_modes(strdefault :break ; } - }else { + } + +if (state_index ==0 ) { rdev->pm.power_state =kzalloc (sizeof (struct radeon_power_state ),GFP_KERNEL );if (rdev->pm.power_state) {/* add the default mode */
Greg Kroah-Hartman
maintainerPATCH 10/12 tracing: Fix ftrace_dump()
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Steven Rostedt (Red Hat)" <[email protected]>
commit 7fe70b579c9e3daba71635e31b6189394e7b79d3 upstream.
ftrace_dump() had a lot of issues. What ftrace_dump() does, is when ftrace_dump_on_oops is set (via a kernel parameter or sysctl), it will dump out the ftrace buffers to the console when either a oops, panic, or a sysrq-z occurs.
This was written a long time ago when ftrace was fragile to recursion. But it wasn't written well even for that.
There's a possible deadlock that can occur if a ftrace_dump() is happening and an NMI triggers another dump. This is because it grabs a lock before checking if the dump ran.
It also totally disables ftrace, and tracing for no good reasons.
As the ring_buffer now checks if it is read via a oops or NMI, where there's a chance that the buffer gets corrupted, it will disable itself. No need to have ftrace_dump() do the same.
ftrace_dump() is now cleaned up where it uses an atomic counter to make sure only one dump happens at a time. A simple atomic_inc_return() is enough that is needed for both other CPUs and NMIs. No need for a spinlock, as if one CPU is running the dump, no other CPU needs to do it too.
The tracing_on variable is turned off and not turned on. The original code did this, but it wasn't pretty. By just disabling this variable we get the result of not seeing traces that happen between crashes.
For sysrq-z, it doesn't get turned on, but the user can always write a '1' to the tracing_on file. If they are using sysrq-z, then they should know about tracing_on.
The new code is much easier to read and less error prone. No more deadlock possibility when an NMI triggers here.
--- kernel/trace/trace.c | 51 +++++++++++++++++------------------------- kernel/trace/trace_selftest.c | 9 ++++--- 2 files changed, 26 insertions(+), 34 deletions(-)
kernel/trace/trace.c +21 -30
@@ -4489,30 +4489,32 @@ void trace_init_global_iter(struct trace iter->cpu_file =TRACE_PIPE_ALL_CPU ; } -static void -__ftrace_dump (bool disable_tracing,enum ftrace_dump_mode oops_dump_mode) +void ftrace_dump (enum ftrace_dump_mode oops_dump_mode) { -static arch_spinlock_t ftrace_dump_lock = - (arch_spinlock_t )__ARCH_SPIN_LOCK_UNLOCKED;/* use static because iter can be a bit big for the stack */ static struct trace_iterator iter; +static atomic_t dump_running;unsigned int old_userobj; -static int dump_ran;unsigned long flags;int cnt =0 , cpu; -/* only one dump */ -local_irq_save (flags); -arch_spin_lock (&ftrace_dump_lock); -if (dump_ran) - goto out; - - dump_ran =1 ; +/* Only allow one dump user at a time. */ +if (atomic_inc_return (&dump_running) !=1 ) { +atomic_dec (&dump_running); +return ; + } +/* +* Always turn off tracing when we dump. +* We don't need to show trace output of what happens +* between multiple crashes. +* +* If the user does a sysrq-z, then they can re-enable +* tracing with echo 1 > tracing_on. +*/ tracing_off (); -if (disable_tracing) -ftrace_kill (); +local_irq_save (flags);trace_init_global_iter (&iter);
@@ -4583,26 +4585,15 @@ __ftrace_dump(bool disable_tracing, enumprintk (KERN_TRACE "---------------------------------\n" ); out_enable: -/* Re-enable tracing if requested */ -if (!disable_tracing) { - trace_flags |= old_userobj; + trace_flags |= old_userobj; -for_each_tracing_cpu (cpu) { -atomic_dec (&iter.tr->data[cpu]->disabled); - } -tracing_on (); +for_each_tracing_cpu (cpu) { +atomic_dec (&iter.tr->data[cpu]->disabled); } - - out: -arch_spin_unlock (&ftrace_dump_lock); +atomic_dec (&dump_running);local_irq_restore (flags); } - -/* By default: disable tracing after the dump */ -void ftrace_dump (enum ftrace_dump_mode oops_dump_mode) -{ -__ftrace_dump (true, oops_dump_mode); -} +EXPORT_SYMBOL_GPL (ftrace_dump);__init static int tracer_alloc_buffers (void ) {
kernel/trace/trace_selftest.c +5 -4
@@ -461,8 +461,6 @@ trace_selftest_startup_function(struct t/* Maximum number of functions to trace before diagnosing a hang */ #define GRAPH_MAX_FUNC_TEST 100000000 -static void -__ftrace_dump (bool disable_tracing,enum ftrace_dump_mode oops_dump_mode);static unsigned int graph_hang_thresh;/* Wrap the real function entry probe to avoid possible hanging */
@@ -472,8 +470,11 @@ static int trace_graph_entry_watchdog(stif (unlikely (++graph_hang_thresh >GRAPH_MAX_FUNC_TEST )) {ftrace_graph_stop ();printk (KERN_WARNING "BUG: Function graph tracer hang!\n" ); -if (ftrace_dump_on_oops) -__ftrace_dump (false,DUMP_ALL ); +if (ftrace_dump_on_oops) { +ftrace_dump (DUMP_ALL ); +/* ftrace_dump() disables tracing */ +tracing_on (); + }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 11/12 kernel/audit_tree.c: tree will leak memory when failure occurs in audit_trim_trees()
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chen Gang <[email protected]>
commit 12b2f117f3bf738c1a00a6f64393f1953a740bd4 upstream.
audit_trim_trees() calls get_tree(). If a failure occurs we must call put_tree().
--- kernel/audit_tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/audit_tree.c +1 -1
@@ -614,9 +614,9 @@ void audit_trim_trees(void) }spin_unlock (&hash_lock);trim_marked (tree); -put_tree (tree);drop_collected_mounts (root_mnt); skip_it: +put_tree (tree);mutex_lock (&audit_filter_mutex); }list_del (&cursor);
Greg Kroah-Hartman
maintainerPATCH 12/12 x86/mm: account for PGDIR_SIZE alignment
In reply to Greg Kroah-Hartman3.0-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jerry Hoemann <[email protected]>
Patch for -stable. Function find_early_table_space removed upstream.
Fixes panic in alloc_low_page due to pgt_buf overflow during init_memory_mapping.
find_early_table_space sizes pgt_buf based upon the size of the memory being mapped, but it does not take into account the alignment of the memory. When the region being mapped spans a 512GB (PGDIR_SIZE) alignment, a panic from alloc_low_pages occurs.
kernel_physical_mapping_init takes into account PGDIR_SIZE alignment. This causes an extra call to alloc_low_page to be made. This extra call isn't accounted for by find_early_table_space and causes a kernel panic.
Change is to take into account PGDIR_SIZE alignment in find_early_table_space.
--- arch/x86/mm/init.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/x86/mm/init.c +5 -0
@@ -44,11 +44,15 @@ static void __init find_early_table_spacint i;unsigned long puds =0 , pmds =0 , ptes =0 , tables;unsigned long start =0 , good_end; +unsigned long pgd_extra =0 ;phys_addr_t base;for (i =0 ; i < nr_range; i++) {unsigned long range, extra; +if ((mr[i].end >>PGDIR_SHIFT ) - (mr[i].start >>PGDIR_SHIFT )) + pgd_extra++; + range = mr[i].end - mr[i].start; puds += (range +PUD_SIZE -1 ) >>PUD_SHIFT ;
@@ -73,6 +77,7 @@ static void __init find_early_table_spac tables =roundup (puds *sizeof (pud_t),PAGE_SIZE ); tables +=roundup (pmds *sizeof (pmd_t),PAGE_SIZE ); tables +=roundup (ptes *sizeof (pte_t),PAGE_SIZE ); + tables += (pgd_extra *PAGE_SIZE );#ifdef CONFIG_X86_32 /* for fixmap */
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.0.78 release. There are 12 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat May 11 22:34:47 UTC 2013. Anything received after that time might be too late.
Quoted 8 lines
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v3.0/stable-review/patch-3.0.78-rc1.gzand the diffstat can be found below.
thanks,
greg k-h
Patches applied cleanly to 3.0.77, 3.4.44, 3.8.12, and 3.9.1
Compiled and booted on the following systems:
Samsung Series 9 900X4C Intel Corei5:
(3.4.45-rc1, 3.8.13-rc1, and 3.9.2-rc1)
HP ProBook 6475b AMD A10-4600M APU with Radeon(tm) HD Graphics:
(3.0.78-rc1, 3.4.45-rc1, 3.8.13-rc1, and 3.9.2-rc1)dmesgs for all releases look good. No regressions compared to the previous dmesgs for each of these releases.
Cross-compile testing:
HP Compaq dc7700 SFF desktop: x86-64 Intel Core-i2:
(3.0.78-rc1, 3.4.45-rc1, 3.8.13-rc1, and 3.9.2-rc1)
Cross-compile tests results:
alpha: defconfig passed on all
arm: defconfig passed on all
arm64: not applicable to 3.0.y, 3.4.y. defconfig passed on 3.8.y, and 3.9.y
c6x: not applicable to 3.0.y, defconfig passed on 3.4.y, 3.8.y, and 3.9.y
mips: defconfig passed on all
mipsel: defconfig passed on all
powerpc: wii_defconfig passed on all
sh: defconfig passed on all
sparc: defconfig passed on all
tile: tilegx_defconfig passed on all
thanks,
-- Shuah
Shuah Khan, Linux Kernel Developer - Open Source Group Samsung Research America (Silicon Valley) [email protected] | (970) 672-0658
At Thu, 9 May 2013 15:37:13 -0700,
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.0.78 release. There are 12 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat May 11 22:34:47 UTC 2013. Anything received after that time might be too late.
This kernel can be built and boot without any problem. Building a kernel with this kernel also works fine.
- Build Machine: debian wheezy x86_64
CPU: Intel(R) Core(TM) i5-2400 CPU @ 3.10GHz x 4
memory: 8GB
- Test machine: debian wheezy x86_64(KVM guest on the Build Machine)
vCPU: x2
memory: 2GB
I reviewed the following patch and it looks good to me.
Quoted 2 lines
Chen Gang <[email protected]>
kernel/audit_tree.c: tree will leak memory when failure occurs inaudit_trim_trees()
Thanks,
Satoru