Pull networking fixes from David Miller: 1) BPF verifier fixes from Daniel Borkmann. 2) HNS driver fixes from Huazhong Tan. 3) FDB only works for ethernet devices, reject attempts to install FDB rules for others. From Ido Schimmel. 4) Fix spectre V1 in vhost, from Jason Wang. 5) Don't pass on-stack object to irq_set_affinity_hint() in mvpp2 driver, from Marc Zyngier. 6) Fix mlx5e checksum handling when RXFCS is enabled, from Eric Dumazet. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (49 commits) openvswitch: Fix push/pop ethernet validation net: stmmac: Fix stmmac_mdio_reset() when building stmmac as modules bpf: test make sure to run unpriv test cases in test_verifier bpf: add various test cases to test_verifier bpf: don't set id on after map lookup with ptr_to_map_val return bpf: fix partial copy of map_ptr when dst is scalar libbpf: Fix compile error in libbpf_attach_type_by_name kselftests/bpf: use ping6 as the default ipv6 ping binary if it exists selftests: mlxsw: qos_mc_aware: Add a test for UC awareness selftests: mlxsw: qos_mc_aware: Tweak for min shaper mlxsw: spectrum: Set minimum shaper on MC TCs mlxsw: reg: QEEC: Add minimum shaper fields net: hns3: bugfix for rtnl_lock's range in the hclgevf_reset() net: hns3: bugfix for rtnl_lock's range in the hclge_reset() net: hns3: bugfix for handling mailbox while the command queue reinitialized net: hns3: fix incorrect return value/type of some functions net: hns3: bugfix for hclge_mdio_write and hclge_mdio_read net: hns3: bugfix for is_valid_csq_clean_head() net: hns3: remove unnecessary queue reset in the hns3_uninit_all_ring() net: hns3: bugfix for the initialization of command queue's spin lock ...
Showing the changes to include/linux (3 of 56 files). Show all
Unified · Split
| @@ -62,13 +62,19 @@ · 61 unmodified lines | ||
| 62 | 62 | /* Error Codes */ |
| 63 | 63 | enum virtchnl_status_code { |
| 64 | 64 | VIRTCHNL_STATUS_SUCCESS = 0, |
| 65 | − VIRTCHNL_ERR_PARAM = -5, | |
| 65 | + VIRTCHNL_STATUS_ERR_PARAM = -5, | |
| 66 | + VIRTCHNL_STATUS_ERR_NO_MEMORY = -18, | |
| 66 | 67 | VIRTCHNL_STATUS_ERR_OPCODE_MISMATCH = -38, |
| 67 | 68 | VIRTCHNL_STATUS_ERR_CQP_COMPL_ERROR = -39, |
| 68 | 69 | VIRTCHNL_STATUS_ERR_INVALID_VF_ID = -40, |
| 69 | − VIRTCHNL_STATUS_NOT_SUPPORTED = -64, | |
| 70 | + VIRTCHNL_STATUS_ERR_ADMIN_QUEUE_ERROR = -53, | |
| 71 | + VIRTCHNL_STATUS_ERR_NOT_SUPPORTED = -64, | |
| 70 | 72 | }; |
| 71 | 73 | |
| 74 | +/* Backward compatibility */ | |
| 75 | +#define VIRTCHNL_ERR_PARAM VIRTCHNL_STATUS_ERR_PARAM | |
| 76 | +#define VIRTCHNL_STATUS_NOT_SUPPORTED VIRTCHNL_STATUS_ERR_NOT_SUPPORTED | |
| 77 | + | |
| 72 | 78 | #define VIRTCHNL_LINK_SPEED_100MB_SHIFT 0x1 |
| 73 | 79 | #define VIRTCHNL_LINK_SPEED_1000MB_SHIFT 0x2 |
| 74 | 80 | #define VIRTCHNL_LINK_SPEED_10GB_SHIFT 0x3 |
| @@ -831,7 +837,7 @@ virtchnl_vc_validate_vf_msg(struct virtchnl_version_info *ver, u32 v_opcode, · 756 unmodified lines | ||
| 831 | 837 | case VIRTCHNL_OP_EVENT: |
| 832 | 838 | case VIRTCHNL_OP_UNKNOWN: |
| 833 | 839 | default: |
| 834 | − return VIRTCHNL_ERR_PARAM; | |
| 840 | + return VIRTCHNL_STATUS_ERR_PARAM; | |
| 835 | 841 | } |
| 836 | 842 | /* few more checks */ |
| 837 | 843 | if (err_msg_format || valid_len != msglen) |
| @@ -51,6 +51,9 @@ struct bpf_reg_state { · 50 unmodified lines | ||
| 51 | 51 | * PTR_TO_MAP_VALUE_OR_NULL |
| 52 | 52 | */ |
| 53 | 53 | struct bpf_map *map_ptr; |
| 54 | + | |
| 55 | + /* Max size from any of the above. */ | |
| 56 | + unsigned long raw; | |
| 54 | 57 | }; |
| 55 | 58 | /* Fixed part of pointer offset, pointer types only */ |
| 56 | 59 | s32 off; |
| @@ -37,7 +37,9 @@ struct in_device { · 36 unmodified lines | ||
| 37 | 37 | unsigned long mr_v1_seen; |
| 38 | 38 | unsigned long mr_v2_seen; |
| 39 | 39 | unsigned long mr_maxdelay; |
| 40 | − unsigned char mr_qrv; | |
| 40 | + unsigned long mr_qi; /* Query Interval */ | |
| 41 | + unsigned long mr_qri; /* Query Response Interval */ | |
| 42 | + unsigned char mr_qrv; /* Query Robustness Variable */ | |
| 41 | 43 | unsigned char mr_gq_running; |
| 42 | 44 | unsigned char mr_ifc_count; |
| 43 | 45 | struct timer_list mr_gq_timer; /* general query timer */ |