diff options
| -rw-r--r-- | .mailmap | 2 | ||||
| -rw-r--r-- | CREDITS | 1 | ||||
| -rw-r--r-- | MAINTAINERS | 56 | ||||
| -rw-r--r-- | drivers/char/ipmi/ipmi_msghandler.c | 8 | ||||
| -rw-r--r-- | drivers/media/v4l2-core/v4l2-mc.c | 2 | ||||
| -rw-r--r-- | include/media/v4l2-mc.h | 2 | ||||
| -rw-r--r-- | tools/virtio/ringtest/Makefile | 4 | ||||
| -rw-r--r-- | tools/virtio/ringtest/README | 4 | ||||
| -rw-r--r-- | tools/virtio/ringtest/noring.c | 69 | ||||
| -rwxr-xr-x | tools/virtio/ringtest/run-on-all.sh | 4 |
10 files changed, 127 insertions, 25 deletions
@@ -89,6 +89,7 @@ Leonid I Ananiev <[email protected]> Linas Vepstas <[email protected]> Mark Brown <[email protected]> Matthieu CASTET <[email protected]> +Mauro Carvalho Chehab <[email protected]> <[email protected]> <[email protected]> <[email protected]> <[email protected]> <[email protected]> <[email protected]> Mayuresh Janorkar <[email protected]> Michael Buesch <[email protected]> Michel Dänzer <[email protected]> @@ -122,6 +123,7 @@ Santosh Shilimkar <[email protected]> Sascha Hauer <[email protected]> S.Çağlar Onur <[email protected]> Shiraz Hashim <[email protected]> <[email protected]> +Shuah Khan <[email protected]> <[email protected]> <[email protected]> <[email protected]> <[email protected]> Simon Kelley <[email protected]> Stéphane Witzmann <[email protected]> Stephen Hemminger <[email protected]> @@ -649,6 +649,7 @@ D: Configure, Menuconfig, xconfig N: Mauro Carvalho Chehab D: Media subsystem (V4L/DVB) drivers and core D: EDAC drivers and EDAC 3.0 core rework diff --git a/MAINTAINERS b/MAINTAINERS index 16700e4fcc4a..b697a03e307a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2242,7 +2242,8 @@ F: include/net/ax25.h F: net/ax25/ AZ6007 DVB DRIVER -M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git @@ -2709,7 +2710,8 @@ F: Documentation/filesystems/btrfs.txt F: fs/btrfs/ BTTV VIDEO4LINUX DRIVER -M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git @@ -3344,7 +3346,8 @@ S: Maintained F: drivers/media/dvb-frontends/cx24120* CX88 VIDEO4LINUX DRIVER -M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git @@ -4291,7 +4294,8 @@ F: fs/ecryptfs/ EDAC-CORE M: Doug Thompson <[email protected]> M: Borislav Petkov <[email protected]> -M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> T: git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next @@ -4336,7 +4340,8 @@ S: Maintained F: drivers/edac/e7xxx_edac.c EDAC-GHES -M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> S: Maintained F: drivers/edac/ghes_edac.c @@ -4360,19 +4365,22 @@ S: Maintained F: drivers/edac/i5000_edac.c EDAC-I5400 -M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> S: Maintained F: drivers/edac/i5400_edac.c EDAC-I7300 -M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> S: Maintained F: drivers/edac/i7300_edac.c EDAC-I7CORE -M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> S: Maintained F: drivers/edac/i7core_edac.c @@ -4409,7 +4417,8 @@ S: Maintained F: drivers/edac/r82600_edac.c EDAC-SBRIDGE -M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> S: Maintained F: drivers/edac/sb_edac.c @@ -4468,7 +4477,8 @@ S: Maintained F: drivers/net/ethernet/ibm/ehea/ EM28XX VIDEO4LINUX DRIVER -M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git @@ -6487,6 +6497,7 @@ F: include/uapi/linux/sunrpc/ KERNEL SELFTEST FRAMEWORK M: Shuah Khan <[email protected]> +M: Shuah Khan <[email protected]> T: git git://git.kernel.org/pub/scm/shuah/linux-kselftest S: Maintained @@ -7358,7 +7369,8 @@ S: Supported F: drivers/media/pci/netup_unidvb/* MEDIA INPUT INFRASTRUCTURE (V4L/DVB) -M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> P: LinuxTV.org Project W: https://linuxtv.org @@ -9852,7 +9864,8 @@ S: Odd Fixes F: drivers/media/i2c/saa6588* SAA7134 VIDEO4LINUX DRIVER -M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git @@ -10371,7 +10384,8 @@ S: Maintained F: drivers/media/radio/si4713/radio-usb-si4713.c SIANO DVB DRIVER -M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git @@ -11137,7 +11151,8 @@ S: Maintained F: drivers/media/i2c/tda9840* TEA5761 TUNER DRIVER -M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git @@ -11145,7 +11160,8 @@ S: Odd fixes F: drivers/media/tuners/tea5761.* TEA5767 TUNER DRIVER -M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git @@ -11532,7 +11548,8 @@ F: include/linux/shmem_fs.h F: mm/shmem.c TM6000 VIDEO4LINUX DRIVER -M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git @@ -11886,7 +11903,8 @@ F: drivers/usb/common/usb-otg-fsm.c USB OVER IP DRIVER M: Valentina Manea <[email protected]> -M: Shuah Khan <[email protected]> +M: Shuah Khan <[email protected]> +M: Shuah Khan <[email protected]> S: Maintained F: Documentation/usb/usbip_protocol.txt @@ -12130,6 +12148,7 @@ VIRTIO CORE, NET AND BLOCK DRIVERS M: "Michael S. Tsirkin" <[email protected]> S: Maintained +F: Documentation/devicetree/bindings/virtio/ F: drivers/virtio/ F: tools/virtio/ F: drivers/net/virtio_net.c @@ -12518,7 +12537,8 @@ S: Maintained F: arch/x86/entry/vdso/ XC2028/3028 TUNER DRIVER -M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> +M: Mauro Carvalho Chehab <[email protected]> W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index 94fb407d8561..44b1bd6baa38 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -3820,6 +3820,7 @@ static void handle_new_recv_msgs(ipmi_smi_t intf) while (!list_empty(&intf->waiting_rcv_msgs)) { smi_msg = list_entry(intf->waiting_rcv_msgs.next, struct ipmi_smi_msg, link); + list_del(&smi_msg->link); if (!run_to_completion) spin_unlock_irqrestore(&intf->waiting_rcv_msgs_lock, flags); @@ -3829,11 +3830,14 @@ static void handle_new_recv_msgs(ipmi_smi_t intf) if (rv > 0) { /* * To preserve message order, quit if we - * can't handle a message. + * can't handle a message. Add the message + * back at the head, this is safe because this + * tasklet is the only thing that pulls the + * messages. */ + list_add(&smi_msg->link, &intf->waiting_rcv_msgs); break; } else { - list_del(&smi_msg->link); if (rv == 0) /* Message handled */ ipmi_free_smi_msg(smi_msg); diff --git a/drivers/media/v4l2-core/v4l2-mc.c b/drivers/media/v4l2-core/v4l2-mc.c index ca94bded3386..8bef4331bd51 100644 --- a/drivers/media/v4l2-core/v4l2-mc.c +++ b/drivers/media/v4l2-core/v4l2-mc.c @@ -1,7 +1,7 @@ /* * Media Controller ancillary functions * - * Copyright (c) 2016 Mauro Carvalho Chehab <[email protected]> + * Copyright (c) 2016 Mauro Carvalho Chehab <[email protected]> * Copyright (C) 2016 Shuah Khan <[email protected]> * Copyright (C) 2006-2010 Nokia Corporation * Copyright (c) 2016 Intel Corporation. diff --git a/include/media/v4l2-mc.h b/include/media/v4l2-mc.h index 98a938aabdfb..7a8d6037a4bb 100644 --- a/include/media/v4l2-mc.h +++ b/include/media/v4l2-mc.h @@ -1,7 +1,7 @@ /* * v4l2-mc.h - Media Controller V4L2 types and prototypes * - * Copyright (C) 2016 Mauro Carvalho Chehab <[email protected]> + * Copyright (C) 2016 Mauro Carvalho Chehab <[email protected]> * Copyright (C) 2006-2010 Nokia Corporation * Copyright (c) 2016 Intel Corporation. * diff --git a/tools/virtio/ringtest/Makefile b/tools/virtio/ringtest/Makefile index 6ba745529833..6173adae9f08 100644 --- a/tools/virtio/ringtest/Makefile +++ b/tools/virtio/ringtest/Makefile @@ -1,6 +1,6 @@ all: -all: ring virtio_ring_0_9 virtio_ring_poll virtio_ring_inorder +all: ring virtio_ring_0_9 virtio_ring_poll virtio_ring_inorder noring CFLAGS += -Wall CFLAGS += -pthread -O2 -ggdb @@ -15,11 +15,13 @@ ring: ring.o main.o virtio_ring_0_9: virtio_ring_0_9.o main.o virtio_ring_poll: virtio_ring_poll.o main.o virtio_ring_inorder: virtio_ring_inorder.o main.o +noring: noring.o main.o clean: -rm main.o -rm ring.o ring -rm virtio_ring_0_9.o virtio_ring_0_9 -rm virtio_ring_poll.o virtio_ring_poll -rm virtio_ring_inorder.o virtio_ring_inorder + -rm noring.o noring .PHONY: all clean diff --git a/tools/virtio/ringtest/README b/tools/virtio/ringtest/README index 34e94c46104f..d83707a336c9 100644 --- a/tools/virtio/ringtest/README +++ b/tools/virtio/ringtest/README @@ -1,2 +1,6 @@ Partial implementation of various ring layouts, useful to tune virtio design. Uses shared memory heavily. + +Typical use: + +# sh run-on-all.sh perf stat -r 10 --log-fd 1 -- ./ring diff --git a/tools/virtio/ringtest/noring.c b/tools/virtio/ringtest/noring.c new file mode 100644 index 000000000000..eda2f4824130 --- /dev/null +++ b/tools/virtio/ringtest/noring.c @@ -0,0 +1,69 @@ +#define _GNU_SOURCE +#include "main.h" +#include <assert.h> + +/* stub implementation: useful for measuring overhead */ +void alloc_ring(void) +{ +} + +/* guest side */ +int add_inbuf(unsigned len, void *buf, void *datap) +{ + return 0; +} + +/* + * skb_array API provides no way for producer to find out whether a given + * buffer was consumed. Our tests merely require that a successful get_buf + * implies that add_inbuf succeed in the past, and that add_inbuf will succeed, + * fake it accordingly. + */ +void *get_buf(unsigned *lenp, void **bufp) +{ + return "Buffer"; +} + +void poll_used(void) +{ +} + +void disable_call() +{ + assert(0); +} + +bool enable_call() +{ + assert(0); +} + +void kick_available(void) +{ + assert(0); +} + +/* host side */ +void disable_kick() +{ + assert(0); +} + +bool enable_kick() +{ + assert(0); +} + +void poll_avail(void) +{ +} + +bool use_buf(unsigned *lenp, void **bufp) +{ + return true; +} + +void call_used(void) +{ + assert(0); +} diff --git a/tools/virtio/ringtest/run-on-all.sh b/tools/virtio/ringtest/run-on-all.sh index 52b0f71ffa8d..2e69ca812b4c 100755 --- a/tools/virtio/ringtest/run-on-all.sh +++ b/tools/virtio/ringtest/run-on-all.sh @@ -3,10 +3,10 @@ #use last CPU for host. Why not the first? #many devices tend to use cpu0 by default so #it tends to be busier -HOST_AFFINITY=$(cd /dev/cpu; ls|grep -v '[a-z]'|sort -n|tail -1) +HOST_AFFINITY=$(lscpu -p=cpu | tail -1) #run command on all cpus -for cpu in $(cd /dev/cpu; ls|grep -v '[a-z]'|sort -n); +for cpu in $(seq 0 $HOST_AFFINITY) do #Don't run guest and host on same CPU #It actually works ok if using signalling |