History

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

Pull virtio updates from Michael Tsirkin: "vhost and virtio fixes and features: - Hardening work by Jason - vdpa driver for Alibaba ENI - Performance tweaks for virtio blk - virtio rng rework using an internal buffer - mac/mtu programming for mlx5 vdpa - Misc fixes, cleanups" * tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost: (45 commits) vdpa/mlx5: Forward only packets with allowed MAC address vdpa/mlx5: Support configuration of MAC vdpa/mlx5: Fix clearing of VIRTIO_NET_F_MAC feature bit vdpa_sim_net: Enable user to set mac address and mtu vdpa: Enable user to set mac and mtu of vdpa device vdpa: Use kernel coding style for structure comments vdpa: Introduce query of device config layout vdpa: Introduce and use vdpa device get, set config helpers virtio-scsi: don't let virtio core to validate used buffer length virtio-blk: don't let virtio core to validate used length virtio-net: don't let virtio core to validate used length virtio_ring: validate used buffer length virtio_blk: correct types for status handling virtio_blk: allow 0 as num_request_queues i2c: virtio: Add support for zero-length requests virtio-blk: fixup coccinelle warnings virtio_ring: fix typos in vring_desc_extra virtio-pci: harden INTX interrupts virtio_pci: harden MSI-X interrupts virtio_config: introduce a new .enable_cbs method ...

Linus Torvalds committed 5 years ago

Commit 43e1b122 parents d4ec3d5 540061a36 files · +1780 −296Browse files

Showing the changes to include/uapi/linux (2 of 36 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/vdpa.h +7 −0
  2. include/uapi/linux/virtio_i2c.h +6 −0
include/uapi/linux/vdpa.h+7−0
@@ -17,6 +17,7 @@ enum vdpa_command { · 16 unmodified lines
17 VDPA_CMD_DEV_NEW,17 VDPA_CMD_DEV_NEW,
18 VDPA_CMD_DEV_DEL,18 VDPA_CMD_DEV_DEL,
19 VDPA_CMD_DEV_GET, /* can dump */19 VDPA_CMD_DEV_GET, /* can dump */
20 VDPA_CMD_DEV_CONFIG_GET, /* can dump */
20};21};
21 22
22enum vdpa_attr {23enum vdpa_attr {
@@ -32,6 +33,12 @@ enum vdpa_attr { · 9 unmodified lines
32 VDPA_ATTR_DEV_VENDOR_ID, /* u32 */33 VDPA_ATTR_DEV_VENDOR_ID, /* u32 */
33 VDPA_ATTR_DEV_MAX_VQS, /* u32 */34 VDPA_ATTR_DEV_MAX_VQS, /* u32 */
34 VDPA_ATTR_DEV_MAX_VQ_SIZE, /* u16 */35 VDPA_ATTR_DEV_MAX_VQ_SIZE, /* u16 */
36 VDPA_ATTR_DEV_MIN_VQ_SIZE, /* u16 */
37
38 VDPA_ATTR_DEV_NET_CFG_MACADDR, /* binary */
39 VDPA_ATTR_DEV_NET_STATUS, /* u8 */
40 VDPA_ATTR_DEV_NET_CFG_MAX_VQP, /* u16 */
41 VDPA_ATTR_DEV_NET_CFG_MTU, /* u16 */
35 42
36 /* new attributes must be added above here */43 /* new attributes must be added above here */
37 VDPA_ATTR_MAX,44 VDPA_ATTR_MAX,
include/uapi/linux/virtio_i2c.h+6−0
@@ -11,9 +11,15 @@ · 10 unmodified lines
11#include <linux/const.h>11#include <linux/const.h>
12#include <linux/types.h>12#include <linux/types.h>
13 13
14/* Virtio I2C Feature bits */
15#define VIRTIO_I2C_F_ZERO_LENGTH_REQUEST 0
16
14/* The bit 0 of the @virtio_i2c_out_hdr.@flags, used to group the requests */17/* The bit 0 of the @virtio_i2c_out_hdr.@flags, used to group the requests */
15#define VIRTIO_I2C_FLAGS_FAIL_NEXT _BITUL(0)18#define VIRTIO_I2C_FLAGS_FAIL_NEXT _BITUL(0)
16 19
20/* The bit 1 of the @virtio_i2c_out_hdr.@flags, used to mark a buffer as read */
21#define VIRTIO_I2C_FLAGS_M_RD _BITUL(1)
22
17/**23/**
18 * struct virtio_i2c_out_hdr - the virtio I2C message OUT header24 * struct virtio_i2c_out_hdr - the virtio I2C message OUT header
19 * @addr: the controlled device address25 * @addr: the controlled device address

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t