History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Pull networking fixes from David Miller: 1) Unbalanced locking in mwifiex_process_country_ie, from Brian Norris. 2) Fix thermal zone registration in iwlwifi, from Andrei Otcheretianski. 3) Fix double free_irq in sgi ioc3 eth, from Thomas Bogendoerfer. 4) Use after free in mptcp, from Florian Westphal. 5) Use after free in wireguard's root_remove_peer_lists, from Eric Dumazet. 6) Properly access packets heads in bonding alb code, from Eric Dumazet. 7) Fix data race in skb_queue_len(), from Qian Cai. 8) Fix regression in r8169 on some chips, from Heiner Kallweit. 9) Fix XDP program ref counting in hv_netvsc, from Haiyang Zhang. 10) Certain kinds of set link netlink operations can cause a NULL deref in the ipv6 addrconf code. Fix from Eric Dumazet. 11) Don't cancel uninitialized work queue in drop monitor, from Ido Schimmel. * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (84 commits) net: thunderx: use proper interface type for RGMII mt76: mt7615: fix max_nss in mt7615_eeprom_parse_hw_cap bpf: Improve bucket_log calculation logic selftests/bpf: Test freeing sockmap/sockhash with a socket in it bpf, sockhash: Synchronize_rcu before free'ing map bpf, sockmap: Don't sleep while holding RCU lock on tear-down bpftool: Don't crash on missing xlated program instructions bpf, sockmap: Check update requirements after locking drop_monitor: Do not cancel uninitialized work item mlxsw: spectrum_dpipe: Add missing error path mlxsw: core: Add validation of hardware device types for MGPIR register mlxsw: spectrum_router: Clear offload indication from IPv6 nexthops on abort selftests: mlxsw: Add test cases for local table route replacement mlxsw: spectrum_router: Prevent incorrect replacement of local table routes net: dsa: microchip: enable module autoprobe ipv6/addrconf: fix potential NULL deref in inet6_set_link_af() dpaa_eth: support all modes with rate adapting PHYs net: stmmac: update pci platform data to use phy_interface net: stmmac: xgmac: fix missing IFF_MULTICAST checki in dwxgmac2_set_filter net: stmmac: fix missing IFF_MULTICAST check in dwmac4_set_filter ...

Linus Torvalds committed 6 years ago

Commit 291abfe2 parents d4f309c 29ca3b380 files · +782 −327Browse files

Showing the changes to include/linux (5 of 80 files). Show all

Unified · Split

5 files
  1. include/linux/bpf.h +5 −2
  2. include/linux/mlx5/mlx5_ifc.h +4 −3
  3. include/linux/platform_data/b53.h +1 −1
  4. include/linux/platform_data/microchip-ksz.h +1 −1
  5. include/linux/skbuff.h +13 −1
include/linux/bpf.h+5−2
@@ -728,7 +728,7 @@ struct bpf_struct_ops { · 727 unmodified lines
728728 #if defined(CONFIG_BPF_JIT) && defined(CONFIG_BPF_SYSCALL)
729729 #define BPF_MODULE_OWNER ((void *)((0xeB9FUL << 2) + POISON_POINTER_DELTA))
730730 const struct bpf_struct_ops *bpf_struct_ops_find(u32 type_id);
731−void bpf_struct_ops_init(struct btf *btf);
731+void bpf_struct_ops_init(struct btf *btf, struct bpf_verifier_log *log);
732732 bool bpf_struct_ops_get(const void *kdata);
733733 void bpf_struct_ops_put(const void *kdata);
734734 int bpf_struct_ops_map_sys_lookup_elem(struct bpf_map *map, void *key,
@@ -752,7 +752,10 @@ static inline const struct bpf_struct_ops *bpf_struct_ops_find(u32 type_id) · 17 unmodified lines
752752 {
753753 return NULL;
754754 }
755−static inline void bpf_struct_ops_init(struct btf *btf) { }
755+static inline void bpf_struct_ops_init(struct btf *btf,
756+ struct bpf_verifier_log *log)
757+{
758+}
756759 static inline bool bpf_try_module_get(const void *data, struct module *owner)
757760 {
758761 return try_module_get(owner);
include/linux/mlx5/mlx5_ifc.h+4−3
@@ -1448,14 +1448,15 @@ struct mlx5_ifc_cmd_hca_cap_bits { · 1447 unmodified lines
14481448
14491449 u8 reserved_at_440[0x20];
14501450
1451− u8 tls[0x1];
1452− u8 reserved_at_461[0x2];
1451+ u8 reserved_at_460[0x3];
14531452 u8 log_max_uctx[0x5];
14541453 u8 reserved_at_468[0x3];
14551454 u8 log_max_umem[0x5];
14561455 u8 max_num_eqs[0x10];
14571456
1458− u8 reserved_at_480[0x3];
1457+ u8 reserved_at_480[0x1];
1458+ u8 tls_tx[0x1];
1459+ u8 reserved_at_482[0x1];
14591460 u8 log_max_l2_table[0x5];
14601461 u8 reserved_at_488[0x8];
14611462 u8 log_uar_page_sz[0x10];
include/linux/platform_data/b53.h+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
1919 #ifndef __B53_H
2020 #define __B53_H
2121
22−#include <linux/kernel.h>
22+#include <linux/types.h>
2323 #include <linux/platform_data/dsa.h>
2424
2525 struct b53_platform_data {
include/linux/platform_data/microchip-ksz.h+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
1919 #ifndef __MICROCHIP_KSZ_H
2020 #define __MICROCHIP_KSZ_H
2121
22−#include <linux/kernel.h>
22+#include <linux/types.h>
2323
2424 struct ksz_platform_data {
2525 u32 chip_id;
include/linux/skbuff.h+13−1
@@ -1821,6 +1821,18 @@ static inline __u32 skb_queue_len(const struct sk_buff_head *list_) · 1820 unmodified lines
18211821 return list_->qlen;
18221822 }
18231823
1824+/**
1825+ * skb_queue_len_lockless - get queue length
1826+ * @list_: list to measure
1827+ *
1828+ * Return the length of an &sk_buff queue.
1829+ * This variant can be used in lockless contexts.
1830+ */
1831+static inline __u32 skb_queue_len_lockless(const struct sk_buff_head *list_)
1832+{
1833+ return READ_ONCE(list_->qlen);
1834+}
1835+
18241836 /**
18251837 * __skb_queue_head_init - initialize non-spinlock portions of sk_buff_head
18261838 * @list: queue to initialize
@@ -2026,7 +2038,7 @@ static inline void __skb_unlink(struct sk_buff *skb, struct sk_buff_head *list) · 199 unmodified lines
20262038 {
20272039 struct sk_buff *next, *prev;
20282040
2029− list->qlen--;
2041+ WRITE_ONCE(list->qlen, list->qlen - 1);
20302042 next = skb->next;
20312043 prev = skb->prev;
20322044 skb->next = skb->prev = NULL;

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