git.karo-electronics.de Git - karo-tx-linux.git/log

Merge remote-tracking branch 'i.MX/for-next'

Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
arch/arm/mach-mx5/mm.c
arch/arm/plat-mxc/include/mach/hardware.h

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 01:22:48 +0000 (12:22 +1100)]

Merge remote-tracking branch 'at91/at91-next'

Conflicts:
arch/arm/mach-at91/at91cap9.c
arch/arm/mach-at91/at91sam9260.c
arch/arm/mach-at91/at91sam9261.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9g45.c
arch/arm/mach-at91/at91sam9rl.c
arch/arm/mach-at91/setup.c

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 01:03:45 +0000 (12:03 +1100)]

Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
arch/arm/include/asm/pgalloc.h
arch/arm/include/asm/pgtable.h
arch/arm/include/asm/tlb.h
arch/arm/mm/ioremap.c

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 00:47:49 +0000 (11:47 +1100)]

Merge remote-tracking branch 'arm/for-next'

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 00:41:44 +0000 (11:41 +1100)]

Merge remote-tracking branch 'crypto-current/master'

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 00:41:35 +0000 (11:41 +1100)]

Merge remote-tracking branch 'input-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 00:41:34 +0000 (11:41 +1100)]

Merge remote-tracking branch 'char-misc.current/char-misc-linus'

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 00:41:33 +0000 (11:41 +1100)]

Merge remote-tracking branch 'staging.current/staging-linus'

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 00:41:32 +0000 (11:41 +1100)]

Merge remote-tracking branch 'usb.current/usb-linus'

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 00:41:31 +0000 (11:41 +1100)]

Merge remote-tracking branch 'tty.current/tty-linus'

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 00:41:31 +0000 (11:41 +1100)]

Merge remote-tracking branch 'driver-core.current/driver-core-linus'

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 00:41:29 +0000 (11:41 +1100)]

Merge remote-tracking branch 'wireless/master'

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 00:41:28 +0000 (11:41 +1100)]

Merge remote-tracking branch 'pci-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 00:41:27 +0000 (11:41 +1100)]

Merge remote-tracking branch 'sound-current/for-linus'

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 00:41:26 +0000 (11:41 +1100)]

Merge remote-tracking branch 'net/master'

commit | commitdiff | tree

Stephen Rothwell [Tue, 22 Nov 2011 00:41:23 +0000 (11:41 +1100)]

Merge remote-tracking branch 'arm-current/fixes'

commit | commitdiff | tree

Jacek Galowicz [Tue, 22 Nov 2011 00:09:01 +0000 (11:09 +1100)]

lguest: switch segment-voodoo-numbers to readable symbols

When studying lguest's x86 segment descriptor code, it is not longer
necessary to have the Intel x86 architecture manual open on the page
with the segment descriptor illustration to understand the crazy
numbers assigned to both descriptor structure halves a/b.
Now the struct desc_struct's fields, like suggested by
Glauber de Oliveira Costa in 2008, are used.

Signed-off-by: Jacek Galowicz <jacek@galowicz.de>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit | commitdiff | tree

Kevin Cernekee [Sun, 13 Nov 2011 03:08:56 +0000 (19:08 -0800)]

module: Fix performance regression on modules with large symbol tables

Commit 554bdfe5acf3715e87c8d5e25a4f9a896ac9f014 (module: reduce string
table for loaded modules) introduced an optimization to shrink the size of
the resident string table.  Part of this involves calling bitmap_weight()
on the strmap bitmap once for each core symbol.  strmap contains one bit
for each byte of the module's strtab.

For kernel modules with a large number of symbols, the addition of the
bitmap_weight() operation to each iteration of the add_kallsyms() loop
resulted in a significant "insmod" performance regression from 2.6.31
to 2.6.32.  bitmap_weight() is expensive when the bitmap is large.

The proposed alternative optimizes the common case in this loop
(is_core_symbol() == true, and the symbol name is not a duplicate), while
penalizing the exceptional case of a duplicate symbol.

My test was run on a 600 MHz MIPS processor, using a kernel module with
15,000 "core" symbols and 10,000 symbols in .init.text.  .strtab takes up
250,227 bytes.

Original code: insmod takes 3.39 seconds
Patched code: insmod takes 0.07 seconds

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit | commitdiff | tree

Kevin Cernekee [Sun, 13 Nov 2011 03:08:55 +0000 (19:08 -0800)]

module: Add comments describing how the "strmap" logic works

Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit | commitdiff | tree

Rusty Russell [Tue, 22 Nov 2011 00:09:00 +0000 (11:09 +1100)]

virtio: add debugging if driver doesn't kick.

Under the existing #ifdef DEBUG, check that they don't have more than
1/10 of a second between an add_buf() and a
virtqueue_notify()/virtqueue_kick_prepare() call.

We could get false positives on a really busy system, but good for
development.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit | commitdiff | tree

Rusty Russell [Tue, 22 Nov 2011 00:09:00 +0000 (11:09 +1100)]

virtio: expose added descriptors immediately.

A virtio driver does virtqueue_add_buf() multiple times before finally
calling virtqueue_kick(); previously we only exposed the added buffers
in the virtqueue_kick() call. This means we don't need a memory
barrier in virtqueue_add_buf(), but it reduces concurrency as the
device (ie. host) can't see the buffers until the kick.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit | commitdiff | tree

Rusty Russell [Tue, 22 Nov 2011 00:08:59 +0000 (11:08 +1100)]

virtio: avoid modulus operation.

Since we know vq->vring.num is a power of 2, modulus is lazy (it's asserted
in vring_new_virtqueue()).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit | commitdiff | tree

Rusty Russell [Tue, 22 Nov 2011 00:08:59 +0000 (11:08 +1100)]

virtio: support unlocked queue kick

Based on patch by Christoph for virtio_blk speedup:

Split virtqueue_kick to be able to do the actual notification
outside the lock protecting the virtqueue. This patch was
originally done by Stefan Hajnoczi, but I can't find the
original one anymore and had to recreated it from memory.
Pointers to the original or corrections for the commit message
are welcome.

Stefan's patch was here:

https://github.com/stefanha/linux/commit/a6d06644e3a58e57a774e77d7dc34c4a5a2e7496
http://www.spinics.net/lists/linux-virtualization/msg14616.html

Third time's the charm!

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

commit | commitdiff | tree

Rusty Russell [Tue, 22 Nov 2011 00:08:59 +0000 (11:08 +1100)]

virtio: rename virtqueue_add_buf_gfp to virtqueue_add_buf

Remove wrapper functions. This makes the allocation type explicit in
all callers; I used GPF_KERNEL where it seemed obvious, left it at
GFP_ATOMIC otherwise.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Reviewed-by: Christoph Hellwig <hch@lst.de>

commit | commitdiff | tree

Rusty Russell [Tue, 22 Nov 2011 00:08:58 +0000 (11:08 +1100)]

virtio: document functions better.

The old documentation is left over from when we used a structure with
strategy pointers.

And move the documentation to the C file as per kernel practice.
Though I disagree...

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Reviewed-by: Christoph Hellwig <hch@lst.de>

Linux kernel for KaRo TX COM modules

RSS Atom