Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed3c5a0b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost 

Pull virtio updates from Michael Tsirkin:
 "virtio, vhost: new device, fixes, speedups

  This includes the new virtio crypto device, and fixes all over the
  place. In particular enabling endian-ness checks for sparse builds
  found some bugs which this fixes. And it appears that everyone is in
  agreement that disabling endian-ness sparse checks shouldn't be
  necessary any longer.

  So this enables them for everyone, and drops the __CHECK_ENDIAN__ and
  __bitwise__ APIs.

  IRQ handling in virtio has been refactored somewhat, the larger switch
  to IRQ_SHARED will have to wait as it proved too aggressive"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (34 commits)
  Makefile: drop -D__CHECK_ENDIAN__ from cflags
  fs/logfs: drop __CHECK_ENDIAN__
  Documentation/sparse: drop __CHECK_ENDIAN__
  linux: drop __bitwise__ everywhere
  checkpatch: replace __bitwise__ with __bitwise
  Documentation/sparse: drop __bitwise__
  tools: enable endian checks for all sparse builds
  linux/types.h: enable endian checks for all sparse builds
  virtio_mmio: Set dev.release() to avoid warning
  vhost: remove unused feature bit
  virtio_ring: fix description of virtqueue_get_buf
  vhost/scsi: Remove unused but set variable
  tools/virtio: use {READ,WRITE}_ONCE() in uaccess.h
  vringh: kill off ACCESS_ONCE()
  tools/virtio: fix READ_ONCE()
  crypto: add virtio-crypto driver
  vhost: cache used event for better performance
  vsock: lookup and setup guest_cid inside vhost_vsock_lock
  virtio_pci: split vp_try_to_find_vqs into INTx and MSI-X variants
  virtio_pci: merge vp_free_vectors into vp_del_vqs
  ...
parents 66d46672 6bdf1e0e

Documentation/dev-tools/sparse.rst

+1 −13
Original line number Original line Diff line number Diff line
@@ -51,13 +51,6 @@ sure that bitwise types don't get mixed up (little-endian vs big-endian 
vs cpu-endian vs whatever), and there the constant "0" really _is_

vs cpu-endian vs whatever), and there the constant "0" really _is_

special.

special.





__bitwise__ - to be used for relatively compact stuff (gfp_t, etc.) that

is mostly warning-free and is supposed to stay that way.  Warnings will

be generated without __CHECK_ENDIAN__.



__bitwise - noisy stuff; in particular, __le*/__be* are that.  We really

don't want to drown in noise unless we'd explicitly asked for it.



Using sparse for lock checking

Using sparse for lock checking

------------------------------

------------------------------
@@ -109,9 +102,4 @@ be recompiled or not. The latter is a fast way to check the whole tree if you 
have already built it.

have already built it.





The optional make variable CF can be used to pass arguments to sparse.  The

The optional make variable CF can be used to pass arguments to sparse.  The

build system passes -Wbitwise to sparse automatically.  To perform endianness

build system passes -Wbitwise to sparse automatically.
 
checks, you may define __CHECK_ENDIAN__::



        make C=2 CF="-D__CHECK_ENDIAN__"



These checks are disabled by default as they generate a host of warnings.

Documentation/translations/zh_CN/sparse.txt

+1 −6
Original line number Original line Diff line number Diff line
@@ -92,9 +92,4 @@ DaveJ 把每小时自动生成的 git 源码树 tar 包放在以下地址： 
如果你已经编译了内核，用后一种方式可以很快地检查整个源码树。

如果你已经编译了内核，用后一种方式可以很快地检查整个源码树。





make 的可选变量 CHECKFLAGS 可以用来向 sparse 工具传递参数。编译系统会自

make 的可选变量 CHECKFLAGS 可以用来向 sparse 工具传递参数。编译系统会自

动向 sparse 工具传递 -Wbitwise 参数。你可以定义 __CHECK_ENDIAN__ 来进行

动向 sparse 工具传递 -Wbitwise 参数。
 
大小尾检查。



	make C=2 CHECKFLAGS="-D__CHECK_ENDIAN__"



这些检查默认都是被关闭的，因为他们通常会产生大量的警告。

MAINTAINERS

+9 −0
Original line number Original line Diff line number Diff line
@@ -13013,6 +13013,7 @@ F: drivers/net/virtio_net.c 
F:	drivers/block/virtio_blk.c

F:	drivers/block/virtio_blk.c

F:	include/linux/virtio_*.h

F:	include/linux/virtio_*.h

F:	include/uapi/linux/virtio_*.h

F:	include/uapi/linux/virtio_*.h

F:	drivers/crypto/virtio/





VIRTIO DRIVERS FOR S390

VIRTIO DRIVERS FOR S390

M:	Christian Borntraeger <borntraeger@de.ibm.com>

M:	Christian Borntraeger <borntraeger@de.ibm.com>
@@ -13049,6 +13050,14 @@ S: Maintained 
F:	drivers/virtio/virtio_input.c

F:	drivers/virtio/virtio_input.c

F:	include/uapi/linux/virtio_input.h

F:	include/uapi/linux/virtio_input.h





VIRTIO CRYPTO DRIVER

M:  Gonglei <arei.gonglei@huawei.com>

L:  virtualization@lists.linux-foundation.org

L:  linux-crypto@vger.kernel.org

S:  Maintained

F:  drivers/crypto/virtio/

F:  include/uapi/linux/virtio_crypto.h



VIA RHINE NETWORK DRIVER

VIA RHINE NETWORK DRIVER

S:	Orphan

S:	Orphan

F:	drivers/net/ethernet/via/via-rhine.c

F:	drivers/net/ethernet/via/via-rhine.c

arch/arm/plat-samsung/include/plat/gpio-cfg.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ 




#include <linux/types.h>

#include <linux/types.h>





typedef unsigned int __bitwise__ samsung_gpio_pull_t;

typedef unsigned int __bitwise samsung_gpio_pull_t;





/* forward declaration if gpio-core.h hasn't been included */

/* forward declaration if gpio-core.h hasn't been included */

struct samsung_gpio_chip;

struct samsung_gpio_chip;

drivers/bluetooth/Makefile

+0 −2
Original line number Original line Diff line number Diff line
@@ -40,5 +40,3 @@ hci_uart-$(CONFIG_BT_HCIUART_QCA) += hci_qca.o 
hci_uart-$(CONFIG_BT_HCIUART_AG6XX)	+= hci_ag6xx.o

hci_uart-$(CONFIG_BT_HCIUART_AG6XX)	+= hci_ag6xx.o

hci_uart-$(CONFIG_BT_HCIUART_MRVL)	+= hci_mrvl.o

hci_uart-$(CONFIG_BT_HCIUART_MRVL)	+= hci_mrvl.o

hci_uart-objs				:= $(hci_uart-y)
 
hci_uart-objs				:= $(hci_uart-y)
 


ccflags-y += -D__CHECK_ENDIAN__