Linux 4.12.14
Greg KH
maintainerI'm announcing the release of the 4.12.14 kernel.
All users of the 4.12 kernel series must upgrade.
Note, the 4.12.y kernel series is now end-of-life, there will not be any more updates. Please move to 4.13.y at this point in time.
The updated 4.12.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.12.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/x86/include/asm/elf.h | 5 arch/x86/kernel/process_64.c | 236 +++++++------ drivers/md/raid1.c | 19 - drivers/md/raid10.c | 35 + drivers/md/raid5.c | 4 drivers/net/dsa/bcm_sf2.c | 4 drivers/net/dsa/bcm_sf2.h | 1 drivers/net/dsa/bcm_sf2_cfp.c | 8 drivers/net/ethernet/broadcom/bcmsysport.c | 4 drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 6 drivers/net/ethernet/freescale/fec_main.c | 8 drivers/net/ethernet/freescale/fman/mac.c | 2 drivers/net/ethernet/freescale/gianfar.c | 2 drivers/net/ethernet/marvell/mvpp2.c | 2 drivers/net/ethernet/mellanox/mlx5/core/en.h | 1 drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 24 - drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c | 6 drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 2 drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 8 drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 17 drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c | 2 drivers/net/ethernet/mellanox/mlx5/core/srq.c | 12 drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 6 drivers/net/ethernet/qlogic/qlge/qlge_dbg.c | 2 drivers/net/hyperv/netvsc_drv.c | 7 drivers/net/macsec.c | 1 drivers/net/phy/phy.c | 3 drivers/vhost/net.c | 7 fs/f2fs/recovery.c | 4 fs/fuse/dev.c | 13 fs/fuse/file.c | 3 include/linux/netdevice.h | 2 include/net/inet_frag.h | 35 - include/net/ip6_fib.h | 31 + include/net/udp.h | 2 kernel/bpf/hashtab.c | 30 - lib/idr.c | 2 net/bridge/br_device.c | 3 net/core/datagram.c | 2 net/core/dev.c | 3 net/ieee802154/6lowpan/reassembly.c | 11 net/ipv4/inet_fragment.c | 4 net/ipv4/ip_fragment.c | 12 net/ipv4/udp.c | 3 net/ipv6/addrconf.c | 2 net/ipv6/ip6_fib.c | 60 ++- net/ipv6/ip6_gre.c | 4 net/ipv6/ipv6_sockglue.c | 1 net/ipv6/netfilter/nf_conntrack_reasm.c | 12 net/ipv6/output_core.c | 6 net/ipv6/reassembly.c | 12 net/ipv6/route.c | 20 - net/ipv6/udp.c | 11 net/kcm/kcmsock.c | 4 net/packet/af_packet.c | 12 net/sctp/sctp_diag.c | 7 net/sctp/socket.c | 3 net/sctp/ulpqueue.c | 3 net/tipc/socket.c | 6 62 files changed, 465 insertions(+), 299 deletions(-)
Andrew Lunn (1):
net: fec: Allow reception of frames bigger than 1522 bytes
Andy Lutomirski (3):
x86/fsgsbase/64: Fully initialize FS and GS state in start_thread_common x86/fsgsbase/64: Report FSBASE and GSBASE correctly in core dumps x86/switch_to/64: Rewrite FS/GS switching yet again to fix AMD CPUs
Antoine Tenart (1):
net: mvpp2: fix the mac address used when using PPv2.2
Arnd Bergmann (1):
qlge: avoid memcpy buffer overflow
Benjamin Poirier (1):
packet: Don't write vnet header beyond end of buffer
Bob Peterson (1):
tipc: Fix tipc_sk_reinit handling of -EAGAIN
Claudiu Manoil (1):
gianfar: Fix Tx flow control deactivation
Daniel Borkmann (1):
bpf: fix map value attribute for hash of maps
Eran Ben Elisha (1):
net/mlx5e: Fix dangling page pointer on DMA mapping error
Eric Biggers (1):
idr: remove WARN_ON_ONCE() when trying to replace negative ID
Eric Dumazet (3):
udp: on peeking bad csum, drop packets even if not at head
kcm: do not attach PF_KCM sockets to avoid deadlock
ipv6: fix typo in fib6_net_exit()
Florian Fainelli (6):
fsl/man: Inherit parent device and of_node
net: systemport: Be drop monitor friendly
net: bcmgenet: Be drop monitor friendly
net: systemport: Free DMA coherent descriptors on errors
net: dsa: bcm_sf2: Fix number of CFP entries for BCM7278 Revert "net: phy: Correctly process PHY_HALTED in phy_stop_machine()"
Greg Kroah-Hartman (1):
Linux 4.12.14
Huy Nguyen (2):
net/mlx5e: Check for qos capability in dcbnl_initialize net/mlx5e: Fix DCB_CAP_ATTR_DCBX capability for DCBNL getcap.
Ido Schimmel (2):
mlxsw: spectrum: Forbid linking to devices that have uppers
bridge: switchdev: Clear forward mark when transmitting packet
Inbar Karmy (1):
net/mlx5e: Don't override user RSS upon set channels
Jaegeuk Kim (2):
f2fs: let fill_super handle roll-forward errors
f2fs: check hot_data for roll-forward recovery
Jason Wang (1):
vhost_net: correctly check tx avail during rx busy polling
Jesper Dangaard Brouer (2):
Revert "net: use lib/percpu_counter API for fragmentation mem accounting" Revert "net: fix percpu memory leaks"
Marcelo Ricardo Leitner (1):
sctp: fix missing wake ups in some situations
Miklos Szeredi (1):
fuse: allow server to run in different pid_ns
Moshe Shemesh (1):
net/mlx5e: Fix inline header size for small packets
Noa Osherovich (1):
net/mlx5: Fix arm SRQ command for ISSI version 0
Paolo Abeni (1):
udp6: set rx_dst_cookie on rx_dst updates
Paul Blakey (1):
net/mlx5e: Properly resolve TC offloaded ipv6 vxlan tunnel source address
Sabrina Dubroca (2):
macsec: add genl family module alias
ipv6: fix memory leak with multiple tables during netns destruction
Shahar Klein (1):
net/mlx5: E-Switch, Unload the representors in the correct order
Shaohua Li (1):
md/raid1/10: reset bio allocated from mempool
Song Liu (1):
md/raid5: release/flush io in raid5_do_work()
Stefano Brivio (3):
ipv6: accept 64k - 1 packet length in ip6_find_1stfragopt()
sctp: Avoid out-of-bounds reads from address storage
cxgb4: Fix stack out-of-bounds read due to wrong size to t4_record_mbox()
Steffen Klassert (1):
ipv6: Fix may be used uninitialized warning in rt6_check
Tal Gilboa (1):
net/mlx5e: Fix CQ moderation mode not set properly
Wei Wang (2):
ipv6: add rcu grace period before freeing fib6_node
ipv6: fix sparse warning on rt6i_node
Xin Long (3):
ipv6: set dst.obsolete when a cached route has expired
ipv6: do not set sk_destruct in IPV6_ADDRFORM sockopt
ip6_gre: update mtu properly in ip6gre_err
stephen hemminger (1):
netvsc: fix deadlock betwen link status and removal
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 4 PATCHLEVEL = 12 -SUBLEVEL = 13 +SUBLEVEL = 14 EXTRAVERSION = NAME = Fearless Coyote
arch/x86/include/asm/elf.h +3 -2
@@ -204,6 +204,7 @@ void set_personality_ia32(bool);#define ELF_CORE_COPY_REGS (pr_reg, regs) \ do { \ + unsigned long base; \ unsigned v; \ (pr_reg)[0] = (regs)->r15; \ (pr_reg)[1] = (regs)->r14; \
@@ -226,8 +227,8 @@ do { \ (pr_reg)[18 ] = (regs)->flags; \ (pr_reg)[19 ] = (regs)->sp; \ (pr_reg)[20 ] = (regs)->ss; \ - (pr_reg)[21 ] = current->thread.fsbase; \ - (pr_reg)[22 ] = current->thread.gsbase; \ +rdmsrl (MSR_FS_BASE , base); (pr_reg)[21 ] = base; \ +rdmsrl (MSR_KERNEL_GS_BASE , base); (pr_reg)[22 ] = base; \ asm("movl %%ds,%0" :"=r" (v)); (pr_reg)[23 ] = v; \ asm("movl %%es,%0" :"=r" (v)); (pr_reg)[24 ] = v; \ asm("movl %%fs,%0" :"=r" (v)); (pr_reg)[25 ] = v; \
arch/x86/kernel/process_64.c +131 -105
270 lines not on this page · raw message
drivers/md/raid1.c +18 -1
@@ -2586,6 +2586,23 @@ static int init_resync(struct r1conf *conf)return 0 ; } +static struct r1bio *raid1_alloc_init_r1buf (struct r1conf *conf) +{ +struct r1bio *r1bio =mempool_alloc (conf->r1buf_pool,GFP_NOIO ); +struct resync_pages *rps; +struct bio *bio; +int i; + +for (i = conf->poolinfo->raid_disks; i--; ) { + bio = r1bio->bios[i]; + rps = bio->bi_private; +bio_reset (bio); + bio->bi_private = rps; + } + r1bio->master_bio =NULL ; +return r1bio; +} +/* * perform a "sync" on one "block" *
@@ -2671,7 +2688,7 @@ static sector_t raid1_sync_request(struct mddev *mddev, sector_t sector_nr,bitmap_cond_end_sync (mddev->bitmap, sector_nr,mddev_is_clustered (mddev) && (sector_nr +2 *RESYNC_SECTORS > conf->cluster_sync_high)); - r1_bio =mempool_alloc (conf->r1buf_pool,GFP_NOIO ); + r1_bio =raid1_alloc_init_r1buf (conf);raise_barrier (conf, sector_nr);
drivers/md/raid10.c +32 -3
@@ -2807,6 +2807,35 @@ static int init_resync(struct r10conf *conf)return 0 ; } +static struct r10bio *raid10_alloc_init_r10buf (struct r10conf *conf) +{ +struct r10bio *r10bio =mempool_alloc (conf->r10buf_pool,GFP_NOIO ); +struct rsync_pages *rp; +struct bio *bio; +int nalloc; +int i; + +if (test_bit (MD_RECOVERY_SYNC , &conf->mddev->recovery) || +test_bit (MD_RECOVERY_RESHAPE , &conf->mddev->recovery)) + nalloc = conf->copies;/* resync */ +else + nalloc =2 ;/* recovery */ + +for (i =0 ; i < nalloc; i++) { + bio = r10bio->devs[i].bio; + rp = bio->bi_private; +bio_reset (bio); + bio->bi_private = rp; + bio = r10bio->devs[i].repl_bio; +if (bio) { + rp = bio->bi_private; +bio_reset (bio); + bio->bi_private = rp; + } + } +return r10bio; +} +/* * perform a "sync" on one "block" *
@@ -3036,7 +3065,7 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr,atomic_inc (&mreplace->nr_pending);rcu_read_unlock (); - r10_bio =mempool_alloc (conf->r10buf_pool,GFP_NOIO ); + r10_bio =raid10_alloc_init_r10buf (conf); r10_bio->state =0 ;raise_barrier (conf, rb2 !=NULL );atomic_set (&r10_bio->remaining,0 );
@@ -3245,7 +3274,7 @@ static sector_t raid10_sync_request(struct mddev *mddev, sector_t sector_nr, }if (sync_blocks < max_sync) max_sync = sync_blocks; - r10_bio =mempool_alloc (conf->r10buf_pool,GFP_NOIO ); + r10_bio =raid10_alloc_init_r10buf (conf); r10_bio->state =0 ; r10_bio->mddev = mddev;
@@ -4369,7 +4398,7 @@ static sector_t reshape_request(struct mddev *mddev, sector_t sector_nr, read_more:/* Now schedule reads for blocks from sector_nr to last */ - r10_bio =mempool_alloc (conf->r10buf_pool,GFP_NOIO ); + r10_bio =raid10_alloc_init_r10buf (conf); r10_bio->state =0 ;raise_barrier (conf, sectors_done !=0 );atomic_set (&r10_bio->remaining,0 );
drivers/md/raid5.c +4 -0
@@ -6238,6 +6238,10 @@ static void raid5_do_work(struct work_struct *work)spin_unlock_irq (&conf->device_lock); +flush_deferred_bios (conf); + +r5l_flush_stripe_to_raid (conf->log); +async_tx_issue_pending_all ();blk_finish_plug (&plug);
drivers/net/dsa/bcm_sf2.c +4 -0
@@ -1055,6 +1055,7 @@ struct bcm_sf2_of_data {u32 type;const u16 *reg_offsets;unsigned int core_reg_align; +unsigned int num_cfp_rules; };/* Register offsets for the SWITCH_REG_* block */
@@ -1078,6 +1079,7 @@ static const struct bcm_sf2_of_data bcm_sf2_7445_data = { .type = BCM7445_DEVICE_ID, .core_reg_align = 0, .reg_offsets = bcm_sf2_7445_reg_offsets, + .num_cfp_rules = 256, };static const u16 bcm_sf2_7278_reg_offsets[] = {
@@ -1100,6 +1102,7 @@ static const struct bcm_sf2_of_data bcm_sf2_7278_data = { .type = BCM7278_DEVICE_ID, .core_reg_align = 1, .reg_offsets = bcm_sf2_7278_reg_offsets, + .num_cfp_rules = 128, };static const struct of_device_id bcm_sf2_of_match[] = {
@@ -1156,6 +1159,7 @@ static int bcm_sf2_sw_probe(struct platform_device *pdev) priv->type = data->type; priv->reg_offsets = data->reg_offsets; priv->core_reg_align = data->core_reg_align; + priv->num_cfp_rules = data->num_cfp_rules;/* Auto-detection using standard registers will not work, so * provide an indication of what kind of device we are for
drivers/net/dsa/bcm_sf2.h +1 -0
@@ -72,6 +72,7 @@ struct bcm_sf2_priv {u32 type;const u16 *reg_offsets;unsigned int core_reg_align; +unsigned int num_cfp_rules;/* spinlock protecting access to the indirect registers */ spinlock_t indir_lock;
drivers/net/dsa/bcm_sf2_cfp.c +4 -4
@@ -98,7 +98,7 @@ static inline void bcm_sf2_cfp_rule_addr_set(struct bcm_sf2_priv *priv, {u32 reg; -WARN_ON (addr >=CFP_NUM_RULES ); +WARN_ON (addr >= priv->num_cfp_rules); reg =core_readl (priv,CORE_CFP_ACC ); reg &= ~(XCESS_ADDR_MASK <<XCESS_ADDR_SHIFT );
@@ -109,7 +109,7 @@ static inline void bcm_sf2_cfp_rule_addr_set(struct bcm_sf2_priv *priv,static inline unsigned int bcm_sf2_cfp_rule_size (struct bcm_sf2_priv *priv) {/* Entry #0 is reserved */ -return CFP_NUM_RULES -1 ; +return priv->num_cfp_rules -1 ; } static int bcm_sf2_cfp_rule_set(struct dsa_switch *ds, int port,
@@ -523,7 +523,7 @@ static int bcm_sf2_cfp_rule_get_all(struct bcm_sf2_priv *priv,if (!(reg &OP_STR_DONE ))break ; - }while (index <CFP_NUM_RULES ); + }while (index < priv->num_cfp_rules);/* Put the TCAM size here */ nfc->data =bcm_sf2_cfp_rule_size (priv);
@@ -544,7 +544,7 @@ int bcm_sf2_get_rxnfc(struct dsa_switch *ds, int port,case ETHTOOL_GRXCLSRLCNT :/* Subtract the default, unusable rule */ nfc->rule_cnt =bitmap_weight (priv->cfp.used, -CFP_NUM_RULES ) -1 ; + priv->num_cfp_rules) -1 ;/* We support specifying rule locations */ nfc->data |=RX_CLS_LOC_SPECIAL ;break ;
drivers/net/ethernet/broadcom/bcmsysport.c +3 -1
@@ -593,7 +593,7 @@ static int bcm_sysport_set_coalesce(struct net_device *dev,static void bcm_sysport_free_cb (struct bcm_sysport_cb *cb) { -dev_kfree_skb_any (cb->skb); +dev_consume_skb_any (cb->skb); cb->skb =NULL ;dma_unmap_addr_set (cb, dma_addr,0 ); }
@@ -1342,6 +1342,8 @@ static int bcm_sysport_init_tx_ring(struct bcm_sysport_priv *priv, ring->cbs =kcalloc (size,sizeof (struct bcm_sysport_cb ),GFP_KERNEL );if (!ring->cbs) { +dma_free_coherent (kdev,sizeof (struct dma_desc ), + ring->desc_cpu, ring->desc_dma);netif_err (priv, hw, priv->netdev,"CB allocation failed\n" );return -ENOMEM ; }
drivers/net/ethernet/broadcom/genet/bcmgenet.c +2 -2
@@ -1203,7 +1203,7 @@ static struct enet_cb *bcmgenet_get_txcb(struct bcmgenet_priv *priv,/* Simple helper to free a control block's resources */ static void bcmgenet_free_cb (struct enet_cb *cb) { -dev_kfree_skb_any (cb->skb); +dev_consume_skb_any (cb->skb); cb->skb =NULL ;dma_unmap_addr_set (cb, dma_addr,0 ); }
@@ -1868,7 +1868,7 @@ static int bcmgenet_alloc_rx_buffers(struct bcmgenet_priv *priv, cb = ring->cbs + i; skb =bcmgenet_rx_refill (priv, cb);if (skb) -dev_kfree_skb_any (skb); +dev_consume_skb_any (skb);if (!cb->skb)return -ENOMEM ; }
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c +3 -3
@@ -369,12 +369,12 @@ int t4_wr_mbox_meat_timeout(struct adapter *adap, int mbox, const void *cmd,list_del (&entry.list);spin_unlock (&adap->mbox_lock); ret = (v ==MBOX_OWNER_FW ) ? -EBUSY : -ETIMEDOUT ; -t4_record_mbox (adap, cmd,MBOX_LEN , access, ret); +t4_record_mbox (adap, cmd, size, access, ret);return ret; }/* Copy in the new mailbox command and send it on its way ... */ -t4_record_mbox (adap, cmd,MBOX_LEN , access,0 ); +t4_record_mbox (adap, cmd, size, access,0 );for (i =0 ; i < size; i +=8 )t4_write_reg64 (adap, data_reg + i,be64_to_cpu (*p++));
@@ -426,7 +426,7 @@ int t4_wr_mbox_meat_timeout(struct adapter *adap, int mbox, const void *cmd, } ret = (pcie_fw &PCIE_FW_ERR_F ) ? -ENXIO : -ETIMEDOUT ; -t4_record_mbox (adap, cmd,MBOX_LEN , access, ret); +t4_record_mbox (adap, cmd, size, access, ret);dev_err (adap->pdev_dev,"command %#x in mailbox %d timed out\n" , *(const u8 *)cmd, mbox);t4_report_fw_error (adap);
drivers/net/ethernet/freescale/fec_main.c +5 -3
@@ -173,10 +173,12 @@ MODULE_PARM_DESC(macaddr, "FEC Ethernet MAC address");#endif /* CONFIG_M5272 */ /* The FEC stores dest/src/type/vlan, data, and checksum for receive packets. +* +* 2048 byte skbufs are allocated. However, alignment requirements +* varies between FEC variants. Worst case is 64, so round down by 64. */ -#define PKT_MAXBUF_SIZE 1522 +#define PKT_MAXBUF_SIZE (round_down(2048 - 64, 64))#define PKT_MINBUF_SIZE 64 -#define PKT_MAXBLR_SIZE 1536/* FEC receive acceleration */ #define FEC_RACC_IPDIS (1 << 1)
@@ -848,7 +850,7 @@ static void fec_enet_enable_ring(struct net_device *ndev)for (i =0 ; i < fep->num_rx_queues; i++) { rxq = fep->rx_queue[i];writel (rxq->bd.dma, fep->hwp +FEC_R_DES_START (i)); -writel (PKT_MAXBLR_SIZE , fep->hwp +FEC_R_BUFF_SIZE (i)); +writel (PKT_MAXBUF_SIZE , fep->hwp +FEC_R_BUFF_SIZE (i));/* enable DMA1/2 */ if (i)
drivers/net/ethernet/freescale/fman/mac.c +2 -0
@@ -623,6 +623,8 @@ static struct platform_device *dpaa_eth_add_device(int fman_id, goto no_mem; } + pdev->dev.of_node = node; + pdev->dev.parent = priv->dev;set_dma_ops (&pdev->dev,get_dma_ops (priv->dev)); ret =platform_device_add_data (pdev, &data,sizeof (data));
drivers/net/ethernet/freescale/gianfar.c +1 -1
@@ -3687,7 +3687,7 @@ static noinline void gfar_update_link_state(struct gfar_private *priv)u32 tempval1 =gfar_read (®s->maccfg1);u32 tempval =gfar_read (®s->maccfg2);u32 ecntrl =gfar_read (®s->ecntrl); -u32 tx_flow_oldval = (tempval &MACCFG1_TX_FLOW ); +u32 tx_flow_oldval = (tempval1 &MACCFG1_TX_FLOW );if (phydev->duplex != priv->oldduplex) {if (!(phydev->duplex))
drivers/net/ethernet/marvell/mvpp2.c +1 -1
@@ -6465,7 +6465,7 @@ static int mvpp2_port_probe(struct platform_device *pdev,struct resource *res;const char *dt_mac_addr;const char *mac_from; -char hw_mac_addr[ETH_ALEN ]; +char hw_mac_addr[ETH_ALEN ] = {0 };u32 id;int features;int phy_mode;
drivers/net/ethernet/mellanox/mlx5/core/en.h +1 -0
@@ -258,6 +258,7 @@ struct mlx5e_dcbx {/* The only setting that cannot be read from FW */ u8 tc_tsa[IEEE_8021QAZ_MAX_TCS ]; + u8 cap; };#endif
drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c +15 -9
@@ -288,13 +288,8 @@ static int mlx5e_dcbnl_ieee_setpfc(struct net_device *dev,static u8 mlx5e_dcbnl_getdcbx (struct net_device *dev) {struct mlx5e_priv *priv =netdev_priv (dev); -struct mlx5e_dcbx *dcbx = &priv->dcbx; -u8 mode =DCB_CAP_DCBX_VER_IEEE |DCB_CAP_DCBX_VER_CEE ; - -if (dcbx->mode ==MLX5E_DCBX_PARAM_VER_OPER_HOST ) - mode |=DCB_CAP_DCBX_HOST ; -return mode; +return priv->dcbx.cap; }static u8 mlx5e_dcbnl_setdcbx (struct net_device *dev,u8 mode)
@@ -312,6 +307,7 @@ static u8 mlx5e_dcbnl_setdcbx(struct net_device *dev, u8 mode)/* set dcbx to fw controlled */ if (!mlx5e_dcbnl_set_dcbx_mode (priv,MLX5E_DCBX_PARAM_VER_OPER_AUTO )) { dcbx->mode =MLX5E_DCBX_PARAM_VER_OPER_AUTO ; + dcbx->cap &= ~DCB_CAP_DCBX_HOST ;return 0 ; }
@@ -324,6 +320,8 @@ static u8 mlx5e_dcbnl_setdcbx(struct net_device *dev, u8 mode)if (mlx5e_dcbnl_switch_to_host_mode (netdev_priv (dev)))return 1 ; + dcbx->cap = mode; +return 0 ; }
@@ -628,9 +626,9 @@ static u8 mlx5e_dcbnl_getcap(struct net_device *netdev, *cap = false;break ;case DCB_CAP_ATTR_DCBX : - *cap = (DCB_CAP_DCBX_LLD_MANAGED | -DCB_CAP_DCBX_VER_CEE | -DCB_CAP_DCBX_STATIC ); + *cap = priv->dcbx.cap | +DCB_CAP_DCBX_VER_CEE | +DCB_CAP_DCBX_VER_IEEE ;break ;default : *cap =0 ;
@@ -754,8 +752,16 @@ void mlx5e_dcbnl_initialize(struct mlx5e_priv *priv) {struct mlx5e_dcbx *dcbx = &priv->dcbx; +if (!MLX5_CAP_GEN (priv->mdev, qos)) +return ; +if (MLX5_CAP_GEN (priv->mdev, dcbx))mlx5e_dcbnl_query_dcbx_mode (priv, &dcbx->mode); + priv->dcbx.cap =DCB_CAP_DCBX_VER_CEE | +DCB_CAP_DCBX_VER_IEEE ; +if (priv->dcbx.mode ==MLX5E_DCBX_PARAM_VER_OPER_HOST ) + priv->dcbx.cap |=DCB_CAP_DCBX_HOST ; +mlx5e_ets_init (priv); }
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c +4 -2
@@ -580,8 +580,10 @@ static int mlx5e_set_channels(struct net_device *dev, new_channels.params = priv->channels.params; new_channels.params.num_channels = count; -mlx5e_build_default_indir_rqt (priv->mdev, new_channels.params.indirection_rqt, -MLX5E_INDIR_RQT_SIZE , count); +if (!netif_is_rxfh_configured (priv->netdev)) +mlx5e_build_default_indir_rqt (priv->mdev, + new_channels.params.indirection_rqt, +MLX5E_INDIR_RQT_SIZE , count);if (!test_bit (MLX5E_STATE_OPENED , &priv->state)) { priv->channels.params = new_channels.params;
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +1 -0
@@ -1936,6 +1936,7 @@ static void mlx5e_build_rx_cq_param(struct mlx5e_priv *priv, }mlx5e_build_common_cq_param (priv, param); + param->cq_period_mode = params->rx_cq_period_mode; } static void mlx5e_build_tx_cq_param(struct mlx5e_priv *priv,
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +1 -1
@@ -216,13 +216,13 @@ static inline int mlx5e_page_alloc_mapped(struct mlx5e_rq *rq,if (unlikely (!page))return -ENOMEM ; - dma_info->page = page; dma_info->addr =dma_map_page (rq->pdev, page,0 ,RQ_PAGE_SIZE (rq), rq->buff.map_dir);if (unlikely (dma_mapping_error (rq->pdev, dma_info->addr))) {put_page (page);return -ENOMEM ; } + dma_info->page = page;return 0 ; }
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +3 -5
@@ -1262,12 +1262,10 @@ static int mlx5e_route_lookup_ipv6(struct mlx5e_priv *priv,struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;int ret; - dst =ip6_route_output (dev_net (mirred_dev),NULL , fl6); - ret = dst->error; -if (ret) { -dst_release (dst); + ret = ipv6_stub->ipv6_dst_lookup (dev_net (mirred_dev),NULL , &dst, + fl6); +if (ret <0 )return ret; - } *out_ttl =ip6_dst_hoplimit (dst);
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c +10 -7
@@ -127,10 +127,10 @@ static inline int mlx5e_skb_l3_header_offset(struct sk_buff *skb)return mlx5e_skb_l2_header_offset (skb); } -static inline unsigned int mlx5e_calc_min_inline (enum mlx5_inline_modes mode, -struct sk_buff *skb) +static inline u16 mlx5e_calc_min_inline (enum mlx5_inline_modes mode, +struct sk_buff *skb) { -int hlen; +u16 hlen;switch (mode) {case MLX5_INLINE_MODE_NONE :
@@ -139,19 +139,22 @@ static inline unsigned int mlx5e_calc_min_inline(enum mlx5_inline_modes mode, hlen =eth_get_headlen (skb->data,skb_headlen (skb));if (hlen ==ETH_HLEN && !skb_vlan_tag_present (skb)) hlen +=VLAN_HLEN ; -return hlen; +break ;case MLX5_INLINE_MODE_IP :/* When transport header is set to zero, it means no transport * header. When transport header is set to 0xff's, it means * transport header wasn't set. */ -if (skb_transport_offset (skb)) -return mlx5e_skb_l3_header_offset (skb); +if (skb_transport_offset (skb)) { + hlen =mlx5e_skb_l3_header_offset (skb); +break ; + }/* fall through */ case MLX5_INLINE_MODE_L2 :default : -return mlx5e_skb_l2_header_offset (skb); + hlen =mlx5e_skb_l2_header_offset (skb); } +return min_t (u16, hlen, skb->len); } static inline void mlx5e_tx_skb_pull_inline(unsigned char **skb_data,
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +1 -1
@@ -818,7 +818,7 @@ void esw_offloads_cleanup(struct mlx5_eswitch *esw, int nvports)struct mlx5_eswitch_rep *rep;int vport; -for (vport =0 ; vport < nvports; vport++) { +for (vport = nvports -1 ; vport >=0 ; vport--) { rep = &esw->offloads.vport_reps[vport];if (!rep->valid)continue ;
drivers/net/ethernet/mellanox/mlx5/core/srq.c +6 -6
@@ -201,13 +201,13 @@ static int destroy_srq_cmd(struct mlx5_core_dev *dev,static int arm_srq_cmd (struct mlx5_core_dev *dev,struct mlx5_core_srq *srq,u16 lwm,int is_srq) { -/* arm_srq structs missing using identical xrc ones */ -u32 srq_in[MLX5_ST_SZ_DW (arm_xrc_srq_in)] = {0 }; -u32 srq_out[MLX5_ST_SZ_DW (arm_xrc_srq_out)] = {0 }; +u32 srq_in[MLX5_ST_SZ_DW (arm_rq_in)] = {0 }; +u32 srq_out[MLX5_ST_SZ_DW (arm_rq_out)] = {0 }; -MLX5_SET (arm_xrc_srq_in, srq_in, opcode,MLX5_CMD_OP_ARM_XRC_SRQ ); -MLX5_SET (arm_xrc_srq_in, srq_in, xrc_srqn, srq->srqn); -MLX5_SET (arm_xrc_srq_in, srq_in, lwm, lwm); +MLX5_SET (arm_rq_in, srq_in, opcode,MLX5_CMD_OP_ARM_RQ ); +MLX5_SET (arm_rq_in, srq_in, op_mod,MLX5_ARM_RQ_IN_OP_MOD_SRQ ); +MLX5_SET (arm_rq_in, srq_in, srq_number, srq->srqn); +MLX5_SET (arm_rq_in, srq_in, lwm, lwm);return mlx5_cmd_exec (dev, srq_in,sizeof (srq_in), srq_out,sizeof (srq_out));
drivers/net/ethernet/mellanox/mlxsw/spectrum.c +6 -0
@@ -4110,6 +4110,8 @@ static int mlxsw_sp_netdevice_port_upper_event(struct net_device *dev,return -EINVAL ;if (!info->linking)break ; +if (netdev_has_any_upper_dev (upper_dev)) +return -EINVAL ;/* HW limitation forbids to put ports to multiple bridges. */ if (netif_is_bridge_master (upper_dev) && !mlxsw_sp_master_bridge_check (mlxsw_sp, upper_dev))
@@ -4274,6 +4276,10 @@ static int mlxsw_sp_netdevice_bridge_event(struct net_device *br_dev,if (is_vlan_dev (upper_dev) && br_dev != mlxsw_sp->master_bridge.dev)return -EINVAL ; +if (!info->linking) +break ; +if (netdev_has_any_upper_dev (upper_dev)) +return -EINVAL ;break ;case NETDEV_CHANGEUPPER : upper_dev = info->upper_dev;
drivers/net/ethernet/qlogic/qlge/qlge_dbg.c +1 -1
@@ -724,7 +724,7 @@ static void ql_build_coredump_seg_header( seg_hdr->cookie =MPI_COREDUMP_COOKIE ; seg_hdr->segNum = seg_number; seg_hdr->segSize = seg_size; -memcpy (seg_hdr->description, desc, (sizeof (seg_hdr->description)) -1 ); +strncpy (seg_hdr->description, desc, (sizeof (seg_hdr->description)) -1 ); }/*
drivers/net/hyperv/netvsc_drv.c +6 -1
@@ -1270,7 +1270,12 @@ static void netvsc_link_change(struct work_struct *w)bool notify = false, reschedule = false;unsigned long flags, next_reconfig, delay; -rtnl_lock (); +/* if changes are happening, comeback later */ +if (!rtnl_trylock ()) { +schedule_delayed_work (&ndev_ctx->dwork,LINKCHANGE_INT ); +return ; + } + net_device =rtnl_dereference (ndev_ctx->nvdev);if (!net_device) goto out_unlock;
drivers/net/macsec.c +1 -0
@@ -3518,6 +3518,7 @@ module_init(macsec_init);module_exit (macsec_exit);MODULE_ALIAS_RTNL_LINK ("macsec" ); +MODULE_ALIAS_GENL_FAMILY ("macsec" );MODULE_DESCRIPTION ("MACsec IEEE 802.1AE" );MODULE_LICENSE ("GPL v2" );
drivers/net/phy/phy.c +0 -3
@@ -749,9 +749,6 @@ void phy_stop_machine(struct phy_device *phydev)if (phydev->state >PHY_UP && phydev->state !=PHY_HALTED ) phydev->state =PHY_UP ;mutex_unlock (&phydev->lock); - -/* Now we can run the state machine synchronously */ -phy_state_machine (&phydev->state_queue.work); }/**
drivers/vhost/net.c +6 -1
@@ -557,8 +557,13 @@ static int vhost_net_rx_peek_head_len(struct vhost_net *net, struct sock *sk)preempt_enable (); -if (vhost_enable_notify (&net->dev, vq)) +if (!vhost_vq_avail_empty (&net->dev, vq))vhost_poll_queue (&vq->poll); +else if (unlikely (vhost_enable_notify (&net->dev, vq))) { +vhost_disable_notify (&net->dev, vq); +vhost_poll_queue (&vq->poll); + } +mutex_unlock (&vq->mutex); len =peek_head_len (sk);
fs/f2fs/recovery.c +1 -3
@@ -291,7 +291,7 @@ static int check_index_in_prev_nodes(struct f2fs_sb_info *sbi,return 0 ;/* Get the previous summary */ -for (i =CURSEG_WARM_DATA ; i <=CURSEG_COLD_DATA ; i++) { +for (i =CURSEG_HOT_DATA ; i <=CURSEG_COLD_DATA ; i++) {struct curseg_info *curseg =CURSEG_I (sbi, i);if (curseg->segno == segno) { sum = curseg->sum_blk->entries[blkoff];
@@ -599,8 +599,6 @@ int recover_fsync_data(struct f2fs_sb_info *sbi, bool check_only) }clear_sbi_flag (sbi,SBI_POR_DOING ); -if (err) -set_ckpt_flags (sbi,CP_ERROR_FLAG );mutex_unlock (&sbi->cp_mutex);/* let's drop all the directory inodes for clean checkpoint */
fs/fuse/dev.c +7 -6
@@ -1222,9 +1222,6 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file,struct fuse_in *in;unsigned reqsize; -if (task_active_pid_ns (current) != fc->pid_ns) -return -EIO ; - restart:spin_lock (&fiq->waitq.lock); err = -EAGAIN ;
@@ -1262,6 +1259,13 @@ static ssize_t fuse_dev_do_read(struct fuse_dev *fud, struct file *file, in = &req->in; reqsize = in->h.len; + +if (task_active_pid_ns (current) != fc->pid_ns) { +rcu_read_lock (); + in->h.pid =pid_vnr (find_pid_ns (in->h.pid, fc->pid_ns)); +rcu_read_unlock (); + } +/* If request is too large, reply with an error and restart the read */ if (nbytes < reqsize) { req->out.h.error = -EIO ;
@@ -1823,9 +1827,6 @@ static ssize_t fuse_dev_do_write(struct fuse_dev *fud,struct fuse_req *req;struct fuse_out_header oh; -if (task_active_pid_ns (current) != fc->pid_ns) -return -EIO ; -if (nbytes <sizeof (struct fuse_out_header ))return -EINVAL ;
fs/fuse/file.c +0 -3
@@ -2180,9 +2180,6 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock)if ((fl->fl_flags &FL_CLOSE_POSIX ) ==FL_CLOSE_POSIX )return 0 ; -if (pid && pid_nr ==0 ) -return -EOVERFLOW ; -fuse_lk_fill (&args, file, fl, opcode, pid_nr, flock, &inarg); err =fuse_simple_request (fc, &args);
include/linux/netdevice.h +2 -0
@@ -3868,6 +3868,8 @@ int netdev_walk_all_upper_dev_rcu(struct net_device *dev,bool netdev_has_upper_dev_all_rcu (struct net_device *dev,struct net_device *upper_dev); +bool netdev_has_any_upper_dev (struct net_device *dev); +void *netdev_lower_get_next_private (struct net_device *dev,struct list_head **iter); void *netdev_lower_get_next_private_rcu(struct net_device *dev,
include/net/inet_frag.h +9 -26
@@ -1,14 +1,9 @@ #ifndef __NET_FRAG_H__ #define __NET_FRAG_H__ -#include <linux/percpu_counter.h> - struct netns_frags { - /* The percpu_counter "mem" need to be cacheline aligned. - * mem.count must not share cacheline with other writers - */ - struct percpu_counter mem ____cacheline_aligned_in_smp; - + /* Keep atomic mem on separate cachelines in structs that include it */ + atomic_t mem ____cacheline_aligned_in_smp; /* sysctls */ int timeout; int high_thresh;
@@ -108,15 +103,10 @@ struct inet_frags {int inet_frags_init (struct inet_frags *);void inet_frags_fini (struct inet_frags *); -static inline int inet_frags_init_net (struct netns_frags *nf) -{ -return percpu_counter_init (&nf->mem,0 ,GFP_KERNEL ); -} -static inline void inet_frags_uninit_net (struct netns_frags *nf) +static inline void inet_frags_init_net (struct netns_frags *nf) { -percpu_counter_destroy (&nf->mem); +atomic_set (&nf->mem,0 ); } -void inet_frags_exit_net (struct netns_frags *nf,struct inet_frags *f);void inet_frag_kill (struct inet_frag_queue *q,struct inet_frags *f);
@@ -140,31 +130,24 @@ static inline bool inet_frag_evicting(struct inet_frag_queue *q)/* Memory Tracking Functions. */ -/* The default percpu_counter batch size is not big enough to scale to -* fragmentation mem acct sizes. -* The mem size of a 64K fragment is approx: -* (44 fragments * 2944 truesize) + frag_queue struct(200) = 129736 bytes -*/ -static unsigned int frag_percpu_counter_batch =130000 ; -static inline int frag_mem_limit (struct netns_frags *nf) { -return percpu_counter_read (&nf->mem); +return atomic_read (&nf->mem); }static inline void sub_frag_mem_limit (struct netns_frags *nf,int i) { -percpu_counter_add_batch (&nf->mem, -i, frag_percpu_counter_batch); +atomic_sub (i, &nf->mem); }static inline void add_frag_mem_limit (struct netns_frags *nf,int i) { -percpu_counter_add_batch (&nf->mem, i, frag_percpu_counter_batch); +atomic_add (i, &nf->mem); } -static inline unsigned int sum_frag_mem_limit (struct netns_frags *nf) +static inline int sum_frag_mem_limit (struct netns_frags *nf) { -return percpu_counter_sum_positive (&nf->mem); +return atomic_read (&nf->mem); }/* RFC 3168 support :
include/net/ip6_fib.h +29 -2
@@ -70,6 +70,7 @@ struct fib6_node {__u16 fn_flags;int fn_sernum;struct rt6_info *rr_ptr; +struct rcu_head rcu; };#ifndef CONFIG_IPV6_SUBTREES
@@ -104,7 +105,7 @@ struct rt6_info {* the same cache line. */ struct fib6_table *rt6i_table; -struct fib6_node *rt6i_node; +struct fib6_node __rcu *rt6i_node;struct in6_addr rt6i_gateway;
@@ -167,13 +168,39 @@ static inline void rt6_update_expires(struct rt6_info *rt0, int timeout) rt0->rt6i_flags |=RTF_EXPIRES ; } +/* Function to safely get fn->sernum for passed in rt +* and store result in passed in cookie. +* Return true if we can get cookie safely +* Return false if not +*/ +static inline bool rt6_get_cookie_safe (const struct rt6_info *rt, +u32 *cookie) +{ +struct fib6_node *fn; +bool status = false; + +rcu_read_lock (); + fn =rcu_dereference (rt->rt6i_node); + +if (fn) { + *cookie = fn->fn_sernum; + status = true; + } + +rcu_read_unlock (); +return status; +} +static inline u32 rt6_get_cookie (const struct rt6_info *rt) { +u32 cookie =0 ; +if (rt->rt6i_flags &RTF_PCPU || (unlikely (rt->dst.flags &DST_NOCACHE ) && rt->dst.from)) rt = (struct rt6_info *)(rt->dst.from); +rt6_get_cookie_safe (rt, &cookie); -return rt->rt6i_node ? rt->rt6i_node->fn_sernum :0 ; +return cookie; }static inline void ip6_rt_put (struct rt6_info *rt)
include/net/udp.h +1 -1
@@ -265,7 +265,7 @@ static inline struct sk_buff *skb_recv_udp(struct sock *sk, unsigned int flags, }void udp_v4_early_demux (struct sk_buff *skb); -void udp_sk_rx_dst_set (struct sock *sk,struct dst_entry *dst); +bool udp_sk_rx_dst_set (struct sock *sk,struct dst_entry *dst);int udp_get_port (struct sock *sk,unsigned short snum,int (*saddr_cmp)(const struct sock *,const struct sock *));
kernel/bpf/hashtab.c +17 -13
@@ -652,12 +652,27 @@ static void pcpu_copy_value(struct bpf_htab *htab, void __percpu *pptr, } } +static bool fd_htab_map_needs_adjust (const struct bpf_htab *htab) +{ +return htab->map.map_type ==BPF_MAP_TYPE_HASH_OF_MAPS && +BITS_PER_LONG ==64 ; +} + +static u32 htab_size_value (const struct bpf_htab *htab,bool percpu) +{ +u32 size = htab->map.value_size; + +if (percpu ||fd_htab_map_needs_adjust (htab)) + size =round_up (size,8 ); +return size; +} +static struct htab_elem *alloc_htab_elem (struct bpf_htab *htab,void *key,void *value,u32 key_size,u32 hash,bool percpu,bool onallcpus,struct htab_elem *old_elem) { -u32 size = htab->map.value_size; +u32 size =htab_size_value (htab, percpu);bool prealloc =htab_is_prealloc (htab);struct htab_elem *l_new, **pl_new;void __percpu *pptr;
@@ -696,9 +711,6 @@ static struct htab_elem *alloc_htab_elem(struct bpf_htab *htab, void *key,memcpy (l_new->key, key, key_size);if (percpu) { -/* round up value_size to 8 bytes */ - size =round_up (size,8 ); -if (prealloc) { pptr =htab_elem_get_ptr (l_new, key_size); }else {
@@ -1209,17 +1221,9 @@ const struct bpf_map_ops htab_lru_percpu_map_ops = {static struct bpf_map *fd_htab_map_alloc (union bpf_attr *attr) { -struct bpf_map *map; -if (attr->value_size !=sizeof (u32))return ERR_PTR (-EINVAL ); - -/* pointer is stored internally */ - attr->value_size =sizeof (void *); - map =htab_map_alloc (attr); - attr->value_size =sizeof (u32); - -return map; +return htab_map_alloc (attr); }static void fd_htab_map_free (struct bpf_map *map)
lib/idr.c +1 -1
@@ -154,7 +154,7 @@ void *idr_replace(struct idr *idr, void *ptr, int id)void __rcu **slot =NULL ;void *entry; -if (WARN_ON_ONCE (id <0 )) +if (id <0 )return ERR_PTR (-EINVAL );if (WARN_ON_ONCE (radix_tree_is_internal_node (ptr)))return ERR_PTR (-EINVAL );
net/bridge/br_device.c +3 -0
@@ -53,6 +53,9 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) brstats->tx_bytes += skb->len;u64_stats_update_end (&brstats->syncp); +#ifdef CONFIG_NET_SWITCHDEV + skb->offload_fwd_mark =0 ; +#endif BR_INPUT_SKB_CB (skb)->brdev = dev;skb_reset_mac_header (skb);
net/core/datagram.c +1 -1
@@ -345,7 +345,7 @@ int __sk_queue_drop_skb(struct sock *sk, struct sk_buff *skb,if (flags &MSG_PEEK ) { err = -ENOENT ;spin_lock_bh (&sk->sk_receive_queue.lock); -if (skb ==skb_peek (&sk->sk_receive_queue)) { +if (skb->next) {__skb_unlink (skb, &sk->sk_receive_queue);atomic_dec (&skb->users);if (destructor)
net/core/dev.c +2 -1
@@ -5590,12 +5590,13 @@ EXPORT_SYMBOL(netdev_has_upper_dev_all_rcu);* Find out if a device is linked to an upper device and return true in case * it is. The caller must hold the RTNL lock. */ -static bool netdev_has_any_upper_dev (struct net_device *dev) +bool netdev_has_any_upper_dev (struct net_device *dev) {ASSERT_RTNL ();return !list_empty (&dev->adj_list.upper); } +EXPORT_SYMBOL (netdev_has_any_upper_dev);/** * netdev_master_upper_dev_get - Get master upper device
net/ieee802154/6lowpan/reassembly.c +3 -8
@@ -580,19 +580,14 @@ static int __net_init lowpan_frags_init_net(struct net *net) {struct netns_ieee802154_lowpan *ieee802154_lowpan =net_ieee802154_lowpan (net); -int res; ieee802154_lowpan->frags.high_thresh =IPV6_FRAG_HIGH_THRESH ; ieee802154_lowpan->frags.low_thresh =IPV6_FRAG_LOW_THRESH ; ieee802154_lowpan->frags.timeout =IPV6_FRAG_TIMEOUT ; - res =inet_frags_init_net (&ieee802154_lowpan->frags); -if (res) -return res; - res =lowpan_frags_ns_sysctl_register (net); -if (res) -inet_frags_uninit_net (&ieee802154_lowpan->frags); -return res; +inet_frags_init_net (&ieee802154_lowpan->frags); + +return lowpan_frags_ns_sysctl_register (net); } static void __net_exit lowpan_frags_exit_net(struct net *net)
net/ipv4/inet_fragment.c +1 -3
@@ -234,10 +234,8 @@ void inet_frags_exit_net(struct netns_frags *nf, struct inet_frags *f)cond_resched ();if (read_seqretry (&f->rnd_seqlock, seq) || -percpu_counter_sum (&nf->mem)) +sum_frag_mem_limit (nf)) goto evict_again; - -percpu_counter_destroy (&nf->mem); }EXPORT_SYMBOL (inet_frags_exit_net);
net/ipv4/ip_fragment.c +3 -9
@@ -844,8 +844,6 @@ static void __init ip4_frags_ctl_register(void)static int __net_init ipv4_frags_init_net (struct net *net) { -int res; -/* Fragment cache limits. * * The fragment memory accounting code, (tries to) account for
@@ -871,13 +869,9 @@ static int __net_init ipv4_frags_init_net(struct net *net) net->ipv4.frags.max_dist =64 ; - res =inet_frags_init_net (&net->ipv4.frags); -if (res) -return res; - res =ip4_frags_ns_ctl_register (net); -if (res) -inet_frags_uninit_net (&net->ipv4.frags); -return res; +inet_frags_init_net (&net->ipv4.frags); + +return ip4_frags_ns_ctl_register (net); } static void __net_exit ipv4_frags_exit_net(struct net *net)
net/ipv4/udp.c +2 -1
@@ -1762,13 +1762,14 @@ static int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)/* For TCP sockets, sk_rx_dst is protected by socket lock * For UDP, we use xchg() to guard against concurrent changes. */ -void udp_sk_rx_dst_set (struct sock *sk,struct dst_entry *dst) +bool udp_sk_rx_dst_set (struct sock *sk,struct dst_entry *dst) {struct dst_entry *old;dst_hold (dst); old =xchg (&sk->sk_rx_dst, dst);dst_release (old); +return old != dst; }/*
net/ipv6/addrconf.c +1 -1
@@ -5541,7 +5541,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)* our DAD process, so we don't need * to do it again */ -if (!(ifp->rt->rt6i_node)) +if (!rcu_access_pointer (ifp->rt->rt6i_node))ip6_ins_rt (ifp->rt);if (ifp->idev->cnf.forwarding)addrconf_join_anycast (ifp);
net/ipv6/ip6_fib.c +45 -15
130 lines not on this page · raw message
net/ipv6/ip6_gre.c +3 -1
@@ -432,7 +432,9 @@ static void ip6gre_err(struct sk_buff *skb, struct inet6_skb_parm *opt, }break ;case ICMPV6_PKT_TOOBIG : - mtu =be32_to_cpu (info) - offset; + mtu =be32_to_cpu (info) - offset - t->tun_hlen; +if (t->dev->type ==ARPHRD_ETHER ) + mtu -=ETH_HLEN ;if (mtu <IPV6_MIN_MTU ) mtu =IPV6_MIN_MTU ; t->dev->mtu = mtu;
net/ipv6/ipv6_sockglue.c +0 -1
@@ -242,7 +242,6 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, pktopt =xchg (&np->pktoptions,NULL );kfree_skb (pktopt); - sk->sk_destruct = inet_sock_destruct;/* * ... and add it to the refcnt debug socks count * in the new family. -acme
net/ipv6/netfilter/nf_conntrack_reasm.c +3 -9
@@ -622,18 +622,12 @@ EXPORT_SYMBOL_GPL(nf_ct_frag6_gather);static int nf_ct_net_init (struct net *net) { -int res; - net->nf_frag.frags.high_thresh =IPV6_FRAG_HIGH_THRESH ; net->nf_frag.frags.low_thresh =IPV6_FRAG_LOW_THRESH ; net->nf_frag.frags.timeout =IPV6_FRAG_TIMEOUT ; - res =inet_frags_init_net (&net->nf_frag.frags); -if (res) -return res; - res =nf_ct_frag6_sysctl_register (net); -if (res) -inet_frags_uninit_net (&net->nf_frag.frags); -return res; +inet_frags_init_net (&net->nf_frag.frags); + +return nf_ct_frag6_sysctl_register (net); }static void nf_ct_net_exit (struct net *net)
net/ipv6/output_core.c +2 -4
@@ -86,7 +86,6 @@ int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr)while (offset <= packet_len) {struct ipv6_opt_hdr *exthdr; -unsigned int len;switch (**nexthdr) {
@@ -112,10 +111,9 @@ int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr) exthdr = (struct ipv6_opt_hdr *)(skb_network_header (skb) + offset); - len =ipv6_optlen (exthdr); -if (len + offset >=IPV6_MAXPLEN ) + offset +=ipv6_optlen (exthdr); +if (offset >IPV6_MAXPLEN )return -EINVAL ; - offset += len; *nexthdr = &exthdr->nexthdr; }
net/ipv6/reassembly.c +3 -9
@@ -714,19 +714,13 @@ static void ip6_frags_sysctl_unregister(void)static int __net_init ipv6_frags_init_net (struct net *net) { -int res; - net->ipv6.frags.high_thresh =IPV6_FRAG_HIGH_THRESH ; net->ipv6.frags.low_thresh =IPV6_FRAG_LOW_THRESH ; net->ipv6.frags.timeout =IPV6_FRAG_TIMEOUT ; - res =inet_frags_init_net (&net->ipv6.frags); -if (res) -return res; - res =ip6_frags_ns_sysctl_register (net); -if (res) -inet_frags_uninit_net (&net->ipv6.frags); -return res; +inet_frags_init_net (&net->ipv6.frags); + +return ip6_frags_ns_sysctl_register (net); } static void __net_exit ipv6_frags_exit_net(struct net *net)
net/ipv6/route.c +15 -5
@@ -444,7 +444,8 @@ static bool rt6_check_expired(const struct rt6_info *rt)if (time_after (jiffies, rt->dst.expires))return true; }else if (rt->dst.from) { -return rt6_check_expired ((struct rt6_info *) rt->dst.from); +return rt->dst.obsolete !=DST_OBSOLETE_FORCE_CHK || +rt6_check_expired ((struct rt6_info *)rt->dst.from); }return false; }
@@ -1289,7 +1290,9 @@ static void rt6_dst_from_metrics_check(struct rt6_info *rt)static struct dst_entry *rt6_check (struct rt6_info *rt,u32 cookie) { -if (!rt->rt6i_node || (rt->rt6i_node->fn_sernum != cookie)) +u32 rt_cookie =0 ; + +if (!rt6_get_cookie_safe (rt, &rt_cookie) || rt_cookie != cookie)return NULL ;if (rt6_check_expired (rt))
@@ -1357,8 +1360,14 @@ static void ip6_link_failure(struct sk_buff *skb)if (rt->rt6i_flags &RTF_CACHE ) {dst_hold (&rt->dst);ip6_del_rt (rt); - }else if (rt->rt6i_node && (rt->rt6i_flags &RTF_DEFAULT )) { - rt->rt6i_node->fn_sernum =-1 ; + }else { +struct fib6_node *fn; + +rcu_read_lock (); + fn =rcu_dereference (rt->rt6i_node); +if (fn && (rt->rt6i_flags &RTF_DEFAULT )) + fn->fn_sernum =-1 ; +rcu_read_unlock (); } } }
@@ -1375,7 +1384,8 @@ static void rt6_do_update_pmtu(struct rt6_info *rt, u32 mtu)static bool rt6_cache_allowed_for_pmtu (const struct rt6_info *rt) {return !(rt->rt6i_flags &RTF_CACHE ) && - (rt->rt6i_flags &RTF_PCPU || rt->rt6i_node); + (rt->rt6i_flags &RTF_PCPU || +rcu_access_pointer (rt->rt6i_node)); } static void __ip6_rt_update_pmtu(struct dst_entry *dst, const struct sock *sk,
net/ipv6/udp.c +10 -1
@@ -752,6 +752,15 @@ static int __udp6_lib_mcast_deliver(struct net *net, struct sk_buff *skb,return 0 ; } +static void udp6_sk_rx_dst_set (struct sock *sk,struct dst_entry *dst) +{ +if (udp_sk_rx_dst_set (sk, dst)) { +const struct rt6_info *rt = (const struct rt6_info *)dst; + +inet6_sk (sk)->rx_dst_cookie =rt6_get_cookie (rt); + } +} +int __udp6_lib_rcv (struct sk_buff *skb,struct udp_table *udptable,int proto) {
@@ -801,7 +810,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,int ret;if (unlikely (sk->sk_rx_dst != dst)) -udp_sk_rx_dst_set (sk, dst); +udp6_sk_rx_dst_set (sk, dst); ret =udpv6_queue_rcv_skb (sk, skb);sock_put (sk);
net/kcm/kcmsock.c +4 -0
@@ -1383,6 +1383,10 @@ static int kcm_attach(struct socket *sock, struct socket *csock,if (!csk)return -EINVAL ; +/* We must prevent loops or risk deadlock ! */ +if (csk->sk_family ==PF_KCM ) +return -EOPNOTSUPP ; + psock =kmem_cache_zalloc (kcm_psockp,GFP_KERNEL );if (!psock)return -ENOMEM ;
net/packet/af_packet.c +9 -3
@@ -2192,6 +2192,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev,struct timespec ts;__u32 ts_status;bool is_drop_n_account = false; +bool do_vnet = false;/* struct tpacket{2,3}_hdr is aligned to a multiple of TPACKET_ALIGNMENT. * We may add members to them until current aligned size without forcing
@@ -2242,8 +2243,10 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, netoff =TPACKET_ALIGN (po->tp_hdrlen + (maclen <16 ?16 : maclen)) + po->tp_reserve; -if (po->has_vnet_hdr) +if (po->has_vnet_hdr) { netoff +=sizeof (struct virtio_net_hdr ); + do_vnet = true; + } macoff = netoff - maclen; }if (po->tp_version <=TPACKET_V2 ) {
@@ -2260,8 +2263,10 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev,skb_set_owner_r (copy_skb, sk); } snaplen = po->rx_ring.frame_size - macoff; -if ((int )snaplen <0 ) +if ((int )snaplen <0 ) { snaplen =0 ; + do_vnet = false; + } } }else if (unlikely (macoff + snaplen >GET_PBDQC_FROM_RB (&po->rx_ring)->max_frame_len)) {
@@ -2274,6 +2279,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev,if (unlikely ((int )snaplen <0 )) { snaplen =0 ; macoff =GET_PBDQC_FROM_RB (&po->rx_ring)->max_frame_len; + do_vnet = false; } }spin_lock (&sk->sk_receive_queue.lock);
@@ -2299,7 +2305,7 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, }spin_unlock (&sk->sk_receive_queue.lock); -if (po->has_vnet_hdr) { +if (do_vnet) {if (virtio_net_hdr_from_skb (skb, h.raw + macoff -sizeof (struct virtio_net_hdr ),vio_le (), true)) {
net/sctp/sctp_diag.c +5 -2
@@ -70,7 +70,8 @@ static int inet_diag_msg_sctpladdrs_fill(struct sk_buff *skb, info =nla_data (attr);list_for_each_entry_rcu (laddr, address_list, list) { -memcpy (info, &laddr->a, addrlen); +memcpy (info, &laddr->a,sizeof (laddr->a)); +memset (info +sizeof (laddr->a),0 , addrlen -sizeof (laddr->a)); info += addrlen; }
@@ -93,7 +94,9 @@ static int inet_diag_msg_sctpaddrs_fill(struct sk_buff *skb, info =nla_data (attr);list_for_each_entry (from, &asoc->peer.transport_addr_list, transports) { -memcpy (info, &from->ipaddr, addrlen); +memcpy (info, &from->ipaddr,sizeof (from->ipaddr)); +memset (info +sizeof (from->ipaddr),0 , + addrlen -sizeof (from->ipaddr)); info += addrlen; }
net/sctp/socket.c +1 -2
@@ -4538,8 +4538,7 @@ int sctp_get_sctp_info(struct sock *sk, struct sctp_association *asoc, info->sctpi_ictrlchunks = asoc->stats.ictrlchunks; prim = asoc->peer.primary_path; -memcpy (&info->sctpi_p_address, &prim->ipaddr, -sizeof (struct sockaddr_storage )); +memcpy (&info->sctpi_p_address, &prim->ipaddr,sizeof (prim->ipaddr)); info->sctpi_p_state = prim->state; info->sctpi_p_cwnd = prim->cwnd; info->sctpi_p_srtt = prim->srtt;
net/sctp/ulpqueue.c +2 -1
@@ -265,7 +265,8 @@ int sctp_ulpq_tail_event(struct sctp_ulpq *ulpq, struct sctp_ulpevent *event)sctp_ulpq_clear_pd (ulpq);if (queue == &sk->sk_receive_queue && !sp->data_ready_signalled) { - sp->data_ready_signalled =1 ; +if (!sock_owned_by_user (sk)) + sp->data_ready_signalled =1 ; sk->sk_data_ready (sk); }return 1 ;
net/tipc/socket.c +3 -3
@@ -2255,8 +2255,8 @@ void tipc_sk_reinit(struct net *net) do { tsk = ERR_PTR(rhashtable_walk_start(&iter)); - if (tsk) - continue; + if (IS_ERR(tsk)) + goto walk_stop; while ((tsk = rhashtable_walk_next(&iter)) && !IS_ERR(tsk)) { spin_lock_bh(&tsk->sk.sk_lock.slock);
@@ -2265,7 +2265,7 @@ void tipc_sk_reinit(struct net *net)msg_set_orignode (msg, tn->own_addr);spin_unlock_bh (&tsk->sk.sk_lock.slock); } - +walk_stop:rhashtable_walk_stop (&iter); }while (tsk ==ERR_PTR (-EAGAIN )); }