提交 · 976dde010e513a9c7c3117a32b7b015f84b37430 · openeuler / Kernel

04 3月, 2008 28 次提交

Merge branch 'slab-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm · 976dde01

由 Linus Torvalds 提交于 3月 03, 2008

* 'slab-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm:
  slub: fix possible NULL pointer dereference
  slub: Add kmalloc_large_node() to support kmalloc_node fallback
  slub: look up object from the freelist once
  slub: Fix up comments
  slub: Rearrange #ifdef CONFIG_SLUB_DEBUG in calculate_sizes()
  slub: Remove BUG_ON() from ksize and omit checks for !SLUB_DEBUG
  slub: Use the objsize from the kmem_cache_cpu structure
  slub: Remove useless checks in alloc_debug_processing
  slub: Remove objsize check in kmem_cache_flags()
  slub: rename slab_objects to show_slab_objects
  Revert "unique end pointer" patch
  slab: avoid double initialization & do initialization in 1 place

976dde01

exit_notify: fix kill_orphaned_pgrp() usage with mt exit · 821c7de7

由 Oleg Nesterov 提交于 3月 02, 2008

1. exit_notify() always calls kill_orphaned_pgrp(). This is wrong, we
   should do this only when the whole process exits.

2. exit_notify() uses "current" as "ignored_task", obviously wrong.
   Use ->group_leader instead.

Test case:

	void hup(int sig)
	{
		printf("HUP received\n");
	}

	void *tfunc(void *arg)
	{
		sleep(2);
		printf("sub-thread exited\n");
		return NULL;
	}

	int main(int argc, char *argv[])
	{
		if (!fork()) {
			signal(SIGHUP, hup);
			kill(getpid(), SIGSTOP);
			exit(0);
		}

		pthread_t thr;
		pthread_create(&thr, NULL, tfunc, NULL);

		sleep(1);
		printf("main thread exited\n");
		syscall(__NR_exit, 0);

		return 0;
	}

output:

	main thread exited
	HUP received
	Hangup

With this patch the output is:

	main thread exited
	sub-thread exited
	HUP received
Signed-off-by: NOleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>

821c7de7

will_become_orphaned_pgrp: partially fix insufficient ->exit_state check · 05e83df6

由 Oleg Nesterov 提交于 3月 02, 2008

p->exit_state != 0 doesn't mean this process is dead, it may have
sub-threads.  Change the code to use "p->exit_state && thread_group_empty(p)"
instead.

Without this patch, ^Z doesn't deliver SIGTSTP to the foreground process
if the main thread has exited.

However, the new check is not perfect either.  There is a window when
exit_notify() drops tasklist and before release_task().  Suppose that
the last (non-leader) thread exits.  This means that entire group exits,
but thread_group_empty() is not true yet.

As Eric pointed out, is_global_init() is wrong as well, but I did not
dare to do other changes.

Just for the record, has_stopped_jobs() is absolutely wrong too.  But we
can't fix it now, we should first fix SIGNAL_STOP_STOPPED issues.

Even with this patch ^Z doesn't play well with the dead main thread.
The task is stopped correctly but do_wait(WSTOPPED) won't see it.  This
is another unrelated issue, will be (hopefully) fixed separately.
Signed-off-by: NOleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>

05e83df6

introduce kill_orphaned_pgrp() helper · f49ee505

由 Oleg Nesterov 提交于 3月 02, 2008

Factor out the common code in reparent_thread() and exit_notify().

No functional changes.
Signed-off-by: NOleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>

f49ee505

Fix default compose table initialization · 5ce2087e

由 Samuel Thibault 提交于 3月 03, 2008

Oddly enough, unsigned int c = '\300'; puts a "negative" value in c, not
0300...  This fixes the default unicode compose table by using integers
instead of character constants.
Signed-off-by: NSamuel Thibault <samuel.thibault@ens-lyon.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>

5ce2087e

slub: fix possible NULL pointer dereference · 62e5c4b4

由 Cyrill Gorcunov 提交于 3月 02, 2008

This patch fix possible NULL pointer dereference if kzalloc
failed. To be able to return proper error code the function
return type is changed to ssize_t (according to callees and
sysfs definitions).
Signed-off-by: NCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: NChristoph Lameter <clameter@sgi.com>

62e5c4b4

slub: Add kmalloc_large_node() to support kmalloc_node fallback · f619cfe1

由 Christoph Lameter 提交于 3月 01, 2008

Slub is missing some NUMA support for large kmallocs. Provide that.
Reviewed-by: NPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: NChristoph Lameter <clameter@sgi.com>

f619cfe1

slub: look up object from the freelist once · 76931434

由 Pekka J Enberg 提交于 3月 01, 2008

We only need to look up object from c->page->freelist once in
__slab_alloc().
Signed-off-by: NPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: NChristoph Lameter <clameter@sgi.com>

76931434

slub: Fix up comments · 6446faa2

由 Christoph Lameter 提交于 2月 15, 2008

Provide comments and fix up various spelling / style issues.
Signed-off-by: NChristoph Lameter <clameter@sgi.com>

6446faa2

slub: Rearrange #ifdef CONFIG_SLUB_DEBUG in calculate_sizes() · d8b42bf5

由 Christoph Lameter 提交于 2月 15, 2008

Group SLUB_DEBUG code together to reduce the number of #ifdefs. Move some
debug checks under the #ifdef.
Reviewed-by: NPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: NChristoph Lameter <clameter@sgi.com>

d8b42bf5

slub: Remove BUG_ON() from ksize and omit checks for !SLUB_DEBUG · ae20bfda

由 Christoph Lameter 提交于 2月 15, 2008

The BUG_ONs are useless since the pointer derefs will lead to
NULL deref errors anyways. Some of the checks are not necessary
if no debugging is possible.
Signed-off-by: NChristoph Lameter <clameter@sgi.com>

ae20bfda

slub: Use the objsize from the kmem_cache_cpu structure · 27d9e4e9

由 Christoph Lameter 提交于 2月 15, 2008

No need to access the kmem_cache structure. We have the same value
in kmem_cache_cpu.
Reviewed-by: NPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: NChristoph Lameter <clameter@sgi.com>

27d9e4e9

slub: Remove useless checks in alloc_debug_processing · d692ef6d

由 Christoph Lameter 提交于 2月 15, 2008

Alloc debug processing is never called with a NULL object pointer.
No reason to check for NULL.
Reviewed-by: NPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: NChristoph Lameter <clameter@sgi.com>

d692ef6d

slub: Remove objsize check in kmem_cache_flags() · e153362a

由 Christoph Lameter 提交于 2月 15, 2008

There is no page->offset anymore and also no associated limit on the number
of objects. The page->offset field was removed for 2.6.24. So the check
in kmem_cache_flags() is now also obsolete (should have been dropped
earlier, somehow a hunk vanished).
Reviewed-by: NPekka Enberg <penberg@cs.helsinki.fi>
Signed-by: NChristoph Lameter <clameter@sgi.com>

e153362a

slub: rename slab_objects to show_slab_objects · d9acf4b7

由 Christoph Lameter 提交于 2月 15, 2008

The sysfs callback is better named show_slab_objects since it is always
called from the xxx_show callbacks. We need the name for other purposes
later.
Reviewed-by: NPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: NChristoph Lameter <clameter@sgi.com>

d9acf4b7

Revert "unique end pointer" patch · a973e9dd

由 Christoph Lameter 提交于 3月 01, 2008

This only made sense for the alternate fastpath which was reverted last week.

Mathieu is working on a new version that addresses the fastpath issues but that
new code first needs to go through mm and it is not clear if we need the
unique end pointers with his new scheme.
Reviewed-by: NPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: NChristoph Lameter <clameter@sgi.com>

a973e9dd

C

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 · 27710bf6
由 Christoph Lameter 提交于 3月 03, 2008

27710bf6
L
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm · cad226b8
由 Linus Torvalds 提交于 3月 03, 2008
```
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] Fix freeing of page tables for ARM in free_pgd_slow
```
cad226b8

docbook: fix fusion source files · 7105a387